embark-journey 0.0.29 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 682ec526295c2a46036e0c2abcaa6bf168858d82
-  data.tar.gz: a6fe8cb59c20f5f6176bae2f6603f86c1d25533f
+  metadata.gz: 1b89e8bfb66ca4c4f356545376aef856f05f56b6
+  data.tar.gz: c06e140222c70b4b2565f754c8ec18e737cfe1d0
 SHA512:
-  metadata.gz: 66ec3d2cd6f012433c946b427fbbb1cbabf21e5d03bd391ef9be40b7aa2791e900fcbe328d528f3a8294bac84f9451bf9a8bb757342728ce9cff64f516d9a9b1
-  data.tar.gz: 6402734a0ec6526072607c5501984b417490d00f65622b6b6a3887adea5f547f7aad59226dc49b7f3073bf723849c186cf05ec80771f781cd060b14ae6d708ab
+  metadata.gz: b30f45baab6f77c47c0acb08796d4dc38758db834b43beb159cc4bffdb768723d81bf54b62fa34157e5bd6fe33e83b7197c047a7a6ff21a6c1e407db78f9db86
+  data.tar.gz: fbcf3ed97258b645618e9d8723d4cd34215ccb7827f4544a4ecf02de07b9cb64205b13b7b222b0a36b60842c6ec91f30828e5636059bb286b83e310f2f4f364a

data/lib/journey/resource/where_multiple.rb

@@ -21,7 +21,7 @@ module Journey::Resource::WhereMultiple
         end.map(&:to_a).sum
 
       else
-        where(clauses)
+        where(clauses.merge(query: query))
       end
     end
   end

data/lib/journey/version.rb

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

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

@@ -15,7 +15,7 @@ describe Journey::Resource::WhereMultiple do
 
   before { klass.destroy_all }
 
-  let(:candidates) { matchables + unmatchables }
+  let!(:candidates) { matchables + unmatchables }
 
   context "when query doesn't contain any key having an array-like value" do
     let(:matchables) do
@@ -25,7 +25,7 @@ describe Journey::Resource::WhereMultiple do
       [ klass.create(number: 'X') ]
     end
 
-    let(:collection) { klass.where_multiple(query: { number: 'A' }) }
+    let!(:collection) { klass.where_multiple(query: { number: 'A' }) }
 
     it 'returns correct results' do
       expect(matchables).to be_all do |matchable|
@@ -39,6 +39,35 @@ describe Journey::Resource::WhereMultiple do
     pending 'performs 1 query'
   end
 
+  context "when query contains a key with the value of an array containing a single item" do
+
+    let(:matchables) do
+      [
+        klass.create(number: 'A')
+      ]
+    end
+    let(:unmatchables) do
+      [
+        klass.create(number: 'B')
+      ]
+    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
+      expect(unmatchables).not_to be_any do |unmatchable|
+        collection.include?(unmatchable)
+      end
+    end
+
+    pending 'performs n queries'
+
+  end
+
   context "when query contains one key having an array-like value" do
 
     let(:matchables) do
@@ -54,7 +83,7 @@ describe Journey::Resource::WhereMultiple do
       ]
     end
 
-    let(:collection) { klass.where_multiple(query: { number: ['A', 'B'] }) }
+    let!(:collection) { klass.where_multiple(query: { number: ['A', 'B'] }) }
 
     it 'returns correct results' do
       expect(matchables).to be_all do |matchable|
@@ -88,7 +117,7 @@ describe Journey::Resource::WhereMultiple do
       ]
     end
 
-    let(:collection) { klass.where_multiple(query: { number: ['A', 'B'], flash_number: ['1', '2'] }) }
+    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|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embark-journey
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.1.0
 platform: ruby
 authors:
 - Dan Davey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr