embark-journey 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b89e8bfb66ca4c4f356545376aef856f05f56b6
-  data.tar.gz: c06e140222c70b4b2565f754c8ec18e737cfe1d0
+  metadata.gz: be545fab222f3f8b7ba132b398f1939493884720
+  data.tar.gz: adeec5bc879a5ace33102a3306c1c3fa964d14bc
 SHA512:
-  metadata.gz: b30f45baab6f77c47c0acb08796d4dc38758db834b43beb159cc4bffdb768723d81bf54b62fa34157e5bd6fe33e83b7197c047a7a6ff21a6c1e407db78f9db86
-  data.tar.gz: fbcf3ed97258b645618e9d8723d4cd34215ccb7827f4544a4ecf02de07b9cb64205b13b7b222b0a36b60842c6ec91f30828e5636059bb286b83e310f2f4f364a
+  metadata.gz: cdc71dea35635846aa89f5020c51eecb6571885fdeb3c190208a609b577809183fb62b4407a881a7a7f60aa437721cab115815f509626b1deba98a3a3a7729f4
+  data.tar.gz: a2421076bf07010f27daa861efd57d852aef0b9b61d461586ff798d3dc680d40766cb441b5447753382ad5d666e5d9d376440141add2fc4d8b849bbded3632f3

data/lib/journey/resource/where_multiple.rb

@@ -24,6 +24,29 @@ module Journey::Resource::WhereMultiple
         where(clauses.merge(query: query))
       end
     end
+
+    def self.count_multiple(clauses)
+      # TODO refactor me to re-use all the same recursive query logic in `where_multiple`
+
+      query = clauses.delete(:query)
+      query_keys_with_array_values = query.map do |key, value|
+        key if value.is_a?(Array)
+      end.compact
+
+      if branch_key = query_keys_with_array_values.first
+        consistent_query = query.except(branch_key)
+        value_branches = query[branch_key]
+
+        value_branches.map do |value|
+          branch_query = consistent_query.merge(branch_key => value)
+          count_multiple(clauses.merge(query: branch_query))
+        end.sum
+
+      else
+        count(clauses.merge(query: query))
+      end
+
+    end
   end
 
 end

data/lib/journey/version.rb

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

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

@@ -16,8 +16,14 @@ describe Journey::Resource::WhereMultiple do
   before { klass.destroy_all }
 
   let!(:candidates) { matchables + unmatchables }
+  let(:collection) { klass.where_multiple(clauses) }
+  let(:count) { klass.count_multiple(clauses) }
 
   context "when query doesn't contain any key having an array-like value" do
+    let(:clauses) do
+      { query: { number: 'A' } }
+    end
+
     let(:matchables) do
       [ klass.create(number: 'A') ]
     end
@@ -25,7 +31,6 @@ describe Journey::Resource::WhereMultiple do
       [ klass.create(number: 'X') ]
     end
 
-    let!(:collection) { klass.where_multiple(query: { number: 'A' }) }
 
     it 'returns correct results' do
       expect(matchables).to be_all do |matchable|
@@ -36,11 +41,17 @@ describe Journey::Resource::WhereMultiple do
       end
     end
 
+    it 'counts correctly' do
+      expect(count).to eq 1
+    end
+
     pending 'performs 1 query'
   end
 
   context "when query contains a key with the value of an array containing a single item" do
-
+    let(:clauses) do
+      { query: { number: ['A'] }, sort: { number: :desc } }
+    end
     let(:matchables) do
       [
         klass.create(number: 'A')
@@ -52,10 +63,7 @@ describe Journey::Resource::WhereMultiple do
       ]
     end
 
-    let!(:collection) { klass.where_multiple(query: { number: ['A'] }, sort: { number: :desc }) }
-
     it 'returns correct results' do
-      collection
       expect(matchables).to be_all do |matchable|
         collection.include?(matchable)
       end
@@ -64,12 +72,18 @@ describe Journey::Resource::WhereMultiple do
       end
     end
 
+    it 'counts correctly' do
+      expect(count).to eq 1
+    end
+
     pending 'performs n queries'
 
   end
 
   context "when query contains one key having an array-like value" do
-
+    let(:clauses) do
+      { query: { number: ['A', 'B'] } }
+    end
     let(:matchables) do
       [
         klass.create(number: 'A'),
@@ -83,8 +97,6 @@ describe Journey::Resource::WhereMultiple do
       ]
     end
 
-    let!(:collection) { klass.where_multiple(query: { number: ['A', 'B'] }) }
-
     it 'returns correct results' do
       expect(matchables).to be_all do |matchable|
         collection.include?(matchable)
@@ -94,11 +106,18 @@ describe Journey::Resource::WhereMultiple do
       end
     end
 
+    it 'counts correctly' do
+      expect(count).to eq 2
+    end
+
     pending 'performs n queries'
   end
 
 
   context "when query contains two keys having array-like values" do
+    let(:clauses) do
+      { query: { number: ['A', 'B'], flash_number: ['1', '2'] } }
+    end
     let(:matchables) do
       [
         klass.create(number: 'A', flash_number: '1'),
@@ -117,8 +136,6 @@ describe Journey::Resource::WhereMultiple do
       ]
     end
 
-    let!(:collection) { klass.where_multiple(query: { number: ['A', 'B'], flash_number: ['1', '2'] }) }
-
     it 'returns correct results' do
       expect(matchables).to be_all do |matchable|
         collection.include?(matchable)
@@ -128,6 +145,10 @@ describe Journey::Resource::WhereMultiple do
       end
     end
 
+    it 'counts correctly' do
+      expect(count).to eq 4
+    end
+
     pending 'performs m * n queries'
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embark-journey
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dan Davey