hydra_attribute 0.4.2 → 0.5.0.rc1

data/spec/hydra_attribute/model_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe HydraAttribute::Model do
+  describe '.first' do
+    before do
+      Product.hydra_attributes.create(name: 'yyy', backend_type: 'string')
+      Product.hydra_attributes.create(name: 'aaa', backend_type: 'string')
+      Product.hydra_attributes.create(name: 'zzz', backend_type: 'string')
+    end
+
+    it 'should return first created model' do
+      HydraAttribute::HydraAttribute.first.name.should == 'yyy'
+    end
+  end
+
+  describe '.last' do
+    before do
+      Product.hydra_attributes.create(name: 'yyy', backend_type: 'string')
+      Product.hydra_attributes.create(name: 'aaa', backend_type: 'string')
+      Product.hydra_attributes.create(name: 'bbb', backend_type: 'string')
+    end
+
+    it 'should return last created model' do
+      HydraAttribute::HydraAttribute.last.name.should == 'bbb'
+    end
+  end
+
+  describe '.count' do
+    before do
+      Product.hydra_attributes.create(name: 'yyy', backend_type: 'string')
+      Product.hydra_attributes.create(name: 'aaa', backend_type: 'string')
+      Product.hydra_attributes.create(name: 'bbb', backend_type: 'string')
+    end
+
+    it 'should return number of created models' do
+      HydraAttribute::HydraAttribute.count.should be(3)
+    end
+  end
+end

data/spec/hydra_attribute_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe HydraAttribute do
+  describe '#identity_map' do
+    it 'should return IdentityMap object' do
+      HydraAttribute.identity_map.should be_a_kind_of(HydraAttribute::IdentityMap)
+    end
+
+    it 'should cache identity map object' do
+      im1 = HydraAttribute.identity_map
+      im2 = HydraAttribute.identity_map
+      im1.should be(im2)
+    end
+
+    it 'should store identity map into current thread' do
+      im = HydraAttribute.identity_map
+      Thread.current[:hydra_attribute].should be(im)
+    end
+  end
+
+  describe '#cache' do
+    it 'should proxy method to identity map' do
+      HydraAttribute.cache(:a, 1)
+      HydraAttribute.identity_map.cache(:a, 2).should be(1)
+
+      HydraAttribute.cache(:b) { 1 }
+      HydraAttribute.identity_map.cache(:b) { 2 }.should be(1)
+    end
+  end
+
+  describe 'SUPPORTED_BACKEND_TYPES' do
+    it 'should include "string", "text", "integer", "float", "decimal", "boolean" and "datetime"' do
+      HydraAttribute::SUPPORTED_BACKEND_TYPES.should == %w[string text integer float decimal boolean datetime]
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,56 +1,24 @@
-require 'active_record'
 require 'hydra_attribute'
-require 'database_cleaner'
 
 ActiveSupport.on_load(:active_record) do
-  self.default_timezone = :utc
-  unless ActiveRecord::VERSION::STRING.start_with?('3.1.') # @COMPATIBILITY with 3.1.x. active_record 3.1 doesn't have "mass_assignment_sanitizer" method
-    self.mass_assignment_sanitizer = :strict
-  end
-
-  ActiveRecord::Migration.send(:include, HydraAttribute::ActiveRecord::Migration)
+  self.default_timezone          = :utc
+  self.mass_assignment_sanitizer = :strict
 end
 
-ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
-DatabaseCleaner.strategy = :truncation
-
-class Migration < ActiveRecord::Migration
-  def up
-    create_hydra_entity :products do |t|
-      t.string :name
-      t.timestamps
-    end
-  end
+ENV['DB'] ||= 'sqlite'
+require File.expand_path("../environments/#{ENV['DB']}", __FILE__)
 
-  def down
-  end
+if ENV['SQL_LOGGER']
+  require 'active_support/all'
+  ActiveRecord::Base.logger = Logger.new(STDOUT)
 end
 
-Migration.new.up
-
-def redefine_hydra_entity(klass)
-  ::ActiveSupport::Dependencies.clear
-
-  Object.send(:remove_const, klass.to_sym) if Object.const_defined?(klass.to_sym)
-
-  ::HydraAttribute::SUPPORTED_BACKEND_TYPES.each do |type|
-    class_name = "Hydra#{type.capitalize}#{klass}".to_sym
-    ::HydraAttribute.send(:remove_const, class_name) if ::HydraAttribute.const_defined?(class_name)
-  end
-
-  Object.const_set(klass.to_sym, Class.new(::ActiveRecord::Base))
-  klass.to_s.constantize.send(:accessible_attributes_configs).values.each(&:clear)
-  klass.to_s.constantize.attr_accessible :name, :hydra_set_id
-  klass.to_s.constantize.send(:include, ::HydraAttribute::ActiveRecord)
+Dir[File.expand_path('../fixtures/*.rb', __FILE__)].each do |file|
+  load file
 end
 
 RSpec.configure do |config|
   config.before do
-    redefine_hydra_entity('Product')
-    DatabaseCleaner.start
-  end
-
-  config.after do
-    DatabaseCleaner.clean
+    Thread.current[:hydra_attribute] = nil
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hydra_attribute
 version: !ruby/object:Gem::Version
-  version: 0.4.2
-  prerelease: 
+  version: 0.5.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Kostyantyn Stepanyuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,39 +26,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -76,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -133,72 +117,72 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
-- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- cucumber.yml
-- features/entity/create.feature
-- features/entity/destroy.feature
-- features/entity/new.feature
-- features/entity/update.feature
-- features/hydra_attribute/create.feature
-- features/hydra_attribute/destroy.feature
-- features/hydra_attribute/update.feature
-- features/hydra_set/destroy.feature
-- features/migrations/create_and_drop.feature
-- features/migrations/migrate_and_rollback.feature
-- features/relation/query_methods/group.feature
-- features/relation/query_methods/order.feature
-- features/relation/query_methods/reorder.feature
-- features/relation/query_methods/reverse_order.feature
-- features/relation/query_methods/select.feature
-- features/relation/query_methods/where.feature
-- features/step_definitions/connections.rb
-- features/step_definitions/model_steps.rb
-- features/step_definitions/query_methods.rb
-- features/step_definitions/record_steps.rb
-- features/support/env.rb
-- features/support/world.rb
+- gemfiles/activerecord-3.2.gemfile
 - hydra_attribute.gemspec
 - lib/hydra_attribute.rb
 - lib/hydra_attribute/active_record.rb
-- lib/hydra_attribute/active_record/association.rb
 - lib/hydra_attribute/active_record/association_preloader.rb
 - lib/hydra_attribute/active_record/attribute_methods.rb
+- lib/hydra_attribute/active_record/mass_assignment_security.rb
 - lib/hydra_attribute/active_record/migration.rb
-- lib/hydra_attribute/active_record/reflection.rb
 - lib/hydra_attribute/active_record/relation.rb
 - lib/hydra_attribute/active_record/relation/calculations.rb
 - lib/hydra_attribute/active_record/relation/query_methods.rb
 - lib/hydra_attribute/active_record/scoping.rb
-- lib/hydra_attribute/association_builder.rb
-- lib/hydra_attribute/builder.rb
 - lib/hydra_attribute/configuration.rb
-- lib/hydra_attribute/entity_callbacks.rb
 - lib/hydra_attribute/hydra_attribute.rb
-- lib/hydra_attribute/hydra_attribute_methods.rb
-- lib/hydra_attribute/hydra_methods.rb
+- lib/hydra_attribute/hydra_attribute_set.rb
+- lib/hydra_attribute/hydra_entity.rb
+- lib/hydra_attribute/hydra_entity_attribute_association.rb
 - lib/hydra_attribute/hydra_set.rb
-- lib/hydra_attribute/hydra_set_methods.rb
-- lib/hydra_attribute/hydra_value_methods.rb
-- lib/hydra_attribute/memoizable.rb
+- lib/hydra_attribute/hydra_value.rb
+- lib/hydra_attribute/identity_map.rb
+- lib/hydra_attribute/middleware/identity_map.rb
 - lib/hydra_attribute/migrator.rb
+- lib/hydra_attribute/model.rb
+- lib/hydra_attribute/model/cacheable.rb
+- lib/hydra_attribute/model/dirty.rb
+- lib/hydra_attribute/model/has_many_through.rb
+- lib/hydra_attribute/model/identity_map.rb
+- lib/hydra_attribute/model/mediator.rb
+- lib/hydra_attribute/model/notifiable.rb
+- lib/hydra_attribute/model/persistence.rb
+- lib/hydra_attribute/model/validations.rb
 - lib/hydra_attribute/railtie.rb
 - lib/hydra_attribute/version.rb
 - lib/rails/generators/hydra_attribute/install/USAGE
 - lib/rails/generators/hydra_attribute/install/install_generator.rb
 - lib/rails/generators/hydra_attribute/install/templates/hydra_attribute.txt
+- spec/environments/mysql.rb
+- spec/environments/postgresql.rb
+- spec/environments/sqlite.rb
+- spec/fixtures/category.rb
+- spec/fixtures/product.rb
+- spec/fixtures/product_black_list.rb
+- spec/fixtures/product_white_list.rb
 - spec/hydra_attribute/active_record/attribute_methods_spec.rb
-- spec/hydra_attribute/active_record/relation/query_methods_spec.rb
-- spec/hydra_attribute/hydra_attribute_methods_spec.rb
+- spec/hydra_attribute/active_record/mass_assignment_security_spec.rb
+- spec/hydra_attribute/active_record_spec.rb
+- spec/hydra_attribute/hydra_attribute_set_spec.rb
 - spec/hydra_attribute/hydra_attribute_spec.rb
-- spec/hydra_attribute/hydra_methods_spec.rb
-- spec/hydra_attribute/hydra_set_methods_spec.rb
+- spec/hydra_attribute/hydra_entity_attribute_association_spec.rb
+- spec/hydra_attribute/hydra_entity_spec.rb
 - spec/hydra_attribute/hydra_set_spec.rb
-- spec/hydra_attribute/memoizable_spec.rb
+- spec/hydra_attribute/hydra_value_spec.rb
+- spec/hydra_attribute/identity_map_spec.rb
+- spec/hydra_attribute/migrator_spec.rb
+- spec/hydra_attribute/model/cacheable_spec.rb
+- spec/hydra_attribute/model/has_many_through_spec.rb
+- spec/hydra_attribute/model/identity_map_spec.rb
+- spec/hydra_attribute/model/mediator_spec.rb
+- spec/hydra_attribute/model/persistence_spec.rb
+- spec/hydra_attribute/model_spec.rb
+- spec/hydra_attribute_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/kostyantyn/hydra_attribute
 licenses: []
@@ -215,48 +199,40 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -595006172525400845
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: hydra_attribute is an implementation of EAV pattern for ActiveRecord models.
 test_files:
-- Appraisals
-- features/entity/create.feature
-- features/entity/destroy.feature
-- features/entity/new.feature
-- features/entity/update.feature
-- features/hydra_attribute/create.feature
-- features/hydra_attribute/destroy.feature
-- features/hydra_attribute/update.feature
-- features/hydra_set/destroy.feature
-- features/migrations/create_and_drop.feature
-- features/migrations/migrate_and_rollback.feature
-- features/relation/query_methods/group.feature
-- features/relation/query_methods/order.feature
-- features/relation/query_methods/reorder.feature
-- features/relation/query_methods/reverse_order.feature
-- features/relation/query_methods/select.feature
-- features/relation/query_methods/where.feature
-- features/step_definitions/connections.rb
-- features/step_definitions/model_steps.rb
-- features/step_definitions/query_methods.rb
-- features/step_definitions/record_steps.rb
-- features/support/env.rb
-- features/support/world.rb
+- gemfiles/activerecord-3.2.gemfile
+- spec/environments/mysql.rb
+- spec/environments/postgresql.rb
+- spec/environments/sqlite.rb
+- spec/fixtures/category.rb
+- spec/fixtures/product.rb
+- spec/fixtures/product_black_list.rb
+- spec/fixtures/product_white_list.rb
 - spec/hydra_attribute/active_record/attribute_methods_spec.rb
-- spec/hydra_attribute/active_record/relation/query_methods_spec.rb
-- spec/hydra_attribute/hydra_attribute_methods_spec.rb
+- spec/hydra_attribute/active_record/mass_assignment_security_spec.rb
+- spec/hydra_attribute/active_record_spec.rb
+- spec/hydra_attribute/hydra_attribute_set_spec.rb
 - spec/hydra_attribute/hydra_attribute_spec.rb
-- spec/hydra_attribute/hydra_methods_spec.rb
-- spec/hydra_attribute/hydra_set_methods_spec.rb
+- spec/hydra_attribute/hydra_entity_attribute_association_spec.rb
+- spec/hydra_attribute/hydra_entity_spec.rb
 - spec/hydra_attribute/hydra_set_spec.rb
-- spec/hydra_attribute/memoizable_spec.rb
+- spec/hydra_attribute/hydra_value_spec.rb
+- spec/hydra_attribute/identity_map_spec.rb
+- spec/hydra_attribute/migrator_spec.rb
+- spec/hydra_attribute/model/cacheable_spec.rb
+- spec/hydra_attribute/model/has_many_through_spec.rb
+- spec/hydra_attribute/model/identity_map_spec.rb
+- spec/hydra_attribute/model/mediator_spec.rb
+- spec/hydra_attribute/model/persistence_spec.rb
+- spec/hydra_attribute/model_spec.rb
+- spec/hydra_attribute_spec.rb
 - spec/spec_helper.rb

data/Appraisals

@@ -1,7 +0,0 @@
-appraise '3.1' do
-  gem "activerecord", '~> 3.1.0'
-end
-
-appraise '3.2' do
-  gem 'activerecord', '~> 3.2.0'
-end

data/cucumber.yml

@@ -1 +0,0 @@
-default: -r features

data/features/entity/create.feature

@@ -1,145 +0,0 @@
-Feature: create models with hydra attributes
-  When create model with hydra attributes
-  Then hydra attributes should be saved with default values
-
-  When hydra set is specified
-  Then only attributes from this hydra set should be saved
-
-  Background: create hydra attributes
-    Given create hydra attributes for "Product" with role "admin" as "hashes":
-      | name    | backend_type | default_value | white_list |
-      | code    | string       | [nil:]        | [bool:t]   |
-      | info    | text         | [str:]        | [bool:t]   |
-      | total   | integer      | 0             | [bool:t]   |
-      | price   | float        | 0             | [bool:t]   |
-      | active  | boolean      | 0             | [bool:t]   |
-      | started | datetime     | 2012-01-01    | [bool:t]   |
-
-  Scenario: don't pass any hydra attributes
-    Given create "Product" model
-    Then last created "Product" should have the following attributes:
-      | code    | [nil:]            |
-      | info    | [str:]            |
-      | price   | [float:0]         |
-      | total   | [int:0]           |
-      | active  | [bool:f]          |
-      | started | [date:2012-01-01] |
-
-  Scenario: pass two hydra attributes
-    Given create "Product" model with attributes as "rows_hash":
-      | code  | a      |
-      | price | [nil:] |
-    Then last created "Product" should have the following attributes:
-      | code    | a                 |
-      | info    | [str:]            |
-      | total   | [int:0]           |
-      | price   | [nil:]            |
-      | active  | [bool:f]          |
-      | started | [date:2012-01-01] |
-
-  Scenario: pass all hydra attributes
-    Given create "Product" model with attributes as "rows_hash":
-      | code    | a          |
-      | info    | b          |
-      | total   | 0          |
-      | price   | 2          |
-      | active  | 1          |
-      | started | 2012-05-05 |
-
-    Then last created "Product" should have the following attributes:
-      | code    | a                 |
-      | price   | [float:2]         |
-      | active  | [bool:t]          |
-      | info    | b                 |
-      | started | [date:2012-05-05] |
-
-  Scenario: create hydra attribute in runtime
-    # create product to cache all hydra attributes
-    Given create "Product" model
-    And create hydra attributes for "Product" with role "admin" as "hashes":
-      | name     | backend_type | default_value | white_list |
-      | quantity | integer      | [nil:]        | [bool:t]   |
-    And create "Product" model with attributes as "rows_hash":
-      | quantity | 5 |
-    Then last created "Product" should have the following attributes:
-      | code     | [nil:]            |
-      | info     | [str:]            |
-      | price    | [float:0]         |
-      | total    | [int:0]           |
-      | active   | [bool:f]          |
-      | started  | [date:2012-01-01] |
-      | quantity | [int:5]           |
-
-  Scenario: pass only hydra_set_id
-    Given create hydra sets for "Product" as "hashes":
-      | name    |
-      | Default |
-      | General |
-    And add "Product" hydra attributes to hydra set:
-      | hydra attribute name | hydra set name          |
-      | code                 | [array:Default]         |
-      | price                | [array:Default]         |
-      | active               | [array:Default,General] |
-      | info                 | [array:General]         |
-
-    When create "Product" model with attributes as "rows_hash":
-      | hydra_set_id | [eval:Product.hydra_sets.find_by_name('Default').id] |
-    Then table "hydra_string_products" should have 1 record:
-      | entity_id              | hydra_attribute_id                                      |
-      | [eval:Product.last.id] | [eval:Product.hydra_attributes.find_by_name('code').id] |
-    And table "hydra_float_products" should have 1 record:
-      | entity_id              | hydra_attribute_id                                       |
-      | [eval:Product.last.id] | [eval:Product.hydra_attributes.find_by_name('price').id] |
-    And table "hydra_boolean_products" should have 1 record:
-      | entity_id              | hydra_attribute_id                                        |
-      | [eval:Product.last.id] | [eval:Product.hydra_attributes.find_by_name('active').id] |
-    And table "hydra_text_products" should have 0 records
-    And table "hydra_integer_products" should have 0 records
-    And table "hydra_datetime_products" should have 0 records
-
-    When create "Product" model with attributes as "rows_hash":
-      | hydra_set_id | [eval:Product.hydra_sets.find_by_name('General').id] |
-    And table "hydra_boolean_products" should have 2 records:
-      | entity_id              | hydra_attribute_id                                        |
-      | [eval:Product.last.id] | [eval:Product.hydra_attributes.find_by_name('active').id] |
-    And table "hydra_text_products" should have 1 record:
-      | entity_id              | hydra_attribute_id                                      |
-      | [eval:Product.last.id] | [eval:Product.hydra_attributes.find_by_name('info').id] |
-    And table "hydra_string_products" should have 1 record:
-      | entity_id               | hydra_attribute_id                                      |
-      | [eval:Product.first.id] | [eval:Product.hydra_attributes.find_by_name('code').id] |
-    And table "hydra_float_products" should have 1 record:
-      | entity_id               | hydra_attribute_id                                       |
-      | [eval:Product.first.id] | [eval:Product.hydra_attributes.find_by_name('price').id] |
-    And table "hydra_integer_products" should have 0 records
-    And table "hydra_datetime_products" should have 0 records
-
-  Scenario: build model with all attributes, set hydra_set_id and save it
-    Given create hydra sets for "Product" as "hashes":
-      | name    |
-      | Default |
-      | General |
-    And add "Product" hydra attributes to hydra set:
-      | hydra attribute name | hydra set name          |
-      | code                 | [array:Default]         |
-      | price                | [array:Default]         |
-      | active               | [array:Default,General] |
-      | info                 | [array:General]         |
-    When build "Product" model:
-      | code    | #123       |
-      | price   | 2.50       |
-      | active  | 1          |
-      | info    | desc       |
-      | started | 2012-08-20 |
-    And set "hydra_set_id" to "[eval:Product.hydra_sets.find_by_name('General').id]"
-    And save model
-    Then table "hydra_text_products" should have 1 record:
-      | entity_id              | hydra_attribute_id                                      |
-      | [eval:Product.last.id] | [eval:Product.hydra_attributes.find_by_name('info').id] |
-    And table "hydra_boolean_products" should have 1 record:
-      | entity_id              | hydra_attribute_id                                        |
-      | [eval:Product.last.id] | [eval:Product.hydra_attributes.find_by_name('active').id] |
-    And table "hydra_float_products" should have 0 records
-    And table "hydra_string_products" should have 0 records
-    And table "hydra_integer_products" should have 0 records
-    And table "hydra_datetime_products" should have 0 records