property 1.1.0 → 1.2.0

data/.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
 coverage
 *.gem
-log/test.log
+log/test.log
+.project

data/History.txt

@@ -1,3 +1,8 @@
+== 1.2.0 2010-09-26
+
+* Major enhancements
+  * Fixed nasty bug preventing 'name' properties in roles.
+
 == 1.1.0 2010-07-22
 
 * Major enhancements

data/lib/property/schema.rb

@@ -130,12 +130,14 @@ module Property
 
       def check_duplicate_method_definitions(role, keys)
         common_keys = []
+        # we are in an instance's metaclass, find the class
+        superclass  = @binding.ancestors.detect {|a| a.kind_of?(Class)}
         keys.each do |k|
-          common_keys << k if @binding.superclass.method_defined?(k)
+          common_keys << k if superclass.method_defined?(k)
         end
 
         if !common_keys.empty?
-          raise RedefinedMethodError.new("Cannot include role '#{role.name}' in '#{@binding}'. Would hide methods in superclass: #{common_keys.join(', ')}")
+          raise RedefinedMethodError.new("Cannot include role '#{role.name}' in '#{@binding}'. Would hide methods in superclass (#{superclass}): #{common_keys.join(', ')}")
         end
       end
 

data/lib/property/version.rb

@@ -1,3 +1,3 @@
 module Property
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/property.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{property}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Renaud Kern", "Gaspard Bucher"]
-  s.date = %q{2010-07-22}
+  s.date = %q{2010-09-26}
   s.description = %q{Wrap model properties into a single database column and declare properties from within the model.}
   s.email = %q{gaspard@teti.ch}
   s.extra_rdoc_files = [

data/test/unit/property/declaration_test.rb

@@ -77,6 +77,26 @@ class DeclarationTest < Test::Unit::TestCase
       end
     end
   end
+  
+  context 'An instance' do
+    subject do
+      Class.new(ActiveRecord::Base) do
+        set_table_name :dummies
+        include Property
+      end.new
+    end
+    
+    should 'be able to include a role with _name_ property' do
+      role_with_name = Property::Role.new('foo')
+      role_with_name.property do |p|
+        p.string :name
+      end
+      
+      assert_nothing_raised do
+        subject.has_role role_with_name
+      end
+    end
+  end # An instance
 
   context 'Property declaration' do
     Superhero = Class.new(ActiveRecord::Base) do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Renaud Kern
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 +02:00
+date: 2010-09-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency