ar_doc_store 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 859e7263865cce405dd43843c6be28ecadea246f
-  data.tar.gz: ab105e19313a9daa2142bde69a1dba4aa871e3c9
+  metadata.gz: 7e522200ea6aeccb2f865c7642e7ce75ac64224a
+  data.tar.gz: 76c9d6f63fa544eb7bd38fc1e857db5c99f590aa
 SHA512:
-  metadata.gz: c8cf5dde9b458e9713fedd7099d40450ec45767d3c648cdc7c5125b1ec949306e55fd61a9c33b4154e5c08d521b687335f41c9a0b73b248c1de6a415f028aa0a
-  data.tar.gz: b1b30cb1b932b8b4d349fb11db08bd4d48746586bca625e7238ab777618f1e1cb771c37f4302210571814c3a6b596eca4cfd531d5ab2c98450556e179e7d50c4
+  metadata.gz: f247dfe4caaac8e32e33bb2c77fde2e7667e46c3a08e54f1fd6b4fd28a9685d445fb935c20b0964044658330b91f14bec70a3ed1823e651e2768252d6bcf4359
+  data.tar.gz: 5218202cab8de9cec3b81990a95087e9b3d3498837cf283528d8a792458448e837b366a14e2ec3a4ce3b84aa03c2a9160d8ae9e5d43575f906df8a3090fa20d4

data/lib/ar_doc_store/attribute_types/embeds_many.rb

@@ -115,12 +115,9 @@ module ArDocStore
         @parent, @class_name, @assn_name, @models, @values = parent, class_name, assn_name, models, values
         values.each { |value| 
           value = value.symbolize_keys
-          Rails.logger.info value.inspect
           if value.key?(:id)
-            Rails.logger.info 'process_existing_model'
             process_existing_model(value)
           else
-            Rails.logger.info 'adding new model'
             add(value)
           end
         }

data/lib/ar_doc_store/embeddable_model.rb

@@ -33,10 +33,11 @@ module ArDocStore
       
       def initialize(attrs=HashWithIndifferentAccess.new)
         @attributes = HashWithIndifferentAccess.new
-        self.parent = attrs.delete(:parent)
+        self.parent = attrs.delete(:parent) if attrs
         apply_attributes attrs
+        @_initialized = true
       end
-      
+
       def apply_attributes(attrs=HashWithIndifferentAccess.new)
         virtual_attributes.keys.each do |attr|
           @attributes[attr] ||= nil
@@ -67,7 +68,11 @@ module ArDocStore
       end
 
       def write_store_attribute(store, key, value)
-        changed_attributes[key] = read_store_attribute(:data, key)
+        changed_attributes[key] = read_store_attribute(:data, key) if @_initialized
+        @attributes[key] = value
+      end
+
+      def write_default_store_attribute(key, value)
         @attributes[key] = value
       end
 

data/lib/ar_doc_store/model.rb

@@ -5,7 +5,20 @@ module ArDocStore
     def self.included(mod)
       mod.send :include, ArDocStore::Storage
       mod.send :include, ArDocStore::Embedding
+      mod.send :include, InstanceMethods
+    end
+
+    module InstanceMethods
+
+      def write_store_attribute(store_attribute, key, value)
+        public_send "#{key}_will_change!"
+        super(store_attribute, key, value)
+      end
+
+      def write_default_store_attribute(key, default_value)
+        data[key] = default_value
+      end
+
     end
-    
   end
 end

data/lib/ar_doc_store/storage.rb

@@ -27,7 +27,7 @@ module ArDocStore
           super
         end
       end
-      
+
       private
       
       def is_stored_attribute?(name)
@@ -44,6 +44,8 @@ module ArDocStore
         is_store_accessor_method?(name) ? name : name.match(/\'(\w+)\'/)[0].gsub("'", '')
       end
       
+      
+      
     end
     
     module ClassMethods
@@ -56,6 +58,7 @@ module ArDocStore
         raise "Invalid attribute type: #{name}" unless const_defined?(class_name)
         class_name = class_name.constantize
         class_name.build self, name, options
+        define_virtual_attribute_method name
       end
 
       def add_ransacker(key, predicate = nil)
@@ -88,7 +91,8 @@ module ArDocStore
           if value
             value.public_send(typecast_method)
           elsif default_value
-            write_store_attribute(:data, key, default_value)
+            write_default_store_attribute(key, default_value)
+            # write_store_attribute(:data, key, default_value)
             default_value
           end
         }
@@ -101,7 +105,7 @@ module ArDocStore
           end
         }
       end
-
+      
       def store_attribute_from_class(class_name, key)
         define_method key.to_sym, -> {
           ivar = "@#{key}"
@@ -125,6 +129,25 @@ module ArDocStore
           write_store_attribute :data, key, value
         }
       end
+      
+      # Pretty much the same as define_attribute_method but skipping the matches that create read and write methods
+      def define_virtual_attribute_method(attr_name)
+        attr_name = attr_name.to_s
+        attribute_method_matchers.each do |matcher|
+          method_name = matcher.method_name(attr_name)
+          next if instance_method_already_implemented?(method_name)
+          next if %w{attribute attribute= attribute_before_type_cast}.include? matcher.method_missing_target
+          generate_method = "define_method_#{matcher.method_missing_target}"
+          if respond_to?(generate_method, true)
+            send(generate_method, attr_name)
+          else
+            define_proxy_call true, generated_attribute_methods, method_name, matcher.method_missing_target, attr_name.to_s
+          end
+        end
+        attribute_method_matchers_cache.clear
+      end
+            
+      
 
       def string_attributes(*args)
         args.each do |arg|

data/lib/ar_doc_store/version.rb

@@ -1,3 +1,3 @@
 module ArDocStore
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/test/dirty_attributes_test.rb

@@ -0,0 +1,24 @@
+require_relative './test_helper'
+
+class DirtylAttributeTest < MiniTest::Test
+
+  def test_dirty_attributes_on_model
+    b = Building.new name: 'Foo!'
+    assert_equal b.name_changed?, false
+    b.name = 'Bar.'
+    assert b.name_changed?
+    assert_equal 'Foo!', b.name_was
+    assert_equal 'Bar.', b.name
+  end
+
+  def test_dirty_attributes_on_embedded_model
+    b = Building.new
+    r = b.build_restroom is_signage_clear: true
+    assert_equal r.is_signage_clear_changed?, false
+    r.is_signage_clear = false
+    assert r.is_signage_clear_changed?
+    assert_equal true, r.is_signage_clear_was
+    assert_equal false, r.is_signage_clear
+  end
+
+end

data/test/test_helper.rb

@@ -24,11 +24,12 @@ class ARDuck
 
   def initialize(attrs=nil)
     @attributes = HashWithIndifferentAccess.new
-    return if attrs.nil?
-    attrs.each { |key, value|
-      key = "#{key}=".to_sym
-      self.public_send(key, value) if methods.include?(key)
-    }
+    unless attrs.nil?
+      attrs.each { |key, value|
+        @attributes[key] = value
+      }
+    end
+    @_initialized = true
   end
 
   def persisted?
@@ -52,18 +53,10 @@ class ARDuck
   end
 
   def write_store_attribute(store, key, value)
-    changed_attributes[key] = read_store_attribute(:data, key)
+    #changed_attributes[key] = read_store_attribute(:data, key) if @_initialized
     @attributes[key] = value
   end
 
-  def data_will_change!
-    true
-  end
-  
-  def self.columns_hash
-    @@columns_hash ||= HashWithIndifferentAccess.new
-  end
-
 end
 
 class EmptyModel

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_doc_store
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - David Furber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -84,6 +84,7 @@ files:
 - lib/ar_doc_store/model.rb
 - lib/ar_doc_store/storage.rb
 - lib/ar_doc_store/version.rb
+- test/dirty_attributes_test.rb
 - test/embedded_model_attribute_test.rb
 - test/embedding_test.rb
 - test/model_attribute_access_test.rb
@@ -113,6 +114,7 @@ signing_key:
 specification_version: 4
 summary: A document storage gem meant for ActiveRecord PostgresQL JSON storage.
 test_files:
+- test/dirty_attributes_test.rb
 - test/embedded_model_attribute_test.rb
 - test/embedding_test.rb
 - test/model_attribute_access_test.rb