hydra_attribute 0.3.2.beta → 0.3.2

data/CHANGELOG.md

@@ -1,8 +1,11 @@
+**0.3.2 (July 31, 2012)**
+* Add `white_list` option which allow to add attribute to white list for entity during creation it
+
 **0.3.1 (July 28, 2012)**
 * Fix bug "ActiveModel::MassAssignmentSecurity::Error: Can't mass-assign protected attributes: name, backend_type, default_value" during creation hydra attributes 
 
 **0.3.0 (July 27, 2012)**
-* All attribibutes are now stored in database
+* All attributes are now stored in database
 * Support default value for attributes
 * `#inspect` method displays hydra attributes too
 

data/features/attributes/create.feature

@@ -7,7 +7,7 @@ Feature: create hydra attributes
       | name           | backend_type   | white_list     |
       | [string:price] | [string:float] | [boolean:true] |
 
-  Scenario: create hydra attribute in runtime
+  Scenario: create hydra attribute
     # Important: when respond_to? is called the hydra attributes are being loaded for entity class
     Then model "Product" should respond to "price"
     Given create hydra attributes for "Product" with role "admin" as "hashes":
@@ -15,8 +15,16 @@ Feature: create hydra attributes
       | title | string       |
     Then model "Product" should respond to "title"
 
-  Scenario: create hydra attribute from entity class
+  Scenario: create attribute but don't add it to white list
     Given create hydra attributes for "Product" with role "admin" as "hashes":
-      | name | backend_type |
-      | code | integer      |
-    Then model "Product" should respond to "code"
+      | name           | backend_type     | white_list      |
+      | [string:code]  | [string:string]  |                 |
+      | [string:total] | [string:integer] | [boolean:false] |
+    Then class "Product" should not have "code" in white list
+    And class "Product" should not have "total" in white list
+
+  Scenario: create attribute and add it to white list
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
+      | name           | backend_type     | white_list     |
+      | [string:code]  | [string:string]  | [boolean:true] |
+    Then class "Product" should have "code" in white list

data/features/attributes/destroy.feature

@@ -8,10 +8,21 @@ Feature: destroy hydra attributes
       | name           | backend_type   | white_list     |
       | [string:price] | [string:float] | [boolean:true] |
 
-  Scenario: destroy hydra attribute in runtime
+
+  Scenario: entity should not respond to removed attribute
+    When destroy all "HydraAttribute::HydraAttribute" models with attributes as "rows_hash":
+      |name | price |
+    Then model "Product" should not respond to "price"
+
+
+  Scenario: remove all values from appropriate table
     Given create "Product" model with attributes as "rows_hash":
       | price | 10 |
     When destroy all "HydraAttribute::HydraAttribute" models with attributes as "rows_hash":
       |name | price |
-    Then model "Product" should not respond to "price"
-    And total "HydraAttribute::HydraFloatProduct" records should be "0"
+    Then total "HydraAttribute::HydraFloatProduct" records should be "0"
+
+  Scenario: remove attribute from white list
+    When destroy all "HydraAttribute::HydraAttribute" models with attributes as "rows_hash":
+      |name | price |
+    Then class "Product" should not have "price" in white list

data/features/attributes/update.feature

@@ -7,7 +7,7 @@ Feature: update hydra attribute
       | name          | backend_type     | default_value | white_list     |
       | [string:code] | [string:integer] | [integer:1]   | [boolean:true] |
 
-  Scenario: update default value in runtime
+  Scenario: update default value
     Given create "Product" model
     And load and update attributes for "HydraAttribute::HydraAttribute" models with attributes as "rows_hash":
       | default_value | 2 |
@@ -17,3 +17,20 @@ Feature: update hydra attribute
     And last created "Product" should have the following attributes:
       | code | [integer:2] |
 
+  Scenario: update white list attribute to true
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
+      | name           | backend_type    | white_list      |
+      | [string:title] | [string:string] | [boolean:false] |
+    And select last "HydraAttribute::HydraAttribute" record
+    When update attributes as "admin":
+      | white_list | [boolean:true] |
+    Then class "Product" should have "title" in white list
+
+  Scenario: update white list attribute to false
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
+      | name          | backend_type    | white_list      |
+      | [string:info] | [string:string] | [boolean:true] |
+    And select last "HydraAttribute::HydraAttribute" record
+    When update attributes as "admin":
+      | white_list | [boolean:false] |
+    Then class "Product" should not have "info" in white list

data/features/define.feature

@@ -4,9 +4,9 @@ Feature: define hydra attributes
 
   Background: create hydra attributes
     Given create hydra attributes for "Product" with role "admin" as "hashes":
-      | name           | backend_type    |
-      | [string:code]  | [string:string] |
-      | [string:price] | [string:float]  |
+      | name           | backend_type    | white_list      |
+      | [string:code]  | [string:string] | [boolean:true]  |
+      | [string:price] | [string:float]  | [boolean:false] |
 
   Scenario Outline: models should respond to hydra attributes
       Then model "<model>" <action> respond to "<attributes>"
@@ -30,4 +30,9 @@ Feature: define hydra attributes
       | Product | should | price_change           |
       | Product | should | price_will_change!     |
       | Product | should | price_was              |
-      | Product | should | reset_price!           |
+      | Product | should | reset_price!           |
+
+  Scenario: model should have appropriate attributes in white list
+    When redefine "Product" class to use hydra attributes
+    Then class "Product" should have "code" in white list
+    And class "Product" should not have "price" in white list

data/features/step_definitions/model_steps.rb

@@ -1,3 +1,7 @@
+Given /^redefine "([^"]+)" class to use hydra attributes$/ do |klass|
+  redefine_hydra_entity(klass)
+end
+
 Given /^create "([^"]+)" model$/ do |klass|
   klass.constantize.create!
 end
@@ -38,4 +42,9 @@ Then /^(last|first) created "([^"]+)" (should|should not) have the following att
   table.rows_hash.each_with_object(klass.constantize.send(method)) do |(attribute, value), model|
     model.send(attribute).send(match) == type_cast_value(value)
   end
+end
+
+Then /^class "([^"]+)" (should(?:\snot)?) have "([^"]+)" in white list$/ do |klass, accept, attribute|
+  method = accept.sub(' ', '_')
+  klass.constantize.accessible_attributes.send(method, include(attribute))
 end

data/features/step_definitions/record_steps.rb

@@ -21,6 +21,10 @@ When /^keep "([^"]+)" attribute$/ do |attribute|
   @keep[attribute] = @record.send(attribute)
 end
 
+Then /^update attributes as "([^"]+)":$/ do |role, table|
+  @record.update_attributes(type_cast_hash(table.rows_hash), as: role.to_sym)
+end
+
 Then /^record should be nil$/ do
   @record.should be_nil
 end

data/features/support/env.rb

@@ -4,7 +4,6 @@ require 'database_cleaner'
 require 'database_cleaner/cucumber'
 
 ActiveSupport.on_load(:active_record) do
-  self.attr_accessible :name # we create entity model with one column "name" for testing
   self.default_timezone = :utc
   unless ActiveRecord::VERSION::STRING.start_with?('3.1.')
     self.mass_assignment_sanitizer = :strict
@@ -16,21 +15,8 @@ ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:'
 DatabaseCleaner.strategy = :truncation
 
 Before do
-  if Object.const_defined?(:Product)
-    HydraAttribute::SUPPORT_TYPES.each do |type|
-      assoc_model = HydraAttribute::AssociationBuilder.new(Product, type).model_name
-      HydraAttribute.send(:remove_const, assoc_model)
-    end
-
-    Object.send(:remove_const, :Product)
-  end
-
-  ActiveSupport::Dependencies::Reference.clear!
+  redefine_hydra_entity('Product')
   DatabaseCleaner.start
-
-  class Product < ActiveRecord::Base
-    use_hydra_attributes
-  end
 end
 
 After do

data/features/support/world.rb

@@ -33,6 +33,22 @@ module HydraAttribute
           hash[key] = type_cast_value(value)
         end
       end
+
+      def redefine_hydra_entity(klass)
+        ::ActiveSupport::Dependencies.clear
+
+        Object.send(:remove_const, klass.to_sym) if Object.const_defined?(klass.to_sym)
+
+        ::HydraAttribute::SUPPORT_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
+        klass.to_s.constantize.use_hydra_attributes
+      end
     end
   end
 end

data/lib/hydra_attribute/builder.rb

@@ -32,9 +32,7 @@ module HydraAttribute
     end
 
     def build_white_list
-      klass.hydra_attributes.each do |hydra_attribute|
-        klass.accessible_attributes.add(hydra_attribute.name) if hydra_attribute.white_list?
-      end
+      klass.hydra_attributes.each(&:toggle_white_list!)
     end
   end
 end

data/lib/hydra_attribute/hydra_attribute.rb

@@ -16,7 +16,16 @@ module HydraAttribute
     end
 
     before_destroy :delete_dependent_values
-    after_commit   :reload_entity_attributes
+    after_commit   :reload_attribute_methods
+    after_commit   :toggle_white_list!
+
+    def toggle_white_list!
+      if destroyed? or !white_list?
+        remove_from_white_list
+      else
+        add_to_white_list
+      end
+    end
 
     private
 
@@ -25,20 +34,16 @@ module HydraAttribute
       value_class.delete_all(hydra_attribute_id: id)
     end
 
-    def reload_entity_attributes
+    def reload_attribute_methods
       entity_type.constantize.reset_hydra_attribute_methods # TODO should not remove all generated methods just for this attribute
-      destroyed? ? remove_from_white_list : add_to_white_list
     end
 
-    # Add attribute to white list for entity if it has a white list mark
     def add_to_white_list
-      entity_type.constantize.accessible_attributes.add(name) if white_list?
+      entity_type.constantize.accessible_attributes.add(name)
     end
 
-    # Don't check if this attribute is in white list or has a white list mark.
-    # Just remove it from white list for entity
     def remove_from_white_list
-      entity_type.constantize.accessible_attributes.remove(name)
+      entity_type.constantize.accessible_attributes.delete(name)
     end
   end
 end

data/lib/hydra_attribute/version.rb

@@ -1,3 +1,3 @@
 module HydraAttribute
-  VERSION = '0.3.2.beta'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: hydra_attribute
 version: !ruby/object:Gem::Version
-  version: 0.3.2.beta
-  prerelease: 6
+  version: 0.3.2
+  prerelease: 
 platform: ruby
 authors:
 - Kostyantyn Stepanyuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000Z
+date: 2012-07-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152216280 !ruby/object:Gem::Requirement
+  requirement: &2152407120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152216280
+  version_requirements: *2152407120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152215740 !ruby/object:Gem::Requirement
+  requirement: &2152406720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152215740
+  version_requirements: *2152406720
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152215160 !ruby/object:Gem::Requirement
+  requirement: &2152406180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152215160
+  version_requirements: *2152406180
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152214620 !ruby/object:Gem::Requirement
+  requirement: &2152405740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152214620
+  version_requirements: *2152405740
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2152214080 !ruby/object:Gem::Requirement
+  requirement: &2152405300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152214080
+  version_requirements: *2152405300
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &2152191360 !ruby/object:Gem::Requirement
+  requirement: &2152404880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152191360
+  version_requirements: *2152404880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152190940 !ruby/object:Gem::Requirement
+  requirement: &2152404460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152190940
+  version_requirements: *2152404460
 description: hydra_attribute is an implementation of EAV pattern for ActiveRecord
   models.
 email: kostya.stepanyuk@gmail.com
@@ -164,9 +164,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10