ardm 0.1.0 → 0.2.0

data/spec/shared/{resource_spec.rb → resource.rb}

@@ -628,7 +628,7 @@ shared_examples 'A public Resource' do
     describe 'on a resource that is changed outside another resource' do
       before do
         rescue_if @skip do
-          @user.dup.update(:description => 'Changed')
+          @user.clone.update(:description => 'Changed')
         end
       end
 
@@ -825,33 +825,39 @@ shared_examples 'A public Resource' do
         end
 
         it 'should save resource' do
-          pending_if !@user.respond_to?(:comments)
-          expect(@return).to be(true)
+          skip_if !@user.respond_to?(:comments) do
+            expect(@return).to be(true)
+          end
         end
 
         it 'should save the first resource created through new' do
-          pending_if !@user.respond_to?(:comments)
-          expect(@first_comment.new?).to be(false)
+          skip_if !@user.respond_to?(:comments) do
+            expect(@first_comment.new?).to be(false)
+          end
         end
 
         it 'should save the correct foreign key for the first resource' do
-          pending_if !@user.respond_to?(:comments)
-          expect(@first_comment.user).to eql(@user)
+          skip_if !@user.respond_to?(:comments) do
+            expect(@first_comment.user).to eql(@user)
+          end
         end
 
         it 'should save the second resource created through the constructor' do
-          skip "Changing a belongs_to parent should add the resource to the correct association"
-          expect(@second_comment.new?).to be(false)
+          skip "Changing a belongs_to parent should add the resource to the correct association" do
+            expect(@second_comment.new?).to be(false)
+          end
         end
 
         it 'should save the correct foreign key for the second resource' do
-          pending_if !@user.respond_to?(:comments)
-          expect(@second_comment.user).to eql(@user)
+          skip_if !@user.respond_to?(:comments) do
+            expect(@second_comment.user).to eql(@user)
+          end
         end
 
         it 'should create 2 extra resources in persistent storage' do
-          skip "Changing a belongs_to parent should add the resource to the correct association"
-          expect(@user.comments.size).to eq(@initial_comments + 2)
+          skip "Changing a belongs_to parent should add the resource to the correct association" do
+            expect(@user.comments.size).to eq(@initial_comments + 2)
+          end
         end
       end
 
@@ -870,8 +876,9 @@ shared_examples 'A public Resource' do
         end
 
         it 'should return true' do
-          pending_if !@user.respond_to?(:comments)
-          expect(@return).to be(true)
+          skip_if !@user.respond_to?(:comments) do
+            expect(@return).to be(true)
+          end
         end
 
         it 'should not be dirty' do
@@ -879,13 +886,15 @@ shared_examples 'A public Resource' do
         end
 
         it 'should have saved the first child resource' do
-          pending_if !@user.respond_to?(:comments)
-          expect(@first_comment.model.get(*@first_comment.key).body).to eq('It still has rough edges')
+          skip_if !@user.respond_to?(:comments) do
+            expect(@first_comment.model.get(*@first_comment.key).body).to eq('It still has rough edges')
+          end
         end
 
         it 'should not have saved the second child resource' do
-          pending_if !@user.respond_to?(:comments)
-          expect(@second_comment.model.get(*@second_comment.key).body).to eq('is it really?')
+          skip_if !@user.respond_to?(:comments) do
+            expect(@second_comment.model.get(*@second_comment.key).body).to eq('is it really?')
+          end
         end
       end
 
@@ -896,8 +905,9 @@ shared_examples 'A public Resource' do
         end
 
         it 'should not raise an exception when saving the resource' do
-          skip
-          expect { expect(@first_comment.send(method)).to be(false) }.not_to raise_error
+          skip do
+            expect { expect(@first_comment.send(method)).to be(false) }.not_to raise_error
+          end
         end
       end
 
@@ -937,23 +947,27 @@ shared_examples 'A public Resource' do
         end
 
         it 'should not be dirty' do
-          pending_if !@article.respond_to?(:paragraphs)
-          expect(@article).not_to be_dirty
+          skip_if !@article.respond_to?(:paragraphs) do
+            expect(@article).not_to be_dirty
+          end
         end
 
         it 'should not be dirty' do
-          pending_if !@article.respond_to?(:paragraphs)
-          expect(@paragraph).not_to be_dirty
+          skip_if !@article.respond_to?(:paragraphs) do
+            expect(@paragraph).not_to be_dirty
+          end
         end
 
         it 'should set the related resource' do
-          pending_if !@article.respond_to?(:paragraphs)
-          expect(@paragraph.article).to eq(@article)
+          skip_if !@article.respond_to?(:paragraphs) do
+            expect(@paragraph.article).to eq(@article)
+          end
         end
 
         it 'should set the foreign key properly' do
-          pending_if !@article.respond_to?(:paragraphs)
-          expect(@paragraph.article_id).to eq(@article.id)
+          skip_if !@article.respond_to?(:paragraphs) do
+            expect(@paragraph.article_id).to eq(@article.id)
+          end
         end
       end
 
@@ -1211,8 +1225,9 @@ shared_examples 'A public Resource' do
     end
 
     it 'should not overwrite dirty key' do
-      skip
-      expect(@user.name).to eq('dkubb')
+      skip do
+        expect(@user.name).to eq('dkubb')
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,10 @@
-require 'pry'
-require 'database_cleaner'
+Bundler.require(:default, :test)
 
 ENV['ORM'] ||= 'active_record'
 require 'ardm/env'
 
+Dir["#{Pathname(__FILE__).dirname.expand_path}/{shared,support}/*.rb"].each { |file| require file }
+
 Ardm.active_record do
   ActiveRecord::Base.configurations = { "ardm" => {
     "database" => "db/test.sqlite",
@@ -20,12 +21,17 @@ Ardm.active_record do
 end
 
 Ardm.data_mapper do
-  raise "TODO: DataMapper setup."
+  Bundler.require(:datamapper)
+  DataMapper.setup(:default, "sqlite3://#{File.expand_path("../../db/test.sqlite", __FILE__)}")
+  DataMapper.auto_migrate!
 end
 
-Dir["#{Pathname(__FILE__).dirname.expand_path}/shared/*.rb"].each { |file| require file }
-
 RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  if ENV["ORM"] == "active_record"
+    config.filter_run_excluding(:dm => true)
+  end
+
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with(:truncation)

data/spec/support/logger.rb

@@ -0,0 +1,38 @@
+if defined?(::DataMapper)
+  module DataMapper::LogListener
+    def log(message)
+      DataMapper.logger.info("#{message.query}")
+      super
+    rescue Exception => e
+      ::DataMapper.logger.error "[datamapper] #{e.class.name}: #{e.message}: #{message.inspect}}"
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.before(:each) do
+    require 'logger'
+    logger = Logger.new(nil)
+
+    if Ardm.rails4?
+      require 'active_support/logger'
+      logger = if ENV["VERBOSE"]
+                 ActiveSupport::Logger.new(STDOUT)
+               end
+    end
+
+    if defined?(::ActiveRecord::Base)
+      ::ActiveRecord::Base.logger = logger
+    elsif defined?(::DataMapper)
+      require 'active_support/inflector'
+      driver = DataObjects.const_get(ActiveSupport::Inflector.camelize('sqlite3'), false)
+
+      DataObjects::Connection.send(:include, DataMapper::LogListener)
+      # FIXME Setting DataMapper::Logger.new($stdout, :off) alone won't work because the #log
+      # method is currently only available in DO and needs an explicit DO Logger instantiated.
+      # We turn the logger :off because ActiveSupport::Notifications handles displaying log messages
+      driver.logger = DataObjects::Logger.new($stdout, :off)
+      ::DataMapper.logger = logger
+    end
+  end
+end

data/spec/unit/dirty_minder_spec.rb

@@ -31,8 +31,10 @@ describe Ardm::Property::DirtyMinder,'set!' do
   end
 
   shared_examples_for 'a hooked value' do
-    it 'should extend value with hook', pending: true do
-      expect(object.get!(resource)).to be_kind_of(Ardm::Property::DirtyMinder::Hooker)
+    it 'should extend value with hook' do
+      skip "FIXME: This probably should pass" do
+        expect(object.get!(resource)).to be_kind_of(Ardm::Property::DirtyMinder::Hooker)
+      end
     end
   end
 

data/spec/unit/paranoid_boolean_spec.rb

@@ -7,7 +7,7 @@ module ::ParanoidBooleanBlog
     property :deleted, ParanoidBoolean
     timestamps :at
 
-    before_destroy :before_destroy
+    before(:destroy, :before_destroy)
 
     def before_destroy; end
   end
@@ -50,7 +50,7 @@ describe Ardm::Property::ParanoidBoolean do
         @resource = @model.create
       end
 
-      it { expect(!!subject).to be true }
+      it { expect(subject).to be_truthy }
 
       it 'should not delete the resource from the datastore' do
         expect(method(:subject)).not_to change { @model.with_deleted.size }.from(1)
@@ -94,7 +94,7 @@ describe Ardm::Property::ParanoidBoolean do
         @resource = @model.create
       end
 
-      it { expect(!!subject).to be true }
+      it { expect(subject).to be_truthy }
 
       it 'should delete the resource from the datastore' do
         expect(method(:subject)).to change { @model.with_deleted.size }.from(1).to(0)

data/spec/unit/paranoid_datetime_spec.rb

@@ -8,7 +8,7 @@ module ::ParanoidDateTimeBlog
     property :deleted_at, ParanoidDateTime
     timestamps :at
 
-    before_destroy :before_destroy
+    before(:destroy, :before_destroy)
 
     def before_destroy; end
   end
@@ -56,7 +56,7 @@ describe Ardm::Property::ParanoidDateTime do
         @resource = @model.create
       end
 
-      it { expect(!!subject).to be true }
+      it { expect(subject).to be_truthy }
 
       it 'should not delete the resource from the datastore' do
         expect(method(:subject)).not_to change { @model.with_deleted.size }.from(1)
@@ -100,7 +100,7 @@ describe Ardm::Property::ParanoidDateTime do
         @resource = @model.create
       end
 
-      it { expect(!!subject).to be true }
+      it { expect(subject).to be_truthy }
 
       it 'should delete the resource from the datastore' do
         expect(method(:subject)).to change { @model.with_deleted.size }.from(1).to(0)

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ardm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Martin Emde
@@ -14,127 +15,151 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: coercible
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 description: ActiveRecord plugin to provide a smooth migration from DataMapper to
@@ -147,7 +172,8 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- ".gitignore"
+- .gitignore
+- .ruby-version
 - Gemfile
 - LICENSE
 - README.md
@@ -255,6 +281,7 @@ files:
 - spec/fixtures/invention.rb
 - spec/fixtures/network_node.rb
 - spec/fixtures/person.rb
+- spec/fixtures/resource_blog.rb
 - spec/fixtures/software_package.rb
 - spec/fixtures/ticket.rb
 - spec/fixtures/tshirt.rb
@@ -306,14 +333,15 @@ 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/finder_shared.rb
+- spec/shared/flags_shared.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/shared/public_property.rb
+- spec/shared/resource.rb
+- spec/shared/semipublic_property.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/logger.rb
 - spec/unit/bcrypt_hash_spec.rb
 - spec/unit/csv_spec.rb
 - spec/unit/dirty_minder_spec.rb
@@ -334,25 +362,26 @@ files:
 homepage: http://github.com/engineyard/ardm
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: ActiveRecord plugin to provide a smooth migration from DataMapper to ActiveRecord
 test_files: []