dm-core 1.0.0 → 1.0.1

data/lib/dm-core/support/naming_conventions.rb

@@ -28,25 +28,25 @@ module DataMapper
 
       module UnderscoredAndPluralized
         def self.call(name)
-          ActiveSupport::Inflector.pluralize(ActiveSupport::Inflector.underscore(name)).gsub('/', '_')
+          DataMapper::Inflector.pluralize(DataMapper::Inflector.underscore(name)).gsub('/', '_')
         end
       end # module UnderscoredAndPluralized
 
       module UnderscoredAndPluralizedWithoutModule
         def self.call(name)
-          ActiveSupport::Inflector.pluralize(ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(name)))
+          DataMapper::Inflector.pluralize(DataMapper::Inflector.underscore(DataMapper::Inflector.demodulize(name)))
         end
       end # module UnderscoredAndPluralizedWithoutModule
 
       module Underscored
         def self.call(name)
-          ActiveSupport::Inflector.underscore(name)
+          DataMapper::Inflector.underscore(name)
         end
       end # module Underscored
 
       module Yaml
         def self.call(name)
-          "#{ActiveSupport::Inflector.pluralize(ActiveSupport::Inflector.underscore(name))}.yaml"
+          "#{DataMapper::Inflector.pluralize(DataMapper::Inflector.underscore(name))}.yaml"
         end
       end # module Yaml
 
@@ -56,25 +56,25 @@ module DataMapper
 
       module UnderscoredAndPluralized
         def self.call(property)
-          ActiveSupport::Inflector.pluralize(ActiveSupport::Inflector.underscore(property.name.to_s)).gsub('/', '_')
+          DataMapper::Inflector.pluralize(DataMapper::Inflector.underscore(property.name.to_s)).gsub('/', '_')
         end
       end # module UnderscoredAndPluralized
 
       module UnderscoredAndPluralizedWithoutModule
         def self.call(property)
-          ActiveSupport::Inflector.pluralize(ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(property.name.to_s)))
+          DataMapper::Inflector.pluralize(DataMapper::Inflector.underscore(DataMapper::Inflector.demodulize(property.name.to_s)))
         end
       end # module UnderscoredAndPluralizedWithoutModule
 
       module Underscored
         def self.call(property)
-          ActiveSupport::Inflector.underscore(property.name.to_s)
+          DataMapper::Inflector.underscore(property.name.to_s)
         end
       end # module Underscored
 
       module Yaml
         def self.call(property)
-          "#{ActiveSupport::Inflector.pluralize(ActiveSupport::Inflector.underscore(property.name.to_s))}.yaml"
+          "#{DataMapper::Inflector.pluralize(DataMapper::Inflector.underscore(property.name.to_s))}.yaml"
         end
       end # module Yaml
 

data/lib/dm-core/types/discriminator.rb

@@ -13,7 +13,7 @@ module DataMapper
         model           = property.model
         property_name   = property.name
 
-        model.default_scope(repository_name).update(property_name => model.descendants)
+        model.default_scope(repository_name).update(property_name => model.descendants.dup << model)
 
         model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
           extend Chainable
@@ -40,7 +40,7 @@ module DataMapper
             private
 
             def set_discriminator_scope_for(model)
-              model.default_scope(#{repository_name.inspect}).update(#{property_name.inspect} => model.descendants)
+              model.default_scope(#{repository_name.inspect}).update(#{property_name.inspect} => model.descendants.dup << model)
             end
           end
         RUBY

data/spec/public/associations/many_to_one_with_custom_fk_spec.rb

@@ -0,0 +1,49 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+
+# TODO: combine this into many_to_one_spec.rb
+
+describe 'Many to One Associations when foreign key is a custom property' do
+  before :all do
+    class ::CustomPK < DataMapper::Property::String
+      key true
+    end
+
+    class ::Animal
+      include DataMapper::Resource
+
+      property :id,   Serial
+      property :name, String
+
+      belongs_to :zoo
+    end
+
+    class ::Zoo
+      include DataMapper::Resource
+
+      property :id, ::CustomPK
+
+      has n, :animals
+    end
+
+    DataMapper.finalize
+  end
+
+  supported_by :all do
+    before :all do
+      @zoo    = Zoo.create(:id => 'foo')
+      @animal = @zoo.animals.create(:name => 'marty')
+    end
+
+    it 'should have FK of the same property type as zoo PK' do
+      Animal.properties[:zoo_id].class.should be(Zoo.properties[:id].class)
+    end
+
+    it 'should be able to access parent' do
+      @animal.zoo.should == @zoo
+    end
+
+    it 'should be able to access the children' do
+      @zoo.animals.should == [ @animal ]
+    end
+  end
+end

data/spec/public/finalize_spec.rb

@@ -9,9 +9,31 @@ describe DataMapper do
         include DataMapper::Resource
         property :id, Integer, :key => true
       end
-      method(:subject).should_not raise_error
-      DataMapper::Model.descendants.delete(ValidObject)
-      Object.send(:remove_const, :ValidObject)
+      begin
+        method(:subject).should_not raise_error
+      ensure
+        DataMapper::Model.descendants.delete(ValidObject)
+        Object.send(:remove_const, :ValidObject)
+      end
+    end
+
+    it "should not raise on valid child model" do
+      class ::ValidChild
+        include DataMapper::Resource
+        belongs_to :valid_object, :key => true
+      end
+      class ::ValidObject
+        include DataMapper::Resource
+        property :id, Integer, :key => true
+      end
+      begin
+        method(:subject).should_not raise_error
+      ensure
+        DataMapper::Model.descendants.delete(ValidChild)
+        DataMapper::Model.descendants.delete(ValidObject)
+        Object.send(:remove_const, :ValidChild)
+        Object.send(:remove_const, :ValidObject)
+      end
     end
 
     it 'should raise on an anonymous model' do
@@ -19,17 +41,23 @@ describe DataMapper do
         include DataMapper::Resource
         property :id, Integer, :key => true
       end
-      method(:subject).should raise_error(DataMapper::IncompleteModelError, "#{model.inspect} must have a name")
-      DataMapper::Model.descendants.delete(model)
+      begin
+        method(:subject).should raise_error(DataMapper::IncompleteModelError, "#{model.inspect} must have a name")
+      ensure
+        DataMapper::Model.descendants.delete(model)
+      end
     end
 
     it 'should raise on an empty model' do
       class ::EmptyObject
         include DataMapper::Resource
       end
-      method(:subject).should raise_error(DataMapper::IncompleteModelError, 'EmptyObject must have at least one property or many to one relationship to be valid')
-      DataMapper::Model.descendants.delete(EmptyObject)
-      Object.send(:remove_const, :EmptyObject)
+      begin
+        method(:subject).should raise_error(DataMapper::IncompleteModelError, 'EmptyObject must have at least one property or many to one relationship to be valid')
+      ensure
+        DataMapper::Model.descendants.delete(EmptyObject)
+        Object.send(:remove_const, :EmptyObject)
+      end
     end
 
     it 'should raise on a keyless model' do
@@ -37,9 +65,12 @@ describe DataMapper do
         include DataMapper::Resource
         property :name, String
       end
-      method(:subject).should raise_error(DataMapper::IncompleteModelError, 'KeylessObject must have a key to be valid')
-      DataMapper::Model.descendants.delete(KeylessObject)
-      Object.send(:remove_const, :KeylessObject)
+      begin
+        method(:subject).should raise_error(DataMapper::IncompleteModelError, 'KeylessObject must have a key to be valid')
+      ensure
+        DataMapper::Model.descendants.delete(KeylessObject)
+        Object.send(:remove_const, :KeylessObject)
+      end
     end
   end
 end

data/spec/public/property/discriminator_spec.rb

@@ -71,29 +71,29 @@ describe DataMapper::Property::Discriminator do
 
   describe 'Model#descendants' do
     it 'should set the descendants for the grandparent model' do
-      @article_model.descendants.to_a.should == [ @article_model, @announcement_model, @release_model ]
+      @article_model.descendants.to_a.should =~ [ @announcement_model, @release_model ]
     end
 
     it 'should set the descendants for the parent model' do
-      @announcement_model.descendants.to_a.should == [ @announcement_model, @release_model ]
+      @announcement_model.descendants.to_a.should == [ @release_model ]
     end
 
     it 'should set the descendants for the child model' do
-      @release_model.descendants.to_a.should == [ @release_model ]
+      @release_model.descendants.to_a.should == []
     end
   end
 
   describe 'Model#default_scope' do
     it 'should set the default scope for the grandparent model' do
-      @article_model.default_scope[:type].should equal(@article_model.descendants)
+      @article_model.default_scope[:type].to_a.should =~ [ @article_model, @announcement_model, @release_model ]
     end
 
     it 'should set the default scope for the parent model' do
-      @announcement_model.default_scope[:type].should equal(@announcement_model.descendants)
+      @announcement_model.default_scope[:type].to_a.should =~ [ @announcement_model, @release_model ]
     end
 
     it 'should set the default scope for the child model' do
-      @release_model.default_scope[:type].should equal(@release_model.descendants)
+      @release_model.default_scope[:type].to_a.should == [ @release_model ]
     end
   end
 

data/spec/semipublic/adapters/abstract_adapter_spec.rb

@@ -4,7 +4,7 @@ describe 'AbstractAdapter' do
   before :all do
     @adapter = DataMapper::Adapters::AbstractAdapter.new(:abstract, :foo => 'bar')
     @adapter_class = @adapter.class
-    @scheme        = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(@adapter_class).chomp('Adapter'))
+    @scheme        = DataMapper::Inflector.underscore(DataMapper::Inflector.demodulize(@adapter_class).chomp('Adapter'))
     @adapter_name  = "test_#{@scheme}".to_sym
   end
 

data/spec/semipublic/property/lookup_spec.rb

@@ -0,0 +1,26 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '../..', 'spec_helper'))
+require 'dm-core/property/lookup'
+
+describe DataMapper::Property::Lookup do
+  supported_by :all do
+    before(:all) do
+      @klass = Class.new { extend DataMapper::Model }
+
+      DataMapper::Types::LegacyType = Class.new(DataMapper::Types::Text)
+    end
+
+    it "should provide access to Property classes" do
+      @klass::Serial.should == DataMapper::Property::Serial
+    end
+
+    it "should provide access to legacy Types" do
+      @klass::LegacyType.should be(DataMapper::Types::LegacyType)
+    end
+
+    it "should not provide access to unknown Property classes" do
+      lambda {
+        @klass::Bla
+      }.should raise_error(NameError)
+    end
+  end
+end

data/spec/semipublic/property_spec.rb

@@ -2,6 +2,49 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 # instance methods
 describe DataMapper::Property do
+  describe ".find_class" do
+    [ :Serial, :Text ].each do |type|
+      describe "with #{type}" do
+        subject { DataMapper::Property.find_class(type) }
+
+        it { subject.should be(DataMapper::Property.const_get(type)) }
+      end
+    end
+  end
+
+  describe ".determine_class" do
+    [ Integer, String, Float, Class, String, Time, DateTime, Date ].each do |type|
+      describe "with #{type}" do
+        subject { DataMapper::Property.determine_class(type) }
+
+        it { subject.should be(DataMapper::Property.const_get(type.name)) }
+      end
+    end
+
+    describe "with custom types" do
+      before :all do
+        module ::CustomProps
+          class Property
+            class Hash  < DataMapper::Property::Object; end
+            class Other < DataMapper::Property::Object; end
+          end
+        end
+      end
+
+      describe "with ::Foo::Property::Hash" do
+        subject { DataMapper::Property.determine_class(Hash) }
+
+        it { subject.should be(::CustomProps::Property::Hash) }
+      end
+
+      describe "with ::Foo::Property::Other" do
+        subject { DataMapper::Property.determine_class(::CustomProps::Property::Other) }
+
+        it { subject.should be(::CustomProps::Property::Other) }
+      end
+    end
+  end
+
   before :all do
     module ::Blog
       class Author

data/spec/semipublic/resource/state/dirty_spec.rb

@@ -51,7 +51,7 @@ describe DataMapper::Resource::State::Dirty do
         it 'should set the child key if the parent key changes' do
           original_id = @parent.id
           @parent.update(:id => 42).should be(true)
-          method(:subject).should change(@resource, :parent_id).from(original_id.to_s).to('42')
+          method(:subject).should change(@resource, :parent_id).from(original_id).to(42)
         end
 
         it 'should update the resource' do
@@ -127,7 +127,7 @@ describe DataMapper::Resource::State::Dirty do
     supported_by :all do
       describe 'with attributes that keep the resource dirty' do
         before do
-          @key   = @model.properties[:name]
+          @key   = @model.properties[:id]
           @value = @key.get!(@resource)
         end
 
@@ -136,6 +136,8 @@ describe DataMapper::Resource::State::Dirty do
         it 'should return a Dirty state' do
           should equal(@state)
         end
+
+        its(:original_attributes) { should == { @model.properties[:name] => 'Dan Kubb' } }
       end
 
       describe 'with attributes that make the resource clean' do

data/spec/support/{types → properties}/huge_integer.rb

@@ -1,16 +1,16 @@
 module DataMapper
-  module Types
+  class Property
     class HugeInteger < DataMapper::Property::String
-      def self.load(value, property)
+      def load(value)
         value.to_i unless value.nil?
       end
 
-      def self.dump(value, property)
+      def dump(value)
         value.to_s unless value.nil?
       end
 
-      def self.typecast(value, property)
-        load(value, property)
+      def typecast(value)
+        load(value)
       end
     end
   end

data/tasks/local_gemfile.rake

@@ -1,16 +1,14 @@
 desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
 task :local_gemfile do |t|
 
-  root              = Pathname(__FILE__).dirname.parent
-  datamapper        = root.parent
-
-  source_regex     = /DATAMAPPER = 'git:\/\/github.com\/datamapper'/
-  gem_source_regex = /:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/
+  root       = Pathname(__FILE__).dirname.parent
+  datamapper = root.parent
 
   root.join('Gemfile.local').open('w') do |f|
     root.join('Gemfile').open.each do |line|
-      line.sub!(source_regex,     "DATAMAPPER = '#{datamapper}'")
-      line.sub!(gem_source_regex, ':path => "#{DATAMAPPER}/\1"')
+      line.sub!(/DATAMAPPER = 'git:\/\/github.com\/datamapper'/, "DATAMAPPER = '#{datamapper}'")
+      line.sub!(/:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  ':path => "#{DATAMAPPER}/\1"')
+      line.sub!(/do_options\[:git\] = \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  'do_options[:path] = "#{DATAMAPPER}/\1"')
       f.puts line
     end
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Dan Kubb
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -07:00
+date: 2010-09-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 37
         segments: 
         - 0
         - 9
@@ -42,11 +40,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 2
-        - 1
-        version: "2.1"
+        - 2
+        version: "2.2"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,7 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 1
         - 3
@@ -72,7 +68,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 4
@@ -119,7 +114,6 @@ files:
 - lib/dm-core/core_ext/try_dup.rb
 - lib/dm-core/identity_map.rb
 - lib/dm-core/model.rb
-- lib/dm-core/model/descendant_set.rb
 - lib/dm-core/model/hook.rb
 - lib/dm-core/model/is.rb
 - lib/dm-core/model/property.rb
@@ -135,6 +129,7 @@ files:
 - lib/dm-core/property/discriminator.rb
 - lib/dm-core/property/float.rb
 - lib/dm-core/property/integer.rb
+- lib/dm-core/property/lookup.rb
 - lib/dm-core/property/numeric.rb
 - lib/dm-core/property/object.rb
 - lib/dm-core/property/serial.rb
@@ -167,11 +162,14 @@ files:
 - lib/dm-core/spec/lib/spec_helper.rb
 - lib/dm-core/spec/setup.rb
 - lib/dm-core/spec/shared/adapter_spec.rb
+- lib/dm-core/spec/shared/public/property_spec.rb
 - lib/dm-core/spec/shared/resource_spec.rb
 - lib/dm-core/spec/shared/sel_spec.rb
+- lib/dm-core/spec/shared/semipublic/property_spec.rb
 - lib/dm-core/support/assertions.rb
 - lib/dm-core/support/chainable.rb
 - lib/dm-core/support/deprecate.rb
+- lib/dm-core/support/descendant_set.rb
 - lib/dm-core/support/equalizer.rb
 - lib/dm-core/support/hook.rb
 - lib/dm-core/support/lazy_array.rb
@@ -194,6 +192,7 @@ files:
 - spec/public/associations/many_to_many_spec.rb
 - spec/public/associations/many_to_one_spec.rb
 - spec/public/associations/many_to_one_with_boolean_cpk_spec.rb
+- spec/public/associations/many_to_one_with_custom_fk_spec.rb
 - spec/public/associations/one_to_many_spec.rb
 - spec/public/associations/one_to_one_spec.rb
 - spec/public/associations/one_to_one_with_boolean_cpk_spec.rb
@@ -225,7 +224,6 @@ files:
 - spec/public/shared/collection_finder_shared_spec.rb
 - spec/public/shared/collection_shared_spec.rb
 - spec/public/shared/finder_shared_spec.rb
-- spec/public/shared/property_shared_spec.rb
 - spec/rcov.opts
 - spec/semipublic/adapters/abstract_adapter_spec.rb
 - spec/semipublic/adapters/in_memory_adapter_spec.rb
@@ -246,6 +244,7 @@ files:
 - spec/semipublic/property/discriminator_spec.rb
 - spec/semipublic/property/float_spec.rb
 - spec/semipublic/property/integer_spec.rb
+- spec/semipublic/property/lookup_spec.rb
 - spec/semipublic/property/serial_spec.rb
 - spec/semipublic/property/string_spec.rb
 - spec/semipublic/property/text_spec.rb
@@ -263,13 +262,12 @@ files:
 - spec/semipublic/resource/state_spec.rb
 - spec/semipublic/resource_spec.rb
 - spec/semipublic/shared/condition_shared_spec.rb
-- spec/semipublic/shared/property_shared_spec.rb
 - spec/semipublic/shared/resource_shared_spec.rb
 - spec/semipublic/shared/resource_state_shared_spec.rb
 - spec/semipublic/shared/subject_shared_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/support/types/huge_integer.rb
+- spec/support/properties/huge_integer.rb
 - spec/unit/array_spec.rb
 - spec/unit/hash_spec.rb
 - spec/unit/hook_spec.rb
@@ -297,7 +295,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -306,7 +303,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -323,6 +319,7 @@ test_files:
 - spec/public/associations/many_to_many_spec.rb
 - spec/public/associations/many_to_one_spec.rb
 - spec/public/associations/many_to_one_with_boolean_cpk_spec.rb
+- spec/public/associations/many_to_one_with_custom_fk_spec.rb
 - spec/public/associations/one_to_many_spec.rb
 - spec/public/associations/one_to_one_spec.rb
 - spec/public/associations/one_to_one_with_boolean_cpk_spec.rb
@@ -354,7 +351,6 @@ test_files:
 - spec/public/shared/collection_finder_shared_spec.rb
 - spec/public/shared/collection_shared_spec.rb
 - spec/public/shared/finder_shared_spec.rb
-- spec/public/shared/property_shared_spec.rb
 - spec/semipublic/adapters/abstract_adapter_spec.rb
 - spec/semipublic/adapters/in_memory_adapter_spec.rb
 - spec/semipublic/associations/many_to_many_spec.rb
@@ -374,6 +370,7 @@ test_files:
 - spec/semipublic/property/discriminator_spec.rb
 - spec/semipublic/property/float_spec.rb
 - spec/semipublic/property/integer_spec.rb
+- spec/semipublic/property/lookup_spec.rb
 - spec/semipublic/property/serial_spec.rb
 - spec/semipublic/property/string_spec.rb
 - spec/semipublic/property/text_spec.rb
@@ -391,12 +388,11 @@ test_files:
 - spec/semipublic/resource/state_spec.rb
 - spec/semipublic/resource_spec.rb
 - spec/semipublic/shared/condition_shared_spec.rb
-- spec/semipublic/shared/property_shared_spec.rb
 - spec/semipublic/shared/resource_shared_spec.rb
 - spec/semipublic/shared/resource_state_shared_spec.rb
 - spec/semipublic/shared/subject_shared_spec.rb
 - spec/spec_helper.rb
-- spec/support/types/huge_integer.rb
+- spec/support/properties/huge_integer.rb
 - spec/unit/array_spec.rb
 - spec/unit/hash_spec.rb
 - spec/unit/hook_spec.rb