dm-core 1.2.0.rc1 → 1.2.0.rc2

data/Gemfile

@@ -5,9 +5,10 @@ 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.2.0.rc1'
+DM_VERSION     = '~> 1.2.0.rc2'
 DO_VERSION     = '~> 0.10.6'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
+CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
 
 gem 'addressable', '~> 2.2.6'
 
@@ -48,18 +49,24 @@ group :datamapper do
       gem "do_#{adapter}", DO_VERSION, do_options.dup
     end
 
-    gem 'dm-do-adapter', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}"
+    gem 'dm-do-adapter', DM_VERSION,
+      SOURCE  => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}",
+      :branch => CURRENT_BRANCH
   end
 
   adapters.each do |adapter|
-    gem "dm-#{adapter}-adapter", ENV.fetch('ADAPTER_VERSION', DM_VERSION), SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}"
+    gem "dm-#{adapter}-adapter", ENV.fetch('ADAPTER_VERSION', DM_VERSION),
+      SOURCE  => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}",
+      :branch => CURRENT_BRANCH
   end
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']
   plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
 
   plugins.each do |plugin|
-    gem plugin, DM_VERSION, SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}"
+    gem plugin, DM_VERSION,
+      SOURCE  => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}",
+      :branch => CURRENT_BRANCH
   end
 
 end

data/VERSION

@@ -1 +1 @@
-1.2.0.rc1
+1.2.0.rc2

data/dm-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dm-core"
-  s.version = "1.2.0.rc1"
+  s.version = "1.2.0.rc2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = "2011-09-09"
+  s.date = "2011-09-20"
   s.description = "Faster, Better, Simpler."
   s.email = "dan.kubb@gmail.com"
   s.extra_rdoc_files = [

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

@@ -2,6 +2,21 @@ module DataMapper
   class Property
     class Binary < String
       include PassThroughLoadDump
+
+      if RUBY_VERSION >= "1.9"
+
+        def load(value)
+          super.dup.force_encoding("BINARY") unless value.nil?
+        end
+
+        def dump(value)
+          value.dup.force_encoding("BINARY") unless value.nil?
+        rescue
+          value
+        end
+
+      end
+
     end # class Binary
   end # class Property
 end # module DataMapper

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

@@ -15,8 +15,8 @@ module DataMapper
         super
 
         [ :scale, :precision ].each do |key|
-          unless options.key?(key)
-            warn "options[#{key.inspect}] should be set for #{self.class}, defaulting to #{send(key).inspect}"
+          unless @options.key?(key)
+            warn "options[#{key.inspect}] should be set for #{self.class}, defaulting to #{send(key).inspect} (#{caller.first})"
           end
         end
 

data/lib/dm-core/spec/shared/semipublic/property_spec.rb

@@ -73,19 +73,13 @@ share_examples_for 'A semipublic Property' do
   end
 
   describe '#load' do
-    before :all do
-      @value = mock(@value)
-    end
-
     subject { @property.load(@value) }
 
-    describe 'with a property' do
-      it 'should delegate to #typecast' do
-        return_value = mock(@other_value)
-        @property.should_receive(:typecast).with(@value).and_return(return_value)
-        should == return_value
-      end
+    before do
+      @property.should_receive(:typecast).with(@value).and_return(@value)
     end
+
+    it { should eql(@value) }
   end
 
   describe "#typecast" do

data/spec/public/property/binary_spec.rb

@@ -19,4 +19,23 @@ describe DataMapper::Property::Binary do
 
     it { should eql(:primitive => @primitive, :length => 50) }
   end
+
+  if RUBY_VERSION >= "1.9"
+    describe 'encoding' do
+      let(:model) do
+        Class.new do
+          include ::DataMapper::Resource
+          property :bin_data, ::DataMapper::Property::Binary
+        end
+      end
+
+      it 'should always dump with BINARY' do
+        model.bin_data.dump("foo".freeze).encoding.names.should include("BINARY")
+      end
+
+      it 'should always load with BINARY' do
+        model.bin_data.load("foo".freeze).encoding.names.should include("BINARY")
+      end
+    end
+  end
 end

data/spec/semipublic/property/boolean_spec.rb

@@ -11,24 +11,6 @@ describe DataMapper::Property::Boolean do
 
   it_should_behave_like 'A semipublic Property'
 
-  describe '#load' do
-    before :all do
-      @value = mock('value')
-    end
-
-    subject { @property.load(@value) }
-
-    before do
-      @property = @type.new(@model, @name)
-    end
-
-    it 'should delegate to #type.load' do
-      return_value = mock('return value')
-      @property.should_receive(:load).with(@value).and_return(return_value)
-      should == return_value
-    end
-  end
-
   describe '#valid?' do
     [ true, false ].each do |value|
       it "returns true when value is #{value.inspect}" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  hash: 15424023
+  hash: 15424017
   prerelease: 6
   segments: 
   - 1
   - 2
   - 0
   - rc
-  - 1
-  version: 1.2.0.rc1
+  - 2
+  version: 1.2.0.rc2
 platform: ruby
 authors: 
 - Dan Kubb
@@ -17,11 +17,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 Z
+date: 2011-09-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -32,12 +33,12 @@ dependencies:
         - 2
         - 6
         version: 2.2.6
-  prerelease: false
-  requirement: *id001
+  version_requirements: *id001
   name: addressable
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,12 +49,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  prerelease: false
-  requirement: *id002
+  version_requirements: *id002
   name: jeweler
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,12 +65,12 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  prerelease: false
-  requirement: *id003
+  version_requirements: *id003
   name: rake
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,8 +81,7 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  prerelease: false
-  requirement: *id004
+  version_requirements: *id004
   name: rspec
 description: Faster, Better, Simpler.
 email: dan.kubb@gmail.com