renee-core 0.3.11 → 0.4.0.pre1

data/test/{chaining_test.rb → renee-core/chaining_test.rb}

@@ -6,9 +6,9 @@ describe "Route chaining" do
     type = { 'Content-Type' => 'text/plain' }
     mock_app do
       path('/').get { halt [200,type,['foo']] }
-      path('bar').put { halt [200,type,['bar']] }
-      path('bar').var.put { |id| halt [200,type,[id]] }
-      path('bar').var.get.halt { |id| "wow, nice to meet you " }
+      continue_routing.path('bar').put { halt [200,type,['bar']] }
+      continue_routing.path('bar').var.put { |id| halt [200,type,[id]] }
+      continue_routing.path('bar').var.get.halt { |id| "wow, nice to meet you " }
     end
     get '/'
     assert_equal 200,   response.status

data/test/{env_accessors_test.rb → renee-core/env_accessors_test.rb}

@@ -18,7 +18,7 @@ describe Renee::Core::EnvAccessors do
   end
 
   it "should raise when you try to access weird env keys" do
-    assert_raises(Renee::Core::EnvAccessors::InvalidEnvName) {
+    assert_raises(Renee::Core::EnvAccessors::InvalidEnvNameError) {
       @app = Renee.core {
         self.test_test = 'hello'
       }.setup {

data/test/renee-core/request_context_test.rb

@@ -0,0 +1,70 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class AddHelloThereMiddleware
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    if env['hello']
+      env['hello'] << "there"
+    else
+      env['hello'] = 'hello'
+    end
+    @app.call(env)
+  end
+end
+
+class AddWhatsThatMiddleware
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    if env['hello']
+      env['hello'] << "that"
+    else
+      env['hello'] = 'whats'
+    end
+    @app.call(env)
+  end
+end
+
+describe "Route::Core::RequestContext#use" do
+  it "should allow the inclusion of arbitrary middlewares" do
+    type = { 'Content-Type' => 'text/plain' }
+    @app = Renee.core {
+      halt env['hello']
+    }.setup {
+      use AddHelloThereMiddleware
+    }
+    get '/'
+    assert_equal 200,     response.status
+    assert_equal 'hello', response.body
+  end
+
+  it "should call middlewares in sequence (1)" do
+    type = { 'Content-Type' => 'text/plain' }
+    @app = Renee.core {
+      halt env['hello']
+    }.setup {
+      use AddHelloThereMiddleware
+      use AddWhatsThatMiddleware
+    }
+    get '/'
+    assert_equal 200,     response.status
+    assert_equal 'hellothat', response.body
+  end
+
+  it "should call middlewares in sequence (2)" do
+    @app = Renee.core {
+      halt env['hello']
+    }.setup {
+      use AddWhatsThatMiddleware
+      use AddHelloThereMiddleware
+    }
+    get '/'
+    assert_equal 200,     response.status
+    assert_equal 'whatsthere', response.body
+  end
+end

data/test/{routing_test.rb → renee-core/routing_test.rb}

@@ -40,66 +40,6 @@ describe Renee::Core::Routing do
       assert_equal 'posted', response.body
     end
 
-    it "accepts a query string" do
-      type = { 'Content-Type' => 'text/plain' }
-      mock_app do
-        path('test') { get { halt [200, type, [env['QUERY_STRING']]] } }
-
-        path 'foo' do
-          query_string 'bar' do
-            get { halt [200,type,['bar']] }
-          end
-
-          query_string 'foo=bar' do
-            post { halt [200,type,['foo']] }
-          end
-        end
-      end
-
-      get '/test?bar'
-      assert_equal 200,   response.status
-      assert_equal 'bar', response.body
-      get '/foo?bar'
-      assert_equal 200,   response.status
-      assert_equal 'bar', response.body
-      post '/foo?foo=bar'
-      assert_equal 200,   response.status
-      assert_equal 'foo', response.body
-    end
-
-    it "accepts a set of query params (as hash)" do
-      mock_app do
-        path 'test' do
-          query :foo => :integer do |h|
-            halt "foo is #{h[:foo].inspect}"
-          end
-        end
-      end
-
-      get '/test?foo=123'
-      assert_equal 200, response.status
-      assert_equal 'foo is 123', response.body
-      get '/test?foo=bar'
-      assert_equal 404, response.status
-    end
-
-    it "accepts a set of query params (as an array)" do
-      mock_app do
-        path 'test' do
-          query :foo do |var|
-            case var
-            when 'bar'  then halt 200
-            when 'bar2' then halt 500
-            end
-          end
-        end
-      end
-      get '/test?foo=bar'
-      assert_equal 200, response.status
-      get '/test?foo=bar2'
-      assert_equal 500, response.status
-    end
-
     describe "with trailing slashes" do
       it "should ignore trailing slashes normally" do
         type = { 'Content-Type' => 'text/plain' }
@@ -212,6 +152,25 @@ describe Renee::Core::Routing do
       assert_equal '7', response.body
     end
 
+    it "can take an optional variable" do
+      type = { 'Content-Type' => 'text/plain' }
+      mock_app do
+        path 'add' do
+          var(:integer).optional(:integer) do |a, b|
+            b ||= a
+            halt [200, type, ["#{a + b}"]]
+          end
+        end
+      end
+
+      get '/add/3/4'
+      assert_equal 200, response.status
+      assert_equal '7', response.body
+      get '/add/3'
+      assert_equal 200, response.status
+      assert_equal '6', response.body
+    end
+
     it "allows arbitrary ranges of values" do
       type = { 'Content-Type' => 'text/plain' }
       mock_app do
@@ -297,16 +256,12 @@ describe Renee::Core::Routing do
     it "should match an extension" do
       type = { 'Content-Type' => 'text/plain' }
       mock_app do
-        path '/test' do
-          extension 'html' do
-            halt [200, type, ['test html']]
-          end
-          extension 'json' do
-            halt [200, type, ['test json']]
-          end
-
-          no_extension do
-            halt [200, type, ['test nope']]
+        path('/test').get do
+          case extension
+          when 'html' then halt [200, type, ['test html']]
+          when 'json' then halt [200, type, ['test json']]
+          when nil    then halt [200, type, ['test nope']]
+          else             halt [406, type, ['unknown']]
           end
         end
         
@@ -321,20 +276,16 @@ describe Renee::Core::Routing do
       assert_equal 200,    response.status
       assert_equal 'test json', response.body
       get '/test.xml'
-      assert_equal 404,    response.status
+      assert_equal 406,    response.status
     end
 
     it "should match an extension when there is a non-specific variable before" do
       mock_app do
         var do |id|
-          extension 'html' do
-            halt "html #{id}"
-          end
-          extension 'xml' do
-            halt "xml #{id}"
-          end
-          no_extension do
-            halt "none #{id}"
+          case extension
+          when 'html' then halt "html #{id}"
+          when 'xml'  then halt "xml #{id}"
+          when nil    then halt "none #{id}"
           end
         end
       end
@@ -478,9 +429,15 @@ describe Renee::Core::Routing do
       assert_equal 'hiya', response.body
     end
 
-    it "should allow optional paths in the request method" do
-      blk = proc { get('/path') { halt [200, {}, "hiya"] } }
-      assert_equal [200, {}, "hiya"], renee_for('/path', &blk)
+    it "should raise if you fail to halt" do
+      type = { 'Content-Type' => 'text/plain' }
+      mock_app do
+        get {  }
+        halt :ok
+      end
+
+      get '/'
+      assert_equal 404,    response.status
     end
   end
 end

data/test/renee-core/test_helper.rb

@@ -0,0 +1,4 @@
+$: << File.expand_path('../../lib', __FILE__)
+require 'renee/core'
+# Load shared test helpers
+require File.expand_path('../../test_helper', __FILE__)

data/test/test_helper.rb

@@ -1,4 +1,70 @@
-$: << File.expand_path('../../lib', __FILE__)
-require 'renee_core'
-# Load shared test helpers
-require File.expand_path('../../../lib/test_helper', __FILE__)
+require 'rubygems'
+gem 'minitest'
+require 'minitest/autorun'
+gem 'rack-test'
+require 'rack/test'
+
+class ColoredIO
+  ESC = "\e["
+  NND = "#{ESC}0m"
+
+  def initialize(io)
+    @io = io
+  end
+
+  def print(o)
+    case o
+    when "."
+      @io.send(:print, "#{ESC}32m#{o}#{NND}")
+    when "E"
+      @io.send(:print, "#{ESC}33m#{o}#{NND}")
+    when "F"
+      @io.send(:print, "#{ESC}31m#{o}#{NND}")
+    else
+      @io.send(:print, o)
+    end
+  end
+
+  def puts(*o)
+    super
+  end
+end
+
+MiniTest::Unit.output = ColoredIO.new(MiniTest::Unit.output)
+
+## TEST HELPERS
+class MiniTest::Spec
+  include Rack::Test::Methods
+
+  # Sets up a Sinatra::Base subclass defined with the block
+  # given. Used in setup or individual spec methods to establish
+  # the application.
+  def mock_app(&block)
+    path = default_views_path
+    @app = Renee.core(&block).setup {
+      views_path(path) if respond_to?(:views_path)
+    }
+  end
+
+  def default_views_path
+    File.dirname(__FILE__) + "/views"
+  end
+
+  def app
+    Rack::Lint.new(@app)
+  end
+
+  alias :response :last_response
+
+  # create_view :index, "test", :haml
+  def create_view(name, content, engine=:erb)
+    FileUtils.mkdir_p(default_views_path)
+    file = File.join(default_views_path, name.to_s + ".#{engine}")
+    File.open(file, 'w') { |io| io.write content }
+  end
+
+  # Removes the view folder after the test
+  def remove_views
+    FileUtils.rm_rf(File.dirname(__FILE__) + "/views")
+  end
+end

metadata

@@ -1,179 +1,138 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: renee-core
-version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 11
-  version: 0.3.11
+version: !ruby/object:Gem::Version
+  version: 0.4.0.pre1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Josh Hull
 - Nathan Esquenazi
 - Arthur Chiu
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-01-23 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &70111991759760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
-  requirement: *id001
   type: :runtime
   prerelease: false
-  name: rack
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70111991759760
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70111991759260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.6.1
-  requirement: *id002
   type: :development
   prerelease: false
-  name: minitest
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70111991759260
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70111991758860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  name: bundler
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70111991758860
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70111991758280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.0
-  requirement: *id004
   type: :development
   prerelease: false
-  name: rack-test
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70111991758280
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70111991757700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  requirement: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  name: rake
+  version_requirements: *70111991757700
 description: The super-friendly rack helpers.
-email: 
+email:
 - joshbuddy@gmail.com
 - nesquena@gmail.com
 - mr.arthur.chiu@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .yardopts
-- README.md
-- Rakefile
-- lib/renee_core.rb
-- lib/renee_core/chaining.rb
-- lib/renee_core/env_accessors.rb
-- lib/renee_core/exceptions.rb
-- lib/renee_core/matcher.rb
-- lib/renee_core/rack_interaction.rb
-- lib/renee_core/request_context.rb
-- lib/renee_core/responding.rb
-- lib/renee_core/response.rb
-- lib/renee_core/routing.rb
-- lib/renee_core/transform.rb
-- lib/renee_core/url_generation.rb
-- lib/renee_core/version.rb
-- renee-core.gemspec
-- test/chaining_test.rb
-- test/env_accessors_test.rb
-- test/include_test.rb
-- test/responding_test.rb
-- test/routing_test.rb
+files:
+- lib/renee/core.rb
+- lib/renee/core/chaining.rb
+- lib/renee/core/env_accessors.rb
+- lib/renee/core/exceptions.rb
+- lib/renee/core/matcher.rb
+- lib/renee/core/plugins.rb
+- lib/renee/core/rack_interaction.rb
+- lib/renee/core/request_context.rb
+- lib/renee/core/responding.rb
+- lib/renee/core/response.rb
+- lib/renee/core/routing.rb
+- lib/renee/core/transform.rb
+- test/renee-core/chaining_test.rb
+- test/renee-core/env_accessors_test.rb
+- test/renee-core/include_test.rb
+- test/renee-core/request_context_test.rb
+- test/renee-core/responding_test.rb
+- test/renee-core/routing_test.rb
+- test/renee-core/test_helper.rb
+- test/renee-core/variable_type_test.rb
 - test/test_helper.rb
-- test/url_generation_test.rb
-- test/variable_type_test.rb
 homepage: http://reneerb.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4060874974939787425
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
-rubyforge_project: renee
-rubygems_version: 1.8.10
+rubyforge_project: renee-core
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: The super-friendly rack helpers
-test_files: 
-- test/chaining_test.rb
-- test/env_accessors_test.rb
-- test/include_test.rb
-- test/responding_test.rb
-- test/routing_test.rb
+test_files:
+- test/renee-core/chaining_test.rb
+- test/renee-core/env_accessors_test.rb
+- test/renee-core/include_test.rb
+- test/renee-core/request_context_test.rb
+- test/renee-core/responding_test.rb
+- test/renee-core/routing_test.rb
+- test/renee-core/test_helper.rb
+- test/renee-core/variable_type_test.rb
 - test/test_helper.rb
-- test/url_generation_test.rb
-- test/variable_type_test.rb
 has_rdoc: