couch_potato 1.22.1 → 1.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a67f7979fa5b4e50e7b2a99229692134dddb0938d8aa8b9e194a3beecadc9baf
-  data.tar.gz: 781f887008ef098b75f91a642ec373bc43a1e4be46a4452182c335af8a173ed6
+  metadata.gz: 666f7dd052f1c9fbaa75382ed1bca8103b41603950087f1081cf62ff184964bc
+  data.tar.gz: b6ac16b525eebb35e27d92c5546dcb4ff1359a15991d760ab5c5c39490664b88
 SHA512:
-  metadata.gz: c1b30feb5418351056c70e7b2ae0f257e41339317cd0c20649046ad0a645efc42a52814e38fb7d9f6398e23eb16eef7710e25cbc4905db2fc13e85733d8fc3c5
-  data.tar.gz: 4c754a82ca5710332b363fbdfc75a813ac6212a2140993f67b271182e795e9e1540efae3cec1f06c9c356463f698266590b28c8ec9993e96bddea96cdbe5ef9f
+  metadata.gz: 537ff4580ebe58fe9d5b29e10bae273ee70b3b85b7762af94448b70c11b213fc800ca434b6ef47156c62c436b6b398ec162344983fa0d508b2b95611c7560696
+  data.tar.gz: ccb0b54672f83d83762aa900887dbfd950e2d9f8a4fe92790cf01355d3945534fc4a969d9337ba9816dee8715c58a02657795c59074e8a8c553a67a76f9b0f00

data/CHANGES.md

@@ -1,5 +1,8 @@
 # Changes
 
+## 1.22.2
+
+- fix instantiating properties that include CouchPotato::Persistence (call .json_create instead of .new)
 
 ## 1.22.1
 

data/lib/couch_potato/persistence/simple_property.rb

@@ -13,9 +13,9 @@ module CouchPotato
         end
       end
 
-      def assign_attribute(name, value)
+      def assign_attribute(name, value, from_json: false)
         property = self.class.properties.find_property(name)
-        typecasted_value = type_caster.cast(value, property.type)
+        typecasted_value = type_caster.cast(value, property.type, from_json:)
         send("#{name}_will_change!") unless @skip_dirty_tracking || typecasted_value == send(name)
         instance_variable_set("@#{name}", typecasted_value)
       end
@@ -35,7 +35,7 @@ module CouchPotato
       end
 
       def build(object, json)
-        object.send(:assign_attribute, name, json[name])
+        object.send(:assign_attribute, name, json[name], from_json: true)
       end
 
       def serialize(json, object)

data/lib/couch_potato/persistence/type_caster.rb

@@ -6,14 +6,14 @@ module CouchPotato
     class TypeCaster #:nodoc:
       NUMBER_REGEX = /-?\d*\.?\d*/.freeze
 
-      def cast(value, type)
+      def cast(value, type, from_json: false)
         if type == :boolean
           cast_boolean(value)
         elsif type.instance_of?(Array)
           nested_type = type.first
-          value&.map { |val| cast_native(val, nested_type) }
+          value&.map { |val| cast_native(val, nested_type, from_json:) }
         else
-          cast_native(value, type)
+          cast_native(value, type, from_json:)
         end
       end
 
@@ -29,7 +29,7 @@ module CouchPotato
         end
       end
 
-      def cast_native(value, type)
+      def cast_native(value, type, from_json:)
         if type && !value.is_a?(type)
 
           if %w[Integer Bignum].include?(type.to_s)
@@ -40,7 +40,7 @@ module CouchPotato
             value.to_d unless value.blank?
           elsif type == Hash
             value.to_hash unless value.blank?
-          elsif type.ancestors.include?(CouchPotato::Persistence)
+          elsif type.ancestors.include?(CouchPotato::Persistence) && !from_json
             type.new value unless value.blank?
           else
             type.json_create value unless value.blank?

data/lib/couch_potato/version.rb

@@ -1,4 +1,4 @@
 module CouchPotato
-  VERSION = '1.22.1'.freeze
+  VERSION = '1.22.2'.freeze
   RSPEC_VERSION = '4.4.0'.freeze
 end

data/spec/property_spec.rb

@@ -132,8 +132,8 @@ describe 'properties' do
     expect(w.custom_address[0]).to be_an_instance_of Address2
   end
 
-  it 'initializes an typed array property from an array of hashes' do
-    w = Watch.new(custom_address: [{id: 'a1', city: 'Berlin'}])
+  it 'initializes a typed array property from an array of hashes' do
+    w = Watch.new(custom_address: [{_id: 'a1', city: 'Berlin'}])
 
     expect(w.custom_address.map(&:class)).to eq([Address])
     expect(w.custom_address.map(&:id)).to eq(['a1'])
@@ -198,6 +198,32 @@ describe 'properties' do
     expect(p.ship_address).to be_nil
   end
 
+  it "persists a nested object with non-couch potato attributes delegating to properties" do
+    class PersonWithName
+      include CouchPotato::Persistence
+
+      property :first_name
+      property :last_name
+
+      def name=(value)
+        self.first_name = value.split(' ').first
+        self.last_name = value.split(' ').last
+      end
+    end
+    class PersonContainer
+      include CouchPotato::Persistence
+
+      property :person, type: PersonWithName
+    end
+
+    container = PersonContainer.new(person: {name: 'John Doe'})
+    CouchPotato.database.save_document!(container)
+    container = CouchPotato.database.load_document(container.id)
+
+    expect(container.person.first_name).to eq('John')
+    expect(container.person.last_name).to eq('Doe')
+  end
+
   it "should actually pass the null value down in the JSON document " do
     p = Person.new
     p.ship_address = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couch_potato
 version: !ruby/object:Gem::Version
-  version: 1.22.1
+  version: 1.22.2
 platform: ruby
 authors:
 - Alexander Lang
@@ -249,48 +249,4 @@ requirements: []
 rubygems_version: 3.6.9
 specification_version: 4
 summary: Ruby persistence layer for CouchDB
-test_files:
-- spec/attachments_spec.rb
-- spec/callbacks_spec.rb
-- spec/conflict_handling_spec.rb
-- spec/create_spec.rb
-- spec/default_property_spec.rb
-- spec/destroy_spec.rb
-- spec/fixtures/address.rb
-- spec/fixtures/person.rb
-- spec/property_spec.rb
-- spec/rails_spec.rb
-- spec/railtie_spec.rb
-- spec/reload_spec.rb
-- spec/revisions_spec.rb
-- spec/single_design_document_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/unit/active_model_compliance_spec.rb
-- spec/unit/attributes_spec.rb
-- spec/unit/base_view_spec_spec.rb
-- spec/unit/caching_spec.rb
-- spec/unit/callbacks_spec.rb
-- spec/unit/couch_potato_spec.rb
-- spec/unit/create_spec.rb
-- spec/unit/custom_view_spec_spec.rb
-- spec/unit/custom_views_spec.rb
-- spec/unit/database_spec.rb
-- spec/unit/date_spec.rb
-- spec/unit/dirty_attributes_spec.rb
-- spec/unit/flex_view_spec_spec.rb
-- spec/unit/forbidden_attributes_protection_spec.rb
-- spec/unit/initialize_spec.rb
-- spec/unit/json_spec.rb
-- spec/unit/model_view_spec_spec.rb
-- spec/unit/persistence_spec.rb
-- spec/unit/properties_view_spec_spec.rb
-- spec/unit/rspec_stub_db_spec.rb
-- spec/unit/string_spec.rb
-- spec/unit/time_spec.rb
-- spec/unit/validation_spec.rb
-- spec/unit/view_query_spec.rb
-- spec/update_spec.rb
-- spec/validation_context_spec.rb
-- spec/view_updates_spec.rb
-- spec/views_spec.rb
+test_files: []