ar_doc_store 2.0.4 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afe26947ddd8664a737271d05ab8635e62c1f757f97ad52b6d85b703e7c40cb6
-  data.tar.gz: 413625561be11082f189c64715aaacfa61a15b4f92de05f98965024908c806a9
+  metadata.gz: b5e0f3b286ab52eebdb032146c7bd7c368f76888221e3bdf1c01f3a7d088d5ef
+  data.tar.gz: 96e38a0850648b7eb8af1f7b1ebadc44c136b0633f0c33a398ab3e632d734f88
 SHA512:
-  metadata.gz: 2897af9b534b27f233469c277931a78df6154412ecc7e54386168f15b553af567cbca9133ff729f465bcec238f464bf5622b6e01e6c20658ade61aeb315e365d
-  data.tar.gz: 5512f91e3214cbeb4797aceb558106295649ff6ba19ff954ad8199aa8a97a313bc92f2ca1503e6d53668b0155f4af788f6a62286e1db036d98e76611b0b43a46
+  metadata.gz: 5d4cc8a28403eaf2f42277b1c5d1f2d702380c3a90b2dbce9a80aec55d02af3c716dcd15075eb513c8ac1d48f83db3a20e1006770d539eb81be16c2709f04b10
+  data.tar.gz: f7c4ab93d371cf71a7e8a29542e9a00a8a84d64910b9df8763ab56622531bcf5f4545f703c8755ec70bf18b49208ee1ac6996c93e7e44e54243fca8fd95bdecf

data/ar_doc_store.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">=5.2"
+  spec.add_dependency "activerecord", ">=6.1"
   spec.add_dependency "pg"
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "simplecov"
 end

data/lib/ar_doc_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "ar_doc_store/version"
 require "ar_doc_store/storage"
 require "ar_doc_store/embedding"

data/lib/ar_doc_store/attributes/array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Attributes
     class Array < Base

data/lib/ar_doc_store/attributes/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Attributes
     class Base
@@ -32,13 +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 == ['']
-            send :attribute=, attribute_name, value
-            new_value = send :attribute, attribute_name
-            write_store_attribute(json_column, attribute_name, new_value)
-            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/boolean.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Attributes
     class Boolean < Base

data/lib/ar_doc_store/attributes/callback_support.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Attributes
     module CallbackSupport
@@ -18,4 +20,4 @@ module ArDocStore
       end
     end
   end
-end
+end

data/lib/ar_doc_store/attributes/date.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Attributes
     class Date < Base
@@ -18,4 +20,4 @@ module ArDocStore
       end
     end
   end
-end
+end

data/lib/ar_doc_store/attributes/datetime.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Attributes
     class Datetime < Base
@@ -18,4 +20,4 @@ module ArDocStore
       end
     end
   end
-end
+end

data/lib/ar_doc_store/attributes/decimal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Attributes
     class Decimal < Base

data/lib/ar_doc_store/attributes/embeds_base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Attributes
     class EmbedsBase < Base
@@ -20,16 +22,20 @@ module ArDocStore
       end
 
       def create_build_method
+        # override in subclass
       end
 
       def create_ensure_method
+        # override in subclass
       end
 
       def create_attributes_method
+        # override in subclass
       end
 
       def create_validation
+        # override in subclass
       end
     end
   end
-end
+end

data/lib/ar_doc_store/attributes/embeds_many.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Attributes
     class EmbedsMany < EmbedsBase
@@ -7,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
@@ -22,15 +24,15 @@ 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|
             item.parent = new_value
           end
           write_store_attribute json_column, :#{attribute}, new_value
-          new_value          
+          new_value
         end
         CODE
       end
@@ -66,6 +68,7 @@ module ArDocStore
         model.class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{attribute}_attributes=(values)
           return if values.blank?
+
           if values.respond_to?(:each)
             if values.respond_to?(:values)
               values = values.values
@@ -111,6 +114,7 @@ module ArDocStore
 
       def process_existing_model(value)
         return false unless value.key?(:id)
+
         model = find_model_by_value(value)
         model && destroy_or_update(model, value) or add(value)
       end

data/lib/ar_doc_store/attributes/embeds_one.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Attributes
     class EmbedsOne < EmbedsBase
@@ -7,8 +9,8 @@ module ArDocStore
         model.class_eval <<-CODE, __FILE__, __LINE__ + 1
         attribute :#{attribute}, ArDocStore::Types::EmbedsOne.new("#{@class_name}")
         def #{attribute}
-          value = send :attribute, :#{attribute}
-          value && value.parent = self 
+          value = read_attribute :#{attribute}
+          value && value.parent = self
           value && value.embedded_as = :#{attribute}
           value
         end
@@ -17,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}          
+          #{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
@@ -62,8 +64,6 @@ module ArDocStore
           validate :validate_embedded_record_for_#{attribute}
         CODE
       end
-
     end
-
   end
 end

data/lib/ar_doc_store/attributes/enumeration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Attributes
     class Enumeration < Base

data/lib/ar_doc_store/attributes/float.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Attributes
     class Float < Base

data/lib/ar_doc_store/attributes/integer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Attributes
     class Integer < Base

data/lib/ar_doc_store/attributes/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Attributes
     class String < Base

data/lib/ar_doc_store/embeddable_model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'securerandom'
 
 module ArDocStore
@@ -71,7 +73,7 @@ module ArDocStore
       end
 
       def read_store_attribute(store, attr)
-        attributes[attr]
+        attributes[attr.to_s]
       end
 
       def write_store_attribute(store, attribute, value)
@@ -85,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/embedded_collection.rb

@@ -1,14 +1,18 @@
+# frozen_string_literal: true
+
 module ArDocStore
   class EmbeddedCollection < Array
     attr_accessor :parent, :embedded_as
     def save
       parent.send :write_store_attribute, parent.json_column, embedded_as, as_json
     end
+
     def persist
       each &:persist
     end
+
     def inspect
       "ArDocStore::EmbeddedCollection - #{as_json.inspect}"
     end
   end
-end
+end

data/lib/ar_doc_store/embedding.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Embedding
     def self.included(mod)

data/lib/ar_doc_store/model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Model
     def self.included(mod)
@@ -5,25 +7,34 @@ 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
 
     module InstanceMethods
       def assign_json_data
         json_data = respond_to?(json_column) && self[json_column]
-        return if json_data.blank?
-        json_attributes.keys.each do |key|
+        json_data && json_attributes.keys.each do |key|
           next unless json_data.key?(key)
-          send :attribute=, key, json_data[key] if self.respond_to?("#{key}=")
+          self[key] = json_data[key] if respond_to?("#{key}=")
+          # send :attribute=, key, json_data[key] if self.respond_to?("#{key}=")
           self[key].parent = self if self[key].respond_to?(:parent=)
           self[key].embedded_as = key if self[key].respond_to?(:embedded_as)
           mutations_from_database.forget_change(key) unless new_record?
         end
       end
+
+      def save_json_data
+        json_attributes.each do |key, value|
+          write_store_attribute(json_column, key, read_attribute(key)) if changes.key?(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) && !public_send(value.attribute).nil?
-            public_send(value.attribute).persist
+          if value.respond_to?(:embedded?) && value.embedded? && respond_to?(value.attribute)
+            val = public_send(value.attribute)
+            val.persist if val && val.respond_to?(:persist)
           end
         end
       end

data/lib/ar_doc_store/storage.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Storage
 
     def self.included(mod)
-
       mod.class_attribute :json_column
       mod.json_column ||= :data
       mod.class_attribute :json_attributes
@@ -17,12 +18,14 @@ module ArDocStore
         type ||= options.delete(:as) || :string
         class_name = ArDocStore.mappings[type] || "ArDocStore::Attributes::#{type.to_s.classify}"
         raise "Invalid attribute type: #{class_name}" unless const_defined?(class_name)
+
         json_attributes[name] = class_name.constantize.build self, name, options
       end
 
       #:nodoc:
       def add_ransacker(key, predicate = nil)
         return unless respond_to?(:ransacker)
+
         ransacker key do |parent|
           sql = "(#{parent.table[json_column].name}->>'#{key}')"
           if predicate.present?

data/lib/ar_doc_store/types/embeds_many.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Types
     class EmbedsMany < ActiveModel::Type::Value
@@ -25,9 +27,9 @@ module ArDocStore
       end
 
       def serialize(values)
-        if values.nil?
-          nil
-        elsif values.respond_to?(:each)
+        return if values.nil?
+
+        if values.respond_to?(:each)
           values.map { |value|
             if value.nil?
               nil
@@ -49,4 +51,4 @@ module ArDocStore
       end
     end
   end
-end
+end

data/lib/ar_doc_store/types/embeds_one.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
   module Types
     class EmbedsOne < ActiveModel::Type::Value
@@ -9,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
@@ -39,4 +39,4 @@ module ArDocStore
       end
     end
   end
-end
+end

data/lib/ar_doc_store/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ArDocStore
-  VERSION = "2.0.4"
+  VERSION = "2.1.2"
 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.0.4
+  version: 2.1.2
 platform: ruby
 authors:
 - David Furber
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +135,7 @@ homepage: https://github.com/dfurber/ar_doc_store
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,9 +150,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: A document storage gem meant for ActiveRecord PostgresQL JSON storage.
 test_files: