Ensure becomes is always used, also on new records

Author: Jesús Burgos

lib/rails-settings/base.rb

@@ -13,6 +13,7 @@ def settings(var)
           raise ArgumentError.new("Unknown key: #{var}") unless self.class.setting_keys[var]
 
           fetch_settings_record(var)
+            .becomes(self.class.setting_keys[var][:class_name].constantize)
         end
 
         def settings=(value)
@@ -44,22 +45,14 @@ def fetch_settings_record(var)
         end
 
         def find_settings_record(var)
-          setting_objects
-            .select { |s| s.var == var.to_s }
-            .map { |s| s.becomes self.class.setting_keys[var][:class_name].constantize }
-            .first
+          setting_objects.detect { |s| s.var == var.to_s }
         end
 
         def build_settings_record(var)
-          build_args =
-            if RailsSettings.can_protect_attributes?
-              [{ :var => var.to_s }, :without_protection => true]
-            else
-              [:var => var.to_s, :target => self]
-            end
-
-          setting_objects.build(*build_args) do |record|
-            record.becomes self.class.setting_keys[var][:class_name].constantize
+          if RailsSettings.can_protect_attributes?
+            setting_objects.build({ :var => var.to_s }, :without_protection => true)
+          else
+            setting_objects.build(:var => var.to_s, :target => self)
           end
         end
       end

spec/settings_spec.rb

@@ -32,6 +32,16 @@
 end
 
 describe 'Objects' do
+  context "settings should be an instance of :class_name" do
+    it "should be an instance of 'SettingObject' by default" do
+      expect(User.new.settings(:dashboard)).to be_a(RailsSettings::SettingObject)
+    end
+
+    it "should be an instance of 'ProjectSettingObject' if defined" do
+      expect(Project.new.settings(:info)).to be_a(ProjectSettingObject)
+    end
+  end
+
   context 'without defaults' do
     let(:account) { Account.new :subdomain => 'foo' }