serpentine 0.1.0 → 0.1.1

data/test/integration/conditional_filters_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class IfFilterController < ApplicationController
+class InlineIfFilterController < ApplicationController
   filter_collection :by_key, :if => proc { |params| params[:monkey] }
 
   def index
@@ -18,6 +18,51 @@ class IfFilterController < ApplicationController
   end
 end
 
+class InlineIfFilterTest < ActionDispatch::IntegrationTest
+  def test_an_inline_if_conditional
+    User.create! :key => 1
+    User.create! :key => 2
+    User.create! :key => 3
+    User.create! :key => 4
+
+    get '/inline_if_filter/index', :keys => %w(1 2 3), :monkey => true
+
+    assert_response :success
+
+    keys = JSON.parse response.body
+    assert_equal %w(1 2 3), keys
+
+    get '/inline_if_filter/index', :keys => %w(1 2 3)
+
+    assert_response :success
+
+    keys = JSON.parse response.body
+    assert_equal %w(1 2 3 4), keys
+  end
+end
+
+class IfFilterController < ApplicationController
+  filter_collection :by_key, :if => :monkey?
+
+  def index
+    apply_scopes!
+
+    render_results
+  end
+
+  def collection
+    @collection ||= User.scoped
+  end
+
+  def monkey?
+    params[:monkey]
+  end
+
+  def by_key
+    collection.where :key => params[:keys]
+  end
+end
+
 class IfFilterTest < ActionDispatch::IntegrationTest
   def test_an_if_conditional
     User.create! :key => 1
@@ -41,7 +86,7 @@ class IfFilterTest < ActionDispatch::IntegrationTest
   end
 end
 
-class UnlessFilterController < ApplicationController
+class InlineUnlessFilterController < ApplicationController
   filter_collection :by_key, :unless => proc { |params| params[:skip_filters] }
 
   def index
@@ -59,6 +104,51 @@ class UnlessFilterController < ApplicationController
   end
 end
 
+class InlineUnlessFilterTest < ActionDispatch::IntegrationTest
+  def test_an_inline_unless_conditional
+    User.create! :key => 1
+    User.create! :key => 2
+    User.create! :key => 3
+    User.create! :key => 4
+
+    get '/inline_unless_filter/index', :keys => %w(1 2 3)
+
+    assert_response :success
+
+    keys = JSON.parse response.body
+    assert_equal %w(1 2 3), keys
+
+    get '/inline_unless_filter/index', :keys => %w(1 2 3), :skip_filters => true
+
+    assert_response :success
+
+    keys = JSON.parse response.body
+    assert_equal %w(1 2 3 4), keys
+  end
+end
+
+class UnlessFilterController < ApplicationController
+  filter_collection :by_key, :unless => :skip_filters?
+
+  def index
+    apply_scopes!
+
+    render_results
+  end
+
+  def collection
+    @collection ||= User.scoped
+  end
+
+  def skip_filters?
+    params[:skip_filters]
+  end
+
+  def by_key
+    collection.where :key => params[:keys]
+  end
+end
+
 class UnlessFilterTest < ActionDispatch::IntegrationTest
   def test_an_unless_conditional
     User.create! :key => 1

data/test/test_helper.rb

@@ -20,8 +20,4 @@ class ApplicationController
   def render_results
     render :json => collection.map(&:key)
   end
-
-  def collection=(value)
-    @collection = value
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serpentine
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1826887560178753735
+      hash: 1741723546611922369
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1826887560178753735
+      hash: 1741723546611922369
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24