lib/active_remote/association.rb in active_remote-3.3.3 vs lib/active_remote/association.rb in active_remote-5.0.0.pre

@@ -31,16 +31,16 @@
       #     def client
       #       Client.search(:guid => self.client_guid).first
       #     end
       #   end
       #
-      def belongs_to(belongs_to_klass, options={})
+      def belongs_to(belongs_to_klass, options = {})
         perform_association(belongs_to_klass, options) do |klass, object|
           foreign_key = options.fetch(:foreign_key) { :"#{klass.name.demodulize.underscore}_guid" }
           search_hash = {}
           search_hash[:guid] = object.read_attribute(foreign_key)
-          search_hash[options[:scope]] = object.read_attribute(options[:scope]) if options.has_key?(:scope)
+          search_hash[options[:scope]] = object.read_attribute(options[:scope]) if options.key?(:scope)
 
           search_hash.values.any?(&:nil?) ? nil : klass.search(search_hash).first
         end
       end
 
@@ -72,21 +72,21 @@
       #     def users
       #       User.search(:client_guid => self.guid)
       #     end
       #   end
       #
-      def has_many(has_many_class, options={})
+      def has_many(has_many_class, options = {})
         perform_association(has_many_class, options) do |klass, object|
           foreign_key = options.fetch(:foreign_key) { :"#{object.class.name.demodulize.underscore}_guid" }
           search_hash = {}
           search_hash[foreign_key] = object.guid
-          search_hash[options[:scope]] = object.read_attribute(options[:scope]) if options.has_key?(:scope)
+          search_hash[options[:scope]] = object.read_attribute(options[:scope]) if options.key?(:scope)
 
           search_hash.values.any?(&:nil?) ? [] : klass.search(search_hash)
         end
 
-        options.merge!(:has_many => true)
+        options[:has_many] = true
         create_setter_method(has_many_class, options)
       end
 
       # Create a `has_one` association for a given remote resource.
       # Specify one or more associations to define. The constantized
@@ -113,16 +113,16 @@
       #     def client
       #       Client.search(:user_guid => self.guid).first
       #     end
       #   end
       #
-      def has_one(has_one_klass, options={})
+      def has_one(has_one_klass, options = {})
         perform_association(has_one_klass, options) do |klass, object|
           foreign_key = options.fetch(:foreign_key) { :"#{object.class.name.demodulize.underscore}_guid" }
           search_hash = {}
           search_hash[foreign_key] = object.guid
-          search_hash[options[:scope]] = object.read_attribute(options[:scope]) if options.has_key?(:scope)
+          search_hash[options[:scope]] = object.read_attribute(options[:scope]) if options.key?(:scope)
 
           search_hash.values.any?(&:nil?) ? nil : klass.search(search_hash).first
         end
       end
 
@@ -133,32 +133,30 @@
         raise "Could not find attribute: '#{options[:scope]}' on #{associated_class}" unless associated_class.public_instance_methods.include?(options[:scope])
       end
 
     private
 
-      def create_setter_method(associated_klass, options={})
+      def create_setter_method(associated_klass, options = {})
         writer_method = "#{associated_klass}=".to_sym
         define_method(writer_method) do |new_value|
           raise "New value must be an array" if options[:has_many] == true && new_value.class != Array
-          klass_name = options.fetch(:class_name){ associated_klass }
-          klass = klass_name.to_s.classify.constantize
 
           instance_variable_set(:"@#{new_value.class.name.demodulize.underscore}", new_value)
           new_value
         end
       end
 
-      def perform_association(associated_klass, options={})
+      def perform_association(associated_klass, options = {})
         define_method(associated_klass) do
-          klass_name = options.fetch(:class_name){ associated_klass }
+          klass_name = options.fetch(:class_name) { associated_klass }
           klass = klass_name.to_s.classify.constantize
 
-          self.class.validate_scoped_attributes(klass, self.class, options) if options.has_key?(:scope)
+          self.class.validate_scoped_attributes(klass, self.class, options) if options.key?(:scope)
 
           value = instance_variable_get(:"@#{associated_klass}")
 
           unless value
-            value = yield( klass, self )
+            value = yield(klass, self)
             instance_variable_set(:"@#{associated_klass}", value)
           end
 
           return value
         end