ar_doc_store 1.0.5 → 2.0.0

data/test/attributes/integer_attribute_test.rb

@@ -0,0 +1,63 @@
+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
+
+  def test_numeric_validation
+    b = Building.new
+    b.stories = 5
+    assert b.valid?
+  end
+
+  def test_persistence
+    b = Building.new name: 'Test', stories: 5
+    assert b.save
+    assert_equal 5, Building.find(b.id).stories
+  end
+
+  def test_default_value
+    b = Building.new
+    assert_equal 12, b.number_with_default
+  end
+
+  def test_dirty_on_init
+    b = Building.new name: 'Foo'
+    assert b.name_changed?
+  end
+
+  def test_dirty_persisted
+    a = Building.create name: 'Foo'
+    b = Building.find a.id
+    assert !b.name_changed?
+    b.name = 'Bar'
+    assert b.name_changed?
+    assert_equal 'Foo', b.name_was
+  end
+end

data/test/{attribute_types → attributes}/string_attribute_test.rb

@@ -24,4 +24,10 @@ class StringAttributeTest < MiniTest::Test
     assert_equal '51', b.name
   end
 
+  def test_persistence
+    b = Building.new name: 'Test', stories: 5
+    assert b.save
+    assert_equal 'Test', Building.find(b.id).name
+  end
+
 end

data/test/test_helper.rb

@@ -7,82 +7,20 @@ 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
-# A restroom has a door, a route, and some fields measuring the stalls
-# Route and door
-
-# This here is just to mock out enough AR behavior for a model to pretend to be an AR model without a database...
-class ARDuck
-  include ActiveModel::AttributeMethods
-  include ActiveModel::Validations
-  include ActiveModel::Conversion
-  extend  ActiveModel::Naming
-  include ActiveModel::Dirty
-  include ActiveModel::Serialization
-
-  attr_accessor :attributes
-
-  def initialize(attrs=nil)
-    @attributes = HashWithIndifferentAccess.new
-    unless attrs.nil?
-      attrs.each { |key, value|
-        @jattributes[key] = public_send("#{key}=", value)
-      }
-    end
-    @_initialized = true
-  end
-
-  def persisted?
-    false
-  end
-
-  def inspect
-    "#{self.class}: #{attributes.inspect}"
-  end
-
-  delegate :as_json, to: :attributes
-
-  def self.store_accessor(store, key)
-    key = key.to_sym
-    define_method key, -> { read_store_attribute(json_column, key) }
-    define_method "#{key}=".to_sym, -> (value) { write_store_attribute json_column, key, value }
-  end
-
-  def read_store_attribute(store, key)
-    @attributes[key]
-  end
-
-  def write_store_attribute(store, key, value)
-    #changed_json_attributes[key] = read_store_json_attribute(:data, key) if @_initialized
-    @attributes[key] = value
-  end
+require 'active_record/migration'
 
+ActiveRecord::Migration.execute "DROP TABLE IF EXISTS purchase_orders"
+ActiveRecord::Migration.execute "DROP TABLE IF EXISTS buildings"
+ActiveRecord::Migration.create_table :buildings do |t|
+  t.jsonb :data
 end
-
-class EmptyModel
-  include ArDocStore::EmbeddableModel
-end
-
-class ThingWithEmptyModel < ARDuck
-  include ArDocStore::Model
-  embeds_one :empty_model
+ActiveRecord::Migration.create_table :purchase_orders do |t|
+  t.jsonb :data
+  t.belongs_to :building, index: true, foreign_key: true
 end
 
-class EmbeddableA < ARDuck
-  include ArDocStore::EmbeddableModel
-  json_attribute :name
-end
-
-class EmbeddableB < EmbeddableA
-  json_attribute :gender
-end
-
-class Dimensions
-  include ArDocStore::EmbeddableModel
-  json_attribute :length, :float
-  json_attribute :width,  :float
-end
+# require 'simplecov'
+# SimpleCov.start
 
 class Route
   include ArDocStore::EmbeddableModel
@@ -101,29 +39,18 @@ class Door
   json_attribute :clear_distance, as: :integer
   json_attribute :opening_force, as: :integer
   json_attribute :clear_space, as: :integer
+
+  validates :clear_space, numericality: { allow_nil: true }
 end
 
 class Entrance
   include ArDocStore::EmbeddableModel
-  embeds_one :route
-  embeds_one :door
+  json_attribute :name
 end
 
 class Restroom
   include ArDocStore::EmbeddableModel
-  embeds_one :route
-  embeds_one :door
-
-  enumerates :restroom_type, values: %w{single double dirty nasty clean}
-
-  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'
-
-  validates :restroom_type, presence: true
-
+  json_attribute :name
 end
 
 class Building < ActiveRecord::Base
@@ -132,19 +59,20 @@ class Building < ActiveRecord::Base
   json_attribute :comments, as: :string
   json_attribute :finished, :boolean
   json_attribute :stories, as: :integer
+  json_attribute :number_with_default, as: :integer, default: 12
   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
+  json_attribute :inspected_at, as: :datetime
+  json_attribute :finished_on, as: :date
+  json_attribute :cost, as: :decimal
+  embeds_one :entrance
+  embeds_one :main_entrance, class_name: 'Entrance'
   embeds_many :restrooms
-end
 
-class PurchaseOrder < ActiveRecord::Base
-  include ArDocStore::Model
-  attribute :name, :string
-  attribute :price, :float
-  attribute :approved_at, :datetime
+  validates :stories, numericality: { allow_nil: true }
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_doc_store
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 2.0.0
 platform: ruby
 authors:
 - David Furber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Provides an easy way to do something that is possible in Rails but still
   a bit close to the metal using store_accessor: create typecasted, persistent attributes
   that are not columns in the database but stored in the JSON "data" column. Also
@@ -83,32 +97,39 @@ files:
 - Rakefile
 - ar_doc_store.gemspec
 - lib/ar_doc_store.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/datetime_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/attributes/array.rb
+- lib/ar_doc_store/attributes/base.rb
+- lib/ar_doc_store/attributes/boolean.rb
+- lib/ar_doc_store/attributes/callback_support.rb
+- lib/ar_doc_store/attributes/date.rb
+- lib/ar_doc_store/attributes/datetime.rb
+- lib/ar_doc_store/attributes/decimal.rb
+- lib/ar_doc_store/attributes/embeds_base.rb
+- lib/ar_doc_store/attributes/embeds_many.rb
+- lib/ar_doc_store/attributes/embeds_one.rb
+- lib/ar_doc_store/attributes/enumeration.rb
+- lib/ar_doc_store/attributes/float.rb
+- lib/ar_doc_store/attributes/integer.rb
+- lib/ar_doc_store/attributes/string.rb
 - lib/ar_doc_store/embeddable_model.rb
+- lib/ar_doc_store/embedded_collection.rb
 - lib/ar_doc_store/embedding.rb
 - lib/ar_doc_store/model.rb
 - lib/ar_doc_store/storage.rb
+- lib/ar_doc_store/types/embeds_many.rb
+- lib/ar_doc_store/types/embeds_one.rb
 - lib/ar_doc_store/version.rb
-- test/attribute_types/array_attribute_test.rb
-- test/attribute_types/boolean_attribute_test.rb
-- test/attribute_types/datetime_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/attributes/array_attribute_test.rb
+- test/attributes/boolean_attribute_test.rb
+- test/attributes/date_attribute_test.rb
+- test/attributes/datetime_attribute_test.rb
+- test/attributes/decimal_attribute_test.rb
+- test/attributes/embeds_many_attribute_test.rb
+- test/attributes/embeds_one_attribute_test.rb
+- test/attributes/enumeration_attribute_test.rb
+- test/attributes/float_attribute_test.rb
+- test/attributes/integer_attribute_test.rb
+- test/attributes/string_attribute_test.rb
 - test/test_helper.rb
 homepage: https://github.com/dfurber/ar_doc_store
 licenses:
@@ -135,14 +156,15 @@ signing_key:
 specification_version: 4
 summary: A document storage gem meant for ActiveRecord PostgresQL JSON storage.
 test_files:
-- test/attribute_types/array_attribute_test.rb
-- test/attribute_types/boolean_attribute_test.rb
-- test/attribute_types/datetime_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/attributes/array_attribute_test.rb
+- test/attributes/boolean_attribute_test.rb
+- test/attributes/date_attribute_test.rb
+- test/attributes/datetime_attribute_test.rb
+- test/attributes/decimal_attribute_test.rb
+- test/attributes/embeds_many_attribute_test.rb
+- test/attributes/embeds_one_attribute_test.rb
+- test/attributes/enumeration_attribute_test.rb
+- test/attributes/float_attribute_test.rb
+- test/attributes/integer_attribute_test.rb
+- test/attributes/string_attribute_test.rb
 - test/test_helper.rb

data/lib/ar_doc_store/attribute_types/array_attribute.rb

@@ -1,30 +0,0 @@
-module ArDocStore
-  module AttributeTypes
-
-    class ArrayAttribute < BaseAttribute
-
-      def build
-        key = attribute.to_sym
-        default_value = default
-        model.class_eval do
-          store_accessor json_column, key
-          define_method key, -> {
-            value = read_store_attribute(json_column, key)
-            value or default_value
-          }
-          define_method "#{key}=".to_sym, -> (value) {
-            value = nil if value == ['']
-            write_store_attribute(json_column, key, value)
-          }
-          add_ransacker(key, 'text')
-        end
-      end
-
-      def type
-        :array
-      end
-
-    end
-
-  end
-end

data/lib/ar_doc_store/attribute_types/base_attribute.rb

@@ -1,61 +0,0 @@
-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
-        predicate_method = predicate
-        default_value = default
-        dump_method = dump
-        load_method = load
-        model.class_eval do
-          add_ransacker(attribute, predicate_method)
-          define_method attribute.to_sym, -> {
-            value = read_store_attribute(json_column, attribute)
-            if value
-              value.public_send(load_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 json_column, attribute, nil
-            else
-              write_store_attribute(json_column, attribute, value.public_send(dump_method))
-            end
-          }
-        end
-      end
-
-      def conversion
-        :to_s
-      end
-
-      def dump
-        conversion
-      end
-
-      def load
-        conversion
-      end
-    end
-  end
-end