ardm 0.0.1 → 0.1.0

data/spec/unit/paranoid_datetime_spec.rb

@@ -6,6 +6,7 @@ module ::ParanoidDateTimeBlog
 
     property :id,         Serial
     property :deleted_at, ParanoidDateTime
+    timestamps :at
 
     before_destroy :before_destroy
 
@@ -25,7 +26,7 @@ describe Ardm::Property::ParanoidDateTime do
 
   describe 'Model#destroy' do
     before do
-      pending 'Does not work with < 1.8.7, see if backports fixes it' if RUBY_VERSION < '1.8.7'
+      skip 'Does not work with < 1.8.7, see if backports fixes it' if RUBY_VERSION < '1.8.7'
     end
 
     subject { @resource.destroy }
@@ -36,16 +37,16 @@ describe Ardm::Property::ParanoidDateTime do
       end
 
       it 'should not delete the resource from the datastore' do
-        method(:subject).should_not change { @model.with_deleted.size }.from(0)
+        expect(method(:subject)).not_to 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)
+        expect(method(:subject)).not_to change { @resource.deleted_at }.from(nil)
       end
 
       it 'should run the destroy hook' do
         # NOTE: changed behavior because AR doesn't call hooks on destroying new objects
-        @resource.should_not_receive(:before_destroy).with(no_args)
+        expect(@resource).not_to receive(:before_destroy).with(no_args)
         subject
       end
     end
@@ -55,18 +56,18 @@ describe Ardm::Property::ParanoidDateTime do
         @resource = @model.create
       end
 
-      it { (!!subject).should be_true }
+      it { expect(!!subject).to be true }
 
       it 'should not delete the resource from the datastore' do
-        method(:subject).should_not change { @model.with_deleted.size }.from(1)
+        expect(method(:subject)).not_to change { @model.with_deleted.size }.from(1)
       end
 
       it 'should set the paranoid column' do
-        method(:subject).should change { @resource.deleted_at }.from(nil)
+        expect(method(:subject)).to change { @resource.deleted_at }.from(nil)
       end
 
       it 'should run the destroy hook' do
-        @resource.should_receive(:before_destroy).with(no_args)
+        expect(@resource).to receive(:before_destroy).with(no_args)
         subject
       end
     end
@@ -81,15 +82,15 @@ describe Ardm::Property::ParanoidDateTime do
       end
 
       it 'should not delete the resource from the datastore' do
-        method(:subject).should_not change { @model.with_deleted.size }.from(0)
+        expect(method(:subject)).not_to 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)
+        expect(method(:subject)).not_to change { @resource.deleted_at }.from(nil)
       end
 
       it 'should not run the destroy hook' do
-        @resource.should_not_receive(:before_destroy).with(no_args)
+        expect(@resource).not_to receive(:before_destroy).with(no_args)
         subject
       end
     end
@@ -99,18 +100,18 @@ describe Ardm::Property::ParanoidDateTime do
         @resource = @model.create
       end
 
-      it { (!!subject).should be_true }
+      it { expect(!!subject).to be true }
 
       it 'should delete the resource from the datastore' do
-        method(:subject).should change { @model.with_deleted.size }.from(1).to(0)
+        expect(method(:subject)).to 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)
+        expect(method(:subject)).not_to change { @resource.deleted_at }.from(nil)
       end
 
       it 'should not run the destroy hook' do
-        @resource.should_not_receive(:before_destroy).with(no_args)
+        expect(@resource).not_to receive(:before_destroy).with(no_args)
         subject
       end
     end
@@ -118,7 +119,7 @@ describe Ardm::Property::ParanoidDateTime do
 
   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'
+      skip 'Does not work with < 1.8.7, see if backports fixes it' if RUBY_VERSION < '1.8.7'
       @resource = @model.create
       @resource.destroy
     end
@@ -127,7 +128,7 @@ describe Ardm::Property::ParanoidDateTime 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 ]
+        expect(subject.map { |resource| resource.key }).to eq([ @resource.key ])
       end
     end
 
@@ -135,15 +136,16 @@ describe Ardm::Property::ParanoidDateTime do
       subject { @model.with_deleted }
 
       it 'should return a collection scoped to return all resources' do
-        subject.map { |resource| resource.key }.should == [ @resource.key ]
+        expect(subject.map { |resource| resource.key }).to eq([ @resource.key ])
       end
     end
   end
 
   describe 'Model.inherited' do
     it 'sets @paranoid_properties' do
-      ::ParanoidDateTimeBlog::Review.instance_variable_get(:@paranoid_properties).should ==
+      expect(::ParanoidDateTimeBlog::Review.instance_variable_get(:@paranoid_properties)).to eq(
         ::ParanoidDateTimeBlog::Article.instance_variable_get(:@paranoid_properties)
+      )
     end
   end
 end

data/spec/unit/regexp_spec.rb

@@ -19,7 +19,7 @@ try_spec do
         end
 
         it 'create a regexp instance from argument' do
-          @result.should == Regexp.new(@input)
+          expect(@result).to eq(Regexp.new(@input))
         end
       end
 
@@ -30,7 +30,7 @@ try_spec do
         end
 
         it 'returns nil' do
-          @result.should be_nil
+          expect(@result).to be_nil
         end
       end
     end
@@ -43,7 +43,7 @@ try_spec do
         end
 
         it 'escapes the argument' do
-          @result.should == '\\d+'
+          expect(@result).to eq('\\d+')
         end
       end
 
@@ -54,7 +54,7 @@ try_spec do
         end
 
         it 'returns nil' do
-          @result.should be_nil
+          expect(@result).to be_nil
         end
       end
     end

data/spec/unit/uri_spec.rb

@@ -13,36 +13,36 @@ try_spec do
 
     describe '.dump' do
       it 'returns the URI as a String' do
-        @property.dump(@uri).should == @uri_str
+        expect(@property.dump(@uri)).to eq(@uri_str)
       end
 
       describe 'when given nil' do
         it 'returns nil' do
-          @property.dump(nil).should be_nil
+          expect(@property.dump(nil)).to be_nil
         end
       end
 
       describe 'when given an empty string' do
         it 'returns an empty URI' do
-          @property.dump('').should == ''
+          expect(@property.dump('')).to eq('')
         end
       end
     end
 
     describe '.load' do
       it 'returns the URI as Addressable' do
-        @property.load(@uri_str).should == @uri
+        expect(@property.load(@uri_str)).to eq(@uri)
       end
 
       describe 'when given nil' do
         it 'returns nil' do
-          @property.load(nil).should be_nil
+          expect(@property.load(nil)).to be_nil
         end
       end
 
       describe 'if given an empty String' do
         it 'returns an empty URI' do
-          @property.load('').should == Addressable::URI.parse('')
+          expect(@property.load('')).to eq(Addressable::URI.parse(''))
         end
       end
     end
@@ -50,13 +50,13 @@ try_spec do
     describe '.typecast' do
       describe 'given instance of Addressable::URI' do
         it 'does nothing' do
-          @property.typecast(@uri).should == @uri
+          expect(@property.typecast(@uri)).to eq(@uri)
         end
       end
 
       describe 'when given a string' do
         it 'delegates to .load' do
-          @property.typecast(@uri_str).should == @uri
+          expect(@property.typecast(@uri_str)).to eq(@uri)
         end
       end
     end

data/spec/unit/yaml_spec.rb

@@ -13,21 +13,21 @@ try_spec do
     describe '.load' do
       describe 'when nil is provided' do
         it 'returns nil' do
-          @property.load(nil).should be_nil
+          expect(@property.load(nil)).to be_nil
         end
       end
 
       describe 'when YAML encoded primitive string is provided' do
         it 'returns decoded value as Ruby string' do
-          @property.load("--- yaml string\n").should == 'yaml string'
+          expect(@property.load("--- yaml string\n")).to eq('yaml string')
         end
       end
 
       describe 'when something else is provided' do
         it 'raises ArgumentError with a meaningful message' do
-          lambda {
+          expect {
             @property.load(:sym)
-          }.should raise_error(ArgumentError, '+value+ of a property of YAML type must be nil or a String')
+          }.to raise_error(ArgumentError, '+value+ of a property of YAML type must be nil or a String')
         end
       end
     end
@@ -35,31 +35,31 @@ try_spec do
     describe '.dump' do
       describe 'when nil is provided' do
         it 'returns nil' do
-          @property.dump(nil).should be_nil
+          expect(@property.dump(nil)).to be_nil
         end
       end
 
       describe 'when YAML encoded primitive string is provided' do
         it 'does not do double encoding' do
-          YAML.load(@property.dump("--- yaml encoded string\n")).should == 'yaml encoded string'
+          expect(YAML.load(@property.dump("--- yaml encoded string\n"))).to eq('yaml encoded string')
         end
       end
 
       describe 'when regular Ruby string is provided' do
         it 'dumps argument to YAML' do
-          YAML.load(@property.dump('dump me (to yaml)')).should == 'dump me (to yaml)'
+          expect(YAML.load(@property.dump('dump me (to yaml)'))).to eq('dump me (to yaml)')
         end
       end
 
       describe 'when Ruby array is provided' do
         it 'dumps argument to YAML' do
-          YAML.load(@property.dump([ 1, 2, 3 ])).should == [ 1, 2, 3 ]
+          expect(YAML.load(@property.dump([ 1, 2, 3 ]))).to eq([ 1, 2, 3 ])
         end
       end
 
       describe 'when Ruby hash is provided' do
         it 'dumps argument to YAML' do
-          YAML.load(@property.dump({ :datamapper => 'Data access layer in Ruby' })).should == { :datamapper => 'Data access layer in Ruby' }
+          expect(YAML.load(@property.dump({ :datamapper => 'Data access layer in Ruby' }))).to eq({ :datamapper => 'Data access layer in Ruby' })
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ardm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Martin Emde
@@ -9,132 +9,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: coercible
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: ActiveRecord plugin to provide a smooth migration from DataMapper to
@@ -147,7 +147,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -158,12 +158,15 @@ files:
 - lib/ardm/active_record.rb
 - lib/ardm/active_record/associations.rb
 - lib/ardm/active_record/base.rb
+- lib/ardm/active_record/collection.rb
+- lib/ardm/active_record/data_mapper_constant.rb
+- lib/ardm/active_record/data_mapper_constant_proxy.rb
 - lib/ardm/active_record/dirty.rb
+- lib/ardm/active_record/finalize.rb
 - lib/ardm/active_record/hooks.rb
 - lib/ardm/active_record/inheritance.rb
 - lib/ardm/active_record/is.rb
 - lib/ardm/active_record/is/state_machine.rb
-- lib/ardm/active_record/not_found.rb
 - lib/ardm/active_record/predicate_builder.rb
 - lib/ardm/active_record/predicate_builder/array_handler.rb
 - lib/ardm/active_record/predicate_builder/rails3.rb
@@ -178,7 +181,6 @@ files:
 - lib/ardm/active_record/storage_names.rb
 - lib/ardm/active_record/validations.rb
 - lib/ardm/data_mapper.rb
-- lib/ardm/data_mapper/not_found.rb
 - lib/ardm/data_mapper/record.rb
 - lib/ardm/env.rb
 - lib/ardm/property.rb
@@ -246,6 +248,7 @@ files:
 - lib/ardm/support/subject.rb
 - lib/ardm/support/subject_set.rb
 - lib/ardm/version.rb
+- spec/ardm/datamapper_constants_spec.rb
 - spec/fixtures/api_user.rb
 - spec/fixtures/article.rb
 - spec/fixtures/bookmark.rb
@@ -269,6 +272,7 @@ files:
 - spec/integration/uri_spec.rb
 - spec/integration/uuid_spec.rb
 - spec/integration/yaml_spec.rb
+- spec/public/model_spec.rb
 - spec/public/property/binary_spec.rb
 - spec/public/property/boolean_spec.rb
 - spec/public/property/class_spec.rb
@@ -284,6 +288,7 @@ files:
 - spec/public/property/text_spec.rb
 - spec/public/property/time_spec.rb
 - spec/public/property_spec.rb
+- spec/public/resource_spec.rb
 - spec/rcov.opts
 - spec/schema.rb
 - spec/semipublic/property/binary_spec.rb
@@ -301,9 +306,11 @@ files:
 - spec/semipublic/property/text_spec.rb
 - spec/semipublic/property/time_spec.rb
 - spec/semipublic/property_spec.rb
+- spec/shared/finder_shared_spec.rb
 - spec/shared/flags_shared_spec.rb
 - spec/shared/identity_function_group.rb
 - spec/shared/public_property_spec.rb
+- spec/shared/resource_spec.rb
 - spec/shared/semipublic_property_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -325,7 +332,8 @@ files:
 - tasks/yard.rake
 - tasks/yardstick.rake
 homepage: http://github.com/engineyard/ardm
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -333,17 +341,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord plugin to provide a smooth migration from DataMapper to ActiveRecord