embark-journey 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be545fab222f3f8b7ba132b398f1939493884720
-  data.tar.gz: adeec5bc879a5ace33102a3306c1c3fa964d14bc
+  metadata.gz: 6ac4ef34c6325ea06821366e826642336cb034da
+  data.tar.gz: ee74a230579f1b2255337666865eaa36c213c2b0
 SHA512:
-  metadata.gz: cdc71dea35635846aa89f5020c51eecb6571885fdeb3c190208a609b577809183fb62b4407a881a7a7f60aa437721cab115815f509626b1deba98a3a3a7729f4
-  data.tar.gz: a2421076bf07010f27daa861efd57d852aef0b9b61d461586ff798d3dc680d40766cb441b5447753382ad5d666e5d9d376440141add2fc4d8b849bbded3632f3
+  metadata.gz: aa2e19dda566ce02bd7bacd08896fb84485f4a4765dbc0eb25e31f5be66575fd647a14d35bda4c3be7e12244f2f940e7852c480f464d6981cc4aeff85642ca85
+  data.tar.gz: 4f7f5faab4299bb09cb9643d991d95f8cf5ef3c79cf4f34a55ed53e9921e5c36a139602ad0f7fc8eda186de7ae564a8202e328a2ff1b5120950da58f4ce0fdfa

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+v.0.1.3
+- Added `batch_where` to account for massive queries timing out (e.g. 10k objects)
+
 v0.0.21
 - stomped out Rails load order bug by copying over entire Connection class (hacky)
 

data/lib/journey/resource.rb

@@ -44,6 +44,7 @@ require 'journey/resource/enum_sets'
 require 'journey/resource/queries'
 require 'journey/resource/search'
 require 'journey/resource/where_multiple'
+require 'journey/resource/batch_where'
 
 class Journey::Resource
   include API
@@ -56,6 +57,7 @@ class Journey::Resource
   include Queries
   include Search
   include WhereMultiple
+  include BatchWhere
 end
 
 

data/lib/journey/resource/batch_where.rb

@@ -0,0 +1,24 @@
+require 'active_support/concern'
+
+module Journey::Resource::BatchWhere
+  extend ActiveSupport::Concern
+
+  included do
+
+    def self.batch_where(clauses, batch_size=100)
+
+      total_count = count(clauses)
+      query_count = (total_count / batch_size.to_f).ceil.to_i
+
+      (0 ... query_count).to_a.map do |batch_index|
+
+        where_multiple clauses.merge({
+          limit: batch_size,
+          skip: batch_index * batch_size
+        })
+
+      end.flatten
+    end
+
+  end
+end

data/lib/journey/version.rb

@@ -2,7 +2,7 @@ module Journey
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 3
     PRE   = nil
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/spec/models/journey/resource/batch_where_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Journey::Resource::BatchWhere do
+
+  let(:klass) do
+    Class.new(Journey::Resource) do
+      self.element_name = 'technician'
+    end
+  end
+
+  let(:surname) { SecureRandom.uuid }
+  let(:batch_size) { 2 }
+
+  let!(:objects) do
+    (1..5).to_a.map do |index|
+      klass.create(name: index, surname: surname)
+    end
+  end
+
+  it 'returns the correct resources' do
+    candidates = klass.batch_where({ query: { surname: surname } }, batch_size)
+    expect(objects).to eq candidates
+  end
+
+  it 'makes multiple queries' do
+    expect(klass).to receive(:where_multiple).exactly(3).times
+    klass.batch_where({ query: { surname: surname } }, batch_size)
+  end
+
+end

data/spec/models/journey/resource/where_multiple_spec.rb

@@ -5,15 +5,10 @@ describe Journey::Resource::WhereMultiple do
   let(:klass) do
     Class.new(Journey::Resource) do
       self.element_name = 'job'
-
-      def self.destroy_all
-        all.each(&:destroy)
-      end
     end
   end
 
-
-  before { klass.destroy_all }
+  before { klass.all.each(&:destroy) }
 
   let!(:candidates) { matchables + unmatchables }
   let(:collection) { klass.where_multiple(clauses) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embark-journey
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Dan Davey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -152,6 +152,7 @@ files:
 - lib/journey/resource/api.rb
 - lib/journey/resource/attachments.rb
 - lib/journey/resource/attribute_loading.rb
+- lib/journey/resource/batch_where.rb
 - lib/journey/resource/count.rb
 - lib/journey/resource/embed.rb
 - lib/journey/resource/enum_sets.rb
@@ -164,6 +165,7 @@ files:
 - spec/models/journey/configuration_spec.rb
 - spec/models/journey/oplog_spec.rb
 - spec/models/journey/resource/attachments_spec.rb
+- spec/models/journey/resource/batch_where_spec.rb
 - spec/models/journey/resource/where_multiple_spec.rb
 - spec/models/journey/resource_spec.rb
 - spec/spec_helper.rb
@@ -199,6 +201,7 @@ test_files:
 - spec/models/journey/configuration_spec.rb
 - spec/models/journey/oplog_spec.rb
 - spec/models/journey/resource/attachments_spec.rb
+- spec/models/journey/resource/batch_where_spec.rb
 - spec/models/journey/resource/where_multiple_spec.rb
 - spec/models/journey/resource_spec.rb
 - spec/spec_helper.rb