dm-core 1.1.0.rc2 → 1.1.0.rc3

data/spec/unit/module_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'dm-core/core_ext/module'
+require 'dm-core/ext/module'
 
-describe Module do
+describe DataMapper::Ext::Module do
 
   before :all do
     Object.send(:remove_const, :Foo) if defined?(Foo)
@@ -26,46 +26,46 @@ describe Module do
   end
 
   it "should raise NameError for a missing constant" do
-    lambda { Foo.find_const('Moo') }.should raise_error(NameError)
-    lambda { Object.find_const('MissingConstant') }.should raise_error(NameError)
+    lambda { DataMapper::Ext::Module.find_const(Foo, 'Moo') }.should raise_error(NameError)
+    lambda { DataMapper::Ext::Module.find_const(Object, 'MissingConstant') }.should raise_error(NameError)
   end
 
   it "should be able to get a recursive constant" do
-    Object.find_const('Foo::ModBar').should == Foo::ModBar
+    DataMapper::Ext::Module.find_const(Object, 'Foo::ModBar').should == Foo::ModBar
   end
 
   it "should ignore get Constants from the Kernel namespace correctly" do
-    Object.find_const('::Foo::ModBar').should == ::Foo::ModBar
+    DataMapper::Ext::Module.find_const(Object, '::Foo::ModBar').should == ::Foo::ModBar
   end
 
   it "should find relative constants" do
-    Foo.find_const('ModBar').should == Foo::ModBar
-    Foo.find_const('Baz').should == Baz
+    DataMapper::Ext::Module.find_const(Foo, 'ModBar').should == Foo::ModBar
+    DataMapper::Ext::Module.find_const(Foo, 'Baz').should == Baz
   end
 
   it "should find sibling constants" do
-    Foo::ModBar.find_const("Zed").should == Foo::Zed
+    DataMapper::Ext::Module.find_const(Foo::ModBar, "Zed").should == Foo::Zed
   end
 
   it "should find nested constants on nested constants" do
-    Foo::ModBar.find_const('Noo::Too').should == Foo::ModBar::Noo::Too
+    DataMapper::Ext::Module.find_const(Foo::ModBar, 'Noo::Too').should == Foo::ModBar::Noo::Too
   end
 
   it "should find constants outside of nested constants" do
-    Foo::ModBar::Noo::Too.find_const("Zed").should == Foo::Zed
+    DataMapper::Ext::Module.find_const(Foo::ModBar::Noo::Too, "Zed").should == Foo::Zed
   end
 
   it 'should be able to find past the second nested level' do
-    Foo::ModBar::Noo.find_const('Too').should == Foo::ModBar::Noo::Too
-    Foo::ModBar::Noo::Too.find_const('Boo').should == Foo::ModBar::Noo::Too::Boo
+    DataMapper::Ext::Module.find_const(Foo::ModBar::Noo, 'Too').should == Foo::ModBar::Noo::Too
+    DataMapper::Ext::Module.find_const(Foo::ModBar::Noo::Too, 'Boo').should == Foo::ModBar::Noo::Too::Boo
   end
 
 
   it "should be able to deal with constants being added and removed" do
-    Object.find_const('Bar') # First we load Bar with find_const
+    DataMapper::Ext::Module.find_const(Object, 'Bar') # First we load Bar with find_const
     Object.module_eval { remove_const('Bar') } # Now we delete it
     module ::Bar; end; # Now we redefine it
-    Object.find_const('Bar').should == Bar
+    DataMapper::Ext::Module.find_const(Object, 'Bar').should == Bar
   end
 
 end

data/spec/unit/object_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'dm-core/core_ext/object'
+require 'dm-core/ext/object'
 
-describe Object do
+describe DataMapper::Ext::Object do
   before :all do
     Object.send(:remove_const, :HactiveSupport) if defined?(HactiveSupport)
     module ::HactiveSupport
@@ -19,19 +19,19 @@ describe Object do
     end
   end
 
-  describe "#full_const_get" do
+  describe ".full_const_get" do
     it 'returns constant by FQ name in receiver namespace' do
-      Object.full_const_get("Oi").should == Oi
-      Object.full_const_get("Foo::Bar").should == Foo::Bar
+      DataMapper::Ext::Object.full_const_get("Oi").should == Oi
+      DataMapper::Ext::Object.full_const_get("Foo::Bar").should == Foo::Bar
     end
   end
 
-  describe "#full_const_set" do
+  describe ".full_const_set" do
     it 'sets constant value by FQ name in receiver namespace' do
-      Object.full_const_set("HactiveSupport::MCU", HactiveSupport::MemoizeConsideredUseless)
+      DataMapper::Ext::Object.full_const_set("HactiveSupport::MCU", HactiveSupport::MemoizeConsideredUseless)
 
-      Object.full_const_get("HactiveSupport::MCU").should == HactiveSupport::MemoizeConsideredUseless
-      HactiveSupport.full_const_get("MCU").should == HactiveSupport::MemoizeConsideredUseless
+      DataMapper::Ext::Object.full_const_get("HactiveSupport::MCU").should == HactiveSupport::MemoizeConsideredUseless
+      DataMapper::Ext::Object.full_const_get(HactiveSupport, "MCU").should == HactiveSupport::MemoizeConsideredUseless
     end
   end
 

data/spec/unit/try_dup_spec.rb

@@ -1,46 +1,46 @@
 require 'spec_helper'
-require 'dm-core/core_ext/try_dup'
+require 'dm-core/ext/try_dup'
 
 describe "try_dup" do
   it "returns a duplicate version on regular objects" do
     obj = Object.new
-    oth = obj.try_dup
+    oth = DataMapper::Ext.try_dup(obj)
     obj.should_not === oth
   end
 
   it "returns self on Numerics" do
     obj = 12
-    oth = obj.try_dup
+    oth = DataMapper::Ext.try_dup(obj)
     obj.should === oth
   end
 
   it "returns self on Symbols" do
     obj = :test
-    oth = obj.try_dup
+    oth = DataMapper::Ext.try_dup(obj)
     obj.should === oth
   end
 
   it "returns self on true" do
     obj = true
-    oth = obj.try_dup
+    oth = DataMapper::Ext.try_dup(obj)
     obj.should === oth
   end
 
   it "returns self on false" do
     obj = false
-    oth = obj.try_dup
+    oth = DataMapper::Ext.try_dup(obj)
     obj.should === oth
   end
 
   it "returns self on nil" do
     obj = nil
-    oth = obj.try_dup
+    oth = DataMapper::Ext.try_dup(obj)
     obj.should === oth
   end
 
   it "returns self on modules" do
     obj = Module.new
-    oth = obj.try_dup
+    oth = DataMapper::Ext.try_dup(obj)
     obj.object_id.should == oth.object_id
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: dm-core
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.rc2
+  version: 1.1.0.rc3
 platform: ruby
 authors: 
 - Dan Kubb
@@ -10,34 +10,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: i18n
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: addressable
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,10 +23,10 @@ dependencies:
         version: 2.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -56,10 +34,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -67,10 +45,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,7 +56,7 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id004
 description: Faster, Better, Simpler.
 email: dan.kubb@gmail.com
 executables: []
@@ -107,15 +85,17 @@ files:
 - lib/dm-core/associations/one_to_one.rb
 - lib/dm-core/associations/relationship.rb
 - lib/dm-core/collection.rb
-- lib/dm-core/core_ext/array.rb
-- lib/dm-core/core_ext/hash.rb
 - lib/dm-core/core_ext/kernel.rb
-- lib/dm-core/core_ext/module.rb
-- lib/dm-core/core_ext/object.rb
 - lib/dm-core/core_ext/pathname.rb
-- lib/dm-core/core_ext/string.rb
 - lib/dm-core/core_ext/symbol.rb
-- lib/dm-core/core_ext/try_dup.rb
+- lib/dm-core/ext/array.rb
+- lib/dm-core/ext/blank.rb
+- lib/dm-core/ext/hash.rb
+- lib/dm-core/ext/module.rb
+- lib/dm-core/ext/object.rb
+- lib/dm-core/ext/singleton_class.rb
+- lib/dm-core/ext/string.rb
+- lib/dm-core/ext/try_dup.rb
 - lib/dm-core/identity_map.rb
 - lib/dm-core/model.rb
 - lib/dm-core/model/hook.rb
@@ -178,9 +158,14 @@ files:
 - lib/dm-core/support/descendant_set.rb
 - lib/dm-core/support/equalizer.rb
 - lib/dm-core/support/hook.rb
+- lib/dm-core/support/inflections.rb
+- lib/dm-core/support/inflector.rb
+- lib/dm-core/support/inflector/inflections.rb
+- lib/dm-core/support/inflector/methods.rb
 - lib/dm-core/support/lazy_array.rb
 - lib/dm-core/support/local_object_space.rb
 - lib/dm-core/support/logger.rb
+- lib/dm-core/support/mash.rb
 - lib/dm-core/support/naming_conventions.rb
 - lib/dm-core/support/ordered_set.rb
 - lib/dm-core/support/subject.rb
@@ -268,8 +253,11 @@ files:
 - spec/semipublic/shared/subject_shared_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/core_ext/hash.rb
+- spec/support/core_ext/inheritable_attributes.rb
 - spec/support/properties/huge_integer.rb
 - spec/unit/array_spec.rb
+- spec/unit/blank_spec.rb
 - spec/unit/data_mapper/ordered_set/append_spec.rb
 - spec/unit/data_mapper/ordered_set/clear_spec.rb
 - spec/unit/data_mapper/ordered_set/delete_spec.rb
@@ -324,6 +312,7 @@ files:
 - spec/unit/hash_spec.rb
 - spec/unit/hook_spec.rb
 - spec/unit/lazy_array_spec.rb
+- spec/unit/mash_spec.rb
 - spec/unit/module_spec.rb
 - spec/unit/object_spec.rb
 - spec/unit/try_dup_spec.rb
@@ -355,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An Object/Relational Mapper for Ruby
@@ -438,8 +427,11 @@ test_files:
 - spec/semipublic/shared/resource_state_shared_spec.rb
 - spec/semipublic/shared/subject_shared_spec.rb
 - spec/spec_helper.rb
+- spec/support/core_ext/hash.rb
+- spec/support/core_ext/inheritable_attributes.rb
 - spec/support/properties/huge_integer.rb
 - spec/unit/array_spec.rb
+- spec/unit/blank_spec.rb
 - spec/unit/data_mapper/ordered_set/append_spec.rb
 - spec/unit/data_mapper/ordered_set/clear_spec.rb
 - spec/unit/data_mapper/ordered_set/delete_spec.rb
@@ -494,6 +486,7 @@ test_files:
 - spec/unit/hash_spec.rb
 - spec/unit/hook_spec.rb
 - spec/unit/lazy_array_spec.rb
+- spec/unit/mash_spec.rb
 - spec/unit/module_spec.rb
 - spec/unit/object_spec.rb
 - spec/unit/try_dup_spec.rb

data/lib/dm-core/core_ext/array.rb

@@ -1,36 +0,0 @@
-class Array
-
-  ##
-  # Transforms an Array of key/value pairs into a Hash
-  #
-  # This is a better idiom than using Hash[*array.flatten] in Ruby 1.8.6
-  # because it is not possible to limit the flattening to a single
-  # level.
-  #
-  # @return [Hash]
-  #   A Hash where each entry in the Array is turned into a key/value
-  #
-  # @api public
-  def to_hash
-    h = {}
-    each { |k,v| h[k] = v }
-    h
-  end
-
-  ##
-  # Transforms an Array of key/value pairs into a Mash
-  #
-  # This is a better idiom than using Mash[*array.flatten] in Ruby 1.8.6
-  # because it is not possible to limit the flattening to a single
-  # level.
-  #
-  # @return [Mash]
-  #   A Hash where each entry in the Array is turned into a key/value
-  #
-  # @api public
-  def to_mash
-    m = Mash.new
-    each { |k,v| m[k] = v }
-    m
-  end
-end # class Array

data/lib/dm-core/core_ext/hash.rb

@@ -1,30 +0,0 @@
-class Hash
-
-  ##
-  # Create a hash with *only* key/value pairs in receiver and +allowed+
-  #
-  #   { :one => 1, :two => 2, :three => 3 }.only(:one)    #=> { :one => 1 }
-  #
-  # @param [Array[String, Symbol]] *allowed The hash keys to include.
-  #
-  # @return [Hash] A new hash with only the selected keys.
-  #
-  # @api public
-  def only(*allowed)
-    hash = {}
-    allowed.each {|k| hash[k] = self[k] if self.has_key?(k) }
-    hash
-  end
-
-  # Convert to Mash. This class has semantics of ActiveSupport's
-  # HashWithIndifferentAccess and we only have it so that people can write
-  # params[:key] instead of params['key'].
-  #
-  # @return [Mash] This hash as a Mash for string or symbol key access.
-  def to_mash
-    hash = Mash.new(self)
-    hash.default = default
-    hash
-  end
-
-end

data/lib/dm-core/core_ext/module.rb

@@ -1,46 +0,0 @@
-require 'dm-core/core_ext/object'
-
-class Module
-
-  def find_const(const_name)
-    if const_name[0..1] == '::'
-      Object.full_const_get(const_name[2..-1])
-    else
-      nested_const_lookup(const_name)
-    end
-  end
-
-  private
-
-  # Doesn't do any caching since constants can change with remove_const
-  def nested_const_lookup(const_name)
-    unless equal?(Object)
-      constants = []
-
-      name.split('::').each do |part|
-        const = constants.last || Object
-        constants << const.const_get(part)
-      end
-
-      parts = const_name.split('::')
-
-      # from most to least specific constant, use each as a base and try
-      # to find a constant with the name const_name within them
-      constants.reverse_each do |const|
-        # return the nested constant if available
-        return const if parts.all? do |part|
-          const = if RUBY_VERSION >= '1.9.0'
-            const.const_defined?(part, false) ? const.const_get(part, false) : nil
-          else
-            const.const_defined?(part) ? const.const_get(part) : nil
-          end
-        end
-      end
-    end
-
-    # no relative constant found, fallback to an absolute lookup and
-    # use const_missing if not found
-    Object.full_const_get(const_name)
-  end
-
-end