rory 0.3.7 → 0.3.8

data/lib/rory/dispatcher.rb

@@ -45,7 +45,9 @@ module Rory
 
     def controller
       if klass = controller_class
-        klass.new(@request.merge(:dispatcher => self), @context)
+        request_for_delivery = @request.dup
+        request_for_delivery[:dispatcher] = self
+        klass.new(request_for_delivery, @context)
       end
     end
 

data/lib/rory/version.rb

@@ -1,3 +1,3 @@
 module Rory
-  VERSION = '0.3.7'
+  VERSION = '0.3.8'
 end

data/rory.gemspec

@@ -34,6 +34,7 @@ EOF
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'capybara'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'reek'
   s.add_development_dependency 'simplecov'

data/spec/application_spec.rb

@@ -78,7 +78,8 @@ describe Rory::Application do
         { :controller => 'awesome', :action => 'rad', :regex => /^this\/(?<path>[^\/]+)\/is\/(?<very_awesome>[^\/]+)$/},
         { :controller => 'lumpies', :action => 'show', :regex => /^lumpies\/(?<lump>[^\/]+)$/, :module => 'goose', :methods => [:get] },
         { :controller => 'rabbits', :action => 'chew', :regex => /^rabbits\/(?<chew>[^\/]+)$/, :module => 'goose/wombat', :methods => [:get] },
-        { :controller => 'root', :action => 'vegetable', :regex => /^$/, :methods => [:get] }
+        { :controller => 'root', :action => 'vegetable', :regex => /^$/, :methods => [:get] },
+        { :controller => 'for_reals', :action => 'srsly', :regex => /^for_reals\/(?<parbles>[^\/]+)$/, :methods => [:get] }
       ].inspect
     end
   end
@@ -90,7 +91,7 @@ describe Rory::Application do
     end
   end
 
-  describe '.autoload_paths' do
+  describe '.auto_require_paths' do
     after(:each) do
       Fixture::Application.instance.instance_variable_set(:@auto_require_paths, nil)
     end

data/spec/fixture_app/config/routes.rb

@@ -9,4 +9,5 @@ Fixture::Application.set_routes do
     match 'rabbits/:chew', :to => 'rabbits#chew', :methods => [:get]
   end
   match '/', :to => 'root#vegetable', :methods => [:get]
+  match 'for_reals/:parbles', :to => 'for_reals#srsly', :methods => [:get]
 end

data/spec/fixture_app/controllers/for_reals_controller.rb

@@ -0,0 +1,5 @@
+class ForRealsController < Rory::Controller
+  def srsly
+    @gibbit = @params[:parbles]
+  end
+end

data/spec/fixture_app/views/for_reals/srsly.html.erb

@@ -0,0 +1 @@
+You've done it again, <%= @gibbit %>!

data/spec/requests/controller_spec.rb

@@ -0,0 +1,9 @@
+describe "Controller" do
+  describe "presentation", :type => :feature do
+    it 'renders action template' do
+      visit '/for_reals/pickles'
+
+      expect(page).to have_text("You've done it again, pickles!")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ ENV['RORY_STAGE'] = 'test'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
+require 'capybara/rspec'
 require 'rory'
 require 'rack'
 
@@ -14,9 +15,10 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 require_relative 'fixture_app/config/application'
 Fixture::Application.root = File.join(File.dirname(__FILE__), 'fixture_app')
-
 Fixture::Application.require_all_files
 
+Capybara.app = Fixture::Application
+
 RSpec.configure do |config|
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rory
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -188,13 +204,16 @@ files:
 - spec/dispatcher_spec.rb
 - spec/fixture_app/config/application.rb
 - spec/fixture_app/config/routes.rb
+- spec/fixture_app/controllers/for_reals_controller.rb
 - spec/fixture_app/controllers/goose/lumpies_controller.rb
 - spec/fixture_app/controllers/goose/wombat/rabbits_controller.rb
 - spec/fixture_app/controllers/stub_controller.rb
+- spec/fixture_app/views/for_reals/srsly.html.erb
 - spec/fixture_app/views/layouts/surround.html.erb
 - spec/fixture_app/views/test/dynamic.html.erb
 - spec/fixture_app/views/test/letsgo.html.erb
 - spec/fixture_app/views/test/static.html.erb
+- spec/requests/controller_spec.rb
 - spec/rory_spec.rb
 - spec/spec_helper.rb
 - spec/support_spec.rb