property 1.2.0 → 2.0.0

data/test/unit/property/declaration_test.rb

@@ -42,8 +42,10 @@ class DeclarationTest < Test::Unit::TestCase
         assert_equal %w{age first_name name}, subject.schema.column_names.sort
       end
 
-      should 'not be allowed to overwrite a property from the parent class' do
-        assert_raise(Property::RedefinedPropertyError) do
+      # This is allowed: it's the user's responsability to make sure such a thing does not happen
+      # or cause problems.
+      should 'be allowed to overwrite a property from the parent class' do
+        assert_nothing_raised do
           subject.class_eval do
             property.string 'name'
           end
@@ -58,9 +60,10 @@ class DeclarationTest < Test::Unit::TestCase
         end
       end
 
-      # This is because we include a module and the module would hide the method
-      should 'not be allowed to define a property with the name of a method in the parent class' do
-        assert_raise(Property::RedefinedMethodError) do
+      # This is allowed, it's the user's responsability to make sure such a thing does not cause
+      # problems.
+      should 'be allowed to define a property with the name of a method in the parent class' do
+        assert_nothing_raised do
           subject.class_eval do
             property.string 'method_in_parent'
           end
@@ -77,7 +80,7 @@ class DeclarationTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context 'An instance' do
     subject do
       Class.new(ActiveRecord::Base) do
@@ -85,15 +88,15 @@ class DeclarationTest < Test::Unit::TestCase
         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
+        subject.include_role role_with_name
       end
     end
   end # An instance
@@ -175,12 +178,12 @@ class DeclarationTest < Test::Unit::TestCase
       assert_equal Time, column.klass
       assert_equal :datetime, column.type
     end
-    
+
     should 'allow multiple declarations in one go' do
       subject.property.string 'foo', 'bar', 'baz'
       assert_equal %w{bar baz foo}, subject.schema.column_names.sort
     end
-    
+
     should 'allow multiple declarations in an Array' do
       subject.property.string ['foo', 'bar', 'baz']
       assert_equal %w{bar baz foo}, subject.schema.column_names.sort
@@ -225,7 +228,7 @@ class DeclarationTest < Test::Unit::TestCase
           p.string 'poem'
         end
 
-        @instance.has_role @poet
+        @instance.include_role @poet
       end
 
       should 'behave like any other property column' do
@@ -236,10 +239,19 @@ class DeclarationTest < Test::Unit::TestCase
         assert_equal Hash['poem' => 'shazam'], @instance.prop
       end
 
+      should 'use method_missing for property methods' do
+        assert !@instance.respond_to?(:poem=)
+        assert_nothing_raised do
+          @instance.poem = 'shazam'
+          assert_equal 'shazam', @instance.poem
+        end
+      end
+
       should 'not affect instance class' do
         assert !subject.schema.column_names.include?('poem')
         assert_raise(NoMethodError) do
-          subject.new.poem = 'not a poet'
+          instance = subject.new
+          instance.poem = 'not a poet'
         end
       end
     end
@@ -265,29 +277,13 @@ class DeclarationTest < Test::Unit::TestCase
     subject { Class.new(Developer) }
 
     should 'raise an exception if we ask to behave like a class without schema' do
-      assert_raise(TypeError) { subject.has_role String }
+      assert_raise(TypeError) { subject.include_role String }
     end
 
     should 'raise an exception if we ask to behave like an object' do
-      assert_raise(TypeError) { subject.has_role 'me' }
-    end
-    
-    should 'raise an exception if the role redefines properties' do
-      @emp = Property::Role.new('empi')
-      @emp.property.string 'first_name'
-      assert_raise(Property::RedefinedPropertyError) do
-        subject.has_role @emp
-      end
-    end
-    
-    should 'raise an exception if the role contains superclass methods' do
-      @emp = Property::Role.new('empi')
-      @emp.property.string 'method_in_parent'
-      assert_raise(Property::RedefinedMethodError) do
-        subject.has_role @emp
-      end
+      assert_raise(TypeError) { subject.include_role 'me' }
     end
-    
+
     should 'inherit properties when asking to behave like a class' do
       @class = Class.new(ActiveRecord::Base) do
         include Property
@@ -295,10 +291,10 @@ class DeclarationTest < Test::Unit::TestCase
           p.string 'hop'
         end
       end
-      
-      subject.has_role @class
+
+      subject.include_role @class
       assert_equal %w{language last_name hop age first_name}, subject.schema.column_names
-      assert subject.has_role?(@class)
+      assert subject.has_role?(@class.schema)
     end
   end
 
@@ -321,12 +317,10 @@ class DeclarationTest < Test::Unit::TestCase
         p.string 'first_name'
         p.string 'famous', :default => :get_is_famous
         p.integer 'age'
+      end
 
-        p.actions do
-          def get_is_famous
-            'no'
-          end
-        end
+      def get_is_famous
+        'no'
       end
 
       def version

data/test/unit/property/index_field_test.rb

@@ -0,0 +1,56 @@
+require 'test_helper'
+require 'fixtures'
+
+class IndexFieldTest < ActiveSupport::TestCase
+
+  class Person < ActiveRecord::Base
+    include Property
+    set_table_name :employees
+    property.string 'name'
+    property.float 'age', :index => '.idx_float1'
+  end
+
+  context 'A class with a field index' do
+    subject do
+      Person
+    end
+
+    context 'on record creation' do
+      should 'succeed' do
+        assert_difference('Person.count', 1) do
+          Person.create('name' => 'Jake Sully', 'age' => 30)
+        end
+      end
+
+      should 'save index in the model' do
+        person = Person.create('name' => 'Jake Sully', 'age' => 30)
+        assert_equal 30, Person.find(person.id).idx_float1
+      end
+    end
+
+    context 'on record update' do
+      subject do
+        Person.create('name' => 'Jake Sully', 'age' => 30)
+      end
+
+      should 'update index entries' do
+        subject.update_attributes('age' => 15)
+        assert_equal 15, Person.find(subject).idx_float1
+      end
+    end
+
+    context 'on index rebuild' do
+      subject do
+        p = Person.create('name' => 'Jake Sully', 'age' => 30)
+        Person.connection.execute "UPDATE #{Person.table_name} SET idx_float1 = NULL"
+        Person.find(p)
+      end
+
+      should 'rebuild field index' do
+        subject.rebuild_index!
+        assert_equal 30, Person.find(subject.id).idx_float1
+      end
+    end # on index rebuild
+
+  end
+end

data/test/unit/property/role_test.rb

@@ -10,17 +10,10 @@ class RoleTest < ActiveSupport::TestCase
       @poet = Property::Role.new('Poet') do |p|
         p.string 'poem', :default => :muse
         p.integer 'year'
-
-        p.actions do
-          def muse
-            'I am your muse'
-          end
-        end
       end
     end
 
-    should_insert_properties_on_has_role_poet
-    should_add_role_methods
+    should_insert_properties_on_include_role_poet
     should_take_part_in_used_list
     should_not_maintain_indices # no indexed column defined
 
@@ -48,12 +41,10 @@ class RoleTest < ActiveSupport::TestCase
       property do |p|
         p.string 'poem', :default => :muse
         p.integer 'year'
+      end
 
-        p.actions do
-          def muse
-            'I am your muse'
-          end
-        end
+      def muse
+        'I am your muse'
       end
     end
 
@@ -61,8 +52,7 @@ class RoleTest < ActiveSupport::TestCase
       @poet = Foo
     end
 
-    should_insert_properties_on_has_role_poet
-    should_add_role_methods
+    should_insert_properties_on_include_role_poet
     should_take_part_in_used_list
 
     context 'set on a sub-class instance' do
@@ -71,7 +61,7 @@ class RoleTest < ActiveSupport::TestCase
       end
 
       should 'not raise an exception' do
-        assert_nothing_raised { subject.has_role Developer }
+        assert_nothing_raised { subject.include_role Developer }
       end
     end # set on a sub-class instance
   end # A class used as role

data/test/unit/property/stored_role_test.rb

@@ -24,7 +24,92 @@ class StoredRoleTest < ActiveSupport::TestCase
         @poet = Role.find(role.id)
       end
 
-      should_insert_properties_on_has_role_poet
+      
+      # ========================== should_insert_properties_on_include_role_poet
+      
+        context 'added' do
+
+          context 'to a parent class' do
+            setup do
+              @parent = Class.new(ActiveRecord::Base) do
+                set_table_name :dummies
+                include Property
+                property.string 'name'
+
+                def muse
+                  'I am your muse'
+                end
+              end
+
+              @klass = Class.new(@parent)
+            end
+
+            should 'propagate definitions to child' do
+              @parent.include_role @poet
+              assert_equal %w{name poem year}, @klass.schema.column_names.sort
+            end
+
+            should 'return true on has_role?' do
+              @parent.include_role @poet
+              assert @klass.has_role?(@poet)
+            end
+
+            should 'not raise an exception on double inclusion' do
+              @parent.include_role @poet
+              assert_nothing_raised { @parent.include_role @poet }
+            end
+
+            should 'add accessor methods to child' do
+              subject = @klass.new
+              assert_raises(NoMethodError) { subject.poem = 'Poe'}
+              @parent.include_role @poet
+
+              assert_nothing_raised { subject.poem = 'Poe'}
+            end
+          end
+
+          context 'to a class' do
+            setup do
+              @klass = Class.new(ActiveRecord::Base) do
+                set_table_name :dummies
+                include Property
+                property.string 'name'
+
+                def muse
+                  'I am your muse'
+                end
+              end
+            end
+
+            should 'insert definitions' do
+              @klass.include_role @poet
+              assert_equal %w{name poem year}, @klass.schema.column_names.sort
+            end
+
+            should 'return true on class has_role?' do
+              @klass.include_role @poet
+              assert @klass.has_role?(@poet)
+            end
+
+            should 'return role from column' do
+              @klass.include_role @poet
+              assert_equal (@poet.kind_of?(Class) ? @poet.schema : @poet), @klass.schema.columns['poem'].role
+            end
+          end
+
+          context 'to an instance' do
+            subject { Developer.new }
+
+            setup do
+              subject.include_role @poet
+            end
+
+            should 'merge property definitions' do
+              assert_equal %w{age first_name language last_name poem year}, subject.schema.column_names.sort
+            end
+          end
+        end
+      # ==========================
       should_take_part_in_used_list(false)
       should_not_maintain_indices # no indexed column defined
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
-  - 1
   - 2
   - 0
-  version: 1.2.0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Renaud Kern
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-26 00:00:00 +02:00
+date: 2010-11-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -34,9 +37,11 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -93,6 +98,7 @@ files:
 - test/unit/property/dirty_test.rb
 - test/unit/property/index_complex_test.rb
 - test/unit/property/index_custom_test.rb
+- test/unit/property/index_field_test.rb
 - test/unit/property/index_foreign_test.rb
 - test/unit/property/index_simple_test.rb
 - test/unit/property/role_test.rb
@@ -111,23 +117,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: property
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: model properties wrap into a single database column
@@ -145,6 +155,7 @@ test_files:
 - test/unit/property/dirty_test.rb
 - test/unit/property/index_complex_test.rb
 - test/unit/property/index_custom_test.rb
+- test/unit/property/index_field_test.rb
 - test/unit/property/index_foreign_test.rb
 - test/unit/property/index_simple_test.rb
 - test/unit/property/role_test.rb