dm-types 0.10.2 → 1.0.0.rc1

data/spec/unit/json_spec.rb

@@ -2,24 +2,31 @@ require 'spec_helper'
 require 'shared/identity_function_group'
 
 try_spec do
-  describe DataMapper::Types::Json do
+
+  require './spec/fixtures/person'
+
+  describe DataMapper::Property::Json do
+    before :all do
+      @property = DataMapper::Types::Fixtures::Person.properties[:positions]
+    end
+
     describe '.load' do
       describe 'when nil is provided' do
         it 'returns nil' do
-          DataMapper::Types::Json.load(nil, :property).should be_nil
+          @property.load(nil).should be_nil
         end
       end
 
       describe 'when Json encoded primitive string is provided' do
         it 'returns decoded value as Ruby string' do
-          DataMapper::Types::Json.load(JSON.dump(:value => 'JSON encoded string'), :property).should == { 'value' => 'JSON encoded string' }
+          @property.load(JSON.dump(:value => 'JSON encoded string')).should == { 'value' => 'JSON encoded string' }
         end
       end
 
       describe 'when something else is provided' do
         it 'raises ArgumentError with a meaningful message' do
           lambda {
-            DataMapper::Types::Json.load(:sym, :property)
+            @property.load(:sym)
           }.should raise_error(ArgumentError, '+value+ of a property of JSON type must be nil or a String')
         end
       end
@@ -28,31 +35,31 @@ try_spec do
     describe '.dump' do
       describe 'when nil is provided' do
         it 'returns nil' do
-          DataMapper::Types::Json.dump(nil, :property).should be_nil
+          @property.dump(nil).should be_nil
         end
       end
 
       describe 'when Json encoded primitive string is provided' do
         it 'does not do double encoding' do
-          DataMapper::Types::Json.dump('Json encoded string', :property).should == 'Json encoded string'
+          @property.dump('Json encoded string').should == 'Json encoded string'
         end
       end
 
       describe 'when regular Ruby string is provided' do
         it 'dumps argument to Json' do
-          DataMapper::Types::Json.dump('dump me (to JSON)', :property).should == 'dump me (to JSON)'
+          @property.dump('dump me (to JSON)').should == 'dump me (to JSON)'
         end
       end
 
       describe 'when Ruby array is provided' do
         it 'dumps argument to Json' do
-          DataMapper::Types::Json.dump([1, 2, 3], :property).should == '[1,2,3]'
+          @property.dump([1, 2, 3]).should == '[1,2,3]'
         end
       end
 
       describe 'when Ruby hash is provided' do
         it 'dumps argument to Json' do
-          DataMapper::Types::Json.dump({ :datamapper => 'Data access layer in Ruby' }, :property).
+          @property.dump({ :datamapper => 'Data access layer in Ruby' }).
             should == '{"datamapper":"Data access layer in Ruby"}'
         end
       end
@@ -67,7 +74,7 @@ try_spec do
         before :all do
           @input = { :library => 'DataMapper' }
 
-          @result = DataMapper::Types::Json.typecast(@input, :property)
+          @result = @property.typecast(@input)
         end
 
         it_should_behave_like 'identity function'
@@ -77,7 +84,7 @@ try_spec do
         before :all do
           @input = %w[ dm-core dm-more ]
 
-          @result = DataMapper::Types::Json.typecast(@input, :property)
+          @result = @property.typecast(@input)
         end
 
         it_should_behave_like 'identity function'
@@ -87,7 +94,7 @@ try_spec do
         before :all do
           @input = nil
 
-          @result = DataMapper::Types::Json.typecast(@input, :property)
+          @result = @property.typecast(@input)
         end
 
         it_should_behave_like 'identity function'
@@ -97,7 +104,7 @@ try_spec do
         before :all do
           @input = '{ "value": 11 }'
 
-          @result = DataMapper::Types::Json.typecast(@input, :property)
+          @result = @property.typecast(@input)
         end
 
         it 'decodes value from JSON' do
@@ -110,7 +117,7 @@ try_spec do
           @input      = SerializeMe.new
           @input.name = 'Hello!'
 
-          # @result = DataMapper::Types::Json.typecast(@input, :property)
+          # @result = @property.typecast(@input)
         end
 
         it 'attempts to load value from JSON string'

data/spec/unit/paranoid_boolean_spec.rb

@@ -0,0 +1,138 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe DataMapper::Property::ParanoidBoolean do
+  before :all do
+    Object.send(:remove_const, :Blog) if defined?(Blog)
+    module ::Blog
+      class Article
+        include DataMapper::Resource
+
+        property :id,      Serial
+        property :deleted, ParanoidBoolean
+
+        before :destroy, :before_destroy
+
+        def before_destroy; end
+      end
+    end
+
+    @model = Blog::Article
+  end
+
+  supported_by :all do
+    describe 'Resource#destroy' do
+      subject { @resource.destroy }
+
+      describe 'with a new resource' do
+        before do
+          @resource = @model.new
+        end
+
+        it { should be_false }
+
+        it 'should not delete the resource from the datastore' do
+          method(:subject).should_not change { @model.with_deleted.size }.from(0)
+        end
+
+        it 'should not set the paranoid column' do
+          method(:subject).should_not change { @resource.deleted }.from(false)
+        end
+
+        it 'should run the destroy hook' do
+          @resource.should_receive(:before_destroy).with(no_args)
+          subject
+        end
+      end
+
+      describe 'with a saved resource' do
+        before do
+          @resource = @model.create
+        end
+
+        it { should be_true }
+
+        it 'should not delete the resource from the datastore' do
+          method(:subject).should_not change { @model.with_deleted.size }.from(1)
+        end
+
+        it 'should set the paranoid column' do
+          method(:subject).should change { @resource.deleted }.from(false).to(true)
+        end
+
+        it 'should run the destroy hook' do
+          @resource.should_receive(:before_destroy).with(no_args)
+          subject
+        end
+      end
+    end
+
+    describe 'Resource#destroy!' do
+      subject { @resource.destroy! }
+
+      describe 'with a new resource' do
+        before do
+          @resource = @model.new
+        end
+
+        it { should be_false }
+
+        it 'should not delete the resource from the datastore' do
+          method(:subject).should_not change { @model.with_deleted.size }.from(0)
+        end
+
+        it 'should not set the paranoid column' do
+          method(:subject).should_not change { @resource.deleted }.from(false)
+        end
+
+        it 'should not run the destroy hook' do
+          @resource.should_not_receive(:before_destroy).with(no_args)
+          subject
+        end
+      end
+
+      describe 'with a saved resource' do
+        before do
+          @resource = @model.create
+        end
+
+        it { should be_true }
+
+        it 'should delete the resource from the datastore' do
+          method(:subject).should change { @model.with_deleted.size }.from(1).to(0)
+        end
+
+        it 'should not set the paranoid column' do
+          method(:subject).should_not change { @resource.deleted }.from(false)
+        end
+
+        it 'should not run the destroy hook' do
+          @resource.should_not_receive(:before_destroy).with(no_args)
+          subject
+        end
+      end
+    end
+
+    describe 'Model#with_deleted' do
+      before do
+        @resource = @model.create
+        @resource.destroy
+      end
+
+      describe 'with a block' do
+        subject { @model.with_deleted { @model.all } }
+
+        it 'should scope the block to return all resources' do
+          subject.map { |resource| resource.key }.should == [ @resource.key ]
+        end
+      end
+
+      describe 'without a block' do
+        subject { @model.with_deleted }
+
+        it 'should return a collection scoped to return all resources' do
+          subject.map { |resource| resource.key }.should == [ @resource.key ]
+        end
+      end
+    end
+  end
+end

data/spec/unit/paranoid_datetime_spec.rb

@@ -0,0 +1,143 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe DataMapper::Property::ParanoidDateTime do
+  before :all do
+    Object.send(:remove_const, :Blog) if defined?(Blog)
+    module ::Blog
+      class Article
+        include DataMapper::Resource
+
+        property :id,         Serial
+        property :deleted_at, ParanoidDateTime
+
+        before :destroy, :before_destroy
+
+        def before_destroy; end
+      end
+    end
+
+    @model = Blog::Article
+  end
+
+  supported_by :all do
+    describe 'Resource#destroy' do
+      before do
+        pending 'Does not work with < 1.8.7, see if backports fixes it' if RUBY_VERSION < '1.8.7'
+      end
+
+      subject { @resource.destroy }
+
+      describe 'with a new resource' do
+        before do
+          @resource = @model.new
+        end
+
+        it { should be_false }
+
+        it 'should not delete the resource from the datastore' do
+          method(:subject).should_not change { @model.with_deleted.size }.from(0)
+        end
+
+        it 'should not set the paranoid column' do
+          method(:subject).should_not change { @resource.deleted_at }.from(nil)
+        end
+
+        it 'should run the destroy hook' do
+          @resource.should_receive(:before_destroy).with(no_args)
+          subject
+        end
+      end
+
+      describe 'with a saved resource' do
+        before do
+          @resource = @model.create
+        end
+
+        it { should be_true }
+
+        it 'should not delete the resource from the datastore' do
+          method(:subject).should_not change { @model.with_deleted.size }.from(1)
+        end
+
+        it 'should set the paranoid column' do
+          method(:subject).should change { @resource.deleted_at }.from(nil)
+        end
+
+        it 'should run the destroy hook' do
+          @resource.should_receive(:before_destroy).with(no_args)
+          subject
+        end
+      end
+    end
+
+    describe 'Resource#destroy!' do
+      subject { @resource.destroy! }
+
+      describe 'with a new resource' do
+        before do
+          @resource = @model.new
+        end
+
+        it { should be_false }
+
+        it 'should not delete the resource from the datastore' do
+          method(:subject).should_not change { @model.with_deleted.size }.from(0)
+        end
+
+        it 'should not set the paranoid column' do
+          method(:subject).should_not change { @resource.deleted_at }.from(nil)
+        end
+
+        it 'should not run the destroy hook' do
+          @resource.should_not_receive(:before_destroy).with(no_args)
+          subject
+        end
+      end
+
+      describe 'with a saved resource' do
+        before do
+          @resource = @model.create
+        end
+
+        it { should be_true }
+
+        it 'should delete the resource from the datastore' do
+          method(:subject).should change { @model.with_deleted.size }.from(1).to(0)
+        end
+
+        it 'should not set the paranoid column' do
+          method(:subject).should_not change { @resource.deleted_at }.from(nil)
+        end
+
+        it 'should not run the destroy hook' do
+          @resource.should_not_receive(:before_destroy).with(no_args)
+          subject
+        end
+      end
+    end
+
+    describe 'Model#with_deleted' do
+      before do
+        pending 'Does not work with < 1.8.7, see if backports fixes it' if RUBY_VERSION < '1.8.7'
+        @resource = @model.create
+        @resource.destroy
+      end
+
+      describe 'with a block' do
+        subject { @model.with_deleted { @model.all } }
+
+        it 'should scope the block to return all resources' do
+          subject.map { |resource| resource.key }.should == [ @resource.key ]
+        end
+      end
+
+      describe 'without a block' do
+        subject { @model.with_deleted }
+
+        it 'should return a collection scoped to return all resources' do
+          subject.map { |resource| resource.key }.should == [ @resource.key ]
+        end
+      end
+    end
+  end
+end

data/spec/unit/regexp_spec.rb

@@ -1,12 +1,22 @@
 require 'spec_helper'
 
 try_spec do
-  describe DataMapper::Types::Regexp  do
+  describe DataMapper::Property::Regexp  do
+    before :all do
+      class User
+        include DataMapper::Resource
+        property :id, Serial
+        property :regexp, Regexp
+      end
+
+      @property = User.properties[:regexp]
+    end
+
     describe '.load' do
       describe 'when argument is a string' do
         before :all do
           @input  = '[a-z]\d+'
-          @result = DataMapper::Types::Regexp.load(@input, :property)
+          @result = @property.load(@input)
         end
 
         it 'create a regexp instance from argument' do
@@ -17,7 +27,7 @@ try_spec do
       describe 'when argument is nil' do
         before :all do
           @input  = nil
-          @result = DataMapper::Types::Regexp.load(@input, :property)
+          @result = @property.load(@input)
         end
 
         it 'returns nil' do
@@ -30,7 +40,7 @@ try_spec do
       describe 'when argument is a regular expression' do
         before :all do
           @input  = /\d+/
-          @result = DataMapper::Types::Regexp.dump(@input, :property)
+          @result = @property.dump(@input)
         end
 
         it 'escapes the argument' do
@@ -41,7 +51,7 @@ try_spec do
       describe 'when argument is nil' do
         before :all do
           @input = nil
-          @result = DataMapper::Types::Regexp.dump(@input, :property)
+          @result = @property.dump(@input)
         end
 
         it 'returns nil' do

data/spec/unit/uri_spec.rb

@@ -1,44 +1,48 @@
 require 'spec_helper'
 
+require './spec/fixtures/bookmark'
+
 try_spec do
-  describe DataMapper::Types::URI do
+  describe DataMapper::Property::URI do
     before do
       @uri_str = 'http://example.com/path/to/resource/'
       @uri     = Addressable::URI.parse(@uri_str)
+
+      @property = DataMapper::Types::Fixtures::Bookmark.properties[:uri]
     end
 
     describe '.dump' do
       it 'returns the URI as a String' do
-        DataMapper::Types::URI.dump(@uri, :property).should == @uri_str
+        @property.dump(@uri).should == @uri_str
       end
 
       describe 'when given nil' do
         it 'returns nil' do
-          DataMapper::Types::URI.dump(nil, :property).should be_nil
+          @property.dump(nil).should be_nil
         end
       end
 
       describe 'when given an empty string' do
         it 'returns an empty URI' do
-          DataMapper::Types::URI.dump('', :property).should == ''
+          @property.dump('').should == ''
         end
       end
     end
 
     describe '.load' do
       it 'returns the URI as Addressable' do
-        DataMapper::Types::URI.load(@uri_str, :property).should == @uri
+        @property.load(@uri_str).should == @uri
       end
 
       describe 'when given nil' do
         it 'returns nil' do
-          DataMapper::Types::URI.load(nil, :property).should be_nil
+          @property.load(nil).should be_nil
         end
       end
 
       describe 'if given an empty String' do
         it 'returns an empty URI' do
-          DataMapper::Types::URI.load('', :property).should == Addressable::URI.parse('')
+          @property.load('').should == Addressable::URI.parse('')
         end
       end
     end
@@ -46,13 +50,13 @@ try_spec do
     describe '.typecast' do
       describe 'given instance of Addressable::URI' do
         it 'does nothing' do
-          DataMapper::Types::URI.typecast(@uri, :property).should == @uri
+          @property.typecast(@uri).should == @uri
         end
       end
 
       describe 'when given a string' do
         it 'delegates to .load' do
-          DataMapper::Types::URI.typecast(@uri_str, :property).should == @uri
+          @property.typecast(@uri_str).should == @uri
         end
       end
     end