remarkable_rails 3.0.7 → 3.0.8

data/CHANGELOG

@@ -1,3 +1,5 @@
+* Ensure set_cookies and set_session work with arrays [#55]
+
 * Added set_cookies matcher [#51]
 
 * Add a helper to declare that a XmlHttpRequest should be performed:

data/lib/remarkable_rails/action_controller/matchers/set_cookies_matcher.rb

@@ -15,14 +15,23 @@ module Remarkable
         #
         # On Rails 2.3.2:
         #
-        #   1. Convert :to values to string, unless it's nil
+        #   1. Return nil if nil, join when array or convert to string;
         #   2. Convert all keys to string.
         #
         before_assert do
-          if @subject.request.env.key?("rack.input")
-            @options[:to] = @options[:to].to_s if @options.key?(:to) && !@options[:to].nil?
-          else
-            @options[:to] = @options[:to] ? [@options[:to]] : [] if @options.key?(:to)
+          if @options.key?(:to)
+            if @subject.request.env.key?("rack.input")
+              @options[:to] = case @options[:to]
+                when nil
+                  nil
+                when Array
+                  @options[:to].join('&')
+                else
+                  @options[:to].to_s
+              end
+            else
+              @options[:to] = @options[:to] ? Array(@options[:to]) : []
+            end
           end
 
           @keys.collect!(&:to_s)

data/lib/remarkable_rails/action_controller/matchers/set_session_matcher.rb

@@ -44,7 +44,7 @@ module Remarkable
           #
           def is_equal_value?
             return true unless value_to_compare?
-            assert_contains(session[@key], @options[:to])
+            assert_contains([session[@key]], @options[:to])
           end
 
           def session

data/spec/action_controller/set_cookies_matcher_spec.rb

@@ -30,7 +30,7 @@ describe 'set_cookies' do
       @matcher.failure_message.should == 'Expected cookie user to be set, got {}'
     end
 
-    if RAILS_VERSION =~ /^2.1/ || RAILS_VERSION =~ /^2.2/
+    if RAILS_VERSION =~ /^2.(1|2)/
       it 'should set contains_value? message' do
         build_response { cookies[:user] = 10 }
         @matcher = set_cookies.to(1)
@@ -63,10 +63,11 @@ describe 'set_cookies' do
     before(:each) do
      build_response {
         cookies[:user]    = 'jose'
-        cookies[:address] = 'Avenue'
         cookies[:true]    = true
         cookies[:false]   = false
-        cookies[:nil]     = nil
+        cookies[:nil]     = nil
+        cookies[:array]   = [1,2]
+        cookies[:date]    = Date.today
       }
     end
 
@@ -96,17 +97,26 @@ describe 'set_cookies' do
 
     it { should set_cookies(:nil) }
     it { should set_cookies(:nil).to(nil) }
-    it { should_not set_cookies(:nil).to(true) }
+    it { should_not set_cookies(:nil).to(true) }
+
+    it { should set_cookies(:array) }
+    it { should set_cookies(:array).to([1,2]) }
+    it { should_not set_cookies(:array).to([2,1]) }
+
+    it { should set_cookies(:date) }
+    it { should set_cookies(:date).to(Date.today) }
+    it { should_not set_cookies(:date).to(Date.today + 1) }
   end
 
   describe 'macro' do
     before(:each) do
      build_response {
         cookies[:user]    = 'jose'
-        cookies[:address] = 'Avenue'
         cookies[:true]    = true
         cookies[:false]   = false
-        cookies[:nil]     = nil
+        cookies[:nil]     = nil
+        cookies[:array]   = [1,2]
+        cookies[:date]    = Date.today
       }
     end
 
@@ -136,7 +146,15 @@ describe 'set_cookies' do
 
     should_set_cookies :nil
     should_set_cookies :nil, :to => nil
-    should_not_set_cookies :nil, :to => true
+    should_not_set_cookies :nil, :to => true
+
+    should_set_cookies :array
+    should_set_cookies :array, :to => [1,2]
+    should_not_set_cookies :array, :to => [2,1]
+
+    should_set_cookies :date
+    should_set_cookies :date, :to => Date.today
+    should_not_set_cookies :date, :to => (Date.today + 1)
   end
 
   describe 'with no parameter' do

data/spec/action_controller/set_session_matcher_spec.rb

@@ -48,10 +48,11 @@ describe 'set_session' do
     before(:each) do
      build_response {
         session[:user]    = 'jose'
-        session[:address] = 'Avenue'
         session[:true]    = true
         session[:false]   = false
-        session[:nil]     = nil
+        session[:nil]     = nil
+        session[:array]   = [1,2]
+        session[:date]    = Date.today
       }
     end
 
@@ -81,17 +82,26 @@ describe 'set_session' do
 
     it { should set_session(:nil) }
     it { should set_session(:nil).to(nil) }
-    it { should_not set_session(:nil).to(true) }
+    it { should_not set_session(:nil).to(true) }
+
+    it { should set_session(:array) }
+    it { should set_session(:array).to([1,2]) }
+    it { should_not set_session(:array).to([2,1]) }
+
+    it { should set_session(:date) }
+    it { should set_session(:date).to(Date.today) }
+    it { should_not set_session(:date).to(Date.today + 1) }
   end
 
   describe 'macro' do
     before(:each) do
      build_response {
         session[:user]    = 'jose'
-        session[:address] = 'Avenue'
         session[:true]    = true
         session[:false]   = false
-        session[:nil]     = nil
+        session[:nil]     = nil
+        session[:array]   = [1,2]
+        session[:date]    = Date.today
       }
     end
 
@@ -121,7 +131,15 @@ describe 'set_session' do
 
     should_set_session :nil
     should_set_session :nil, :to => nil
-    should_not_set_session :nil, :to => true
+    should_not_set_session :nil, :to => true
+
+    should_set_session :array
+    should_set_session :array, :to => [1,2]
+    should_not_set_session :array, :to => [2,1]
+
+    should_set_session :date
+    should_set_session :date, :to => Date.today
+    should_not_set_session :date, :to => (Date.today + 1)
   end
 
   describe 'with no parameter' do

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'ruby-debug'
 
 RAILS_ENV     = 'test'
-RAILS_VERSION = ENV['RAILS_VERSION'] || '=2.2.2'
+RAILS_VERSION = ENV['RAILS_VERSION'] || '2.2.2'
 RSPEC_VERSION = ENV['RSPEC_VERSION'] || Spec::VERSION::STRING
 
 # Load Rails

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable_rails
 version: !ruby/object:Gem::Version 
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors: 
 - Carlos Brando
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-22 00:00:00 +02:00
+date: 2009-04-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.7
+        version: 3.0.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: remarkable_activerecord
@@ -41,7 +41,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.7
+        version: 3.0.8
     version: 
 description: "Remarkable Rails: collection of matchers and macros with I18n for Rails"
 email: 
@@ -60,13 +60,9 @@ files:
 - LICENSE
 - CHANGELOG
 - lib/remarkable_rails.rb
-- lib/remarkable_rails
-- lib/remarkable_rails/action_view
 - lib/remarkable_rails/action_view/base.rb
-- lib/remarkable_rails/action_controller
 - lib/remarkable_rails/action_controller/macro_stubs.rb
 - lib/remarkable_rails/action_controller/base.rb
-- lib/remarkable_rails/action_controller/matchers
 - lib/remarkable_rails/action_controller/matchers/route_matcher.rb
 - lib/remarkable_rails/action_controller/matchers/set_the_flash_matcher.rb
 - lib/remarkable_rails/action_controller/matchers/set_session_matcher.rb
@@ -82,6 +78,8 @@ files:
 - locale/en.yml
 has_rdoc: true
 homepage: http://github.com/carlosbrando/remarkable
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -102,24 +100,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: remarkable
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: "Remarkable Rails: collection of matchers and macros with I18n for Rails"
 test_files: 
-- spec/application
-- spec/application/examples
 - spec/application/examples/new.html.erb
 - spec/application/examples/example.xml.builder
 - spec/application/examples/_example.html.erb
 - spec/application/examples/example.html.erb
 - spec/application/application.rb
-- spec/application/projects
 - spec/application/projects/new.html.erb
-- spec/application/layouts
 - spec/application/layouts/examples.html.erb
 - spec/application/tasks_controller.rb
-- spec/action_controller
 - spec/action_controller/macro_stubs_spec.rb
 - spec/action_controller/assign_to_matcher_spec.rb
 - spec/action_controller/set_cookies_matcher_spec.rb