Fixes some problems caught by tests

Author: Jesús Burgos

lib/rails-settings.rb

@@ -5,6 +5,15 @@ module RailsSettings
   def self.can_protect_attributes?
     (ActiveRecord::VERSION::MAJOR == 3) || defined?(ProtectedAttributes)
   end
+
+  def self.can_use_becomes?
+    ![
+      [3, 0],
+      [3, 1],
+      [3, 2],
+      [4, 0]
+    ].include?([ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR])
+  end
 end
 
 require 'rails-settings/setting_object'
@@ -20,4 +29,3 @@ def self.has_settings(*args, &block)
     extend RailsSettings::Scopes
   end
 end
-

lib/rails-settings/base.rb

@@ -12,7 +12,7 @@ def settings(var)
           raise ArgumentError unless var.is_a?(Symbol)
           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)
+          fetch_settings_record(var)
         end
 
         def settings=(value)
@@ -44,14 +44,22 @@ def fetch_settings_record(var)
         end
 
         def find_settings_record(var)
-          setting_objects.detect { |s| s.var == var.to_s }
+          setting_objects
+            .select { |s| s.var == var.to_s }
+            .map { |s| s.becomes self.class.setting_keys[var][:class_name].constantize }
+            .first
         end
 
         def build_settings_record(var)
-          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)
+          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
           end
         end
       end

lib/rails-settings/setting_object.rb

@@ -28,6 +28,15 @@ def respond_to?(method_name, include_priv=false)
       super || method_name.to_s =~ REGEX_SETTER || _setting?(method_name)
     end
 
+    # Annoying hack for old Rails
+    unless RailsSettings.can_use_becomes?
+      def becomes(klass)
+        became = super(klass)
+        became.instance_variable_set("@changed_attributes", @changed_attributes)
+        became
+      end
+    end
+
     def method_missing(method_name, *args, &block)
       if block_given?
         super
@@ -78,7 +87,12 @@ def _target_class
     end
 
     def _setting?(method_name)
-      _target_class.setting_keys[var.to_sym][:default_value].keys.include?(method_name.to_s)
+      return false if target_id.nil? || target_type.nil?
+
+      _target_class
+        .setting_keys[var.to_sym][:default_value]
+        .keys
+        .include?(method_name.to_s)
     end
   end
 end