where_conditioner 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cbdd592512b031ccd2c5d372c5c523e2397d361
-  data.tar.gz: 33e5d99969813c2ec9bb10e986f62e96a79b27b7
+  metadata.gz: c44ce09a4fe3727fe41e7db71d8dc99635964804
+  data.tar.gz: 8ee269cec9b22ef62b15669b4b61a1f4ed03aeee
 SHA512:
-  metadata.gz: dbcb4cc8993e3188161690f895a3ac38ac39212172370b8d656fd6290de211e3026a704036c0ad2188537ab9e540d685bda2b8f55145cc1509ad60c34a5fb806
-  data.tar.gz: fa8d21e6d95897283363f2713d17c0b37815c6b3d51895879658859ca4aa82e53c03b0870db63a1f171c57685b3395725a27e4d53912776aa46fc9a39f032a44
+  metadata.gz: c266e1cb927721587d933c59b39461acffa37c854052d45785cb2e5899a55b8d091157ed275bf3ea7965539b65df433f4f29433d9efefd80dfc97b69fb88403c
+  data.tar.gz: 8797fabf41f090281b204ed1df708f76458334ae49ec23e44595c914f120765c410a7c0b620e5b2dccb44ff294e353960715722046c6ab2738de709f394dda3d

data/lib/where_conditioner.rb

@@ -24,6 +24,12 @@ module WhereConditioner
     conditional !@last_condition, &block
   end
 
+  def elsif condition, &block
+    result = conditional (!@last_condition && condition), &block
+    @last_condition = condition
+    result
+  end
+
   def where_if_present *args    
     if Hash === args.first && args.length == 1
       hash = args.first.compact

data/spec/lib/where_conditioner_spec.rb

@@ -132,4 +132,70 @@ describe WhereConditioner do
       end
     end
   end
+
+  describe '#elsif' do
+    context 'chained' do
+      context 'with true, true condition' do
+        it 'passes method calls to relation' do
+          expect(relation).to receive(:foo).and_return(relation)
+          expect(relation).to receive(:baz)
+          relation.if(true).foo.elsif(true).bar.baz
+        end
+      end
+
+      context 'with false, true condition' do
+        it 'passes method calls to relation' do
+          expect(relation).to receive_message_chain(:bar, :baz)
+          relation.if(false).foo.elsif(true).bar.baz
+        end
+      end
+
+      context 'with false, false condition' do
+        it 'passes method calls to relation' do
+          expect(relation).to receive(:baz)
+          relation.if(false).foo.elsif(false).bar.baz
+        end
+      end
+
+      context 'with true, false condition' do
+        it 'passes method calls to relation' do
+          expect(relation).to receive(:foo).and_return(relation)
+          expect(relation).to receive(:baz)
+          relation.if(true).foo.elsif(false).bar.baz
+        end
+      end
+    end
+
+    context 'with a block' do
+      context 'with true, true condition' do
+        it 'passes method calls to relation' do
+          expect(relation).to receive(:foo).and_return(relation)
+          expect(relation).to receive(:moop)
+          relation.if(true).foo.elsif(true) { bar.baz }.moop
+        end
+      end
+
+      context 'with false, true condition' do
+        it 'passes method calls to relation' do
+          expect(relation).to receive_message_chain(:bar, :baz, :moop)
+          relation.if(false).foo.elsif(true) { bar.baz }.moop
+        end
+      end
+
+      context 'with false, false condition' do
+        it 'passes method calls to relation' do
+          expect(relation).to receive(:moop)
+          relation.if(false).foo.elsif(false) { bar.baz }.moop
+        end
+      end
+
+      context 'with true, false condition' do
+        it 'passes method calls to relation' do
+          expect(relation).to receive(:foo).and_return(relation)
+          expect(relation).to receive(:moop)
+          relation.if(true).foo.elsif(false) { bar.baz }.moop
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: where_conditioner
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tony Novak
+- Jonathan Aizen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -71,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Where Conditioner