smooth_operator 1.2.6 → 1.2.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTQyODc3MjY2NmU2MTlkYTU2NzM0MTRjMjUxYTY0MGRlMDEzNjU5NA==
+    YTM5NDgwNzg0NmI2ZTkwNTg5Y2RlMGI2NDY0ZDdjMzhiNjE2NTRhYw==
   data.tar.gz: !binary |-
-    MDI2NmM2NTYxODllNzRmOWE0ZTAxZjM5NTYzOGIzNmIxMTg1ZmJiZA==
+    MWJkNmU3ZjRjMGRkYjA2M2QyMWQzMGNhMWMwODFlYWIyNjYxNTgzYg==
 SHA512:
   metadata.gz: !binary |-
-    YWJlMjY1OGI1NmY2NjJhMmVkNzI4YjNmZjYyZWFhMGM5NDNkZWNiYWVlMWZm
-    Mzg5MjQ4MTIxOTYxZDVhZmQ4OTQzMjc2YzdkOWI3MjhlMzAzZDg4Y2ZjOTdl
-    NDU1MzMyZWY0MWE3N2Q3YzhiNWQ2N2QxNDI5NDNkNWY1NjMwMGU=
+    ZWIxMWJhYWJiY2U1ZjM5YzBhOTVhMzUwZjNjODYzYzMxZWVhODQ2YzNjNDdj
+    OGNkM2MzYTNlYTUyODhhNTlhYzBjOTcwMDhiZTNlYjk3MzJjZjkzZWNlN2U5
+    YjZhMzhmZjM3NzYxN2E2NjI2NWUyMjhlNzI5NTBjNDZlODFmZmU=
   data.tar.gz: !binary |-
-    YjU2NTgxMjlhODFhZjUyOWUyM2I0NzZkYmQ1NTgwMjI5ZGJkZDZkZjViYThi
-    YTJjZmZlYjhlZTNiMjA4MzJmMDc2NWE2MWU5NjI4MmQxODdmYzYxMGQ0N2Qz
-    NDZkM2Q2ZWQ1YmNlOGJlM2EyYTVkNTBkZTA1NzljMGU1ZDZiZTY=
+    MGMyNmQ4ZTc1ZGVhMzAxNjE2M2E0ZmYyODMwZGY3YjQzMGVkMmI5MDVmZTMy
+    NDAyYjlhZDZhNTM4MDFlNDkxMWU5ODMzZTkzODBmODVjZWZlYmZhOWJhNGE1
+    MDViZjNiMjk0MjNmNTNjM2MwYjVlODI1MDg0ZTYyNmU2NDRhMzY=

data/lib/smooth_operator/attribute_methods.rb

@@ -28,8 +28,6 @@ module SmoothOperator
 
       known_attributes.add attribute_name
 
-      attribute_name, attribute_value = extract_nested_attributes(attribute_name, attribute_value)
-
       initiate_or_update_internal_data(attribute_name, attribute_value)
 
       new_record_or_mark_for_destruction?(attribute_name, attribute_value)
@@ -37,18 +35,6 @@ module SmoothOperator
 
     protected #################### PROTECTED METHODS DOWN BELOW ######################
 
-    def extract_nested_attributes(attribute_name, attribute_value)
-      if !!(attribute_name =~ /_attributes$/)
-        attribute_name = attribute_name[0..-12]
-
-        if self.class.reflect_on_association(attribute_name.to_sym).has_many?
-          attribute_value = attribute_value.values
-        end
-      end
-
-      [attribute_name, attribute_value]
-    end
-
     def initiate_or_update_internal_data(attribute_name, attribute_value)
       if internal_data[attribute_name].nil?
         initiate_internal_data(attribute_name, attribute_value)

data/lib/smooth_operator/relation/array_relation.rb

@@ -1,6 +1,6 @@
 module SmoothOperator
   module Relation
-    class ArrayRelation
+    class ArrayRelation < ::SimpleDelegator
 
       attr_reader :object, :association
 
@@ -8,16 +8,6 @@ module SmoothOperator
         @object, @association = object, association
       end
 
-      def method_missing(method, *args, &block)
-        data.respond_to?(method) ? data.send(method, *args) : super
-      end
-
-      def data
-        data = object.get_internal_data(association.to_s)
-
-        data.nil? ? [] : [*data]
-      end
-
       def reload
         "TODO"
       end
@@ -28,6 +18,14 @@ module SmoothOperator
 
       alias :build :new
 
+      protected ############### PROTECTED ###############
+
+      def refresh
+        data = object.get_internal_data(association.to_s)
+
+        __setobj__(data.nil? ? [] : [*data])
+      end
+
     end
   end
 end

data/lib/smooth_operator/relation/associations.rb

@@ -45,6 +45,10 @@ module SmoothOperator
         else
           define_single_association_method(reflection, association)
         end
+
+        self.send(:attr_reader, "#{association}_attributes".to_sym)
+
+        define_attributes_setter_methods(reflection, association)
       end
 
       private ####################### PRIVATE ######################
@@ -59,6 +63,8 @@ module SmoothOperator
             instance_variable_set("@#{association}", array_relation)
           end
 
+          array_relation.send(:refresh)
+
           array_relation
         end
       end
@@ -69,6 +75,16 @@ module SmoothOperator
         define_method("build_#{reflection.single_name}") { |attributes = {}| reflection.klass.new(attributes) }
       end
 
+      def define_attributes_setter_methods(reflection, association)
+        define_method("#{association}_attributes=") do |attributes|
+          instance_variable_set("@#{association}_attributes", attributes)
+
+          attributes = attributes.values if reflection.has_many?
+
+          push_to_internal_data(association.to_s, attributes)
+        end
+      end
+
       def parse_options(options, default_options)
         options = options.is_a?(Hash) ? options.merge(default_options) : default_options
 

data/lib/smooth_operator/version.rb

@@ -1,3 +1,3 @@
 module SmoothOperator
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smooth_operator
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler