dm-core 1.1.0.rc3 → 1.1.0

data/.document

@@ -1,5 +1,5 @@
-README.rdoc
 lib/**/*.rb
 bin/*
-features/**/*.feature
+--
+README.rdoc
 LICENSE

data/.yardopts

@@ -0,0 +1 @@
+--markup rdoc --title 'DataMapper Documentation' --protected

data/Gemfile

@@ -5,7 +5,7 @@ source 'http://rubygems.org'
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION     = '~> 1.1.0.rc3'
+DM_VERSION     = '~> 1.1.0'
 DO_VERSION     = '~> 0.10.2'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
@@ -16,17 +16,15 @@ group :development do
   gem 'jeweler', '~> 1.5.2'
   gem 'rake',    '~> 0.8.7'
   gem 'rspec',   '~> 1.3.1'
+  gem 'yard',    '~> 0.6'
 
 end
 
-platforms :mri_18 do
-  group :quality do
+group :quality do
 
-    gem 'rcov',      '~> 0.9.9'
-    gem 'yard',      '~> 0.6'
-    gem 'yardstick', '~> 0.2'
+  gem 'yardstick',  '~> 0.2'
+  gem 'rcov',       '~> 0.9.9', :platforms => [:mri_18]
 
-  end
 end
 
 group :datamapper do

data/VERSION

@@ -1 +1 @@
-1.1.0.rc3
+1.1.0

data/dm-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-core}
-  s.version = "1.1.0.rc3"
+  s.version = "1.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2011-03-10}
+  s.date = %q{2011-03-16}
   s.description = %q{Faster, Better, Simpler.}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".autotest",
     ".document",
+    ".yardopts",
     "Gemfile",
     "LICENSE",
     "README.rdoc",
@@ -38,14 +39,6 @@ Gem::Specification.new do |s|
     "lib/dm-core/core_ext/kernel.rb",
     "lib/dm-core/core_ext/pathname.rb",
     "lib/dm-core/core_ext/symbol.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",
@@ -107,6 +100,13 @@ Gem::Specification.new do |s|
     "lib/dm-core/support/deprecate.rb",
     "lib/dm-core/support/descendant_set.rb",
     "lib/dm-core/support/equalizer.rb",
+    "lib/dm-core/support/ext/array.rb",
+    "lib/dm-core/support/ext/blank.rb",
+    "lib/dm-core/support/ext/hash.rb",
+    "lib/dm-core/support/ext/module.rb",
+    "lib/dm-core/support/ext/object.rb",
+    "lib/dm-core/support/ext/string.rb",
+    "lib/dm-core/support/ext/try_dup.rb",
     "lib/dm-core/support/hook.rb",
     "lib/dm-core/support/inflections.rb",
     "lib/dm-core/support/inflector.rb",
@@ -428,17 +428,20 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6"])
     else
       s.add_dependency(%q<addressable>, ["~> 2.2.4"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_dependency(%q<yard>, ["~> 0.6"])
     end
   else
     s.add_dependency(%q<addressable>, ["~> 2.2.4"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])
     s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+    s.add_dependency(%q<yard>, ["~> 0.6"])
   end
 end
 

data/lib/dm-core.rb

@@ -11,12 +11,10 @@ module DataMapper
   module Undefined; end
 end
 
-require 'dm-core/ext/singleton_class'
-require 'dm-core/ext/blank'
-
-require 'dm-core/ext/hash'
-require 'dm-core/ext/object'
-require 'dm-core/ext/string'
+require 'dm-core/support/ext/blank'
+require 'dm-core/support/ext/hash'
+require 'dm-core/support/ext/object'
+require 'dm-core/support/ext/string'
 
 begin
   require 'fastthread'
@@ -25,8 +23,9 @@ rescue LoadError
 end
 
 require 'dm-core/core_ext/pathname'
-require 'dm-core/ext/module'
-require 'dm-core/ext/array'
+require 'dm-core/support/ext/module'
+require 'dm-core/support/ext/array'
+require 'dm-core/support/ext/try_dup'
 
 require 'dm-core/support/mash'
 require 'dm-core/support/inflector'

data/lib/dm-core/associations/relationship.rb

@@ -452,8 +452,14 @@ module DataMapper
         @options                = options.dup.freeze
         @child_repository_name  = @options[:child_repository_name]
         @parent_repository_name = @options[:parent_repository_name]
-        @child_properties       = DataMapper::Ext.try_dup(@options[:child_key]).freeze
-        @parent_properties      = DataMapper::Ext.try_dup(@options[:parent_key]).freeze
+
+        unless @options[:child_key].nil?
+          @child_properties     = DataMapper::Ext.try_dup(@options[:child_key]).freeze
+        end
+        unless @options[:parent_key].nil?
+          @parent_properties    = DataMapper::Ext.try_dup(@options[:parent_key]).freeze
+        end
+
         @min                    = @options[:min]
         @max                    = @options[:max]
         @reader_visibility      = @options.fetch(:reader_visibility, :public)

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

@@ -1,5 +1,17 @@
 module Kernel
-  private
+
+  # Returns the object's singleton class.
+  #
+  # @return [Class]
+  #
+  # @api private
+  def singleton_class
+    class << self
+      self
+    end
+  end unless respond_to?(:singleton_class)  # exists in 1.9.2
+
+private
 
   # Delegates to DataMapper.repository()
   #
@@ -7,4 +19,5 @@ module Kernel
   def repository(*args, &block)
     DataMapper.repository(*args, &block)
   end
+
 end # module Kernel

data/lib/dm-core/property/decimal.rb

@@ -36,7 +36,6 @@ module DataMapper
       # @api private
       def typecast_to_primitive(value)
         if value.kind_of?(::Integer)
-          # TODO: remove this case when Integer#to_d added by extlib
           value.to_s.to_d
         else
           typecast_to_numeric(value, :to_d)

data/lib/dm-core/{ext → support/ext}/module.rb

@@ -1,5 +1,3 @@
-require 'dm-core/ext/object'
-
 module DataMapper; module Ext
   module Module
 

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

@@ -1,5 +1,3 @@
-require 'dm-core/ext/try_dup'
-
 class LazyArray  # borrowed partially from StrokeDB
   include Enumerable
 

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

@@ -1,36 +1,35 @@
-require "time" # httpdate
-# ==== Public Extlib Logger API
+# ==== Public DataMapper Logger API
 #
 # To replace an existing logger with a new one:
-#  Extlib::Logger.set_log(log{String, IO},level{Symbol, String})
+#  DataMapper::Logger.set_log(log{String, IO},level{Symbol, String})
 #
 # Available logging levels are
-#   Extlib::Logger::{ Fatal, Error, Warn, Info, Debug }
+#   DataMapper::Logger::{ Fatal, Error, Warn, Info, Debug }
 #
 # Logging via:
-#   Extlib.logger.fatal(message<String>,&block)
-#   Extlib.logger.error(message<String>,&block)
-#   Extlib.logger.warn(message<String>,&block)
-#   Extlib.logger.info(message<String>,&block)
-#   Extlib.logger.debug(message<String>,&block)
+#   DataMapper.logger.fatal(message<String>,&block)
+#   DataMapper.logger.error(message<String>,&block)
+#   DataMapper.logger.warn(message<String>,&block)
+#   DataMapper.logger.info(message<String>,&block)
+#   DataMapper.logger.debug(message<String>,&block)
 #
 # Logging with autoflush:
-#   Extlib.logger.fatal!(message<String>,&block)
-#   Extlib.logger.error!(message<String>,&block)
-#   Extlib.logger.warn!(message<String>,&block)
-#   Extlib.logger.info!(message<String>,&block)
-#   Extlib.logger.debug!(message<String>,&block)
+#   DataMapper.logger.fatal!(message<String>,&block)
+#   DataMapper.logger.error!(message<String>,&block)
+#   DataMapper.logger.warn!(message<String>,&block)
+#   DataMapper.logger.info!(message<String>,&block)
+#   DataMapper.logger.debug!(message<String>,&block)
 #
 # Flush the buffer to
-#   Extlib.logger.flush
+#   DataMapper.logger.flush
 #
 # Remove the current log object
-#   Extlib.logger.close
+#   DataMapper.logger.close
 #
-# ==== Private Extlib Logger API
+# ==== Private DataMapper Logger API
 #
 # To initialize the logger you create a new object, proxies to set_log.
-#   Extlib::Logger.new(log{String, IO},level{Symbol, String})
+#   DataMapper::Logger.new(log{String, IO},level{Symbol, String})
 module DataMapper
 
   class << self
@@ -155,7 +154,7 @@ module DataMapper
     end
     alias_method :push, :<<
 
-    # Generate the logging methods for Extlib.logger for each log level.
+    # Generate the logging methods for DataMapper.logger for each log level.
     Levels.each_pair do |name, number|
       class_eval <<-LEVELMETHODS, __FILE__, __LINE__
 

data/lib/dm-core/version.rb

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

data/spec/unit/array_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'dm-core/ext/array'
+require 'dm-core/support/ext/array'
 require 'dm-core/support/mash'
 
 describe DataMapper::Ext::Array do

data/spec/unit/blank_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'dm-core/ext/blank'
+require 'dm-core/support/ext/blank'
 
 describe 'DataMapper::Ext.blank?', Object do
   it 'should be blank if it is nil' do

data/spec/unit/hash_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'dm-core/ext/hash'
+require 'dm-core/support/ext/hash'
 require 'dm-core/support/mash'
 
 describe DataMapper::Ext::Hash, "only" do

data/spec/unit/module_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'dm-core/ext/module'
+require 'dm-core/support/ext/module'
 
 describe DataMapper::Ext::Module do
 

data/spec/unit/object_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'dm-core/ext/object'
+require 'dm-core/support/ext/object'
 
 describe DataMapper::Ext::Object do
   before :all do

data/spec/unit/try_dup_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'dm-core/ext/try_dup'
+require 'dm-core/support/ext/try_dup'
 
 describe "try_dup" do
   it "returns a duplicate version on regular objects" do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.1.0.rc3
+  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors: 
 - Dan Kubb
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 -08:00
+date: 2011-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,17 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: yard
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.6"
+  type: :development
+  prerelease: false
+  version_requirements: *id005
 description: Faster, Better, Simpler.
 email: dan.kubb@gmail.com
 executables: []
@@ -69,6 +80,7 @@ extra_rdoc_files:
 files: 
 - .autotest
 - .document
+- .yardopts
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -88,14 +100,6 @@ files:
 - lib/dm-core/core_ext/kernel.rb
 - lib/dm-core/core_ext/pathname.rb
 - lib/dm-core/core_ext/symbol.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
@@ -157,6 +161,13 @@ files:
 - lib/dm-core/support/deprecate.rb
 - lib/dm-core/support/descendant_set.rb
 - lib/dm-core/support/equalizer.rb
+- lib/dm-core/support/ext/array.rb
+- lib/dm-core/support/ext/blank.rb
+- lib/dm-core/support/ext/hash.rb
+- lib/dm-core/support/ext/module.rb
+- lib/dm-core/support/ext/object.rb
+- lib/dm-core/support/ext/string.rb
+- lib/dm-core/support/ext/try_dup.rb
 - lib/dm-core/support/hook.rb
 - lib/dm-core/support/inflections.rb
 - lib/dm-core/support/inflector.rb
@@ -338,9 +349,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: datamapper

data/lib/dm-core/ext/singleton_class.rb

@@ -1,8 +0,0 @@
-module Kernel
-  # Returns the object's singleton class.
-  def singleton_class
-    class << self
-      self
-    end
-  end unless respond_to?(:singleton_class) # exists in 1.9.2
-end