ar_doc_store 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 389dfcb42c57c087c024326589ff09ca183bd224
-  data.tar.gz: ad6f5ac50966c3e2d8979cda69383c28dcaa0908
+  metadata.gz: 119e03286bb8ecf36dfa1d089075188a1979b1cb
+  data.tar.gz: fc1841751d938d5152c6b902c8925c5c25eac98e
 SHA512:
-  metadata.gz: 4416430c4d7d03f97294e0b9fb31b3d03af2bb220d097975ff7ecd4104c27dfe8909125039c09c278dbefc633ebf5a303e95cf6f84e2a95fda10e1907a5d5dcd
-  data.tar.gz: bc49e9c3ed777a4f7fe140f6811ede9ba42123968545c602d121c4a86ad05e307791b21a2bc537eeee25958756d806592bc39d33bd855929cec62d494a4fab44
+  metadata.gz: fb2485d03e362542372b0a41e2fb4cde66c385731fefd3d437553e82f8c3637bca84ff63b46893a3ccef9be08de23bd299e1abfdac5356120fda85ffab411003
+  data.tar.gz: 4a0023a148212b537f2b07500641f138ecc870540bbe61c6c79e06ded4e3161fe8528d747ed5989809439399406997cb82550b603c89ad579ead55dd17911c8f

data/Gemfile

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

data/README.md

@@ -65,12 +65,12 @@ Now there are several ways to play but all boil down to one method on the model:
 class Building < ActiveRecord::Base
   include ArDocStore::Model
 
-  attribute :name, :string
-  attribute :width, :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,
+  json_attribute :name, :string
+  json_attribute :width, :float
+  json_attribute :height, as: :float # the :as is optional but if you like the consistency with SimpleForm
+  json_attribute :storeys, :integer
+  json_attribute :finished, :boolean
+  json_attribute :construction_type, :enumeration,
             values: %w{wood plaster mud brick},
             multiple: true,
             strict: true
@@ -90,7 +90,7 @@ You noticed the enumeration type on the construction_type takes an array. That's
 
 ```ruby
 class Building ...
-  attribute :construction_type,
+  json_attribute :construction_type,
             :enumeration,
             values: %w{wood plaster mud brick},
             multiple: true,
@@ -114,17 +114,17 @@ class Door
   enumerates :door_type,
              multiple: true,
              values: %w{single double french sliding push pull}
-  attribute :open_handle,  
+  json_attribute :open_handle,  
             as: :enumeration,
             multiple: true,
             values: %w{push pull plate knob handle}
-  attribute :close_handle,
+  json_attribute :close_handle,
             as: :enumeration,
             multiple: true,
             values: %w{push pull plate knob handle}
-  attribute :clear_distance, as: :integer
-  attribute :opening_force, as: :integer
-  attribute :clear_space, as: :integer
+  json_attribute :clear_distance, as: :integer
+  json_attribute :opening_force, as: :integer
+  json_attribute :clear_space, as: :integer
 end
 ```
 
@@ -177,9 +177,9 @@ You can also embeds_many. It works the same way:
 ```ruby
 class Room
   include ArDocStore::EmbeddableModel
-  attribute :length, as: :float
-  attribute :width, as: :float
-  attribute :height, as: :float
+  json_attribute :length, as: :float
+  json_attribute :width, as: :float
+  json_attribute :height, as: :float
   enumerates :light_switch_type, %w{flip knob switchplate clapper}
 end
 

data/ar_doc_store.gemspec

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

data/lib/ar_doc_store.rb

@@ -31,7 +31,7 @@ module ArDocStore
   def self.mappings
     @mappings
   end
-  
+
   def self.convert_boolean(bool)
     if bool.is_a?(String)
       return true if bool == true || bool =~ (/^(true|t|yes|y|1)$/i)
@@ -46,5 +46,12 @@ module ArDocStore
       return nil
     end
   end
-end
 
+  def self.clobber_attribute_method!
+    ArDocStore::Storage::ClassMethods.module_eval do
+      def attribute(*args)
+        json_attribute *args
+      end
+    end
+  end
+end

data/lib/ar_doc_store/attribute_types/embeds_many_attribute.rb

@@ -101,7 +101,7 @@ module ArDocStore
       def create_embeds_many_validation(assn_name)
         model.class_eval do
           validate_method = "validate_embedded_record_for_#{assn_name}"
-          define_method validate_method, -> { validate_embeds_many assn_name }
+          define_method validate_method.to_s, -> { validate_embeds_many assn_name }
           validate validate_method
         end
       end

data/lib/ar_doc_store/attribute_types/enumeration_attribute.rb

@@ -2,7 +2,7 @@ module ArDocStore
   module AttributeTypes
 
     class EnumerationAttribute < BaseAttribute
-      
+
       def build
         key = attribute.to_sym
         dictionary = options[:values]
@@ -10,9 +10,9 @@ module ArDocStore
         strict = options[:strict]
         default_value = default
         model.class_eval do
-          
+
           if multiple
-            attribute key, as: :array, default: default_value
+            json_attribute key, as: :array, default: default_value
             if strict
               define_method "validate_#{key}" do
                 value = public_send(key)
@@ -21,7 +21,7 @@ module ArDocStore
               validate "validate_#{key}".to_sym
             end
           else
-            attribute key, as: :string, default: default_value
+            json_attribute key, as: :string, default: default_value
             if strict
               validates_inclusion_of key, in: dictionary, allow_blank: true
             end

data/lib/ar_doc_store/embeddable_model.rb

@@ -24,7 +24,11 @@ module ArDocStore
 
         delegate :as_json, to: :attributes
 
-        attribute :id, :uuid
+        json_attribute :id, :uuid
+
+        def self.attribute(name, *args)
+          json_attribute name, *args
+        end
 
       end
 

data/lib/ar_doc_store/embedding.rb

@@ -1,25 +1,25 @@
 module ArDocStore
   module Embedding
     def self.included(mod)
-      mod.send :extend, ClassMethods        
+      mod.send :extend, ClassMethods
       mod.send :include, InstanceMethods
     end
-    
+
     module ClassMethods
 
       def embeds_many(assn_name, *args)
-        attribute assn_name, :embeds_many, *args
+        json_attribute assn_name, :embeds_many, *args
       end
 
       def embeds_one(assn_name, *args)
-        attribute assn_name, :embeds_one, *args
+        json_attribute assn_name, :embeds_one, *args
       end
 
     end
-    
-  
+
+
     module InstanceMethods
-    
+
       # Returns whether or not the association is valid and applies any errors to
       # the parent, <tt>self</tt>, if it wasn't. Skips any <tt>:autosave</tt>
       # enabled records if they're marked_for_destruction? or destroyed.

data/lib/ar_doc_store/storage.rb

@@ -67,7 +67,7 @@ module ArDocStore
 
     module ClassMethods
 
-      def attribute(name, *args)
+      def json_attribute(name, *args)
         type = args.shift if args.first.is_a?(Symbol)
         options = args.extract_options!
         type ||= options.delete(:as) || :string
@@ -120,28 +120,28 @@ module ArDocStore
       # Allows you to define several string attributes at once. Deprecated.
       def string_attributes(*args)
         args.each do |arg|
-          attribute arg, as: :string
+          json_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
+          json_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
+          json_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
+          json_attribute arg, as: :boolean
         end
       end
 
@@ -150,7 +150,7 @@ module ArDocStore
       def enumerates(field, *args)
         options = args.extract_options!
         options[:as] = :enumeration
-        attribute field, options
+        json_attribute field, options
       end
 
 

data/lib/ar_doc_store/version.rb

@@ -1,3 +1,3 @@
 module ArDocStore
-  VERSION = "0.2.1"
+  VERSION = "1.0.0"
 end

data/test/test_helper.rb

@@ -27,7 +27,7 @@ class ARDuck
     @attributes = HashWithIndifferentAccess.new
     unless attrs.nil?
       attrs.each { |key, value|
-        @attributes[key] = public_send("#{key}=", value)
+        @jattributes[key] = public_send("#{key}=", value)
       }
     end
     @_initialized = true
@@ -54,7 +54,7 @@ class ARDuck
   end
 
   def write_store_attribute(store, key, value)
-    #changed_attributes[key] = read_store_attribute(:data, key) if @_initialized
+    #changed_json_attributes[key] = read_store_json_attribute(:data, key) if @_initialized
     @attributes[key] = value
   end
 
@@ -71,36 +71,36 @@ end
 
 class EmbeddableA < ARDuck
   include ArDocStore::EmbeddableModel
-  attribute :name
+  json_attribute :name
 end
 
 class EmbeddableB < EmbeddableA
-  attribute :gender
+  json_attribute :gender
 end
 
 class Dimensions
   include ArDocStore::EmbeddableModel
-  attribute :length, :float
-  attribute :width,  :float
+  json_attribute :length, :float
+  json_attribute :width,  :float
 end
 
 class Route
   include ArDocStore::EmbeddableModel
-  attribute :is_route_unobstructed, as: :boolean
-  attribute :is_route_lighted, as: :boolean
-  attribute :route_surface, as: :string
-  attribute :route_slope_percent, as: :integer
-  attribute :route_min_width, as: :integer
+  json_attribute :is_route_unobstructed, as: :boolean
+  json_attribute :is_route_lighted, as: :boolean
+  json_attribute :route_surface, as: :string
+  json_attribute :route_slope_percent, as: :integer
+  json_attribute :route_min_width, as: :integer
 end
 
 class Door
   include ArDocStore::EmbeddableModel
   enumerates :door_type, multiple: true, values: %w{single double french sliding push pull}
-  attribute :open_handle,  as: :enumeration, multiple: true, values: %w{push pull plate knob handle}
-  attribute :close_handle, as: :enumeration, multiple: true, values: %w{push pull plate knob handle}
-  attribute :clear_distance, as: :integer
-  attribute :opening_force, as: :integer
-  attribute :clear_space, as: :integer
+  json_attribute :open_handle,  as: :enumeration, multiple: true, values: %w{push pull plate knob handle}
+  json_attribute :close_handle, as: :enumeration, multiple: true, values: %w{push pull plate knob handle}
+  json_attribute :clear_distance, as: :integer
+  json_attribute :opening_force, as: :integer
+  json_attribute :clear_space, as: :integer
 end
 
 class Entrance
@@ -116,8 +116,8 @@ class Restroom
 
   enumerates :restroom_type, values: %w{single double dirty nasty clean}
 
-  attribute :is_restroom_provided, as: :boolean
-  attribute :is_signage_clear, as: :boolean
+  json_attribute :is_restroom_provided, as: :boolean
+  json_attribute :is_signage_clear, as: :boolean
 
   embeds_one :stall_area_dimensions, class_name: 'Dimensions'
   embeds_one :sink_area_dimensions, class_name: 'Dimensions'
@@ -128,16 +128,16 @@ end
 
 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
-  attribute :strict_multi_enumeration, as: :enumeration, values: %w{happy sad glad bad}, multiple: true, strict: true
+  json_attribute :name, :string
+  json_attribute :comments, as: :string
+  json_attribute :finished, :boolean
+  json_attribute :stories, as: :integer
+  json_attribute :height, as: :float
+  json_attribute :architects, as: :array
+  json_attribute :construction, as: :enumeration, values: %w{concrete wood brick plaster steel}
+  json_attribute :multiconstruction, as: :enumeration, values: %w{concrete wood brick plaster steel}, multiple: true
+  json_attribute :strict_enumeration, as: :enumeration, values: %w{happy sad glad bad}, strict: true
+  json_attribute :strict_multi_enumeration, as: :enumeration, values: %w{happy sad glad bad}, multiple: true, strict: true
   embeds_many :entrances
   embeds_many :restrooms
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ar_doc_store
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - David Furber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-09-15 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'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A document storage gem meant for ActiveRecord PostgresQL JSON storage.