remarkable_rails 3.1.7 → 3.1.8

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

@@ -6,7 +6,7 @@ module Remarkable
         arguments :method, :path
 
         assertions :map_to_path?, :generate_params?
-
+
         before_assert do
           @options[:controller] ||= controller_name
           @populated_path = @path.dup
@@ -17,15 +17,15 @@ module Remarkable
           end
 
           ::ActionController::Routing::Routes.reload if ::ActionController::Routing::Routes.empty?
-        end
-
-        def controller
-          @controller ||= @spec.controller if @spec.respond_to?(:controller)
-        end
-
-        def request
-          controller.request if controller
-        end
+        end
+
+        def controller
+          @controller ||= @spec.controller if @spec.respond_to?(:controller)
+        end
+
+        def request
+          controller.request if controller
+        end
 
         private
 
@@ -35,10 +35,10 @@ module Remarkable
           end
 
           def generate_params?
-            env = ::ActionController::Routing::Routes.extract_request_environment(controller.request) if controller
+            env = ::ActionController::Routing::Routes.extract_request_environment(controller.request) if controller
 
             env ||= {}
-            env[:method] = @method.to_sym
+            env[:method] = @method.to_sym
             params_from  = ::ActionController::Routing::Routes.recognize_path(@populated_path, env) rescue nil
             return params_from == @options, :actual => params_from.inspect
           end
@@ -57,21 +57,21 @@ module Remarkable
               raise ArgumentError, "I cannot guess the controller name in route. Please supply :controller as option"
             end
           end
-
-          def controller_class
-            @controller_class ||= begin
-              spec_class = @spec.class unless @spec.class == Class
-
-              attempts = []
-              attempts << controller.class if controller
-              attempts << @subject.class   if @subject
-              attempts << spec_class.controller_class if spec_class.respond_to?(:controller_class)
-              attempts << spec_class.described_class  if spec_class.respond_to?(:described_class)
-
-              attempts.find{ |controller| ::ActionController::Base >= controller }
-            end
-          end
-
+
+          def controller_class
+            @controller_class ||= begin
+              spec_class = @spec.class unless @spec.class == Class
+
+              attempts = []
+              attempts << controller.class if controller
+              attempts << @subject.class   if @subject
+              attempts << spec_class.controller_class if spec_class.respond_to?(:controller_class)
+              attempts << spec_class.described_class  if spec_class.respond_to?(:described_class)
+
+              attempts.find{ |controller| ::ActionController::Base >= controller }
+            end
+          end
+
           def interpolation_options
             { :options => @options.inspect, :method => @method.to_s.upcase, :path => @path.inspect }
           end

data/spec/action_controller/route_matcher_spec.rb

@@ -1,8 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe 'route_matcher' do
-  include FunctionalBuilder
-
+describe 'route_matcher' do
+  controller_name :tasks
+
   describe 'messages' do
     before(:each) do
       @matcher = route(:get, '/projects', :controller => 'boo', :action => 'index')
@@ -62,18 +62,6 @@ describe 'route_matcher' do
     should_not_route :xyz, '/projects',    :controller => :projects, :action => :index
   end
 
-  describe TasksController, :type => :routing do
-    controller_name 'tasks'
-
-    # Test the nested routes with implicit controller
-    should_route :get,    '/projects/5/tasks',     :action => :index,   :project_id => 5
-    should_route :post,   '/projects/5/tasks',     :action => :create,  :project_id => 5
-    should_route :get,    '/projects/5/tasks/1',   :action => :show,    :id => 1, :project_id => 5
-    should_route :delete, '/projects/5/tasks/1',   :action => :destroy, :id => 1, :project_id => 5
-    should_route :get,    '/projects/5/tasks/new', :action => :new,     :project_id => 5
-    should_route :put,    '/projects/5/tasks/1',   :action => :update,  :id => 1, :project_id => 5
-  end
-
   describe 'using controller.request' do
     it "should extract environment from controller request" do
       @matcher = route(:get, '/projects', :controller => 'projects', :action => 'index')
@@ -82,5 +70,14 @@ describe 'route_matcher' do
       @matcher.matches?(@controller)
     end
   end
-
-end
+end
+
+# Test implicit controller
+describe TasksController, :type => :routing do
+  should_route :get,    '/projects/5/tasks',     :action => :index,   :project_id => 5
+  should_route :post,   '/projects/5/tasks',     :action => :create,  :project_id => 5
+  should_route :get,    '/projects/5/tasks/1',   :action => :show,    :id => 1, :project_id => 5
+  should_route :delete, '/projects/5/tasks/1',   :action => :destroy, :id => 1, :project_id => 5
+  should_route :get,    '/projects/5/tasks/new', :action => :new,     :project_id => 5
+  should_route :put,    '/projects/5/tasks/1',   :action => :update,  :id => 1, :project_id => 5
+end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 
 RAILS_ENV     = 'test'
 RAILS_VERSION = ENV['RAILS_VERSION'] || '2.3.2'
-RSPEC_VERSION = ENV['RSPEC_VERSION'] || Spec::VERSION::STRING
 
 # Load Rails
 gem 'activesupport', RAILS_VERSION
@@ -32,8 +31,12 @@ require File.join(RAILS_ROOT, 'tasks_controller')
 # Load Remarkable Rails
 require File.join(dir, 'functional_builder')
 
-# Load spec-rails
-gem 'rspec-rails', RSPEC_VERSION
+# Load spec-rails
+if ENV['RSPEC_VERSION']
+  gem 'rspec-rails', ENV['RSPEC_VERSION']
+else
+  gem 'rspec-rails'
+end
 require 'spec/rails'
 
 require File.join(dir, '..', 'lib', 'remarkable_rails')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable_rails
 version: !ruby/object:Gem::Version 
-  version: 3.1.7
+  version: 3.1.8
 platform: ruby
 authors: 
 - Carlos Brando
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-05 00:00:00 +02:00
+date: 2009-07-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.1.7
+        version: 3.1.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: remarkable_activerecord
@@ -51,7 +51,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.1.7
+        version: 3.1.8
     version: 
 description: "Remarkable Rails: collection of matchers and macros with I18n for Rails"
 email: