ar_doc_store 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e522200ea6aeccb2f865c7642e7ce75ac64224a
-  data.tar.gz: 76c9d6f63fa544eb7bd38fc1e857db5c99f590aa
+  metadata.gz: c4a712bbb6d8bdecd00a0266ffa78914695441c3
+  data.tar.gz: 7f05b2322e14a906d047b4762c85014126c9989c
 SHA512:
-  metadata.gz: f247dfe4caaac8e32e33bb2c77fde2e7667e46c3a08e54f1fd6b4fd28a9685d445fb935c20b0964044658330b91f14bec70a3ed1823e651e2768252d6bcf4359
-  data.tar.gz: 5218202cab8de9cec3b81990a95087e9b3d3498837cf283528d8a792458448e837b366a14e2ec3a4ce3b84aa03c2a9160d8ae9e5d43575f906df8a3090fa20d4
+  metadata.gz: e8d6cd07419016a93663a11d2134ba2b1f2d60ff35013759031e807fde872f03204410dc7574a19f570ee8d8ccd5b974d1864c189d4e7efc1523ee878c324595
+  data.tar.gz: b235a93f0323b82e4e2ac226e903729d162fec7cea3a91be892bd1850bd11f7f80a9b0ee05240d6303a8a6037bedb77b4709d54284f670c7b554f2e433e9e432

data/lib/ar_doc_store/attribute_types/embeds_many.rb

@@ -31,18 +31,19 @@ module ArDocStore
       def create_reader_for(assn_name, class_name)
         add_method assn_name.to_sym, -> {
           ivar = "@#{assn_name}"
-          existing = instance_variable_get(ivar)
-          return existing if existing
-          my_class_name = class_name.constantize
-          items = read_store_attribute(:data, assn_name)
-          if items.present? && items.first.respond_to?(:keys)
-            items = ArDocStore::EmbeddedCollection.new items.map { |item| my_class_name.new(item) }
+          instance_variable_get(ivar) || begin
+            my_class_name = class_name.constantize
+            items = read_store_attribute(:data, assn_name)
+            if items.is_a?(Array) || items.is_a?(ArDocStore::EmbeddedCollection)
+              items = ArDocStore::EmbeddedCollection.new items.map { |item| my_class_name.new(item) }
+            else
+              items ||= ArDocStore::EmbeddedCollection.new
+            end
+            instance_variable_set ivar, (items)
+            items.parent = self
+            items.map {|item| item.parent = self }
+            items
           end
-          items ||= ArDocStore::EmbeddedCollection.new
-          instance_variable_set ivar, (items)
-          items.parent = self
-          items.map {|item| item.parent = self }
-          items
         }
       end
       def create_writer_for(assn_name, class_name)

data/lib/ar_doc_store/embeddable_model.rb

@@ -51,6 +51,8 @@ module ArDocStore
         self
       end
       
+      # TODO: This doesn't work very well for embeds_many because the parent needs to have its setter triggered
+      # before the embedded model will actually get saved.
       def save
         parent && parent.save
       end
@@ -76,10 +78,6 @@ module ArDocStore
         @attributes[key] = value
       end
 
-      def data_will_change!
-        true
-      end
-      
       def to_param
         id
       end
@@ -88,6 +86,7 @@ module ArDocStore
     
     module ClassMethods
       
+      #:nodoc:
       def store_accessor(store, key)
         self.virtual_attributes ||= HashWithIndifferentAccess.new
         virtual_attributes[key] ||= true

data/lib/ar_doc_store/storage.rb

@@ -43,9 +43,20 @@ module ArDocStore
       def attribute_name_from_foreign_key(name)
         is_store_accessor_method?(name) ? name : name.match(/\'(\w+)\'/)[0].gsub("'", '')
       end
-      
-      
-      
+
+      def clean_attribute_names_for_arel(attribute_names)
+        attribute_names.reject{|attribute_name| is_stored_attribute?(attribute_name)}
+      end
+
+      # Overridden otherwise insert and update queries get fooled into thinking that stored attributes are real columns.
+      def arel_attributes_with_values_for_create(attribute_names) #:nodoc:
+        super clean_attribute_names_for_arel(attribute_names)
+      end
+
+      # Overridden otherwise insert and update queries get fooled into thinking that stored attributes are real columns.
+      def arel_attributes_with_values_for_update(attribute_names) #:nodoc:
+        super clean_attribute_names_for_arel(attribute_names)
+      end
     end
     
     module ClassMethods
@@ -61,6 +72,7 @@ module ArDocStore
         define_virtual_attribute_method name
       end
 
+      #:nodoc:
       def add_ransacker(key, predicate = nil)
         return unless respond_to?(:ransacker)
         ransacker key do
@@ -72,6 +84,7 @@ module ArDocStore
         end
       end
 
+      #:nodoc:
       def store_attributes(typecast_method, predicate=nil, attributes=[], default_value=nil)
         attributes = [attributes] unless attributes.respond_to?(:each)
         attributes.each do |key|
@@ -85,6 +98,7 @@ module ArDocStore
         end
       end
 
+      #:nodoc:
       def store_attribute_from_symbol(typecast_method, key, default_value)
         define_method key.to_sym, -> { 
           value = read_store_attribute(:data, key)
@@ -92,12 +106,10 @@ module ArDocStore
             value.public_send(typecast_method)
           elsif default_value
             write_default_store_attribute(key, default_value)
-            # write_store_attribute(:data, key, default_value)
             default_value
           end
         }
         define_method "#{key}=".to_sym, -> (value) {
-          # data_will_change! if @initalized
           if value == '' || value.nil?
             write_store_attribute :data, key, nil
           else
@@ -106,6 +118,9 @@ module ArDocStore
         }
       end
       
+      # TODO: add default value support. 
+      # Default ought to be a hash of attributes, 
+      # also accept a proc that receives the newly initialized object
       def store_attribute_from_class(class_name, key)
         define_method key.to_sym, -> {
           ivar = "@#{key}"
@@ -147,32 +162,36 @@ module ArDocStore
         attribute_method_matchers_cache.clear
       end
             
-      
-
+      # Allows you to define several string attributes at once. Deprecated.
       def string_attributes(*args)
         args.each do |arg|
           attribute arg, as: :string
         end
       end
 
+      # Allows you to define several float attributes at once. Deprecated.
       def float_attributes(*args)
         args.each do |arg|
           attribute arg, as: :float
         end
       end
 
+      # Allows you to define several integer attributes at once. Deprecated.
       def integer_attributes(*args)
         args.each do |arg|
           attribute arg, as: :integer
         end
       end
 
+      # Allows you to define several boolean attributes at once. Deprecated.
       def boolean_attributes(*args)
         args.each do |arg|
           attribute arg, as: :boolean
         end
       end
-      
+
+      # Shorthand for attribute :name, as: :enumeration, values: %w{a b c}
+      # Deprecated.
       def enumerates(field, *args)
         options = args.extract_options!
         options[:as] = :enumeration

data/lib/ar_doc_store/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_doc_store
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - David Furber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord