embark-journey 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46babc42da1d1c930577a354fc7c2a5618802e8d
-  data.tar.gz: 7f4c9b046e632f974256b208ba5086296caa08e1
+  metadata.gz: 682ec526295c2a46036e0c2abcaa6bf168858d82
+  data.tar.gz: a6fe8cb59c20f5f6176bae2f6603f86c1d25533f
 SHA512:
-  metadata.gz: 77fedd260429ea7da42267e9c76851e2cf38695eaed140c500accb0ffaf98c4ebb22a19721566961a7d45530c057c3fefe64126c2f81ddbb1dc0eaea8f44396a
-  data.tar.gz: ef8171616a0a856a023809bfac96300ec481edcf64a4ef2e48892ab64f9148cb68db862bd6d159ce7981b4f2e00a145ae23f231147a492f2cadac2256d71c9e0
+  metadata.gz: 66ec3d2cd6f012433c946b427fbbb1cbabf21e5d03bd391ef9be40b7aa2791e900fcbe328d528f3a8294bac84f9451bf9a8bb757342728ce9cff64f516d9a9b1
+  data.tar.gz: 6402734a0ec6526072607c5501984b417490d00f65622b6b6a3887adea5f547f7aad59226dc49b7f3073bf723849c186cf05ec80771f781cd060b14ae6d708ab

data/lib/journey/resource.rb

@@ -43,6 +43,7 @@ require 'journey/resource/enums'
 require 'journey/resource/enum_sets'
 require 'journey/resource/queries'
 require 'journey/resource/search'
+require 'journey/resource/where_multiple'
 
 class Journey::Resource
   include API
@@ -54,6 +55,7 @@ class Journey::Resource
   include EnumSets
   include Queries
   include Search
+  include WhereMultiple
 end
 
 

data/lib/journey/resource/where_multiple.rb

@@ -0,0 +1,29 @@
+require 'active_support/concern'
+
+module Journey::Resource::WhereMultiple
+  extend ActiveSupport::Concern
+
+  included do
+    def self.where_multiple(clauses)
+
+      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)
+          where_multiple(clauses.merge(query: branch_query))
+        end.map(&:to_a).sum
+
+      else
+        where(clauses)
+      end
+    end
+  end
+
+end

data/lib/journey/version.rb

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

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

@@ -0,0 +1,106 @@
+require 'spec_helper'
+
+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 }
+
+  let(:candidates) { matchables + unmatchables }
+
+  context "when query doesn't contain any key having an array-like value" do
+    let(:matchables) do
+      [ klass.create(number: 'A') ]
+    end
+    let(:unmatchables) 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|
+        collection.include?(matchable)
+      end
+      expect(unmatchables).not_to be_any do |unmatchable|
+        collection.include?(unmatchable)
+      end
+    end
+
+    pending 'performs 1 query'
+  end
+
+  context "when query contains one key having an array-like value" do
+
+    let(:matchables) do
+      [
+        klass.create(number: 'A'),
+        klass.create(number: 'B')
+      ]
+    end
+    let(:unmatchables) do
+      [
+        klass.create(number: 'X'),
+        klass.create(number: 'Y')
+      ]
+    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)
+      end
+      expect(unmatchables).not_to be_any do |unmatchable|
+        collection.include?(unmatchable)
+      end
+    end
+
+    pending 'performs n queries'
+  end
+
+
+  context "when query contains two keys having array-like values" do
+    let(:matchables) do
+      [
+        klass.create(number: 'A', flash_number: '1'),
+        klass.create(number: 'A', flash_number: '2'),
+        klass.create(number: 'B', flash_number: '1'),
+        klass.create(number: 'B', flash_number: '2'),
+      ]
+    end
+    let(:unmatchables) do
+      [
+        klass.create(number: 'A', flash_number: '3'),
+        klass.create(number: 'B', flash_number: '3'),
+        klass.create(number: 'C', flash_number: '1'),
+        klass.create(number: 'C', flash_number: '2'),
+        klass.create(number: 'C', flash_number: '3'),
+      ]
+    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)
+      end
+      expect(unmatchables).not_to be_any do |unmatchable|
+        collection.include?(unmatchable)
+      end
+    end
+
+    pending 'performs m * n queries'
+  end
+
+
+end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'pry'
 require 'journey'
 
+Journey.logger = Logger.new('/dev/null')
 
 require 'dotenv'
 Dotenv.load

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embark-journey
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Dan Davey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -158,11 +158,13 @@ files:
 - lib/journey/resource/enums.rb
 - lib/journey/resource/queries.rb
 - lib/journey/resource/search.rb
+- lib/journey/resource/where_multiple.rb
 - lib/journey/version.rb
 - spec/models/journey/configurable_spec.rb
 - spec/models/journey/configuration_spec.rb
 - spec/models/journey/oplog_spec.rb
 - spec/models/journey/resource/attachments_spec.rb
+- spec/models/journey/resource/where_multiple_spec.rb
 - spec/models/journey/resource_spec.rb
 - spec/spec_helper.rb
 - spec/support/configuration_cache.rb
@@ -197,6 +199,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/where_multiple_spec.rb
 - spec/models/journey/resource_spec.rb
 - spec/spec_helper.rb
 - spec/support/configuration_cache.rb