ar_doc_store 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e38a8f9b053750e7ffcceb4cc75567d1c2b082f7
-  data.tar.gz: c7c42d91dd649a304f115fcb682b0bd13bdf65c8
+  metadata.gz: 9bc6988ec4fcb270a64c6e8ab1bca2ba8fd6590a
+  data.tar.gz: 7d11854e6bca4785b91a87e5f3bec76847e621c5
 SHA512:
-  metadata.gz: 3203c8187eb0a57cbc4975dce49d1f23c84f956f2f97846f293b0f60d7216f306e1a4034344c69e0b49d1cd3dd7f874f71b73c06d5d9549805bde838f5069466
-  data.tar.gz: 9125796b99835dfe9f806d05dcace1019065112bd2afea6419e2a50d46179716b3ca911811c6c0792be632a96bf4beae52c059b763ca32671a552772af0aa53a
+  metadata.gz: b219537a7081e7325f968e674efe0e31c16d48c5f145e1d470dc95316628f75196232ec7aaa44197dd27152b5eba6ead6579ca6d2ca6f2d0178ee1ef95c27742
+  data.tar.gz: 22efd90e20b683daef4bb7b2497f0353de52da1b09a28ab2e76279c312d05b3bb9b67073fd8ca6dbaf3852679859af7a37efa7a2619a7b045b81539b5981b8e6

data/.gitignore

@@ -1,3 +1,4 @@
+/.idea/
 *.gem
 /.bundle/
 /.yardoc

data/README.md

@@ -30,7 +30,7 @@ The first thing you need to do is create a migration that adds a column called "
 change_table :buildings do |t|
 	t.json :data
 end
-``
+```
 
 Then in the model file:
 
@@ -49,7 +49,7 @@ class Building < ActiveRecord::Base
 	
 	attribute :name, :string
 	attribute :width, :float
-	attribute :height, as: :float
+	attribute :height, as: :float # the :as is optional but if you like the consistency with SimpleForm
 	attribute :storeys, :integer
 	attribute :finished, :boolean
 	attribute :construction_type, :enumeration, values: %w{wood plaster mud brick}, multiple: true, strict: true
@@ -100,6 +100,7 @@ Now let's put a Door on a Building:
 ```ruby
 class Building ...
   embeds_one :door
+  embeds_one :secret_door, class_name: 'Door'
 end
 ```
 
@@ -110,6 +111,8 @@ building.build_door
 building.door.clear_distance = 30
 building.door.opening_force = 20
 building.door.open_handle = %w{pull knob}
+building.build_secret_door
+building.secret_door.clear_distance = 3
 building.save
 ```
 
@@ -124,6 +127,7 @@ def resource_params
 	params.require(:building).permit :name, :height, door_attributes: [:door_type]
 end
 
+# in the view, with a bonus plug for Slim templates:
 = simple_form_for @building do |form|
 	= form.input :name, as: :string
 	= form.input :height, as: :float
@@ -147,6 +151,7 @@ end
 
 class Building ...
 	embeds_many :rooms
+	embeds_one :foyer, class_name: 'Room'
 end
 
 building = Building.new
@@ -221,9 +226,16 @@ class BooleanInput < SimpleForm::Inputs::CollectionRadioButtonsInput
 end
 ```
 
+## Roadmap
+1. Default values for attributes. (I haven't needed yet...)
+2. Ransackers for embedded model attributes. (I haven't needed yet...)
+3. Refactor the EmbedsOne and EmbedsMany modules to use a Builder class instead of procedural metaprogramming. (Hello Code Climate...)
+4. Currently when you mass-assign values to an embedded model, you need to assign all the values. It basically replaces what is there with what you send in, removing what has :_destroy set. I would be nice if it could do a smarter find or create behavior.
+5. It would be nice if you could use the AR fluent query API on stored attributes, where is knows to replace, say, "name" with "data->>name" but I don't see how to do that, and Ransack provides a nice enough wrapper around ARel to get the job done another way.
+
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/ar_doc_store/fork )
+1. Fork it ( https://github.com/dfurber/ar_doc_store/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/ar_doc_store/attribute_types/array.rb

@@ -2,12 +2,17 @@ module ArDocStore
   module AttributeTypes
     
     class ArrayAttribute < Base
-      def conversion
-        :to_a
-      end
 
-      def predicate
-        'text'
+      def build
+        key = attribute.to_sym
+        model.class_eval do
+          store_accessor :data, key
+          define_method "#{key}=".to_sym, -> (value) {
+            value = nil if value == ['']
+            write_store_attribute(:data, key, value)
+          }
+          add_ransacker(key, 'text')
+        end
       end
 
     end

data/lib/ar_doc_store/attribute_types/base.rb

@@ -9,11 +9,20 @@ module ArDocStore
 
       def initialize(model, attribute, options)
         @model, @attribute, @options = model, attribute, options
+        add_to_columns_hash
       end
 
       def build
         model.store_attributes conversion, predicate, attribute
       end
+
+      def add_to_columns_hash
+        model.columns_hash[attribute.to_s] = ActiveRecord::ConnectionAdapters::PostgreSQLColumn.new(attribute, nil, column_type)
+      end
+
+      def column_type
+        ActiveRecord::Type::String.new
+      end
     end
 
   end

data/lib/ar_doc_store/attribute_types/boolean.rb

@@ -6,7 +6,6 @@ module ArDocStore
         key = attribute.to_sym
         model.class_eval do
           store_accessor :data, key
-          # define_method key, -> { item = super(); item && item == true }
           define_method "#{key}?".to_sym, -> { !!key }
           define_method "#{key}=".to_sym, -> (value) {
             res = nil
@@ -17,6 +16,11 @@ module ArDocStore
           add_ransacker(key, 'bool')
         end
       end
+
+      def column_type
+        ActiveRecord::Type::Boolean.new
+      end
+
     end
 
   end

data/lib/ar_doc_store/attribute_types/float.rb

@@ -9,6 +9,11 @@ module ArDocStore
       def predicate
         'float'
       end
+
+      def column_type
+        ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Decimal.new
+      end
+
     end
 
   end

data/lib/ar_doc_store/attribute_types/integer.rb

@@ -9,6 +9,11 @@ module ArDocStore
       def predicate
         'int'
       end
+
+      def column_type
+        ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer.new
+      end
+
     end
 
   end

data/lib/ar_doc_store/embeddable_model.rb

@@ -4,17 +4,6 @@ module ArDocStore
 
     def self.included(mod)
 
-      mod.send :include, ArDocStore::Storage
-      mod.send :include, ArDocStore::Embedding
-      mod.send :include, InstanceMethods
-      mod.send :extend, ClassMethods
-      mod.send :include, ActiveModel::AttributeMethods
-      mod.send :include, ActiveModel::Validations
-      mod.send :include, ActiveModel::Conversion
-      mod.send :extend,  ActiveModel::Naming
-      mod.send :include, ActiveModel::Dirty
-      mod.send :include, ActiveModel::Serialization
-
       mod.class_eval do
         attr_accessor :_destroy
         attr_accessor :attributes
@@ -23,11 +12,28 @@ module ArDocStore
 
         def self.virtual_attributes; @virtual_attributes; end
         def self.virtual_attributes=(value); @virtual_attributes=value; end
-        def virtual_attributes; self.class.virtual_attributes || HashWithIndifferentAccess.new; end
+        def virtual_attributes; self.class.virtual_attributes; end
+
+        @columns_hash = HashWithIndifferentAccess.new
+        def self.columns_hash; @columns_hash; end
+        def self.columns_hash=(value); @columns_hash=value; end
+        def columns_hash; self.class.columns_hash; end
 
         delegate :as_json, to: :attributes
 
       end
+
+      mod.send :include, ArDocStore::Storage
+      mod.send :include, ArDocStore::Embedding
+      mod.send :include, InstanceMethods
+      mod.send :extend, ClassMethods
+      mod.send :include, ActiveModel::AttributeMethods
+      mod.send :include, ActiveModel::Validations
+      mod.send :include, ActiveModel::Conversion
+      mod.send :extend,  ActiveModel::Naming
+      mod.send :include, ActiveModel::Dirty
+      mod.send :include, ActiveModel::Serialization
+
     end
     
     module InstanceMethods
@@ -76,7 +82,7 @@ module ArDocStore
         define_method key, -> { read_store_attribute(:data, key) }
         define_method "#{key}=".to_sym, -> (value) { write_store_attribute :data, key, value }
       end
-            
+      
     end
 
   end

data/lib/ar_doc_store/storage.rb

@@ -48,10 +48,8 @@ module ArDocStore
         type = args.shift if args.first.is_a?(Symbol)
         options = args.extract_options!
         type ||= options.delete(:as) || :string
-        class_name = ArDocStore.mappings[type]
-        unless const_defined?(class_name)
-          raise "Invalid attribute type: #{name}"
-        end
+        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
       end
@@ -87,29 +85,34 @@ module ArDocStore
         }
         define_method "#{key}=".to_sym, -> (value) {
           # data_will_change! if @initalized
-          write_store_attribute(:data, key, value.public_send(typecast_method))
+          if value == '' || value.nil?
+            write_store_attribute :data, key, nil
+          else
+            write_store_attribute(:data, key, value.public_send(typecast_method))
+          end
         }
       end
 
       def store_attribute_from_class(class_name, key)
         define_method key.to_sym, -> {
           ivar = "@#{key}"
-          existing = instance_variable_get ivar
-          existing || begin
+          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
-            item
           end
         }
         define_method "#{key}=".to_sym, -> (value) {
           ivar = "@#{key}"
           class_name = class_name.constantize if class_name.respond_to?(:constantize)
-          value = class_name.new(value) unless value.is_a?(class_name)
+          if value == ''
+            value = nil
+          else
+            value = class_name.new(value) unless value.is_a?(class_name)
+          end
           instance_variable_set ivar, value
           write_store_attribute :data, key, value
-          # data_will_change! if @initialized
         }
       end
 

data/lib/ar_doc_store/version.rb

@@ -1,3 +1,3 @@
 module ArDocStore
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/test_helper.rb

@@ -60,6 +60,10 @@ class ARDuck
     true
   end
   
+  def self.columns_hash
+    @@columns_hash ||= HashWithIndifferentAccess.new
+  end
+  
 end
 
 class Dimensions

metadata

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