ardm-core 1.2.1 → 1.3.0

data/spec/public/resource_spec.rb

@@ -72,7 +72,7 @@ describe DataMapper::Resource do
     before :all do
       user = @user_model.create(:name => 'dbussink', :age => 25, :description => 'Test')
 
-      @user = @user_model.get(*user.key)
+      @user = @user_model.get!(*user.key)
     end
 
     it_should_behave_like 'A public Resource'
@@ -187,7 +187,7 @@ describe DataMapper::Resource do
           rescue_if @skip do
             @dkubb = @user.referrer = @user_model.create(:name => 'dkubb', :age => 33)
             @user.save
-            @user = @user_model.get(*@user.key)
+            @user = @user_model.get!(*@user.key)
             @user.referrer.should == @dkubb
 
             @solnic = @user_model.create(:name => 'solnic', :age => 28)
@@ -196,7 +196,7 @@ describe DataMapper::Resource do
 
             relationship = @user_model.relationships[:referrer]
             relationship.child_key.to_a.each_with_index do |k, i|
-              @attributes[k.name] = relationship.parent_key.to_a[i].get(@solnic)
+              @attributes[k.name] = relationship.parent_key.to_a[i].get!(@solnic)
             end
 
             @return = @user.__send__(method, @attributes)
@@ -212,12 +212,12 @@ describe DataMapper::Resource do
         end
 
         it 'should persist the changes' do
-          resource = @user_model.get(*@user.key)
+          resource = @user_model.get!(*@user.key)
           @attributes.each { |key, value| resource.__send__(key).should == value }
         end
 
         it 'should return correct parent' do
-          resource = @user_model.get(*@user.key)
+          resource = @user_model.get!(*@user.key)
           resource.referrer.should == @solnic
         end
       end

data/spec/public/shared/association_collection_shared_spec.rb

@@ -24,7 +24,7 @@ share_examples_for 'It can transfer a Resource from another association' do
 
   it 'should remove the Resource from the original Collection' do
     pending do
-      @original.should_not be_include(@resource)
+      @original.should_not include(@resource)
     end
   end
 end

data/spec/public/shared/collection_shared_spec.rb

@@ -324,7 +324,7 @@ share_examples_for 'A public Collection' do
       end
 
       it 'should remove the Resource from the Collection' do
-        @articles.should_not be_include(@resource)
+        @articles.should_not include(@resource)
       end
     end
 
@@ -356,7 +356,7 @@ share_examples_for 'A public Collection' do
       end
 
       it 'should remove the Resource from the Collection' do
-        @articles.should_not be_include(@resource)
+        @articles.should_not include(@resource)
       end
     end
 
@@ -390,7 +390,7 @@ share_examples_for 'A public Collection' do
       end
 
       it 'should remove the Resources from the Collection' do
-        @resources.each { |resource| @articles.should_not be_include(resource) }
+        @resources.each { |resource| @articles.should_not include(resource) }
       end
     end
 
@@ -458,7 +458,7 @@ share_examples_for 'A public Collection' do
         end
 
         it 'should not destroy the other Resource' do
-          @article_model.get(*@other.key).should_not be_nil
+          @article_model.get!(*@other.key).should_not be_nil
         end
       end
     end
@@ -688,7 +688,7 @@ share_examples_for 'A public Collection' do
       end
 
       it 'should remove the Resource from the Collection' do
-        @articles.should_not be_include(@new)
+        @articles.should_not include(@new)
       end
     end
 
@@ -707,7 +707,7 @@ share_examples_for 'A public Collection' do
         end
 
         it 'should remove the Resource from the Collection' do
-          @articles.should_not be_include(@new)
+          @articles.should_not include(@new)
         end
       end
     end
@@ -754,7 +754,7 @@ share_examples_for 'A public Collection' do
       end
 
       it 'should remove the Resources from the Collection' do
-        @resources.each { |resource| @articles.should_not be_include(resource) }
+        @resources.each { |resource| @articles.should_not include(resource) }
       end
     end
 
@@ -1007,7 +1007,7 @@ share_examples_for 'A public Collection' do
       end
 
       it 'should remove the Resource from the Collection' do
-        @articles.should_not be_include(@return)
+        @articles.should_not include(@return)
       end
     end
 
@@ -1027,7 +1027,7 @@ share_examples_for 'A public Collection' do
         end
 
         it 'should remove the Resource from the Collection' do
-          @articles.should_not be_include(@article)
+          @articles.should_not include(@article)
         end
       end
     end
@@ -1062,7 +1062,7 @@ share_examples_for 'A public Collection' do
       end
 
       it 'should remove the Resource from the Collection' do
-        @articles.should_not be_include(@resource)
+        @articles.should_not include(@resource)
       end
     end
 
@@ -1082,7 +1082,7 @@ share_examples_for 'A public Collection' do
       end
 
       it 'should remove the Resources from the Collection' do
-        @resources.each { |resource| @articles.should_not be_include(resource) }
+        @resources.each { |resource| @articles.should_not include(resource) }
       end
 
       it 'should scope the Collection' do
@@ -1106,7 +1106,7 @@ share_examples_for 'A public Collection' do
       end
 
       it 'should remove the Resources from the Collection' do
-        @resources.each { |resource| @articles.should_not be_include(resource) }
+        @resources.each { |resource| @articles.should_not include(resource) }
       end
 
       it 'should scope the Collection' do
@@ -1130,7 +1130,7 @@ share_examples_for 'A public Collection' do
       end
 
       it 'should remove the Resource from the Collection' do
-        @articles.should_not be_include(@resource)
+        @articles.should_not include(@resource)
       end
     end
 
@@ -1150,7 +1150,7 @@ share_examples_for 'A public Collection' do
       end
 
       it 'should remove the Resources from the Collection' do
-        @resources.each { |resource| @articles.should_not be_include(resource) }
+        @resources.each { |resource| @articles.should_not include(resource) }
       end
 
       it 'should scope the Collection' do
@@ -1174,7 +1174,7 @@ share_examples_for 'A public Collection' do
       end
 
       it 'should remove the Resources from the Collection' do
-        @resources.each { |resource| @articles.should_not be_include(resource) }
+        @resources.each { |resource| @articles.should_not include(resource) }
       end
 
       it 'should scope the Collection' do
@@ -1307,7 +1307,7 @@ share_examples_for 'A public Collection' do
         end
 
         it 'should include the Resource in the Collection' do
-          @articles.should be_include(@resource)
+          @articles.should include(@resource)
         end
       end
 
@@ -1335,7 +1335,7 @@ share_examples_for 'A public Collection' do
         end
 
         it 'should include the Resource in the Collection' do
-          @articles.should be_include(@resource)
+          @articles.should include(@resource)
         end
       end
 
@@ -1363,7 +1363,7 @@ share_examples_for 'A public Collection' do
         end
 
         it 'should include the Resource in the Collection' do
-          @articles.should be_include(@resource)
+          @articles.should include(@resource)
         end
       end
 
@@ -1391,7 +1391,7 @@ share_examples_for 'A public Collection' do
         end
 
         it 'should include the Resource in the Collection' do
-          @articles.should be_include(@resource)
+          @articles.should include(@resource)
         end
       end
 
@@ -1419,7 +1419,7 @@ share_examples_for 'A public Collection' do
         end
 
         it 'should include the Resource in the Collection' do
-          @articles.should be_include(@resource)
+          @articles.should include(@resource)
         end
       end
 
@@ -1447,7 +1447,7 @@ share_examples_for 'A public Collection' do
         end
 
         it 'should include the Resource in the Collection' do
-          @articles.should be_include(@resource)
+          @articles.should include(@resource)
         end
       end
     end
@@ -1555,7 +1555,7 @@ share_examples_for 'A public Collection' do
         end
 
         it 'should persist the changes' do
-          resource = @article_model.get(*@article.key)
+          resource = @article_model.get!(*@article.key)
           @attributes.each { |key, value| resource.__send__(key).should == value }
         end
       end
@@ -1580,7 +1580,7 @@ share_examples_for 'A public Collection' do
         end
 
         it 'should persist the changes' do
-          resource = @article_model.get(*@article.key)
+          resource = @article_model.get!(*@article.key)
           @attributes.each { |key, value| resource.__send__(key).should == value }
         end
       end
@@ -1625,7 +1625,7 @@ share_examples_for 'A public Collection' do
         end
 
         it 'should persist the changes' do
-          resource = @article_model.get(*@article.key)
+          resource = @article_model.get!(*@article.key)
           @attributes.each { |key, value| resource.__send__(key).should == value }
         end
 

data/spec/public/shared/finder_shared_spec.rb

@@ -895,19 +895,37 @@ share_examples_for 'Finder Interface' do
   it { @articles.should respond_to(:each) }
 
   describe '#each' do
-    subject { @articles.each(&block) }
+    context 'with a block' do
+      subject { @articles.each(&block) }
 
-    let(:yields) { []                                       }
-    let(:block)  { lambda { |resource| yields << resource } }
+      let(:yields) { []                                       }
+      let(:block)  { lambda { |resource| yields << resource } }
 
-    before do
-      @copy = @articles.kind_of?(Class) ? @articles : @articles.dup
-      @copy.to_a
+      before do
+        @copy = @articles.kind_of?(Class) ? @articles : @articles.dup
+        @copy.to_a
+      end
+
+      it { should equal(@articles) }
+
+      it { method(:subject).should change { yields.dup }.from([]).to(@copy.to_a) }
     end
 
-    it { should equal(@articles) }
+    context 'without a block' do
+      subject { @articles.each }
 
-    it { method(:subject).should change { yields.dup }.from([]).to(@copy.to_a) }
+      let(:yields) { []                                       }
+      let(:block)  { lambda { |resource| yields << resource } }
+
+      before do
+        @copy = @articles.kind_of?(Class) ? @articles : @articles.dup
+        @copy.to_a
+      end
+
+      it { should be_instance_of(to_enum.class) }
+
+      it { expect { subject.each(&block) }.to change { yields.dup }.from([]).to(@copy.to_a) }
+    end
   end
 
   it { @articles.should respond_to(:fetch) }

data/spec/spec.opts

@@ -1,5 +1,3 @@
 --colour
 --loadby random
---require ./spec/lib/rspec_immediate_feedback_formatter.rb
---format Spec::Runner::Formatter::ImmediateFeedbackFormatter
---backtrace
+--format profile

data/tasks/ci.rake

@@ -1 +1 @@
-task :ci => [ :verify_measurements, 'metrics:all' ]
+task :ci => [ :verify_measurements, 'spec' ]

data/tasks/spec.rake

@@ -14,25 +14,4 @@ rescue LoadError
   end
 end
 
-begin
-  require 'rcov'
-  require 'spec/rake/verify_rcov'
-
-  Spec::Rake::SpecTask.new(:rcov) do |rcov|
-    spec_defaults.call(rcov)
-    rcov.rcov      = true
-    rcov.rcov_opts = File.read('spec/rcov.opts').split(/\s+/)
-  end
-
-  RCov::VerifyTask.new(:verify_rcov => :rcov) do |rcov|
-    rcov.threshold = 100
-  end
-rescue LoadError
-  %w[ rcov verify_rcov ].each do |name|
-    task name do
-      abort "rcov is not available. In order to run #{name}, you must: gem install rcov"
-    end
-  end
-end
-
 task :default => :spec

data/tasks/yardstick.rake

@@ -8,7 +8,7 @@ begin
 
   # verify_measurements task
   Yardstick::Rake::Verify.new do |verify|
-    verify.threshold = 100
+    verify.threshold = 84.3
   end
 rescue LoadError
   %w[ yardstick_measure verify_measurements ].each do |name|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ardm-core
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Martin Emde
@@ -9,48 +9,54 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 description: Ardm fork of dm-core
@@ -63,11 +69,11 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
-- ".autotest"
-- ".document"
-- ".gitignore"
-- ".travis.yml"
-- ".yardopts"
+- .autotest
+- .document
+- .gitignore
+- .travis.yml
+- .yardopts
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -202,6 +208,7 @@ files:
 - spec/public/property/text_spec.rb
 - spec/public/property/time_spec.rb
 - spec/public/property_spec.rb
+- spec/public/resource/state_spec.rb
 - spec/public/resource_spec.rb
 - spec/public/sel_spec.rb
 - spec/public/setup_spec.rb
@@ -330,17 +337,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.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Ardm fork of dm-core
@@ -375,6 +382,7 @@ test_files:
 - spec/public/property/text_spec.rb
 - spec/public/property/time_spec.rb
 - spec/public/property_spec.rb
+- spec/public/resource/state_spec.rb
 - spec/public/resource_spec.rb
 - spec/public/sel_spec.rb
 - spec/public/setup_spec.rb
@@ -488,4 +496,3 @@ test_files:
 - spec/unit/module_spec.rb
 - spec/unit/object_spec.rb
 - spec/unit/try_dup_spec.rb
-has_rdoc: