dm-core 1.1.0.rc2 → 1.1.0.rc3

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

@@ -1,4 +1,4 @@
-require 'dm-core/core_ext/try_dup'
+require 'dm-core/ext/try_dup'
 
 class LazyArray  # borrowed partially from StrokeDB
   include Enumerable
@@ -358,9 +358,9 @@ class LazyArray  # borrowed partially from StrokeDB
   end
 
   def initialize_copy(original)
-    @head  = @head.try_dup
-    @tail  = @tail.try_dup
-    @array = @array.try_dup
+    @head  = DataMapper::Ext.try_dup(@head)
+    @tail  = DataMapper::Ext.try_dup(@tail)
+    @array = DataMapper::Ext.try_dup(@array)
   end
 
   def lazy_load

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

@@ -0,0 +1,176 @@
+module DataMapper
+  # This class has dubious semantics and we only have it so that people can write
+  # params[:key] instead of params['key'].
+  class Mash < Hash
+
+    # Initializes a new mash.
+    #
+    # @param [Hash, Object] constructor
+    #   The default value for the mash. If +constructor+ is a Hash, a new mash
+    #   will be created based on the keys of the hash and no default value will
+    #   be set.
+    def initialize(constructor = {})
+      if constructor.is_a?(Hash)
+        super()
+        update(constructor)
+      else
+        super(constructor)
+      end
+    end
+
+    # Gets the default value for the mash.
+    #
+    # @param [Object] key
+    #   The default value for the mash. If +key+ is a Symbol and it is a key in
+    #   the mash, then the default value will be set to the value matching the
+    #   key.
+    def default(key = nil)
+      if key.is_a?(Symbol) && include?(key = key.to_s)
+        self[key]
+      else
+        super
+      end
+    end
+
+    alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
+    alias_method :regular_update, :update unless method_defined?(:regular_update)
+
+    # Sets the +value+ associated with the specified +key+.
+    #
+    # @param [Object] key The key to set.
+    # @param [Object] value The value to set the key to.
+    def []=(key, value)
+      regular_writer(convert_key(key), convert_value(value))
+    end
+
+    # Updates the mash with the key/value pairs from the specified hash.
+    #
+    # @param [Hash] other_hash
+    #   A hash to update values in the mash with. The keys and the values will be
+    #   converted to Mash format.
+    #
+    # @return [Mash] The updated mash.
+    def update(other_hash)
+      other_hash.each_pair { |key, value| regular_writer(convert_key(key), convert_value(value)) }
+      self
+    end
+
+    alias_method :merge!, :update
+
+    # Determines whether the mash contains the specified +key+.
+    #
+    # @param [Object] key The key to check for.
+    # @return [Boolean] True if the key exists in the mash.
+    def key?(key)
+      super(convert_key(key))
+    end
+
+    alias_method :include?, :key?
+    alias_method :has_key?, :key?
+    alias_method :member?, :key?
+
+    # @param [Object] key The key to fetch.
+    # @param [Array] *extras Default value.
+    #
+    # @return [Object] The value at key or the default value.
+    def fetch(key, *extras)
+      super(convert_key(key), *extras)
+    end
+
+    # @param [Array] *indices
+    #   The keys to retrieve values for.
+    #
+    # @return [Array] The values at each of the provided keys.
+    def values_at(*indices)
+      indices.collect {|key| self[convert_key(key)]}
+    end
+
+    # @param [Hash] hash The hash to merge with the mash.
+    #
+    # @return [Mash] A new mash with the hash values merged in.
+    def merge(hash)
+      self.dup.update(hash)
+    end
+
+    # @param [Object] key The key to delete from the mash.
+    def delete(key)
+      super(convert_key(key))
+    end
+
+    # Returns a mash that includes everything but the given +keys+.
+    #
+    # @param [Array<String, Symbol>] *keys The mash keys to exclude.
+    #
+    # @return [Mash] A new mash without the selected keys.
+    #
+    # @example
+    #   { :one => 1, :two => 2, :three => 3 }.except(:one)
+    #     #=> { "two" => 2, "three" => 3 }
+    def except(*keys)
+      self.dup.except!(*keys.map {|k| convert_key(k)})
+    end
+
+    # Removes the specified +keys+ from the mash.
+    #
+    # @param [Array] *keys The mash keys to exclude.
+    #
+    # @return [Hash] +hash+
+    #
+    # @example
+    #   mash = { :one => 1, :two => 2, :three => 3 }
+    #   mash.except!(:one, :two)
+    #   mash # => { :three => 3 }
+    def except!(*keys)
+      keys.each { |key| delete(key) }
+      self
+    end
+
+    # Used to provide the same interface as Hash.
+    #
+    # @return [Mash] This mash unchanged.
+    def stringify_keys!; self end
+
+    # @return [Hash] The mash as a Hash with symbolized keys.
+    def symbolize_keys
+      h = Hash.new(default)
+      each { |key, val| h[key.to_sym] = val }
+      h
+    end
+
+    # @return [Hash] The mash as a Hash with string keys.
+    def to_hash
+      Hash.new(default).merge(self)
+    end
+
+    protected
+    # @param [Object] key The key to convert.
+    #
+    # @param [Object]
+    #   The converted key. If the key was a symbol, it will be converted to a
+    #   string.
+    #
+    # @api private
+    def convert_key(key)
+      key.kind_of?(Symbol) ? key.to_s : key
+    end
+
+    # @param [Object] value The value to convert.
+    #
+    # @return [Object]
+    #   The converted value. A Hash or an Array of hashes, will be converted to
+    #   their Mash equivalents.
+    #
+    # @api private
+    def convert_value(value)
+      if value.class == Hash
+         mash = Mash.new(value)
+         mash.default = value.default
+         mash
+      elsif value.is_a?(Array)
+        value.collect { |e| convert_value(e) }
+      else
+        value
+      end
+    end
+  end
+end

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

@@ -16,7 +16,7 @@ module DataMapper
       if @default.respond_to?(:call)
         @default.call(resource, self)
       else
-        @default.try_dup
+        DataMapper::Ext.try_dup(@default)
       end
     end
 

data/lib/dm-core/version.rb

@@ -1,3 +1,3 @@
 module DataMapper
-  VERSION = '1.1.0.rc2'
+  VERSION = '1.1.0.rc3'
 end

data/spec/public/model/relationship_spec.rb

@@ -281,7 +281,8 @@ share_examples_for 'it creates a many accessor' do
         @expected.should_not be_nil
 
         # set the model scope to only return the first record
-        @model.default_scope.update(@model.key(@repository.name).zip(@expected.key).to_hash)
+        @model.default_scope.update(
+          DataMapper::Ext::Array.to_hash(@model.key(@repository.name).zip(@expected.key)))
 
         @return = @car.model.get(*@car.key).__send__(@name)
       end

data/spec/public/shared/collection_shared_spec.rb

@@ -123,7 +123,10 @@ share_examples_for 'A public Collection' do
       end
 
       it 'should update the Collection inline' do
-        @articles.each { |resource| resource.attributes.only(:title, :content).should == { :title => 'Sample Article', :content => 'New Content' } }
+        @articles.each { |resource|
+          DataMapper::Ext::Hash.only(resource.attributes, :title, :content).should ==
+            { :title => 'Sample Article', :content => 'New Content' }
+        }
       end
     end
   end
@@ -919,7 +922,7 @@ share_examples_for 'A public Collection' do
       end
 
       it 'should be a Resource with attributes matching the Hash' do
-        @return.first.attributes.only(*@array.first.keys).should == @array.first
+        DataMapper::Ext::Hash.only(@return.first.attributes, *@array.first.keys).should == @array.first
       end
     end
   end

data/spec/public/shared/finder_shared_spec.rb

@@ -342,7 +342,8 @@ share_examples_for 'Finder Interface' do
 
       describe 'with a collection' do
         before :all do
-          @collection = @article_model.all(@article_model.key.zip(@original.key).to_hash)
+          @collection = @article_model.all(
+            DataMapper::Ext::Array.to_hash(@article_model.key.zip(@original.key)))
 
           @return = @articles.all(:original => @collection)
         end
@@ -479,7 +480,8 @@ share_examples_for 'Finder Interface' do
 
       describe 'with a collection' do
         before :all do
-          @collection = @article_model.all(@article_model.key.zip(@new.key).to_hash)
+          @collection = @article_model.all(
+            DataMapper::Ext::Array.to_hash(@article_model.key.zip(@new.key)))
 
           @return = @articles.all(:previous => @collection)
         end
@@ -615,7 +617,8 @@ share_examples_for 'Finder Interface' do
 
       describe 'with a collection' do
         before :all do
-          @collection = @article_model.all(@article_model.key.zip(@new.key).to_hash)
+          @collection = @article_model.all(
+            DataMapper::Ext::Array.to_hash(@article_model.key.zip(@new.key)))
 
           @return = @articles.all(:revisions => @collection)
         end
@@ -755,7 +758,8 @@ share_examples_for 'Finder Interface' do
 
       describe 'with a collection' do
         before :all do
-          @collection = @publication_model.all(@publication_model.key.zip(@publication.key).to_hash)
+          @collection = @publication_model.all(
+            DataMapper::Ext::Array.to_hash(@publication_model.key.zip(@publication.key)))
 
           @return = @articles.all(:publications => @collection)
         end
@@ -1093,7 +1097,7 @@ share_examples_for 'Finder Interface' do
       end
 
       it 'should be expected Resource' do
-        @resource.attributes.only(*@conditions.keys).should == @conditions
+        DataMapper::Ext::Hash.only(@resource.attributes, *@conditions.keys).should == @conditions
       end
 
       it 'should be a saved Resource' do
@@ -1136,7 +1140,7 @@ share_examples_for 'Finder Interface' do
       end
 
       it 'should be expected Resource' do
-        @resource.attributes.only(*@conditions.keys).should == @conditions
+        DataMapper::Ext::Hash.only(@resource.attributes, *@conditions.keys).should == @conditions
       end
 
       it 'should not be a saved Resource' do

data/spec/semipublic/adapters/in_memory_adapter_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require DataMapper.root / 'lib' / 'dm-core' / 'spec' / 'shared' / 'adapter_spec'
+require 'dm-core/spec/shared/adapter_spec'
 
 describe 'Adapter' do
   supported_by :in_memory do

data/spec/semipublic/query_spec.rb

@@ -791,7 +791,7 @@ describe DataMapper::Query do
         it 'should raise an exception' do
           lambda {
             DataMapper::Query.new(@repository, @model, @options.update(:conditions => { 'unknown.id' => 1 }))
-          }.should raise_error(ArgumentError, "condition \"unknown.id\" does not map to a relationship in #{@model}")
+          }.should raise_error(ArgumentError, "condition \"unknown.id\" does not map to a property or relationship in #{@model}")
         end
       end
 
@@ -1952,7 +1952,7 @@ describe DataMapper::Query do
     end
 
     it 'should return expected value' do
-      @return.should == <<-INSPECT.compress_lines
+      @return.should == DataMapper::Ext::String.compress_lines(<<-INSPECT)
         #<DataMapper::Query
           @repository=:default
           @model=User

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

@@ -21,7 +21,8 @@ describe DataMapper::Resource::State::Immutable do
     @parent = @model.create(:name => 'John Doe')
 
     @resource = @model.create(:name => 'Dan Kubb', :parent => @parent)
-    @resource = @model.first(@model.key.zip(@resource.key).to_hash.merge(:fields => [ :name, :parent_id ]))
+    attributes = DataMapper::Ext::Array.to_hash(@model.key.zip(@resource.key))
+    @resource = @model.first(attributes.merge(:fields => [ :name, :parent_id ]))
 
     @state = @resource.persisted_state
     @state.should be_kind_of(DataMapper::Resource::State::Immutable)

data/spec/semipublic/resource/state_spec.rb

@@ -181,9 +181,7 @@ describe DataMapper::Resource::State do
   describe '#hash' do
     subject { @state.hash }
 
-    it 'should be the hash of the resource' do
-      should == @resource.hash
-    end
+    it { should == @state.class.hash ^ @resource.hash }
   end
 
   describe '#resource' do

data/spec/semipublic/shared/resource_state_shared_spec.rb

@@ -49,7 +49,8 @@ share_examples_for 'Resource::State::Persisted#get' do
         @resource.should be_dirty
         @resource.save.should be(true)
 
-        @resource = @model.first(@model.key.zip(@resource.key).to_hash.merge(:fields => @model.key))
+        attributes = DataMapper::Ext::Array.to_hash(@model.key.zip(@resource.key))
+        @resource = @model.first(attributes.merge(:fields => @model.key))
         @state    = @state.class.new(@resource)
 
         # make sure the subject is not loaded

data/spec/semipublic/shared/subject_shared_spec.rb

@@ -18,7 +18,7 @@ share_examples_for 'A semipublic Subject' do
       subject { @subject_without_default.default_for(@resource) }
 
       it 'should match the default value' do
-        should be_blank
+        DataMapper::Ext.blank?(subject).should == true
       end
 
       it 'should be used as a default for the subject accessor' do

data/spec/support/core_ext/hash.rb

@@ -0,0 +1,10 @@
+class Hash
+  def except(*keys)
+    dup.except!(*keys)
+  end
+
+  def except!(*keys)
+    keys.each { |key| delete(key) }
+    self
+  end
+end

data/spec/support/core_ext/inheritable_attributes.rb

@@ -0,0 +1,46 @@
+class Class
+  def class_inheritable_reader(*ivars)
+    instance_reader = ivars.pop[:reader] if ivars.last.is_a?(Hash)
+
+    ivars.each do |ivar|
+      self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def self.#{ivar}
+          return @#{ivar} if defined?(@#{ivar})
+          return nil      if self.object_id == #{self.object_id}
+          ivar = superclass.#{ivar}
+          return nil if ivar.nil?
+          @#{ivar} = DataMapper::Ext.try_dup(ivar)
+        end
+      RUBY
+
+      unless instance_reader == false
+        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{ivar}
+            self.class.#{ivar}
+          end
+        RUBY
+      end
+    end
+  end
+
+  def class_inheritable_writer(*ivars)
+    instance_writer = ivars.pop[:instance_writer] if ivars.last.is_a?(Hash)
+    ivars.each do |ivar|
+      self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def self.#{ivar}=(obj)
+          @#{ivar} = obj
+        end
+      RUBY
+      unless instance_writer == false
+        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{ivar}=(obj) self.class.#{ivar} = obj end
+        RUBY
+      end
+    end
+  end
+
+  def class_inheritable_accessor(*syms)
+    class_inheritable_reader(*syms)
+    class_inheritable_writer(*syms)
+  end
+end

data/spec/unit/array_spec.rb

@@ -1,25 +1,15 @@
 require 'spec_helper'
-require 'dm-core/core_ext/array'
+require 'dm-core/ext/array'
+require 'dm-core/support/mash'
 
-begin
-  require 'active_support/hash_with_indifferent_access'
-  unless defined?(Mash)
-    Mash = ActiveSupport::HashWithIndifferentAccess
-  end
-rescue LoadError
-  require 'extlib/mash'
-end
-
-describe Array do
+describe DataMapper::Ext::Array do
   before :all do
     @array = [ [ :a, [ 1 ] ], [ :b, [ 2 ] ], [ :c, [ 3 ] ] ].freeze
   end
 
-  it { @array.should respond_to(:to_hash) }
-
-  describe '#to_hash' do
+  describe '.to_hash' do
     before :all do
-      @return = @array.to_hash
+      @return = DataMapper::Ext::Array.to_hash(@array)
     end
 
     it 'should return a Hash' do
@@ -31,15 +21,13 @@ describe Array do
     end
   end
 
-  it { @array.should respond_to(:to_mash) }
-
-  describe '#to_mash' do
+  describe '.to_mash' do
     before :all do
-      @return = @array.to_mash
+      @return = DataMapper::Ext::Array.to_mash(@array)
     end
 
     it 'should return a Mash' do
-      @return.should be_kind_of(Mash)
+      @return.should be_kind_of(DataMapper::Mash)
     end
 
     it 'should return expected value' do