ar_doc_store 2.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0118efe822fe133ce4561bbb5feb3dc3640666b6f9cab8b116f041241e160594'
-  data.tar.gz: db55c5000a7215f5d1a3d312965f562c79c209b3446b1a630cd84ffe25a79f49
+  metadata.gz: ab415cae0a0fff588b20796660e16da2d406a9800d689ffc1d4e3c02e725636c
+  data.tar.gz: ec609a135f59c8e04c05fdbc8b907a86e49b7818e0d3f406f57d2f62223ce4ae
 SHA512:
-  metadata.gz: 00b523748532b1e6109e12e09941cead7a4df9b927286e82ced80d6d47bc47859e2df9ede2fcb7b77b483cd2c19470714c386cd866dfb09fb874fab9274e0753
-  data.tar.gz: b3020b345638f79c1ebb035d40d0ac764343a7a6caf58a94c3bbeaeceeb46570b56953adcd3fc8081eea7a5185809cc471d47973d538571fe16f9c23fd88dd15
+  metadata.gz: 1d321c097e506f2005a2be86dbbe6245011fdda1859bd819c80af147b9d1357106a70c4fcc983e00e50ccb3b4800984f734302c8da8700098a5a3dd33e34da46
+  data.tar.gz: 931e6d3655e830d7df0913508aca632f1bdcb7f32b0d356efb9b8aac9d058210c2d70f2fd23093d6ef012b14d43e7c46ff257c0f5a1247af79c1537bd64bfb7a

data/lib/ar_doc_store/attributes/base.rb

@@ -34,12 +34,13 @@ module ArDocStore
         options.merge!(default: default) if default.present?
         model.class_eval do
           attribute attribute_name, attribute_type.new, **options
-          define_method "#{attribute_name}=".to_sym, -> (value) {
-            value = nil if value == '' || value == ['']
-            write_attribute attribute_name, value
-            new_value = read_attribute attribute_name
-            write_store_attribute(json_column, attribute_name, new_value)
-          }
+          # define_method "#{attribute_name}=".to_sym, -> (value) {
+          #   value = nil if value == '' || value == ['']
+          #   write_attribute attribute_name, value
+          #   # new_value = read_attribute attribute_name
+          #   # write_store_attribute(json_column, attribute_name, new_value)
+          #   attributes[attribute_name]
+          # }
         end
       end
 

data/lib/ar_doc_store/attributes/embeds_many.rb

@@ -9,7 +9,7 @@ module ArDocStore
         model.class_eval <<-CODE, __FILE__, __LINE__ + 1
         attribute :#{attribute}, ArDocStore::Types::EmbedsMany.new("#{@class_name}")
         def #{attribute}
-          value = send :attribute, :#{attribute}
+          value = read_attribute :#{attribute}
           if value && !value.is_a?(ArDocStore::EmbeddedCollection)
             value = ArDocStore::EmbeddedCollection.new value
           else
@@ -24,8 +24,8 @@ module ArDocStore
         end
         def #{attribute}=(value)
           value = nil if value == '' || value == ['']
-          send :attribute=, :#{attribute}, value
-          new_value = send :attribute, :#{attribute}
+          write_attribute :#{attribute}, value
+          new_value = read_attribute :#{attribute}
           new_value.parent = self
           new_value.embedded_as = :#{attribute}
           new_value.each do |item|

data/lib/ar_doc_store/attributes/embeds_one.rb

@@ -9,7 +9,7 @@ module ArDocStore
         model.class_eval <<-CODE, __FILE__, __LINE__ + 1
         attribute :#{attribute}, ArDocStore::Types::EmbedsOne.new("#{@class_name}")
         def #{attribute}
-          value = send :attribute, :#{attribute}
+          value = read_attribute :#{attribute}
           value && value.parent = self
           value && value.embedded_as = :#{attribute}
           value
@@ -19,11 +19,11 @@ module ArDocStore
           write_attribute :#{attribute}, value
           value && #{attribute}.parent = self
           value && #{attribute}.embedded_as = :#{attribute}
-          write_store_attribute json_column, :#{attribute}, #{attribute}
           #{attribute}
         end
         CODE
       end
+      # TODO: figure out how to set parent on read and write
 
       def create_build_method
         model.class_eval <<-CODE, __FILE__, __LINE__ + 1

data/lib/ar_doc_store/embeddable_model.rb

@@ -87,6 +87,14 @@ module ArDocStore
         value
       end
 
+      def read_attribute(attribute)
+        attributes[attribute.to_s]
+      end
+
+      def write_attribute(attribute, value)
+        attributes[attribute.to_s] = value
+      end
+
       def to_param
         id
       end

data/lib/ar_doc_store/model.rb

@@ -7,6 +7,7 @@ module ArDocStore
       mod.send :include, ArDocStore::Embedding
       mod.send :include, InstanceMethods
       mod.after_initialize :assign_json_data
+      mod.before_validation :save_json_data
       mod.before_save :mark_embeds_as_persisted
     end
 
@@ -23,6 +24,15 @@ module ArDocStore
           mutations_from_database.forget_change(key) unless new_record?
         end
       end
+
+      def save_json_data
+        json_attributes.each do |key, value|
+          next unless changes.key?(key)
+
+          write_store_attribute json_column, key, read_attribute(key)
+        end
+      end
+
       def mark_embeds_as_persisted
         json_attributes.values.each do |value|
           if value.respond_to?(:embedded?) && value.embedded? && respond_to?(value.attribute)

data/lib/ar_doc_store/types/embeds_one.rb

@@ -11,21 +11,19 @@ module ArDocStore
 
       def cast(value)
         @class_name = @class_name.constantize if class_name.respond_to?(:constantize)
-        if value.nil?
-          value
-        elsif value.kind_of?(class_name)
+        return if value.nil?
+
+        if value.kind_of?(class_name)
           value
         elsif value.respond_to?(:to_hash)
           class_name.new value
-        else
-          nil
         end
       end
 
       def serialize(value)
-        if value.nil?
-          nil
-        elsif value.kind_of?(class_name)
+        return if value.nil?
+
+        if value.kind_of?(class_name)
           value.serializable_hash
         else
           cast(value).serializable_hash

data/lib/ar_doc_store/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArDocStore
-  VERSION = "2.1"
+  VERSION = "2.1.1"
 end

data/test/attributes/embeds_one_attribute_test.rb

@@ -45,7 +45,8 @@ class EmbedsOneAttributeTest < MiniTest::Test
     b.entrance.name = 'Baz'
     assert b.entrance_changed?
     assert b.entrance.name_changed?
-    assert_equal b.data['entrance']['name'], b.entrance.name
+    # b.validate
+    # assert_equal b.data['entrance']['name'], b.entrance.name
     b.save
     c = Building.find(a.id)
     assert_equal b.data, c.data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_doc_store
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: 2.1.1
 platform: ruby
 authors:
 - David Furber
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2021-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A document storage gem meant for ActiveRecord PostgresQL JSON storage.