hydra_attribute 0.4.0 → 0.4.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+**0.4.1 (October 3, 2012)**
+* Fixed bug which din't allow to use hydra attributes for STI models
+
 **0.4.0 (September 13, 2012)**
 * Add attribute sets
 * Add helper methods for attributes and attribute sets

data/README.md

@@ -55,7 +55,7 @@ end
 
 ### Create model
 ```shell
-rails generate model Product type:string name:string --migration=false
+rails generate model Product --migration=false
 rake db:migrate
 ```
 

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/kostyantyn/Sites/github/gems/hydra_attribute
   specs:
-    hydra_attribute (0.4.0.rc1)
+    hydra_attribute (0.4.1)
       activerecord (>= 3.1.0)
 
 GEM

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/kostyantyn/Sites/github/gems/hydra_attribute
   specs:
-    hydra_attribute (0.4.0.rc1)
+    hydra_attribute (0.4.1)
       activerecord (>= 3.1.0)
 
 GEM

data/lib/hydra_attribute/active_record/attribute_methods.rb

@@ -14,22 +14,22 @@ module HydraAttribute
 
       module ClassMethods
         def hydra_attribute_methods_generated?
-          @hydra_attribute_methods_generated ||= false
+          base_class.instance_variable_get(:@hydra_attribute_methods_generated) || base_class.instance_variable_set(:@hydra_attribute_methods_generated, false)
         end
 
         def generated_hydra_attribute_methods
-          @generated_hydra_attribute_methods ||= begin
-            mod = Module.new
-            include mod
-            mod
-          end
+          return base_class.instance_variable_get(:@generated_hydra_attribute_methods) if base_class.instance_variable_defined?(:@generated_hydra_attribute_methods)
+
+          mod = Module.new
+          base_class.send(:include, mod)
+          base_class.instance_variable_set(:@generated_hydra_attribute_methods, mod)
         end
 
         def define_hydra_attribute_methods
-          @hydra_attribute_methods_mutex.synchronize do
+          base_class.instance_variable_get(:@hydra_attribute_methods_mutex).synchronize do
             return if hydra_attribute_methods_generated?
             hydra_attributes.each { |hydra_attribute| define_hydra_attribute_method(hydra_attribute) }
-            @hydra_attribute_methods_generated = true
+            base_class.instance_variable_set(:@hydra_attribute_methods_generated, true)
           end
         end
 
@@ -70,7 +70,7 @@ module HydraAttribute
           generated_hydra_attribute_methods.module_eval do
             instance_methods.each { |m| undef_method(m) }
           end
-          @hydra_attribute_methods_generated = false
+          base_class.instance_variable_set(:@hydra_attribute_methods_generated, false)
 
           clear_hydra_method_cache!
         end

data/lib/hydra_attribute/version.rb

@@ -1,3 +1,3 @@
 module HydraAttribute
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/hydra_attribute/active_record/attribute_methods_spec.rb

@@ -12,6 +12,28 @@ describe HydraAttribute::ActiveRecord::AttributeMethods do
           product.color
         end.should raise_error(HydraAttribute::MissingAttributeInHydraSetError, %(Hydra attribute "color" does not exist in hydra set "Default"))
       end
+
+      it 'should not throw error when new sub class instance is created' do
+        Product.hydra_attributes.create(name: 'color', backend_type: 'string')
+        Product.reset_hydra_attribute_methods!
+
+        sub_class = Class.new(Product)
+        lambda do
+          sub_class.new.color
+        end.should_not raise_error
+      end
+
+      it 'should allow access to attributes from base model and its sub model' do
+        Product.hydra_attributes.create(name: 'color', backend_type: 'string')
+        Product.reset_hydra_attribute_methods!
+        Product.send(:remove_instance_variable, :@generated_hydra_attribute_methods)
+
+        sub_class = Class.new(Product)
+        lambda do
+          sub_class.new.color
+          Product.new.color
+        end.should_not raise_error
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra_attribute
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1684889592311729317
+      hash: -3857802354378024215
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24