smooth_operator 1.10.19 → 1.10.20

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmMyMDMzNzhjMDJjYjZlMWQ1OWJiZWJiMjU0ODdmNDllMjhiMjYyNg==
+    NzJiNWZiMGU0ZTczYjY5OTM2ZTZlYTc4OGU2ZjdkMjQyYzA3NjljMA==
   data.tar.gz: !binary |-
-    ZWU3M2FhMDUwNjQxYTQzYmVkYmQ0ZTFjZDI3ODY4YjMxYzUyODQ3MA==
+    NzM0MmE2ZDJhZDYwZGVmNDAwMTNkMjMzZTFhOWQxZTQzYTEyNjE4Ng==
 SHA512:
   metadata.gz: !binary |-
-    YTljZGY2ZTAxYmY0MGQxMWE2YTE5MzNkY2ZkNTA1NzRhOGE3ZmE3NGMwNjA3
-    MDkzNGQ5NmVkMzIxMjFkNmM3ODgyNTYyYWEyMWYxNDY5MDU2OTBhNDAyNjQz
-    MzY5MjMzYWFkZjg0MDU1MDEyYTMzNmVhNWYxMzhkNzU0NTlhNGY=
+    MzhjODI0NTRkZWZiOTIzMDJiZWRhNjlkYTE1MmFjNmIzMDQxNTYwNjQ4MGVl
+    MTUxNGY4NTliNDc4YjA5MDA3MjAxMWM4ZWJkMzA3OGNmNDg4YjI0MjNmYjZm
+    MDJjNmFmNjU0YmVkYmUwMzE5YzUzM2IzOGQ5NjE5MDZmMDc0ZDQ=
   data.tar.gz: !binary |-
-    YzgxNWU5ZWRlYTA5ZjdhNDBkZWNmOWMyODlhYmJiNWIxM2YyMTBlYjMwZDky
-    YjBhMjE1OGUzMTQwMzNkNjEyZTk1Mzg5Mzk4MmQyY2Y2MzhlZTg1MTFlZTU5
-    MTEwNzJkYTUyOGM1ZGM1ZDc0Y2VjYmYyOGMzOWEyNmQ1NTc3NGU=
+    OTZiNGE4NjhmYjE2Y2FiNjlmN2E5YjY0ZWVlMjE5ZjIzMzhkZWRiNTU4ZWMw
+    OTBkNzM1OGI5YTliMzE4MzE4NGY5MjA0ZTg2ZTUyMTE1MzdiZWI5ODBhY2Vk
+    NDk2MTIxMTkyNTIyN2E4Y2E3MjdiYzI1YzhlOTQ4NDBkN2Y0ZWE=

data/lib/smooth_operator/attribute_assignment.rb

@@ -141,7 +141,7 @@ module SmoothOperator
 
     def update_internal_data(attribute_name, attribute_value)
       if self.class.dirty_attributes?
-        internal_data[attribute_name].set_value(attribute_value, self.class.unknown_hash_class, self)
+        internal_data[attribute_name].set_value(attribute_value, self)
       else
         internal_data[attribute_name] = new_attribute_object(attribute_name, attribute_value).value
       end
@@ -150,7 +150,7 @@ module SmoothOperator
     def new_attribute_object(attribute_name, attribute_value)
       attribute_class = self.class.dirty_attributes? ?  Attributes::Dirty : Attributes::Normal
       
-      attribute_class.new(attribute_name, attribute_value, internal_structure[attribute_name], self.class.unknown_hash_class, self)
+      attribute_class.new(attribute_name, attribute_value, self)
     end
 
   end

data/lib/smooth_operator/attributes/base.rb

@@ -5,10 +5,14 @@ module SmoothOperator
 
       protected ##################### PROTECTED ########################
 
-      def cast_to_type(name, value, type, unknown_hash_class, parent_object)
+      def cast_to_type(name, value, parent_object)
+        known_by_schema, type, unknown_hash_class = parent_object.internal_structure.include?(name), parent_object.internal_structure[name], parent_object.class.unknown_hash_class
+
+        return Helpers.duplicate(value) if known_by_schema && type.nil?
+
         case value
         when Array
-          value.map { |array_entry| self.class.new(name, array_entry, type, unknown_hash_class, parent_object).value }
+          value.map { |array_entry| self.class.new(name, array_entry, parent_object).value }
         when Hash
           type.nil? ? new_unknown_hash(value, unknown_hash_class, parent_object) : type.new(value, parent_object: parent_object)
         else
@@ -91,7 +95,7 @@ module SmoothOperator
         hash = {}
 
         attributes.each do |key, value|
-          hash[key] = cast_to_type(key, value, nil, unknown_hash_class, parent_object)
+          hash[key] = cast_to_type(key, value, parent_object)
         end
 
         hash

data/lib/smooth_operator/attributes/dirty.rb

@@ -3,16 +3,16 @@ module SmoothOperator
 
     class Dirty < Base
 
-      attr_reader :original_name, :original_value, :first_value, :value, :type
+      attr_reader :original_name, :original_value, :first_value, :value
 
-      def initialize(name, value, type, unknown_hash_class, parent_object)
-        @original_name, @original_value, @type = name, value, type
+      def initialize(name, value, parent_object)
+        @original_name, @original_value = name, value
 
-        @first_value = set_value(value, unknown_hash_class, parent_object)
+        @first_value = set_value(value, parent_object)
       end
 
-      def set_value(new_value, unknown_hash_class, parent_object)
-        @value = cast_to_type(original_name, new_value, type, unknown_hash_class, parent_object)
+      def set_value(new_value, parent_object)
+        @value = cast_to_type(original_name, new_value, parent_object)
       end
 
       def changed?

data/lib/smooth_operator/attributes/normal.rb

@@ -5,8 +5,8 @@ module SmoothOperator
 
       attr_reader :value
 
-      def initialize(name, value, type, unknown_hash_class, parent_object)
-        @value = cast_to_type(name, value, type, unknown_hash_class, parent_object)
+      def initialize(name, value, parent_object)
+        @value = cast_to_type(name, value, parent_object)
       end
 
     end

data/lib/smooth_operator/model_schema.rb

@@ -42,7 +42,7 @@ module SmoothOperator
       end
 
       def internal_structure
-        Helpers.get_instance_variable(self, :internal_structure, {})
+        Helpers.get_instance_variable(self, :internal_structure, { "errors" => nil })
       end
 
       def known_attributes

data/lib/smooth_operator/version.rb

@@ -1,3 +1,3 @@
 module SmoothOperator
-  VERSION = "1.10.19"
+  VERSION = "1.10.20"
 end

data/spec/smooth_operator/attribute_assignment_spec.rb

@@ -129,6 +129,34 @@ describe SmoothOperator::AttributeAssignment do
     context "when there is a known schema and the received hash has an attribute" do
       subject { UserWithAddressAndPosts::Son }
 
+      context "that is declared (in schema) as an nil" do
+
+        it "when the attributes's value is '1', should return '1'" do
+          expect(subject.new(complex_field: '1').complex_field).to eq('1')
+        end
+
+        it "when the attributes's value is ['1', '2'], should return ['1', '2']" do
+          expect(subject.new(complex_field: ['1', '2']).complex_field).to eq(['1', '2'])
+        end
+
+        it "when the attributes's value is 1, should be converted to 1" do
+          expect(subject.new(complex_field: 1).complex_field).to eq(1)
+        end
+
+        it "when the attributes's value is { first_name: ['1', '2'] }, should be converted to { first_name: ['1', '2'] }" do
+          expect(subject.new(complex_field: { first_name: ['1', '2'] }).complex_field).to eq({ first_name: ['1', '2'] })
+        end
+
+        it "when the attributes's value is -1, should be converted to -1" do
+          expect(subject.new(complex_field: -1).complex_field).to eq(-1)
+        end
+
+        it "when the attributes's value is 0.35, should be converted to 0.35" do
+          expect(subject.new(complex_field: 0.35).complex_field).to eq(0.35)
+        end
+
+      end
+
       context "that is declared (in schema) as an integer" do
 
         it "when the attributes's value is '1', should be converted to 1" do

data/spec/support/models/user_with_address_and_posts.rb

@@ -19,6 +19,7 @@ module UserWithAddressAndPosts
       price: :float,
       manager: :bool,
       date: :datetime,
+      complex_field: nil,
       first_name: :string
     )
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smooth_operator
 version: !ruby/object:Gem::Version
-  version: 1.10.19
+  version: 1.10.20
 platform: ruby
 authors:
 - João Gonçalves