where_conditioner 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cadede51475344b93a3d88c4220b047430a5668a
-  data.tar.gz: 386286509e4c3fee25ec8b5c5b5ea39b14aca939
+  metadata.gz: 4413174ed2b12c678a7961447406a1af1bc9be81
+  data.tar.gz: 5daab752c7324355971f1847001096273a02fd08
 SHA512:
-  metadata.gz: 0c81ade509e725b5e2c1a22fb0eac3572f522c3e33a9efed92c96ccca2d41e50141c23b30c2b1aadf4ff35d8006fe368a2c91ef7f229467201a7530dc472ee53
-  data.tar.gz: ac5d175acabfb3722c2287d6aa1eade21ee40733c63d593d0dae1d9b08318b85ed0789cb9592b1ae0d4dd4bb9c3cfe17c820aeecab21ba566aaeb8ce95f85085
+  metadata.gz: f0549831f127959ebaaf0fc2be5da7e730c9546ea8c35f2a2591a280f9c24cc7b497818d9cb1cbdab715c5f8b94983f110dc2c27d6deecee130fba37ffb7eb64
+  data.tar.gz: 92eb7f6550cd9023da4a7279aaf910c2b3cdb374e00cfee6599de3f5586ca0e4cb61de1a203350396613a1d6e11fde4d031a15ed240571d53e8d25dc8b640cf3

data/lib/where_conditioner.rb

@@ -25,9 +25,9 @@ module WhereConditioner
   end
 
   def elsif condition, &block
-    result = conditional (!@last_condition && condition), &block
-    @last_condition = condition
-    result
+    condition &&= !@last_condition # falsify condition if an "if" or "elsif" branch has already succeeded
+    @last_condition ||= condition  # @last_condition is true if at least one branch has succeeded, including this elsif
+    conditional condition, &block
   end
 
   def where_if_present *args    

data/spec/lib/where_conditioner_spec.rb

@@ -169,6 +169,22 @@ describe WhereConditioner do
           relation.if(true).foo.elsif(false).bar.baz
         end
       end
+
+      context 'with multiple elsifs' do
+        it 'passes method calls to relation' do
+          expect(relation).to receive(:foo).and_return(relation)
+          expect(relation).to receive(:bar)
+          relation.if(true).foo.elsif(false).bad.elsif(true).other_bad.else.really_bad.bar
+        end
+      end
+
+      context 'with an else clause' do
+        it 'passes method calls to relation' do
+          expect(relation).to receive(:foo).and_return(relation)
+          expect(relation).to receive(:bar)
+          relation.if(true).foo.elsif(false).bad.elsif(false).other_bad.else.really_bad.bar
+        end
+      end
     end
 
     context 'with a block' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: where_conditioner
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Tony Novak
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord