opium 1.0.3 → 1.1.0

data/spec/opium/model/persistable_spec.rb

@@ -3,61 +3,61 @@ require 'spec_helper.rb'
 describe Opium::Model::Persistable do
   let( :model ) { Class.new { include Opium::Model::Persistable } }
 
-  describe 'in a model' do
+  context 'within a model' do
     subject { model }
   
-    it { should respond_to( :destroy_all ).with(1).argument }
-    it { should respond_to( :delete_all ).with(1).argument }
-    it { should respond_to( :create, :create! ).with(1).argument }
-    it { should respond_to( :add_header_to ).with(4).arguments }
-    it { should respond_to( :added_headers ) }
-    it { should respond_to( :get_header_for ).with(2).arguments }
+    it { is_expected.to respond_to( :destroy_all ).with(1).argument }
+    it { is_expected.to respond_to( :delete_all ).with(1).argument }
+    it { is_expected.to respond_to( :create, :create! ).with(1).argument }
+    it { is_expected.to respond_to( :add_header_to ).with(4).arguments }
+    it { is_expected.to respond_to( :added_headers ) }
+    it { is_expected.to respond_to( :get_header_for ).with(2).arguments }
     
-    describe ':added_headers' do
+    describe '.added_headers' do
       it { subject.added_headers.should be_a( Hash ) }
     end
     
-    describe ':add_header_to' do
+    describe '.add_header_to' do
       after { subject.added_headers.clear }
       
       it { expect { subject.add_header_to :put, :x_header, 42 }.to_not raise_exception }
       it { subject.add_header_to(:delete, :x_header, 37, only: :delete).should be_nil }
       
-      it 'should add header information to :added_headers' do
+      it 'adds header information to :added_headers' do
         subject.add_header_to( :put, :x_header, 42, except: :update )
         subject.added_headers.should have_key(:put)
         subject.added_headers[:put].should include( :header, :value, :options )
       end
     end
     
-    describe ':get_header_for' do
+    describe '.get_header_for' do
       after { subject.added_headers.clear }
       
-      it 'should return an empty hash if a method has no added headers' do
+      it 'returns an empty hash if a method has no added headers' do
         subject.get_header_for( :put, :update ).should == {}
       end
       
-      it 'should return an empty hash if a context is not within the only list for a method' do
+      it 'returns an empty hash if a context is not within the only list for a method' do
         subject.add_header_to( :put, :x_header, 42, only: [:foo, :bar] )
         subject.get_header_for( :put, :baz ).should == {}
       end
       
-      it 'should return an empty hash if a context is within the except list for a method' do
+      it 'returns an empty hash if a context is within the except list for a method' do
         subject.add_header_to( :put, :x_header, 42, except: [:foo, :bar] )
         subject.get_header_for( :put, :foo ).should == {}
       end
       
-      it 'should return a headers hash if context-free' do
+      it 'returns a headers hash if context-free' do
         subject.add_header_to( :put, :x_header, 42 )
         subject.get_header_for( :put, :update ).should == { headers: { x_header: 42 } }
       end
       
-      it 'should return a headers hash if a context is within the only list for a method' do
+      it 'returns a headers hash if a context is within the only list for a method' do
         subject.add_header_to( :put, :x_header, 42, only: :update )
         subject.get_header_for( :put, :update ).should == { headers: { x_header: 42 } }
       end
       
-      it 'should return a headers hash if a context is not within the except list for a method' do
+      it 'returns a headers hash if a context is not within the except list for a method' do
         subject.add_header_to( :put, :x_header, 42, except: :foo )
         subject.get_header_for( :put, :update ).should == { headers: { x_header: 42 } }
       end
@@ -67,17 +67,18 @@ describe Opium::Model::Persistable do
   describe 'instance' do
     subject { model.new }
     
-    it { should respond_to( :save ).with(1).argument }
-    it { should respond_to( :save! ).with(0).arguments }
-    it { should respond_to( :update_attributes, :update_attributes! ).with(1).argument }
-    it { should respond_to( :touch ) }
-    it { should respond_to( :destroy ) }
-    it { should respond_to( :delete ) }
-    it { should respond_to( :new_record?, :persisted? ) }
-    it { should respond_to( :pointer, :to_parse ) }
+    it { is_expected.to respond_to( :save ).with(1).argument }
+    it { is_expected.to respond_to( :save! ).with(0).arguments }
+    it { is_expected.to respond_to( :update_attributes, :update_attributes! ).with(1).argument }
+    it { is_expected.to respond_to( :update, :update! ).with(1).argument }
+    it { is_expected.to respond_to( :touch ) }
+    it { is_expected.to respond_to( :destroy ) }
+    it { is_expected.to respond_to( :delete ) }
+    it { is_expected.to respond_to( :new_record?, :persisted? ) }
+    it { is_expected.to respond_to( :pointer, :to_parse ) }
   end
   
-  describe 'within a model' do
+  context 'within a model' do
     before do
       stub_const( 'Game', Class.new do
         include Opium::Model
@@ -93,7 +94,7 @@ describe Opium::Model::Persistable do
       Opium::Model::Criteria.models.clear
     end
     
-    describe ':new_record?' do
+    describe '#new_record?' do
       subject { Game.new }
       
       it 'should be true in a model without an id' do
@@ -244,12 +245,12 @@ describe Opium::Model::Persistable do
       it { expect { subject.save! }.to raise_exception }
     end
     
-    describe 'when saving a model with validates: false' do
+    context 'when saving a model with validates: false' do
       subject { Game.new( title: 'Skyrim' ) }
-      
-      it 'should not receive :valid?, but should receive :create' do
+            
+      it 'does not receive :valid?, but does receive :_create' do
         subject.should_not receive(:valid?)
-        subject.should receive(:create)
+        subject.should receive(:_create)
         subject.save( validates: false )
       end
     end
@@ -356,11 +357,11 @@ describe Opium::Model::Persistable do
       end
     end
     
-    describe ':to_parse' do
+    describe '#to_parse' do
       subject { Game.new( id: 'abcd1234' ) }
       
-      it 'should be a pointer hash' do
-        subject.to_parse.should == subject.pointer.to_parse
+      it 'is a pointer hash' do
+        expect( subject.to_parse ).to eq subject.pointer.to_parse
       end
     end
   end

data/spec/opium/model/queryable_spec.rb

@@ -3,28 +3,28 @@ require 'spec_helper.rb'
 describe Opium::Model::Queryable do
   let( :model ) { Class.new { include Opium::Model::Queryable } }
 
-  describe 'the class' do
+  context 'when included in a class' do
     subject { model }
     
-    it { should respond_to( :all, :all_in ).with(1).argument }
-    it { should respond_to( :and ).with(1).argument }
-    it { should respond_to( :between ).with(1).argument }
-    it { should respond_to( :exists ).with(1).argument }
-    it { should respond_to( :gt, :gte ).with(1).argument }
-    it { should respond_to( :lt, :lte ).with(1).argument }
-    it { should respond_to( :in, :any_in, :nin ).with(1).argument }
-    it { should respond_to( :ne ).with(1).argument }
-    it { should respond_to( :or ).with(1).argument }
-    it { should respond_to( :select, :dont_select ).with(1).argument }
-    it { should respond_to( :keys, :pluck ).with(1).argument }
-    it { should respond_to( :where ).with(1).argument }
-    it { should respond_to( :order ).with(1).argument }
-    it { should respond_to( :limit, :skip ).with(1).argument }
-    it { should respond_to( :cache, :uncache, :cached? ) }
-    it { should respond_to( :count, :total_count ) }
+    it { is_expected.to respond_to( :all, :all_in ).with(1).argument }
+    it { is_expected.to respond_to( :and ).with(1).argument }
+    it { is_expected.to respond_to( :between ).with(1).argument }
+    it { is_expected.to respond_to( :exists ).with(1).argument }
+    it { is_expected.to respond_to( :gt, :gte ).with(1).argument }
+    it { is_expected.to respond_to( :lt, :lte ).with(1).argument }
+    it { is_expected.to respond_to( :in, :any_in, :nin ).with(1).argument }
+    it { is_expected.to respond_to( :ne ).with(1).argument }
+    it { is_expected.to respond_to( :or ).with(1).argument }
+    it { is_expected.to respond_to( :select, :dont_select ).with(1).argument }
+    it { is_expected.to respond_to( :keys, :pluck ).with(1).argument }
+    it { is_expected.to respond_to( :where ).with(1).argument }
+    it { is_expected.to respond_to( :order ).with(1).argument }
+    it { is_expected.to respond_to( :limit, :skip ).with(1).argument }
+    it { is_expected.to respond_to( :cache, :uncache, :cached? ) }
+    it { is_expected.to respond_to( :count, :total_count ) }
   end
   
-  describe 'within a model' do
+  context 'within a model' do
     before do
       stub_const( 'Game', Class.new do
         include Opium::Model
@@ -43,29 +43,29 @@ describe Opium::Model::Queryable do
     
     subject { Game }
     
-    describe ':where' do
-      it 'should return a criteria' do
+    describe '.where' do
+      it 'returns a criteria' do
         subject.where( price: { '$lte' => 5 } ).should be_a( Opium::Model::Criteria )
       end
       
-      it 'should set the "where" constraint to the provided value' do
+      it 'sets the "where" constraint to the provided value' do
         subject.where( price: { '$lte' => 5 } ).tap do |criteria|
           criteria.constraints.should have_key( 'where' )
           criteria.constraints['where'].should =~ { 'price' => { '$lte' => 5 } }
         end
       end
       
-      it 'should deep merge the "where" constraint on successive calls' do
+      it 'deep merges the "where" constraint on successive calls' do
         subject.where( price: { '$lte' => 5 } ).where( price: { '$gte' => 1 } ).tap do |criteria|
           criteria.constraints['where'].should =~ { 'price' => { '$lte' => 5, '$gte' => 1 } }
         end
       end
       
-      it 'should ensure that specified fields exist on the model' do
+      it 'ensures that specified fields exist on the model' do
         expect { subject.where( does_not_exist: true ) }.to raise_exception
       end
       
-      it 'should map ruby names to parse names and ruby values to parse values' do
+      it 'maps ruby names to parse names and ruby values to parse values' do
         time = Time.now - 1000
         subject.where( created_at: { '$gte' => time } ).tap do |criteria|
           criteria.constraints['where'].should =~ { 'createdAt' => { '$gte' => time.to_parse } }
@@ -74,7 +74,7 @@ describe Opium::Model::Queryable do
     end
         
     shared_examples_for 'a chainable criteria clause' do |method|
-      describe ":#{method}" do
+      describe ".#{method}" do
         it 'should return a criteria' do
           subject.send( method, price: 5, title: 'Skyrim' ).should be_a( Opium::Model::Criteria )
         end
@@ -124,6 +124,16 @@ describe Opium::Model::Queryable do
     it_should_behave_like 'an aliased method', :and, :where
     it_should_behave_like 'an aliased method', :all_in, :all
     it_should_behave_like 'an aliased method', :any_in, :in
+    
+    describe '.all' do
+      context 'when no parameter is given' do
+        let(:result) { subject.all }
+        
+        it { expect { result }.to_not raise_exception }
+        it { expect( result ).to be_a Opium::Model::Criteria }
+        it { expect( result ).to eq subject.criteria }
+      end
+    end
         
     describe ':exists' do
       it 'should return a criteria' do

data/spec/opium/model_spec.rb

@@ -23,6 +23,7 @@ describe Opium::Model do
   it { is_expected.to be <= Opium::Model::Scopable }
   it { is_expected.to be <= Opium::Model::Findable }
   it { is_expected.to be <= Opium::Model::Inheritable }
+  it { is_expected.to be <= Opium::Model::Batchable }
     
   describe '#inspect' do
     context 'within a blank model' do

data/spec/opium_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
 describe Opium do
-  its(:constants) { should include( :Model ) }
+  it { expect( described_class.constants ).to include( :Model, :User, :File, :Config ) }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opium
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Joshua Bowers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,6 +220,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: mimemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: Provides an intuitive, Mongoid-inspired mapping layer between your application's
   object space and Parse.
 email:
@@ -231,6 +245,7 @@ files:
 - ".coveralls.yml"
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -258,10 +273,15 @@ files:
 - lib/opium/extensions/pointer.rb
 - lib/opium/extensions/regexp.rb
 - lib/opium/extensions/string.rb
+- lib/opium/extensions/symbol.rb
 - lib/opium/extensions/time.rb
 - lib/opium/extensions/true_class.rb
+- lib/opium/file.rb
 - lib/opium/model.rb
 - lib/opium/model/attributable.rb
+- lib/opium/model/batchable.rb
+- lib/opium/model/batchable/batch.rb
+- lib/opium/model/batchable/operation.rb
 - lib/opium/model/callbacks.rb
 - lib/opium/model/connectable.rb
 - lib/opium/model/criteria.rb
@@ -295,8 +315,13 @@ files:
 - spec/opium/extensions/pointer_spec.rb
 - spec/opium/extensions/regexp_spec.rb
 - spec/opium/extensions/string_spec.rb
+- spec/opium/extensions/symbol_spec.rb
 - spec/opium/extensions/time_spec.rb
+- spec/opium/file_spec.rb
 - spec/opium/model/attributable_spec.rb
+- spec/opium/model/batchable/batch_spec.rb
+- spec/opium/model/batchable/operation_spec.rb
+- spec/opium/model/batchable_spec.rb
 - spec/opium/model/callbacks_spec.rb
 - spec/opium/model/connectable_spec.rb
 - spec/opium/model/criteria_spec.rb
@@ -327,7 +352,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -354,8 +379,13 @@ test_files:
 - spec/opium/extensions/pointer_spec.rb
 - spec/opium/extensions/regexp_spec.rb
 - spec/opium/extensions/string_spec.rb
+- spec/opium/extensions/symbol_spec.rb
 - spec/opium/extensions/time_spec.rb
+- spec/opium/file_spec.rb
 - spec/opium/model/attributable_spec.rb
+- spec/opium/model/batchable/batch_spec.rb
+- spec/opium/model/batchable/operation_spec.rb
+- spec/opium/model/batchable_spec.rb
 - spec/opium/model/callbacks_spec.rb
 - spec/opium/model/connectable_spec.rb
 - spec/opium/model/criteria_spec.rb