ar_doc_store 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26475c142ad4190f755c67790ee452549a04625c
-  data.tar.gz: 50df0fd6be02fc56a5ade3af39ad8faf0946b212
+  metadata.gz: a3700fe9780b88ba20e28eb918e3b49c307750cc
+  data.tar.gz: 0ccdb51dd3e3b5b2c27176282b6f4d0fab67953d
 SHA512:
-  metadata.gz: 57894eff1ed254c21e932e4b18df91f2d1cf2d0e7c5f7496b2bf0866909456f97c2679aa00657ddc5d85b9768de9944e7bfe256b82e470d133c9267635207ee6
-  data.tar.gz: 9523be413ae72a83b3f58826509018acc3bd43f2269eba15b78b2b247e374021f32b698c3173cb07fd7965c0321c22e2e0fc044f43e8484d60fb649fc790bafc
+  metadata.gz: e1794e597e28722089e23f160a3caf8f3376427ce57dfd9a5e942ccb24b3820cf37d5c886cc87cfc867451a70d29ed2ee8dbdab43f7380025e3f0284d12c271a
+  data.tar.gz: 8f70729d52793af0a9dc970957ab986970d617792518f80b872c22b5026ead45afc7d641602e63fc6917d77d245f9f93e78c04446a4ac5f9bd72698813aa0fb7

data/Gemfile

@@ -1,3 +1,4 @@
+ruby '2.2.2'
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ar_doc_store.gemspec

data/README.md

@@ -9,6 +9,7 @@ The use case is primarily when you have a rapidly evolving schema with scores of
 Learn more about the JSON column in Postgres and using it as a document store:
 * The Rails Guide on Postgres: http://edgeguides.rubyonrails.org/active_record_postgresql.html
 * Document Store Gymnastics: http://rob.conery.io/2015/03/01/document-storage-gymnastics-in-postgres/ 
+* Query JSON with Rails 4.2 and Postgres 9.4: http://robertbeene.com/rails-4-2-and-postgresql-9-4/
 * PG as NoSQL: http://thebuild.com%5Cpresentations%5Cpg-as-nosql-pgday-fosdem-2013.pdf
 * Why JSON in PostgreSQL is Awesome: https://functionwhatwhat.com/json-in-postgresql/
 * Indexing JSONB: http://michael.otacoo.com/postgresql-2/postgres-9-4-feature-highlight-indexing-jsonb/
@@ -156,6 +157,7 @@ end
   = form.input :height, as: :float
   = form.object.ensure_door
   = form.fields_for :door do |door_form|
+    = door_form.input :id # <-- because fields_for won't output the hidden id field for us - not a bad thing to put it where you want it instead of where they put it
     = door_form.input :door_type, as: :check_boxes, collection: Door.door_type_choices
 ```
 

data/Rakefile

@@ -3,5 +3,19 @@ require "bundler/gem_tasks"
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.pattern = "test/*_test.rb"
+  t.pattern = "test/**/*_test.rb"
+end
+
+namespace :test do
+  task :prepare_ar_doc_store do
+    require 'active_record'
+    ActiveRecord::Base.establish_connection(adapter: 'postgresql', database: 'ar_doc_store_test', username: 'postgres', password: 'postgres')
+
+    ActiveRecord::Schema.define do
+      self.verbose = false
+      create_table :buildings, force: true do |t|
+        t.jsonb :data
+      end
+    end
+  end
 end

data/ar_doc_store.gemspec

@@ -18,8 +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", ">= 4.0"
-  spec.add_dependency "hashie", ">=3.4.0"
+  spec.add_dependency "activerecord", "~> 4.0"
+  spec.add_dependency "pg", "~> 0.17"
+  # spec.add_dependency "hashie", ">=3.4.0"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 end

data/lib/ar_doc_store.rb

@@ -3,18 +3,22 @@ require "ar_doc_store/storage"
 require "ar_doc_store/embedding"
 require "ar_doc_store/model"
 require "ar_doc_store/embeddable_model"
-require "ar_doc_store/attribute_types/base"
-require "ar_doc_store/attribute_types/array"
-require "ar_doc_store/attribute_types/boolean"
-require "ar_doc_store/attribute_types/enumeration"
-require "ar_doc_store/attribute_types/float"
-require "ar_doc_store/attribute_types/integer"
-require "ar_doc_store/attribute_types/string"
-require "ar_doc_store/attribute_types/uuid"
-require "ar_doc_store/attribute_types/embeds_one"
-require "ar_doc_store/attribute_types/embeds_many"
 
 module ArDocStore
+
+  module AttributeTypes
+    autoload :BaseAttribute, "ar_doc_store/attribute_types/base_attribute"
+    autoload :ArrayAttribute, "ar_doc_store/attribute_types/array_attribute"
+    autoload :BooleanAttribute, "ar_doc_store/attribute_types/boolean_attribute"
+    autoload :EnumerationAttribute, "ar_doc_store/attribute_types/enumeration_attribute"
+    autoload :FloatAttribute, "ar_doc_store/attribute_types/float_attribute"
+    autoload :IntegerAttribute, "ar_doc_store/attribute_types/integer_attribute"
+    autoload :StringAttribute, "ar_doc_store/attribute_types/string_attribute"
+    autoload :UuidAttribute, "ar_doc_store/attribute_types/uuid_attribute"
+    autoload :EmbedsOneAttribute, "ar_doc_store/attribute_types/embeds_one_attribute"
+    autoload :EmbedsManyAttribute, "ar_doc_store/attribute_types/embeds_many_attribute"
+  end
+
   @mappings = Hash.new
   @mappings[:array]       = 'ArDocStore::AttributeTypes::ArrayAttribute'
   @mappings[:boolean]     = 'ArDocStore::AttributeTypes::BooleanAttribute'
@@ -22,7 +26,6 @@ module ArDocStore
   @mappings[:float]       = 'ArDocStore::AttributeTypes::FloatAttribute'
   @mappings[:integer]     = 'ArDocStore::AttributeTypes::IntegerAttribute'
   @mappings[:string]      = 'ArDocStore::AttributeTypes::StringAttribute'
-  @mappings[:json]        = 'ArDocStore::AttributeTypes::JsonAttribute'
   @mappings[:uuid]        = 'ArDocStore::AttributeTypes::UuidAttribute'
 
   def self.mappings

data/lib/ar_doc_store/attribute_types/{array.rb → array_attribute.rb}

@@ -1,7 +1,7 @@
 module ArDocStore
   module AttributeTypes
     
-    class ArrayAttribute < Base
+    class ArrayAttribute < BaseAttribute
 
       def build
         key = attribute.to_sym

data/lib/ar_doc_store/attribute_types/base_attribute.rb

@@ -0,0 +1,52 @@
+module ArDocStore
+  module AttributeTypes
+    class BaseAttribute
+      attr_accessor :conversion, :predicate, :options, :model, :attribute, :default
+
+      def self.build(model, attribute, options={})
+        new(model, attribute, options).build
+      end
+
+      def initialize(model, attribute, options)
+        @model, @attribute, @options = model, attribute, options
+        @model.virtual_attributes[attribute] = self
+        @default = options.delete(:default)
+      end
+
+      def build
+        store_attribute
+      end
+
+      #:nodoc:
+      def store_attribute
+        attribute = @attribute
+        typecast_method = conversion
+        predicate = @predicate
+        default_value = default
+        model.class_eval do
+          add_ransacker(attribute, predicate)
+          define_method attribute.to_sym, -> {
+            value = read_store_attribute(:data, attribute)
+            if value
+              value.public_send(typecast_method)
+            elsif default_value
+              write_default_store_attribute(attribute, default_value)
+              default_value
+            end
+          }
+          define_method "#{attribute}=".to_sym, -> (value) {
+            if value == '' || value.nil?
+              write_store_attribute :data, attribute, nil
+            else
+              write_store_attribute(:data, attribute, value.public_send(typecast_method))
+            end
+          }
+        end
+      end
+
+
+
+    end
+
+  end
+end

data/lib/ar_doc_store/attribute_types/{boolean.rb → boolean_attribute.rb}

@@ -1,7 +1,7 @@
 module ArDocStore
   module AttributeTypes
 
-    class BooleanAttribute < Base
+    class BooleanAttribute < BaseAttribute
       def build
         key = attribute.to_sym
         model.class_eval do

data/lib/ar_doc_store/attribute_types/{embeds_many.rb → embeds_many_attribute.rb}

@@ -6,7 +6,7 @@ module ArDocStore
   
   module AttributeTypes
 
-    class EmbedsManyAttribute < Base
+    class EmbedsManyAttribute < BaseAttribute
 
       def build
         assn_name = attribute.to_sym
@@ -35,7 +35,7 @@ module ArDocStore
             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) }
+              items = ArDocStore::EmbeddedCollection.new items.map { |item| my_class_name.build(item) }
             else
               items ||= ArDocStore::EmbeddedCollection.new
             end
@@ -67,8 +67,7 @@ module ArDocStore
       def create_build_method_for(assn_name, class_name)
         add_method "build_#{assn_name.to_s.singularize}", -> (attributes=nil) {
           assns = self.public_send assn_name
-          item = class_name.constantize.new attributes
-          item.id
+          item = class_name.constantize.build attributes
           item.parent = self
           assns << item
           public_send "#{assn_name}=", assns
@@ -148,7 +147,7 @@ module ArDocStore
       end
       
       def update_attributes(model, value)
-        model.apply_attributes(value)
+        model.attributes = value
       end
       
       def wants_to_die?(value)

data/lib/ar_doc_store/attribute_types/embeds_one_attribute.rb

@@ -0,0 +1,74 @@
+module ArDocStore
+  module AttributeTypes
+
+    class EmbedsOneAttribute < BaseAttribute
+      attr_reader :class_name
+      def build
+        @class_name = options[:class_name] || attribute.to_s.classify
+        create_accessors
+        create_embed_one_attributes_method
+        create_embeds_one_accessors
+        create_embeds_one_validation
+      end
+
+      def create_accessors
+        model.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{attribute}
+          @#{attribute} || begin
+            item = read_store_attribute :data, :#{attribute}
+            item = #{class_name}.build(item) unless item.is_a?(#{class_name})
+            @#{attribute} = item
+          end
+        end
+
+        def #{attribute}=(value)
+          if value == '' || !value
+            value = nil
+          elsif value.is_a?(#{class_name})
+            value = value.attributes
+          end
+          value = #{class_name}.build value
+          @#{attribute} = value
+          write_store_attribute :data, :#{attribute}, value
+        end
+        CODE
+      end
+
+      def create_embeds_one_accessors
+        model.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def build_#{attribute}(attributes=nil)
+          self.#{attribute} = #{class_name}.build(attributes)
+        end
+        def ensure_#{attribute}
+          #{attribute} || build_#{attribute}
+        end
+        CODE
+      end
+
+      def create_embed_one_attributes_method
+        model.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{attribute}_attributes=(values={})
+          values.symbolize_keys! if values.respond_to?(:symbolize_keys!)
+          if values[:_destroy] && (values[:_destroy] == '1')
+            self.#{attribute} = nil
+          else
+            item = ensure_#{attribute}
+            item.attributes = values
+          end
+        end
+        CODE
+      end
+
+      def create_embeds_one_validation
+        model.class_eval <<-CODE, __FILE__, __LINE__ + 1
+          def validate_embedded_record_for_#{attribute}
+            validate_embeds_one :#{attribute}
+          end
+          validate :validate_embedded_record_for_#{attribute}
+        CODE
+      end
+      
+    end
+
+  end
+end

data/lib/ar_doc_store/attribute_types/{enumeration.rb → enumeration_attribute.rb}

@@ -1,7 +1,7 @@
 module ArDocStore
   module AttributeTypes
 
-    class EnumerationAttribute < Base
+    class EnumerationAttribute < BaseAttribute
       
       def build
         key = attribute.to_sym

data/lib/ar_doc_store/attribute_types/{float.rb → float_attribute.rb}

@@ -1,7 +1,7 @@
 module ArDocStore
   module AttributeTypes
 
-    class FloatAttribute < Base
+    class FloatAttribute < BaseAttribute
       def conversion
         :to_f
       end

data/lib/ar_doc_store/attribute_types/{integer.rb → integer_attribute.rb}

@@ -1,7 +1,7 @@
 module ArDocStore
   module AttributeTypes
 
-    class IntegerAttribute < Base
+    class IntegerAttribute < BaseAttribute
       def conversion
         :to_i
       end

data/lib/ar_doc_store/attribute_types/{string.rb → string_attribute.rb}

@@ -1,7 +1,7 @@
 module ArDocStore
   module AttributeTypes
     
-    class StringAttribute < Base
+    class StringAttribute < BaseAttribute
       def conversion
         :to_s
       end

data/lib/ar_doc_store/attribute_types/{uuid.rb → uuid_attribute.rb}

@@ -3,7 +3,7 @@ require 'securerandom'
 module ArDocStore
   module AttributeTypes
 
-    class UuidAttribute < Base
+    class UuidAttribute < BaseAttribute
       def build
         key = attribute.to_sym
         model.class_eval do

data/lib/ar_doc_store/embeddable_model.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module ArDocStore
   module EmbeddableModel
     def self.included(mod)
@@ -14,7 +16,8 @@ module ArDocStore
 
       mod.class_eval do
         attr_accessor :_destroy
-        attr_accessor :attributes, :parent
+        attr_accessor :parent
+        attr_reader :attributes
 
         class_attribute :virtual_attributes
         self.virtual_attributes ||= HashWithIndifferentAccess.new
@@ -22,6 +25,7 @@ module ArDocStore
         delegate :as_json, to: :attributes
         
         attribute :id, :uuid
+
       end
 
     end
@@ -29,13 +33,23 @@ module ArDocStore
     module InstanceMethods
       
       def initialize(attrs=HashWithIndifferentAccess.new)
-        @attributes = HashWithIndifferentAccess.new
-        self.parent = attrs.delete(:parent) if attrs
-        apply_attributes attrs
         @_initialized = true
+        initialize_attributes attrs
+      end
+
+      def instantiate(attrs=HashWithIndifferentAccess.new)
+        initialize_attributes attrs
+        @_initialized = true
+        self
       end
 
-      def apply_attributes(attrs=HashWithIndifferentAccess.new)
+      def initialize_attributes(attrs)
+        @attributes ||= HashWithIndifferentAccess.new
+        self.parent = attributes.delete(:parent) if attributes
+        self.attributes = attrs
+      end
+
+      def attributes=(attrs=HashWithIndifferentAccess.new)
         virtual_attributes.keys.each do |attr|
           @attributes[attr] ||= nil
         end
@@ -48,12 +62,6 @@ 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
-
       def persisted?
         false
       end
@@ -62,23 +70,33 @@ module ArDocStore
         "#{self.class}: #{attributes.inspect}"
       end
 
-      def read_store_attribute(store, key)
-        @attributes[key]
+      def read_store_attribute(store, attr)
+        attributes[attr]
       end
 
-      def write_store_attribute(store, key, value)
-        changed_attributes[key] = read_store_attribute(:data, key) if @_initialized
-        @attributes[key] = value
+      def write_store_attribute(store, attribute, value)
+        if @_initialized
+          old_value = attributes[attribute]
+          if attribute.to_s != 'id' && value != old_value
+            public_send :"#{attribute}_will_change!"
+            parent.data_will_change! if parent
+          end
+
+        end
+        attributes[attribute] = value
       end
 
-      def write_default_store_attribute(key, value)
-        @attributes[key] = value
+      def write_default_store_attribute(attr, value)
+        attributes[attr] = value
       end
 
       def to_param
         id
       end
-      
+
+      def id_will_change!
+      end
+
     end
     
     module ClassMethods
@@ -91,7 +109,17 @@ module ArDocStore
         define_method key, -> { read_store_attribute(:data, key) }
         define_method "#{key}=".to_sym, -> (value) { write_store_attribute :data, key, value }
       end
-      
+
+      def build(attrs=HashWithIndifferentAccess.new)
+        if attrs.is_a?(self.class)
+          attrs
+        else
+          instance = allocate
+          instance.instantiate attrs
+        end
+      end
+
+
     end
 
   end

data/lib/ar_doc_store/storage.rb

@@ -66,10 +66,10 @@ module ArDocStore
         options = args.extract_options!
         type ||= options.delete(:as) || :string
         class_name = ArDocStore.mappings[type] || "ArDocStore::AttributeTypes::#{type.to_s.classify}Attribute"
-        raise "Invalid attribute type: #{name}" unless const_defined?(class_name)
-        class_name = class_name.constantize
-        class_name.build self, name, options
+        raise "Invalid attribute type: #{class_name}" unless const_defined?(class_name)
+        class_name.constantize.build self, name, options
         define_virtual_attribute_method name
+        define_method "#{name}?", -> { public_send(name).present? }
       end
 
       #:nodoc:
@@ -84,64 +84,6 @@ module ArDocStore
         end
       end
 
-      #:nodoc:
-      def store_attribute(attribute, typecast_method, predicate=nil, default_value=nil)
-        store_accessor :data, attribute
-        add_ransacker(attribute, predicate)
-        if typecast_method.is_a?(Symbol)
-          store_attribute_from_symbol typecast_method, attribute, default_value
-        else
-          store_attribute_from_class typecast_method, attribute
-        end
-      end
-
-      #:nodoc:
-      def store_attribute_from_symbol(typecast_method, key, default_value)
-        define_method key.to_sym, -> { 
-          value = read_store_attribute(:data, key)
-          if value
-            value.public_send(typecast_method)
-          elsif default_value
-            write_default_store_attribute(key, default_value)
-            default_value
-          end
-        }
-        define_method "#{key}=".to_sym, -> (value) {
-          if value == '' || value.nil?
-            write_store_attribute :data, key, nil
-          else
-            write_store_attribute(:data, key, value.public_send(typecast_method))
-          end
-        }
-      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}"
-          instance_variable_get(ivar) || begin
-            item = read_store_attribute(:data, key)
-            class_name = class_name.constantize if class_name.respond_to?(:constantize)
-            item = class_name.new(item) unless item.is_a?(class_name)
-            instance_variable_set ivar, item
-          end
-        }
-        define_method "#{key}=".to_sym, -> (value) {
-          ivar = "@#{key}"
-          existing = public_send(key)
-          class_name = class_name.constantize if class_name.respond_to?(:constantize)
-          if value == '' || !value
-            value = nil
-          elsif !value.is_a?(class_name)
-            value = existing.apply_attributes(value)
-          end
-          instance_variable_set ivar, value
-          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

data/lib/ar_doc_store/version.rb

@@ -1,3 +1,3 @@
 module ArDocStore
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/test/attribute_types/array_attribute_test.rb

@@ -0,0 +1,25 @@
+require_relative './../test_helper'
+
+class ArrayAttributeTest < MiniTest::Test
+  
+  def test_attribute_on_model_init
+    architects = %W{Bob John Billy Bob}
+    b = Building.new architects: architects
+    assert_equal architects, b.architects
+  end
+
+  def test_attribute_on_existing_model
+    architects = %W{Bob John Billy Bob}
+    b = Building.new
+    b.architects = architects
+    assert_equal architects, b.architects
+    assert b.architects_changed?
+  end
+  
+  def test_question_mark_method
+    b = Building.new architects: %W{Bob John}
+    assert_equal true, b.architects?
+  end
+
+  # Type conversion doesn't make sense here...
+end

data/test/attribute_types/boolean_attribute_test.rb

@@ -0,0 +1,36 @@
+require_relative './../test_helper'
+
+class BooleanAttributeTest < MiniTest::Test
+  
+  def test_attribute_on_model_init
+    b = Building.new finished: true
+    assert_equal true, b.finished
+  end
+
+  def test_attribute_on_existing_model
+    b = Building.new
+    b.finished = true
+    assert_equal true, b.finished
+    assert b.finished_changed?
+  end
+  
+  def test_question_mark_method
+    b = Building.new finished: true
+    assert_equal true, b.finished?
+  end
+
+  # The setter function doesn't appear to get called in this context.
+  # But more likely traces to ARDuck.
+  # TODO: Does this still fail after replacing ARDuck with AR::Base?
+  def test_type_conversion_on_init
+    b = Building.new finished: '1'
+    assert_equal true, b.finished
+  end
+
+  def test_type_conversion_on_existing
+    b = Building.new
+    b.finished = '1'
+    assert_equal true, b.finished
+  end
+  
+end

data/test/{model_attribute_access_test.rb → attribute_types/enumeration_attribute_test.rb}

@@ -1,49 +1,6 @@
-require_relative './test_helper'
+require_relative './../test_helper'
 
-class ModelAttributeAccessTest < MiniTest::Test
-  def test_string_attribute_on_model_init
-    b = Building.new name: 'test'
-    assert_equal 'test', b.name
-  end
-
-  def test_string_attribute_on_existing_model
-    b = Building.new
-    b.name = 'test'
-    assert_equal 'test', b.name
-  end
-  
-  def test_boolean_attribute_on_model_init
-    b = Building.new finished: true
-    assert b.finished?
-  end
-  
-  def test_boolean_attribute_on_existing_model
-    b = Building.new
-    b.finished = true
-    assert b.finished?
-  end
-  
-  def test_float_attribute_on_init
-    b = Building.new height: 54.45
-    assert_equal 54.45, b.height
-  end
-  
-  def test_float_attribute_on_existing_model
-    b = Building.new
-    b.height = 54.45
-    assert_equal 54.45, b.height
-  end
-  
-  def test_int_attribute_on_init
-    b = Building.new stories: 5
-    assert_equal 5, b.stories
-  end
-  
-  def test_int_attribute_on_set
-    b = Building.new
-    b.stories = 5
-    assert_equal 5, b.stories
-  end
+class EnumerationAttributeTest < MiniTest::Test
   
   def test_simple_enumeration_attribute
     b = Building.new construction: 'wood'
@@ -96,5 +53,10 @@ class ModelAttributeAccessTest < MiniTest::Test
   def test_enumeration_has_choices_to_use_for_select
     assert Building.construction_choices.present?
   end
-    
+
+  def test_question_mark_method
+    b = Building.new strict_multi_enumeration: %w{glad bad}
+    assert_equal true, b.strict_multi_enumeration?
+  end
+
 end

data/test/attribute_types/float_attribute_test.rb

@@ -0,0 +1,33 @@
+require_relative './../test_helper'
+
+class FloatAttributeTest < MiniTest::Test
+  
+  def test_attribute_on_model_init
+    b = Building.new height: 5.42
+    assert_equal 5.42, b.height
+  end
+
+  def test_attribute_on_existing_model
+    b = Building.new
+    b.height = 5.42
+    assert_equal 5.42, b.height
+    assert b.height_changed?
+  end
+  
+  def test_question_mark_method
+    b = Building.new height: 5.42
+    assert_equal true, b.height?
+  end
+  
+  def test_type_conversion_on_init
+    b = Building.new height: '5.42'
+    assert_equal 5.42, b.height
+  end
+  
+  def test_type_conversion_on_existing
+    b = Building.new 
+    b.height = '5.42'
+    assert_equal 5.42, b.height
+  end
+  
+end

data/test/attribute_types/integer_attribute_test.rb

@@ -0,0 +1,33 @@
+require_relative './../test_helper'
+
+class IntegerAttributeTest < MiniTest::Test
+  
+  def test_string_attribute_on_model_init
+    b = Building.new stories: 5
+    assert_equal 5, b.stories
+  end
+
+  def test_string_attribute_on_existing_model
+    b = Building.new
+    b.stories = 5
+    assert_equal 5, b.stories
+    assert b.stories_changed?
+  end
+  
+  def test_question_mark_method
+    b = Building.new stories: 5
+    assert_equal true, b.stories?
+  end
+  
+  def test_type_conversion_on_init
+    b = Building.new stories: '5'
+    assert_equal 5, b.stories
+  end
+  
+  def test_type_conversion_on_existing
+    b = Building.new 
+    b.stories = '5'
+    assert_equal 5, b.stories
+  end
+  
+end

data/test/attribute_types/string_attribute_test.rb

@@ -0,0 +1,27 @@
+require_relative './../test_helper'
+
+class StringAttributeTest < MiniTest::Test
+  
+  def test_attribute_on_model_init
+    b = Building.new name: 'test'
+    assert_equal 'test', b.name
+  end
+
+  def test_attribute_on_existing_model
+    b = Building.new
+    b.name = 'test'
+    assert_equal 'test', b.name
+    assert b.name_changed?
+  end
+  
+  def test_question_mark_method
+    b = Building.new name: 'test'
+    assert_equal true, b.name?
+  end
+  
+  def test_conversion
+    b = Building.new name: 51
+    assert_equal '51', b.name
+  end
+
+end

data/test/originals/dirty_attributes_test.rb

@@ -0,0 +1,35 @@
+require_relative './../test_helper'
+
+class DirtyAttributeTest < MiniTest::Test
+
+  def test_on_model
+    b = Building.new name: 'Foo!'
+    # This used to work but started failing. AR behavior is to make it true.
+    # send :clear_changes_information not working yields undefined method.
+    # assert !b.name_changed?
+    b.name = 'Bar.'
+    assert_equal 'Bar.', b.name
+    assert b.name_changed?
+    # Somehow this worked at one point, but should only work when the record is loaded via instantiate:
+    # assert_equal 'Foo!', b.name_was
+  end
+
+  #This test fails here but passes elsewhere.
+  def test_on_embedded_model
+    b = Building.new
+    r = b.build_restroom restroom_type: 'dirty'
+    assert !r.restroom_type_changed?
+    r.restroom_type = 'nasty'
+    assert r.restroom_type_changed?
+    assert_equal 'dirty', r.restroom_type_was
+    assert_equal 'nasty', r.restroom_type
+  end
+
+  def test_id_does_not_change_on_init
+    b = Building.new
+    r = b.build_restroom
+    assert !r.id_changed?
+    assert !r.changes.keys.include?('id')
+  end
+
+end

data/test/{embedded_model_attribute_test.rb → originals/embedded_model_attribute_test.rb}

@@ -1,4 +1,4 @@
-require_relative './test_helper'
+require_relative './../test_helper'
 
 class EmbeddedModelAttributeTest < MiniTest::Test
   

data/test/{embedding_test.rb → originals/embedding_test.rb}

@@ -1,4 +1,4 @@
-require_relative './test_helper'
+require_relative './../test_helper'
 
 class EmbeddingTest < MiniTest::Test
   

data/test/test_helper.rb

@@ -5,6 +5,7 @@ require 'minitest/autorun'
 require 'active_record'
 
 require_relative './../lib/ar_doc_store'
+ActiveRecord::Base.establish_connection(adapter: 'postgresql', database: 'ar_doc_store_test', username: 'postgres', password: 'postgres')
 
 # A building has many entrances and restrooms and some fields of its own
 # An entrance has a door, a route, and some fields of its own
@@ -26,7 +27,7 @@ class ARDuck
     @attributes = HashWithIndifferentAccess.new
     unless attrs.nil?
       attrs.each { |key, value|
-        @attributes[key] = value
+        @attributes[key] = public_send("#{key}=", value)
       }
     end
     @_initialized = true
@@ -125,13 +126,14 @@ class Restroom
   
 end
 
-class Building < ARDuck
+class Building < ActiveRecord::Base
   include ArDocStore::Model
   attribute :name, :string
   attribute :comments, as: :string
   attribute :finished, :boolean
   attribute :stories, as: :integer
   attribute :height, as: :float
+  attribute :architects, as: :array
   attribute :construction, as: :enumeration, values: %w{concrete wood brick plaster steel}
   attribute :multiconstruction, as: :enumeration, values: %w{concrete wood brick plaster steel}, multiple: true
   attribute :strict_enumeration, as: :enumeration, values: %w{happy sad glad bad}, strict: true

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ar_doc_store
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - David Furber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -83,26 +83,30 @@ files:
 - Rakefile
 - ar_doc_store.gemspec
 - lib/ar_doc_store.rb
-- lib/ar_doc_store/attribute_types/array.rb
-- lib/ar_doc_store/attribute_types/base.rb
-- lib/ar_doc_store/attribute_types/boolean.rb
-- lib/ar_doc_store/attribute_types/embeds_many.rb
-- lib/ar_doc_store/attribute_types/embeds_one.rb
-- lib/ar_doc_store/attribute_types/enumeration.rb
-- lib/ar_doc_store/attribute_types/float.rb
-- lib/ar_doc_store/attribute_types/integer.rb
-- lib/ar_doc_store/attribute_types/json.rb
-- lib/ar_doc_store/attribute_types/string.rb
-- lib/ar_doc_store/attribute_types/uuid.rb
+- lib/ar_doc_store/attribute_types/array_attribute.rb
+- lib/ar_doc_store/attribute_types/base_attribute.rb
+- lib/ar_doc_store/attribute_types/boolean_attribute.rb
+- lib/ar_doc_store/attribute_types/embeds_many_attribute.rb
+- lib/ar_doc_store/attribute_types/embeds_one_attribute.rb
+- lib/ar_doc_store/attribute_types/enumeration_attribute.rb
+- lib/ar_doc_store/attribute_types/float_attribute.rb
+- lib/ar_doc_store/attribute_types/integer_attribute.rb
+- lib/ar_doc_store/attribute_types/string_attribute.rb
+- lib/ar_doc_store/attribute_types/uuid_attribute.rb
 - lib/ar_doc_store/embeddable_model.rb
 - lib/ar_doc_store/embedding.rb
 - 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
+- test/attribute_types/array_attribute_test.rb
+- test/attribute_types/boolean_attribute_test.rb
+- test/attribute_types/enumeration_attribute_test.rb
+- test/attribute_types/float_attribute_test.rb
+- test/attribute_types/integer_attribute_test.rb
+- test/attribute_types/string_attribute_test.rb
+- test/originals/dirty_attributes_test.rb
+- test/originals/embedded_model_attribute_test.rb
+- test/originals/embedding_test.rb
 - test/test_helper.rb
 homepage: https://github.com/dfurber/ar_doc_store
 licenses:
@@ -129,8 +133,13 @@ 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
+- test/attribute_types/array_attribute_test.rb
+- test/attribute_types/boolean_attribute_test.rb
+- test/attribute_types/enumeration_attribute_test.rb
+- test/attribute_types/float_attribute_test.rb
+- test/attribute_types/integer_attribute_test.rb
+- test/attribute_types/string_attribute_test.rb
+- test/originals/dirty_attributes_test.rb
+- test/originals/embedded_model_attribute_test.rb
+- test/originals/embedding_test.rb
 - test/test_helper.rb

data/lib/ar_doc_store/attribute_types/base.rb

@@ -1,23 +0,0 @@
-module ArDocStore
-  module AttributeTypes
-    class Base
-      attr_accessor :conversion, :predicate, :options, :model, :attribute, :default
-
-      def self.build(model, attribute, options={})
-        new(model, attribute, options).build
-      end
-
-      def initialize(model, attribute, options)
-        @model, @attribute, @options = model, attribute, options
-        @model.virtual_attributes[attribute] = self
-        @default = options.delete(:default)
-      end
-
-      def build
-        model.store_attribute attribute, conversion, predicate, default
-      end
-
-    end
-
-  end
-end

data/lib/ar_doc_store/attribute_types/embeds_one.rb

@@ -1,54 +0,0 @@
-module ArDocStore
-  module AttributeTypes
-
-    class EmbedsOneAttribute < Base
-      def build
-        assn_name = attribute.to_sym
-        class_name = options[:class_name] || attribute.to_s.classify
-        model.store_accessor :data, assn_name
-        model.store_attribute_from_class class_name, assn_name
-        create_embed_one_attributes_method(assn_name)
-        create_embeds_one_accessors assn_name, class_name
-        create_embeds_one_validation(assn_name)
-      end
-
-      def create_embeds_one_accessors(assn_name, class_name)
-        model.class_eval do
-          define_method "build_#{assn_name}", -> (attributes=nil) {
-            class_name = class_name.constantize if class_name.respond_to?(:constantize)
-            public_send "#{assn_name}=", class_name.new(attributes)
-            public_send assn_name
-          }
-          define_method "ensure_#{assn_name}", -> {
-            public_send "build_#{assn_name}" if public_send(assn_name).blank?
-          }
-        end
-      end
-
-      def create_embed_one_attributes_method(assn_name)
-        model.class_eval do
-          define_method "#{assn_name}_attributes=", -> (values) {
-            values ||= {}
-            values.symbolize_keys! if values.respond_to?(:symbolize_keys!)
-            if values[:_destroy] && (values[:_destroy] == '1')
-              self.public_send "#{assn_name}=", nil
-            else
-              public_send "#{assn_name}=", values
-            end              
-          }
-        end
-      end
-
-      def create_embeds_one_validation(assn_name)
-        model.class_eval do
-          validate_method = "validate_embedded_record_for_#{assn_name}"
-          define_method validate_method, -> { validate_embeds_one assn_name }
-          validate validate_method
-        end        
-      end
-      
-
-    end
-
-  end
-end

data/lib/ar_doc_store/attribute_types/json.rb

@@ -1,13 +0,0 @@
-class JsonAttribute < ArDocStore::AttributeTypes::Base
-  def conversion
-    Hashie::Mash
-  end
-
-  def predicate
-    'jsonb'
-  end
-
-  def type
-    :object
-  end
-end

data/test/dirty_attributes_test.rb

@@ -1,24 +0,0 @@
-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