opium 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be31fe012527b39345bdd8e4977074bcbb628b0e
-  data.tar.gz: 6765d23444bdc1cff577c6cbc153fcd9ed44ea00
+  metadata.gz: afcd218c0464f3b8a8b47c9f3203007f78a3096c
+  data.tar.gz: 899c86f06d5e7b5ff90e4fe24573964a0f4dc1f7
 SHA512:
-  metadata.gz: 376965c434078ecb12f2b4b27550c49e7040b42eddbaf4c7e749385328ecccb157f31eb3c2405fee5ec8f1fd9ea4f58d09f531029bd1175f1887d074ff79b641
-  data.tar.gz: 8b6ff96b019e20a0a8436e72c211ea29657b721fdc98190208346d714f972fe6859a12b697382629e4e37814fa97a9971a753ce1399931af3785fd37a362008d
+  metadata.gz: aac084bb325da3d6b1bb5458c4c63cbf39e811daa97c3d06a48e96951937ac18d7b9af9b0b18d47b3cf5caa16574fba50d7412937516b99d704010ef43e689d9
+  data.tar.gz: 3deaf7216912daad377f38e4a4dd34afbf9d8be1c49cbe6b142a904d8558e7ba6905a350b7a12e3df9ae0bc8f546eca60a8e6f2bb60214bc76e736817e36a282

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.5.1
+### Resolved Issues
+- Model::Criteria should now respond to #size correctly.
+
 ## 1.5.0
 ### New Features
 - Opium will now work with ActiveModel 5.* going forward. Use a version before 1.5 if ActiveModel 4.* compatibility is needed. As a side-effect, supported rubies moves to anything above 2.2.2

data/lib/opium/model/criteria.rb

@@ -3,73 +3,73 @@ module Opium
     class Criteria
       include Opium::Model::Queryable::ClassMethods
       include Enumerable
-      
+
       class_attribute :models
       self.models = {}.with_indifferent_access
-      
+
       def initialize( model_name )
         @model_name = model_name.respond_to?(:name) ? model_name.name : model_name
         constraints[:count] = 1
       end
-      
+
       attr_reader :model_name
-      
+
       def to_partial_path
         model._to_partial_path
       end
-      
+
       def model
         models[model_name] ||= model_name.constantize
       end
-      
+
       def chain
         Marshal.load( Marshal.dump( self ) ).tap {|m| m.instance_variable_set( :@cache, nil )}
       end
-      
+
       def constraints
         @constraints ||= {}.with_indifferent_access
       end
-      
+
       def update_constraint( constraint, value )
         chain.tap {|c| c.update_constraint!( constraint, value )}
       end
-      
+
       def update_constraint!( constraint, value )
         update_hash_value :constraints, constraint, value
       end
-      
+
       def constraints?
         !constraints.except(:count).empty?
       end
-      
+
       def variables
         @variables ||= {}.with_indifferent_access
       end
-      
+
       def update_variable( variable, value )
         chain.tap {|c| c.update_variable!( variable, value )}
       end
-      
+
       def update_variable!( variable, value )
         update_hash_value :variables, variable, value
       end
-      
+
       def variables?
         !variables.empty?
       end
-      
+
       def empty?
         count == 0
       end
-      
+
       def criteria
         self
       end
-      
+
       def ==( other )
         other.is_a?( self.class ) && self.model_name == other.model_name && self.constraints == other.constraints && self.variables == other.variables
       end
-      
+
       def each(&block)
         if !block_given?
           to_enum(:each)
@@ -88,34 +88,35 @@ module Opium
           end
         end
       end
-            
+
       def inspect
         inspected_constraints = constraints.map {|k, v| [k, v.inspect].join(': ')}.join(', ')
         inspected_constraints.prepend ' ' if inspected_constraints.size > 0
         "#<#{ self.class.name }<#{ model_name }>#{ inspected_constraints }>"
       end
-      
+
       def to_parse
         {}.with_indifferent_access.tap do |result|
           result[:query] = { where: constraints[:where], className: model_name } if constraints[:where]
           result[:key] = constraints[:keys] if constraints[:keys]
         end
       end
-      
+
       def uncache
         super.tap do |criteria|
           criteria.instance_variable_set(:@cache, nil)
         end
       end
-      
+
       def total_count
         count && variables[:total_count]
       end
-      
+
+      alias_method :size, :total_count
       alias_method :to_ary, :to_a
-      
+
       private
-      
+
       def update_hash_value( hash_name, key, value )
         hash = self.send( hash_name )
         if hash[key].nil? || !value.is_a?(Hash)
@@ -126,4 +127,4 @@ module Opium
       end
     end
   end
-end
+end

data/lib/opium/version.rb

@@ -1,3 +1,3 @@
 module Opium
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/spec/opium/model/criteria_spec.rb

@@ -6,10 +6,10 @@ describe Opium::Model::Criteria do
       include Opium::Model
       field :title, type: String
       field :price, type: Float
-      
+
       stub('model_name').and_return(ActiveModel::Name.new(klass, nil, 'Game'))
     end )
-    
+
     stub_request( :get, 'https://api.parse.com/1/classes/Game?count=1' ).with( body: {} ).
       to_return( status: 200, headers: { 'Content-Type' => 'application/json' }, body: {
         count: 10,
@@ -19,13 +19,13 @@ describe Opium::Model::Criteria do
         ]
       }.to_json )
   end
-  
+
   after do
     Opium::Model::Criteria.models.clear
   end
-  
+
   subject { Opium::Model::Criteria.new( 'Object' ) }
-  
+
   it { is_expected.to be_a( Opium::Model::Queryable::ClassMethods ) }
   it { is_expected.to be_an( Enumerable ) }
   it { is_expected.to respond_to( :chain ) }
@@ -37,9 +37,9 @@ describe Opium::Model::Criteria do
   it { is_expected.to respond_to( :to_parse ) }
   it { is_expected.to respond_to( :each ) }
   it { is_expected.to respond_to( :to_a, :to_ary ) }
-  it { is_expected.to respond_to( :count, :total_count ) }
+  it { is_expected.to respond_to( :count, :total_count, :size ) }
   it { is_expected.to respond_to( :to_partial_path ) }
-  
+
   describe '#chain' do
     it 'returns a copy of the object' do
       result = subject.chain
@@ -48,8 +48,8 @@ describe Opium::Model::Criteria do
       result.should_not equal( subject )
     end
   end
-  
-  describe '#update_constraint' do    
+
+  describe '#update_constraint' do
     it 'chains the criteria and alter the specified constraint on the copy' do
       result = subject.update_constraint( :order, ['title', 1] )
       result.should be_a( Opium::Model::Criteria )
@@ -58,20 +58,20 @@ describe Opium::Model::Criteria do
       result.constraints.should have_key( :order )
       result.constraints[:order].should == ['title', 1]
     end
-    
+
     it 'merges hash-valued constraints' do
       subject.constraints['where'] = { score: { '$lte' => 321 } }
       result = subject.update_constraint( 'where', price: { '$gte' => 123 } )
       result.constraints['where'].should =~ { 'score' => { '$lte' => 321 }, 'price' => { '$gte' => 123 } }
     end
-    
+
     it 'deep merges hash-valued constraints' do
       subject.constraints['where'] = { score: { '$lte' => 321 } }
       result = subject.update_constraint( 'where', score: { '$gte' => 123 } )
       result.constraints['where'].should =~ { 'score' => { '$lte' => 321, '$gte' => 123 } }
     end
   end
-  
+
   describe '#update_variable' do
     it 'chains the criteria and alter the specified instance variable on the copy' do
       result = subject.update_variable( :cache, true )
@@ -83,136 +83,136 @@ describe Opium::Model::Criteria do
       result.variables[:cache].should == true
     end
   end
-  
+
   describe '#==' do
     let( :first ) { Opium::Model::Criteria.new( 'Object' ).update_constraint( :order, ['title', 1] ) }
     let( :second ) { Opium::Model::Criteria.new( 'Object' ).update_constraint( :order, ['title', 1] ) }
-    
+
     it 'should not affect :equal?' do
       first.should_not equal( second )
     end
-    
+
     it 'is based on the criteria constraints' do
       first.should == second
     end
-    
+
     it 'is based on the criteria variables' do
       third = first.update_variable( :cache, true )
       second.should_not == third
     end
   end
-  
+
   describe '#criteria' do
     subject { Opium::Model::Criteria.new( 'Object' ).update_constraint( :order, ['title', 1] ) }
-    
+
     it 'is == to self' do
       subject.criteria.should == subject
     end
-    
+
     it 'is not a duplicate of self' do
       subject.criteria.should equal( subject )
     end
   end
-  
+
   describe '#model' do
     subject { Opium::Model::Criteria.new( 'Game' ) }
-    
+
     it 'is the constantized version of :model_name' do
       subject.model_name.should == 'Game'
       subject.model.should == Game
     end
   end
-  
+
   describe '#empty?' do
     before do
       stub_request(:get, "https://api.parse.com/1/classes/Game?count=1&where=%7B%22price%22:%7B%22$gte%22:9000.0%7D%7D").
         to_return(
-          status: 200, 
+          status: 200,
           body: {
             count: 0,
             results: []
-          }.to_json, 
+          }.to_json,
           headers: { content_type: 'application/json' }
         )
     end
-    
+
     subject { Game.criteria }
-    
+
     it { expect { subject.empty? }.to_not raise_exception }
     it do
       expect( subject ).to receive(:count).once.and_call_original
       subject.empty?
     end
-    
+
     it 'returns true if count is 0' do
       subject.gte( price: 9000.0 ).empty?.should == true
     end
-    
+
     it 'returns false if count is not 0' do
       subject.criteria.empty? == false
     end
   end
-  
+
   describe '#constraints?' do
     it 'returns true if count is not the only constraint' do
       Game.limit( 10 ).constraints?.should == true
     end
-    
+
     it 'returns false if count is the only constraint' do
       Game.criteria.constraints?.should == false
     end
   end
-  
+
   describe '#each' do
     subject { Game.criteria }
-    
+
     context 'without a block' do
       it 'returns an Enumerator' do
         subject.each.should be_a( Enumerator )
       end
     end
-    
+
     context 'with a block' do
       it "calls its :model's :http_get" do
         subject.model.should receive(:http_get).with(query: subject.constraints)
         subject.each {|model| }
       end
-      
+
       it 'yields to its block any results it finds' do
         expect {|b| subject.each &b }.to yield_control.twice
       end
-      
+
       it 'yields to its block Opium::Model objects (Game in context)' do
         expect {|b| subject.each &b }.to yield_successive_args(Opium::Model, Opium::Model)
         expect {|b| subject.each &b }.to yield_successive_args(Game, Game)
       end
-      
+
       it "calls its :model's :http_get when counting" do
         subject.model.should receive(:http_get).with(query: subject.constraints).twice
         subject.each {|model| }
         subject.each.count
       end
     end
-    
+
     context 'when #cached?' do
       subject { Game.criteria.cache }
-      
+
       it 'calls its :model\'s :http_get only once' do
         subject.model.should receive(:http_get).with(query: subject.constraints).once
         subject.each {|model| }
         subject.each {|model| }
       end
-      
+
       it 'yields to its block any results it finds' do
         expect {|b| subject.each &b }.to yield_control.twice
         expect {|b| subject.each &b }.to yield_control.twice
       end
-      
+
       it 'yields to its block Opium::Model objects (Game in context)' do
         expect {|b| subject.each &b }.to yield_successive_args(Opium::Model, Opium::Model)
         expect {|b| subject.each &b }.to yield_successive_args(Game, Game)
       end
-      
+
       it "does not call its :model's :http_get when counting" do
         subject.model.should receive(:http_get).with(query: subject.constraints).once
         subject.each {|model| }
@@ -220,62 +220,76 @@ describe Opium::Model::Criteria do
       end
     end
   end
-  
+
   describe '#uncache' do
     subject { Game.criteria.cache }
-    
+
     it 'causes #each to call its :model\'s :http_get twice' do
       subject.model.should receive(:http_get).with(query: subject.constraints).twice
       subject.each {|model| }
       subject.uncache.each {|model| }
     end
-    
+
     it 'deletes its @cache' do
       subject.each {|model| }
       subject.uncache.instance_variable_get(:@cache).should be_nil
     end
   end
-  
+
   describe '#count' do
     subject { Game.criteria }
-    
+
     it { expect { subject.count }.to_not raise_exception }
     it do
       expect( subject ).to receive(:each).and_call_original
       subject.count
     end
-    
+
     it 'equals the number of items from #each' do
       expect( subject.count ).to be == 2
     end
   end
-  
+
   describe '#total_count' do
     subject { Game.criteria }
-    
+
     it { expect { subject.total_count }.to_not raise_exception }
     it do
       expect( subject ).to receive(:each).and_call_original
       subject.total_count
     end
-    
+
     it "equals the 'count' result returned from parse" do
       expect( subject.total_count ).to be == 10
     end
   end
-    
+
+  describe '#size' do
+    subject { Game.criteria }
+
+    it { expect { subject.size }.to_not raise_exception }
+    it do
+      expect( subject ).to receive(:each).and_call_original
+      subject.size
+    end
+
+    it "equals the 'count' result returned from parse" do
+      expect( subject.size ).to be == 10
+    end
+  end
+
   describe '#to_parse' do
     subject { Game.criteria }
-    
+
     it { expect( subject.to_parse ).to be_a( Hash ) }
-    
+
     it 'has a "query" key, if a "where" constraint exists, containing a "where" and a "className"' do
       Game.between( price: 5..10 ).to_parse.tap do |criteria|
         criteria.should have_key( 'query' )
         criteria['query'].should =~ { 'where' => { 'price' => { '$gte' => 5, '$lte' => 10 } }, 'className' => 'Game' }
       end
     end
-    
+
     it 'should have a "key" key, if a "keys" constraint exists' do
       Game.keys( :price ).to_parse.tap do |criteria|
         criteria.should have_key( 'key' )
@@ -283,14 +297,14 @@ describe Opium::Model::Criteria do
       end
     end
   end
-  
+
   describe '#to_partial_path' do
     subject { Game.criteria }
-    
+
     it { expect { subject.to_partial_path }.to_not raise_exception }
-    
+
     it 'comes from the model class' do
       expect( subject.to_partial_path ).to eq 'games/game'
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opium
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Joshua Bowers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler