dm-core 1.0.2 → 1.1.0.rc1

data/spec/unit/hash_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'dm-core/core_ext/hash'
 
 begin
@@ -24,7 +25,7 @@ end
 
 
 describe Hash, 'to_mash' do
-  before :each do
+  before do
     @hash = Hash.new(10)
   end
 

data/spec/unit/hook_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'dm-core/support/hook'
 
 describe DataMapper::Hook do

data/spec/unit/lazy_array_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'dm-core/support/lazy_array'
 
 # only needed for specs
@@ -1953,7 +1954,7 @@ end
     describe 'an unknown method' do
       action { subject.unknown }
 
-      should_raise_error(NoMethodError)
+      should_raise_error(NameError)
     end
   end
 end

data/spec/unit/module_spec.rb

@@ -1,8 +1,9 @@
+require 'spec_helper'
 require 'dm-core/core_ext/module'
 
 describe Module do
 
-  before(:all) do
+  before :all do
     Object.send(:remove_const, :Foo) if defined?(Foo)
     Object.send(:remove_const, :Baz) if defined?(Baz)
     Object.send(:remove_const, :Bar) if defined?(Bar)

data/spec/unit/object_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'dm-core/core_ext/object'
 
 describe Object do

data/spec/unit/try_dup_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'dm-core/core_ext/try_dup'
 
 describe "try_dup" do

data/tasks/spec.rake

@@ -35,7 +35,4 @@ rescue LoadError
   end
 end
 
-task :spec => :check_dependencies
-task :rcov => :check_dependencies
-
 task :default => :spec

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  prerelease: 6
+  version: 1.1.0.rc1
 platform: ruby
 authors: 
 - Dan Kubb
@@ -14,66 +10,75 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 -07:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: extlib
-  prerelease: false
+  name: activesupport
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 15
-        version: 0.9.15
+        version: 3.0.4
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: addressable
-  prerelease: false
+  name: i18n
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
+        version: 0.5.0
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: addressable
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  type: :development
+        version: "2.2"
+  type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+        version: 1.5.2
   type: :development
+  prerelease: false
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *id006
 description: Faster, Better, Simpler.
 email: dan.kubb@gmail.com
 executables: []
@@ -86,7 +91,6 @@ extra_rdoc_files:
 files: 
 - .autotest
 - .document
-- .gitignore
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -146,6 +150,7 @@ files:
 - lib/dm-core/query/operator.rb
 - lib/dm-core/query/path.rb
 - lib/dm-core/query/sort.rb
+- lib/dm-core/relationship_set.rb
 - lib/dm-core/repository.rb
 - lib/dm-core/resource.rb
 - lib/dm-core/resource/state.rb
@@ -166,6 +171,7 @@ files:
 - 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/spec/shared/semipublic/query/conditions/abstract_comparison_spec.rb
 - lib/dm-core/support/assertions.rb
 - lib/dm-core/support/chainable.rb
 - lib/dm-core/support/deprecate.rb
@@ -176,14 +182,9 @@ files:
 - lib/dm-core/support/local_object_space.rb
 - lib/dm-core/support/logger.rb
 - lib/dm-core/support/naming_conventions.rb
+- lib/dm-core/support/ordered_set.rb
 - lib/dm-core/support/subject.rb
-- lib/dm-core/type.rb
-- lib/dm-core/types/boolean.rb
-- lib/dm-core/types/decimal.rb
-- lib/dm-core/types/discriminator.rb
-- lib/dm-core/types/object.rb
-- lib/dm-core/types/serial.rb
-- lib/dm-core/types/text.rb
+- lib/dm-core/support/subject_set.rb
 - lib/dm-core/version.rb
 - script/performance.rb
 - script/profile.rb
@@ -269,6 +270,57 @@ files:
 - spec/spec_helper.rb
 - spec/support/properties/huge_integer.rb
 - spec/unit/array_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
+- spec/unit/data_mapper/ordered_set/each_spec.rb
+- spec/unit/data_mapper/ordered_set/empty_spec.rb
+- spec/unit/data_mapper/ordered_set/entries_spec.rb
+- spec/unit/data_mapper/ordered_set/eql_spec.rb
+- spec/unit/data_mapper/ordered_set/equal_value_spec.rb
+- spec/unit/data_mapper/ordered_set/hash_spec.rb
+- spec/unit/data_mapper/ordered_set/include_spec.rb
+- spec/unit/data_mapper/ordered_set/index_spec.rb
+- spec/unit/data_mapper/ordered_set/initialize_spec.rb
+- spec/unit/data_mapper/ordered_set/merge_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/append_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/clear_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/delete_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/each_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/empty_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/entries_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/include_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/index_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/initialize_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/merge_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/size_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/to_ary_spec.rb
+- spec/unit/data_mapper/ordered_set/size_spec.rb
+- spec/unit/data_mapper/ordered_set/to_ary_spec.rb
+- spec/unit/data_mapper/subject_set/append_spec.rb
+- spec/unit/data_mapper/subject_set/clear_spec.rb
+- spec/unit/data_mapper/subject_set/delete_spec.rb
+- spec/unit/data_mapper/subject_set/each_spec.rb
+- spec/unit/data_mapper/subject_set/empty_spec.rb
+- spec/unit/data_mapper/subject_set/entries_spec.rb
+- spec/unit/data_mapper/subject_set/get_spec.rb
+- spec/unit/data_mapper/subject_set/include_spec.rb
+- spec/unit/data_mapper/subject_set/named_spec.rb
+- spec/unit/data_mapper/subject_set/shared/append_spec.rb
+- spec/unit/data_mapper/subject_set/shared/clear_spec.rb
+- spec/unit/data_mapper/subject_set/shared/delete_spec.rb
+- spec/unit/data_mapper/subject_set/shared/each_spec.rb
+- spec/unit/data_mapper/subject_set/shared/empty_spec.rb
+- spec/unit/data_mapper/subject_set/shared/entries_spec.rb
+- spec/unit/data_mapper/subject_set/shared/get_spec.rb
+- spec/unit/data_mapper/subject_set/shared/include_spec.rb
+- spec/unit/data_mapper/subject_set/shared/named_spec.rb
+- spec/unit/data_mapper/subject_set/shared/size_spec.rb
+- spec/unit/data_mapper/subject_set/shared/to_ary_spec.rb
+- spec/unit/data_mapper/subject_set/shared/values_at_spec.rb
+- spec/unit/data_mapper/subject_set/size_spec.rb
+- spec/unit/data_mapper/subject_set/to_ary_spec.rb
+- spec/unit/data_mapper/subject_set/values_at_spec.rb
 - spec/unit/hash_spec.rb
 - spec/unit/hook_spec.rb
 - spec/unit/lazy_array_spec.rb
@@ -276,18 +328,16 @@ files:
 - spec/unit/object_spec.rb
 - spec/unit/try_dup_spec.rb
 - tasks/ci.rake
-- tasks/local_gemfile.rake
-- tasks/metrics.rake
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: yard
+has_rdoc: true
 homepage: http://github.com/datamapper/dm-core
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -295,21 +345,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: An Object/Relational Mapper for Ruby
@@ -394,6 +440,57 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/properties/huge_integer.rb
 - spec/unit/array_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
+- spec/unit/data_mapper/ordered_set/each_spec.rb
+- spec/unit/data_mapper/ordered_set/empty_spec.rb
+- spec/unit/data_mapper/ordered_set/entries_spec.rb
+- spec/unit/data_mapper/ordered_set/eql_spec.rb
+- spec/unit/data_mapper/ordered_set/equal_value_spec.rb
+- spec/unit/data_mapper/ordered_set/hash_spec.rb
+- spec/unit/data_mapper/ordered_set/include_spec.rb
+- spec/unit/data_mapper/ordered_set/index_spec.rb
+- spec/unit/data_mapper/ordered_set/initialize_spec.rb
+- spec/unit/data_mapper/ordered_set/merge_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/append_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/clear_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/delete_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/each_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/empty_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/entries_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/include_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/index_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/initialize_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/merge_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/size_spec.rb
+- spec/unit/data_mapper/ordered_set/shared/to_ary_spec.rb
+- spec/unit/data_mapper/ordered_set/size_spec.rb
+- spec/unit/data_mapper/ordered_set/to_ary_spec.rb
+- spec/unit/data_mapper/subject_set/append_spec.rb
+- spec/unit/data_mapper/subject_set/clear_spec.rb
+- spec/unit/data_mapper/subject_set/delete_spec.rb
+- spec/unit/data_mapper/subject_set/each_spec.rb
+- spec/unit/data_mapper/subject_set/empty_spec.rb
+- spec/unit/data_mapper/subject_set/entries_spec.rb
+- spec/unit/data_mapper/subject_set/get_spec.rb
+- spec/unit/data_mapper/subject_set/include_spec.rb
+- spec/unit/data_mapper/subject_set/named_spec.rb
+- spec/unit/data_mapper/subject_set/shared/append_spec.rb
+- spec/unit/data_mapper/subject_set/shared/clear_spec.rb
+- spec/unit/data_mapper/subject_set/shared/delete_spec.rb
+- spec/unit/data_mapper/subject_set/shared/each_spec.rb
+- spec/unit/data_mapper/subject_set/shared/empty_spec.rb
+- spec/unit/data_mapper/subject_set/shared/entries_spec.rb
+- spec/unit/data_mapper/subject_set/shared/get_spec.rb
+- spec/unit/data_mapper/subject_set/shared/include_spec.rb
+- spec/unit/data_mapper/subject_set/shared/named_spec.rb
+- spec/unit/data_mapper/subject_set/shared/size_spec.rb
+- spec/unit/data_mapper/subject_set/shared/to_ary_spec.rb
+- spec/unit/data_mapper/subject_set/shared/values_at_spec.rb
+- spec/unit/data_mapper/subject_set/size_spec.rb
+- spec/unit/data_mapper/subject_set/to_ary_spec.rb
+- spec/unit/data_mapper/subject_set/values_at_spec.rb
 - spec/unit/hash_spec.rb
 - spec/unit/hook_spec.rb
 - spec/unit/lazy_array_spec.rb

data/.gitignore

@@ -1,37 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## Rubinius
-*.rbc
-
-## PROJECT::GENERAL
-*.gem
-coverage
-rdoc
-pkg
-tmp
-doc
-log
-.yardoc
-measurements
-
-## BUNDLER
-.bundle
-Gemfile.local
-Gemfile.lock
-Gemfile.local.lock
-
-## PROJECT::SPECIFIC
-spec/db/

data/lib/dm-core/type.rb

@@ -1,216 +0,0 @@
-module DataMapper
-
-  # = Types
-  # Provides means of writing custom types for properties. Each type is based
-  # on a ruby primitive and handles its own serialization and materialization,
-  # and therefore is responsible for providing those methods.
-  #
-  # To see complete list of supported types, see documentation for
-  # Property::PRIMITIVES. dm-types library provides less common
-  # types such as ip address, uuid, json, yaml, uri, slug, version,
-  # file path, bcrypt hash and so forth.
-  #
-  # == Defining new Types
-  # To define a new type, subclass DataMapper::Type, pick ruby primitive, and
-  # set the options for this type.
-  #
-  #   class LowerCase < DataMapper::Type
-  #     primitive        String
-  #     auto_validation  true
-  #     length           255
-  #   end
-  #
-  # Following this, you will be able to use LowerCase as a type for any given
-  # property. If special materialization and serialization is required,
-  # override the class methods
-  #
-  #   class LowerCase < DataMapper::Type
-  #     primitive        String
-  #     auto_validation  true
-  #     length           255
-  #
-  #     def self.dump(value, property)
-  #       return nil unless value
-  #       value.to_s.downcase
-  #     end
-  #
-  #     def self.load(value)
-  #       value
-  #     end
-  #   end
-  #
-  # Properties of LowerCase type now will downcase it's values before
-  # it is persisted to the storage.
-  #
-  # One more real world example from dm-types library is a JSON type
-  # that stores values serialized as JSON, and often useful for embedded
-  # values:
-  #
-  #
-  # module DataMapper
-  #   module Types
-  #     class Json < DataMapper::Type
-  #       primitive String
-  #       length    65535
-  #       lazy      true
-  #
-  #       def self.load(value, property)
-  #         if value.nil?
-  #           nil
-  #         elsif value.kind_of?(String)
-  #           ::JSON.load(value)
-  #         else
-  #           raise ArgumentError, '+value+ of a property of JSON type must be nil or a String'
-  #         end
-  #       end
-  #
-  #       def self.dump(value, property)
-  #         if value.nil? || value.kind_of?(String)
-  #           value
-  #         else
-  #           ::JSON.dump(value)
-  #         end
-  #       end
-  #
-  #       def self.typecast(value, property)
-  #         if value.nil? || value.kind_of?(Array) || value.kind_of?(Hash)
-  #           value
-  #         else
-  #           ::JSON.load(value.to_s)
-  #         end
-  #       end
-  #     end # class Json
-  #     JSON = Json
-  #   end # module Types
-  # end # module DataMapper
-
-  # TODO: this is only for the backward compatibility in case someone's subclassing from one of the deprecated types
-  module Types; end
-
-  class Type
-    # Until cooperation of Property and Type does not change, each must
-    # have a separate list of options, because plugins (ex.: dm-validations)
-    # may want to extend one or the other, and expects no side effects
-    PROPERTY_OPTIONS = [
-      :accessor, :reader, :writer,
-      :lazy, :default, :key, :serial, :field, :size, :length,
-      :format, :index, :unique_index, :auto_validation,
-      :validates, :unique, :precision, :scale, :min, :max,
-      :allow_nil, :allow_blank, :required
-    ]
-
-    class << self
-      # @api private
-      def configure(primitive_type, options)
-        warn "DataMapper.Type.configure is deprecated, specify the primitive and options explicitly (#{caller[0]})"
-
-        @_primitive_type = primitive_type
-        @_options = options
-
-        def self.inherited(base)
-          base.primitive @_primitive_type
-          @_options.each { |key, value| base.send(key, value) }
-        end
-
-        self
-      end
-
-      # Ruby primitive type to use as basis for this type. See
-      # Property::PRIMITIVES for list of types.
-      #
-      # @param primitive [Class, nil]
-      #   The class for the primitive. If nil is passed in, it returns the
-      #   current primitive
-      #
-      # @return [Class] if the <primitive> param is nil, return the current primitive.
-      #
-      # @api public
-      def primitive(primitive = nil)
-        return @primitive if primitive.nil?
-        @primitive = primitive
-
-        return unless @primitive.respond_to?(:options)
-        options = @primitive.options
-
-        return unless options.respond_to?(:each)
-
-        # inherit the options from the primitive if any
-        options.each do |key, value|
-          send(key, value) unless send(key)
-        end
-      end
-
-      # Load Property options
-      PROPERTY_OPTIONS.each do |property_option|
-        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{property_option}(*args)                                  # def unique(*args)
-            if args.any?                                                 #   if args.any?
-              @#{property_option} = args.first                           #     @unique = args.first
-            else                                                         #   else
-              defined?(@#{property_option}) ? @#{property_option} : nil  #     defined?(@unique) ? @unique : nil
-            end                                                          #   end
-          end                                                            # end
-        RUBY
-      end
-
-      def nullable(value)
-        # :required is preferable to :allow_nil, but :nullable maps precisely to :allow_nil
-        warn "#nullable is deprecated, use #required instead (#{caller[0]})"
-        allow_nil(value)
-      end
-
-      # Gives all the options set on this type
-      #
-      # @return [Hash] with all options and their values set on this type
-      #
-      # @api public
-      def options
-        options = {}
-        PROPERTY_OPTIONS.each do |method|
-          next if (value = send(method)).nil?
-          options[method] = value
-        end
-        options
-      end
-    end
-
-    # Stub instance method for dumping
-    #
-    # @param value     [Object, nil]    value to dump
-    # @param property  [Property, nil]  property the type is being used by
-    #
-    # @return [Object] Dumped object
-    #
-    # @api public
-    def self.dump(value, property)
-      value
-    end
-
-    # Stub instance method for loading
-    #
-    # @param value     [Object, nil]    value to serialize
-    # @param property  [Property, nil]  property the type is being used by
-    #
-    # @return [Object] Serialized object. Must be the same type as the Ruby primitive
-    #
-    # @api public
-    def self.load(value, property)
-      value
-    end
-
-    # A hook to allow types to extend or modify property it's bound to.
-    # Implementations are not supposed to modify the state of the type class, and
-    # should produce no side-effects on the type class.
-    def self.bind(property)
-      # no op
-    end
-
-  end # class Type
-
-  # @deprecated
-  def self.Type(primitive_type, options = {})
-    warn "DataMapper.Type(#{primitive_type}) is deprecated, specify the primitive and options explicitly (#{caller[0]})"
-    Class.new(Type).configure(primitive_type, options)
-  end
-
-end # module DataMapper