renee 0.4.0.pre1 → 0.4.0.pre2

data/site/public/css/app.css

@@ -1,73 +1,94 @@
 body {
-  margin-left: 20%;
-  margin-right: 20%;
-  background-image: url('/img/stoneposter.png');
-  font-family: Arial, Verdana;
+  font-family: "Helvetica Neue", "Helvetica", Arial, sans-serif;
+  font-weight: 500;
+  background-color: #F0F0E6;
 }
 
 body .container {
-  min-width: 500px;
-  background: #FCEA97;
-  border-style: solid;
-  border-width: 5px;
-  border-color: #FFC003;
+  width: 800px;
+  font-size: 90%;
+  margin: 2em auto;
+  background: white;
+  border: 2px solid #D8D8CF;
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
   border-radius: 15px;
-  padding: 2em;
-  margin-top: 1.2em;
+  padding: 2em 5em;
 }
 
 h1 {
-  color: #1C1C19;
+  color: #222222;
+  font-size: 1.6em;
+  padding-bottom: 0.4em;
+  border-bottom: 1px solid #9B9B9B;
 }
 
 h2 {
-  color: #FFA000;
+  color: #222222;
+  font-size: 1.5em;
 }
 
 a {
   text-decoration: none;
-  color: #A60202;
+  color: #640000;
 }
 
+a:hover {
+  text-decoration: underline;
+}
+
+ul li {
+  list-style-type: square;
+}
+
+
 pre.CodeRay {
-  border: 1px black solid;
-  background-color: #1C1C19;
-  color: white;
-  padding: 5px;
+  overflow: auto;
+  font-family: 'Bitstream Vera Sans Mono','Courier',monospace;
+  border: 1px solid #CCC;
+  background-color: #F8F8F8;
+  color: black;
+  padding: 7px;
+  font-size: 0.9em;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
+  border-radius: 4px;
 }
 
 pre.CodeRay .string {
-  color: #FFC003;
+  color: #D14;
 }
 
 pre.CodeRay .constant {
-  color: #A60202;
+  color: rgb(0, 128, 128);
+}
+
+pre.CodeRay .predefined-constant {
+  color: rgb(0, 128, 128);
 }
 
 pre.CodeRay .instance-variable {
-  color: #FCEA97;
+  color: #FF9A52;
 }
 
 pre.CodeRay .keyword {
-  color: #dd7;
+  font-weight: bold;
 }
 
 pre.CodeRay .symbol {
-  color: #f77;
+  color: #990073;
 }
 
 pre.CodeRay .integer {
-  color: #f77;
+  color: #FF9A52;
 }
 
 pre.CodeRay .comment {
-  color: #BC9358;
+  color: #998;
 }
 
 pre.CodeRay .regexp {
-  color: #a33;
+  color: #FF9A52;
 }
 
 div.logo {

data/site/views/extending.md

@@ -0,0 +1,66 @@
+# Extending Renee
+
+Renee is a very modular library comprised of four standalone libraries:
+`renee-core`, `renee-render`, `renee-url-generation`, and `renee-session`.
+
+If you need additional functionality, extending Renee can be very easy and quick.
+Renee extensions are basically just included modules. For example, let's say we wanted to implement a simple
+extension. First, define the module:
+
+    :::ruby
+    module Renee
+      module SampleExtension
+
+        module ClassMethods
+          # These are methods that live at the class level for Renee
+        end
+
+        def self.included(o)
+          o.extend(ClassMethods)
+          # ...more here...
+        end
+
+      end
+    end
+
+You can use hooks inside the `included` method to apply code at certain points in the renee lifecycle (init, before, after):
+
+    :::ruby
+    module Renee
+      module SampleExtension
+        def self.included(o)
+          o.on_init do
+            define_method(:foo) { 'bar' }
+            # More things on initialize
+          end
+
+          o.on_before do
+            # ...before every request...
+          end
+
+          o.on_after do
+            # ...after every request...
+          end
+        end
+      end
+    end
+
+And then subclass Renee to add your own libraries:
+
+    :::ruby
+    module Renee
+      class MyApplication < Application
+        include SampleExtension
+      end
+    end
+
+You can now use your subclassed application with your libraries mixed in:
+
+    :::ruby
+    run Renee::MyApplication {
+      path("/").get do
+        halt! foo
+      end
+    }
+
+and that's the basics for extending Renee. Checkout the renee source code and specifically `renee-sessions` for a more detailed example.

data/site/views/index.md

@@ -92,7 +92,7 @@ arbitrary variable types, transform them, and handle error cases in one, easy pl
     }.setup {
       register_variable_type(:hex, /[0-9a-f]{6}/).
         on_transform { |v| v.to_i(16) }.
-        raise_on_error!
+        halt_on_error!
     }
 
 Now, let's throw some requests against this. If we go to `http://127.0.0.1:9393/color/ff99ff`, we'll get a nice fuchsia. Try `http://127.0.0.1:9393/color/blue` and you'll get a 400. Too bad.
@@ -109,7 +109,7 @@ Okay, so, writing blocks is fun, but, it can get a bit indent-y when we don't re
     }.setup {
       register_variable_type(:hex, /[0-9a-f]{6}/).
         on_transform { |v| v.to_i(16) }.
-        raise_on_error!
+        halt_on_error!
     }
 
 You can easily consume chaining yourself, if you want to implement your own routing methods. Find out [more](/chaining)!
@@ -120,7 +120,7 @@ Not happy with what Renee gives you? You can easily subclass to define whatever
 
     :::ruby
     class MyApp < Renee::Application
-      app {
+      run {
         path('justice/great').get.for_great_justice!
         halt 404, "justice not found"
       }
@@ -136,7 +136,7 @@ Not happy with what Renee gives you? You can easily subclass to define whatever
     # for great justice
     # curl http://localhost:9393/justice/good
     # justice not found
-    
+
 
 ## Getting started
 
@@ -193,6 +193,16 @@ Check out detailed guides for each aspect below:
 
 [&#8618; Read about Route generation](/route-generation)
 
+
+## Extending Renee
+
+Renee is a very modular library comprised of four standalone libraries:
+`renee-core`, `renee-render`, `renee-url-generation`, and `renee-session`.
+
+If you need additional functionality, extending Renee can be very easy and quick.
+Renee extensions are basically just included modules. Check out the [Extending Renee](/extending)
+guide for more information.
+
 ## API documentation
 
 Renee is also well-documented with YARD:

data/site/views/routing.md

@@ -221,41 +221,3 @@ Example:
           #{secret_value} (and these will never be nil)"
       }
     }
-
-### `#query_string`
-
-This will match an exact query string. It's equivalent to `match === env['QUERY_STRING']`
-where match is the value passed in.
-
-    :::ruby
-    path 'foo' do
-      query_string 'bar' do
-        get { halt 'BAR!' }
-      end
-
-      query_string 'baz' do
-        get { halt 'BAZ!' }
-      end
-    end
-
-This will respond to `/foo?bar` with "BAR!" and `/foo?baz` with "BAZ!".
-You can also specify query_string in a variety of other ways:
-
-    :::ruby
-    # Check key and value of query param
-    query_string 'foo=bar' do
-      post { halt [200,{},'foo'] }
-    end
-
-    # Declare query params as a hash
-    query :foo => "bar" do
-      halt 200
-    end
-
-    # Switch based on a query parameter
-    query :foo do |var|
-      case var
-      when 'bar' then halt 200
-      when 'bar2' then halt 500
-      end
-    end

data/site/views/variable-types.md

@@ -10,10 +10,10 @@ To create a variable type, in your [setup block](/settings), add a #register_var
     register_variable_type(:hex,       # The name
       /[0-9a-f]{6}/).                  # Part to capture
       on_transform { |v| v.to_i(16) }. # How to transform
-      raise_on_error!                  # What to do when you can't
+      halt_on_error!                   # What to do when you can't
                                        #   capture
 
-First, a registered type needs to have a name. Then, a regexp specifying what to match needs to be provided. If you want to transform the result, use `#on_transform` to pass a block to be called when this type is being used. If a type is attempted to be used, and the regexp doesn't manage to capture anything, the error handler is used to determine what to do. By default, there is no error handler, and so, your programs execution will continue normally. However, if you use`#on_error`, you can supply a block to be called in the event of an error. As a convenience, there is a `#raise_on_error!` method that will halt with a 400, or, if you choose, any HTTP error code you wish (which is an optional parameter to `#raise_on_error!`).
+First, a registered type needs to have a name. Then, a regexp specifying what to match needs to be provided. If you want to transform the result, use `#on_transform` to pass a block to be called when this type is being used. If a type is attempted to be used, and the regexp doesn't manage to capture anything, the error handler is used to determine what to do. By default, there is no error handler, and so, your programs execution will continue normally. However, if you use`#on_error`, you can supply a block to be called in the event of an error. As a convenience, there is a `#halt_on_error!` method that will halt with a 400, or, if you choose, any HTTP error code you wish (which is an optional parameter to `#halt_on_error!`).
 
 ## Default types
 

data/test/renee-url-generation/test_helper.rb

@@ -5,6 +5,6 @@ require File.expand_path('../../test_helper', __FILE__)
 
 class MiniTest::Spec
   def generator
-    Class.new { include Renee::URLGeneration }
+    @generator ||= Renee::URLGeneration::GeneratorSet.new
   end
 end

data/test/{renee-session/session_test.rb → session_test.rb}

@@ -9,7 +9,7 @@ describe Renee::Session do
   end
 
   it "should create a session" do
-    @app.app do
+    @app.run do
       session[:test] = 'hello'
       path('test').get.halt "why #{session[:test]}"
     end
@@ -18,7 +18,7 @@ describe Renee::Session do
   end
 
   it "should persist values across multiple calls" do
-    @app.app do
+    @app.run do
       out = session[:test] || "first"
       session[:test] = 'hello'
       path('test').get.halt out

data/test/test_helper.rb

@@ -4,6 +4,8 @@ require 'minitest/autorun'
 gem 'rack-test'
 require 'rack/test'
 
+require 'renee'
+
 class ColoredIO
   ESC = "\e["
   NND = "#{ESC}0m"
@@ -36,12 +38,17 @@ MiniTest::Unit.output = ColoredIO.new(MiniTest::Unit.output)
 class MiniTest::Spec
   include Rack::Test::Methods
 
+  def blog_app
+    file = File.expand_path("../../examples/blog/config.ru", __FILE__)
+    @app ||= Rack::Builder.parse_file(file).first
+  end
+
   # 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 {
+    @app = Renee(&block).setup {
       views_path(path) if respond_to?(:views_path)
     }
   end

data/test/{renee-url-generation/url_generation_test.rb → url_generation_test.rb}

@@ -4,7 +4,7 @@ require File.expand_path('../test_helper', __FILE__)
 
 describe Renee::URLGeneration do
   before do
-    @r = generator
+    @r = Renee::URLGeneration::GeneratorSet.new
   end
 
   it "should allow registration and generation of paths" do
@@ -47,7 +47,7 @@ describe Renee::URLGeneration do
   it "should allow #prefix calls for nesting common path parts" do
     r = @r
     r.prefix('/foo') do
-      r.register(:foo_bar, '/bar')
+      register(:foo_bar, '/bar')
     end
     assert_equal '/foo/bar', r.path(:foo_bar)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renee
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre1
+  version: 0.4.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000Z
+date: 2012-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70348684672460 !ruby/object:Gem::Requirement
+  requirement: &70286298002980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70348684672460
+  version_requirements: *70286298002980
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70348684671900 !ruby/object:Gem::Requirement
+  requirement: &70286298002160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70348684671900
+  version_requirements: *70286298002160
 - !ruby/object:Gem::Dependency
   name: callsite
-  requirement: &70348684671340 !ruby/object:Gem::Requirement
+  requirement: &70286298001580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,21 +45,32 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70348684671340
+  version_requirements: *70286298001580
+- !ruby/object:Gem::Dependency
+  name: renee-core
+  requirement: &70286298000400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.4.0.pre2
+  type: :runtime
+  prerelease: false
+  version_requirements: *70286298000400
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70348684670800 !ruby/object:Gem::Requirement
+  requirement: &70286297995360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 2.11.1
   type: :development
   prerelease: false
-  version_requirements: *70348684670800
+  version_requirements: *70286297995360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70348684670240 !ruby/object:Gem::Requirement
+  requirement: &70286297994840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348684670240
+  version_requirements: *70286297994840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70348684669300 !ruby/object:Gem::Requirement
+  requirement: &70286297993420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348684669300
+  version_requirements: *70286297993420
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70348684668700 !ruby/object:Gem::Requirement
+  requirement: &70286297991120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +100,10 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *70348684668700
+  version_requirements: *70286297991120
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70348684668200 !ruby/object:Gem::Requirement
+  requirement: &70286297989640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +111,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *70348684668200
+  version_requirements: *70286297989640
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70348684667640 !ruby/object:Gem::Requirement
+  requirement: &70286297988960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348684667640
+  version_requirements: *70286297988960
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70348684666920 !ruby/object:Gem::Requirement
+  requirement: &70286297987660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +133,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348684666920
+  version_requirements: *70286297987660
 description: The super-friendly web framework.
 email:
 - joshbuddy@gmail.com
@@ -133,16 +144,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile-renee
-- Gemfile-renee-core
-- Gemfile-renee-render
-- Gemfile-renee-session
-- Gemfile-renee-url-generation
 - MIT-LICENSE.txt
-- README-renee-core.md
-- README-renee-render.md
-- README-renee-session.md
-- README-renee-url-generation.md
 - README.md
 - Rakefile
 - TODO.txt
@@ -153,28 +155,12 @@ files:
 - examples/blog/views/index.erb
 - examples/blog/views/show.erb
 - lib/renee.rb
-- 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
 - lib/renee/render.rb
 - lib/renee/session.rb
 - lib/renee/url_generation.rb
 - lib/renee/util.rb
 - lib/renee/version.rb
 - plan.txt
-- renee-core.gemspec
-- renee-render.gemspec
-- renee-session.gemspec
-- renee-url-generation.gemspec
 - renee.gemspec
 - site/MIT-LICENSE.txt
 - site/public/css/app.css
@@ -334,6 +320,7 @@ files:
 - site/public/img/stoneposter.png
 - site/public/img/vospit.jpeg
 - site/views/chaining.md
+- site/views/extending.md
 - site/views/index.md
 - site/views/layouts/app.haml
 - site/views/rack-integration.md
@@ -344,24 +331,15 @@ files:
 - site/views/team-renee.md
 - site/views/tutorial.md
 - site/views/variable-types.md
-- test.watchr
-- 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/renee-render/render_test.rb
+- test/blog_test.rb
+- test/render_test.rb
 - test/renee-render/test_helper.rb
-- test/renee-session/session_test.rb
 - test/renee-session/test_helper.rb
 - test/renee-url-generation/test_helper.rb
-- test/renee-url-generation/url_generation_test.rb
-- test/renee/blog_test.rb
-- test/renee/test_helper.rb
+- test/session_test.rb
+- test/test_helper copy.rb
 - test/test_helper.rb
+- test/url_generation_test.rb
 homepage: http://reneerb.com
 licenses: []
 post_install_message: 
@@ -376,7 +354,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1971434403675291859
+      hash: 2093277106572431606
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -390,21 +368,13 @@ signing_key:
 specification_version: 3
 summary: The super-friendly web framework
 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/renee-render/render_test.rb
+- test/blog_test.rb
+- test/render_test.rb
 - test/renee-render/test_helper.rb
-- test/renee-session/session_test.rb
 - test/renee-session/test_helper.rb
 - test/renee-url-generation/test_helper.rb
-- test/renee-url-generation/url_generation_test.rb
-- test/renee/blog_test.rb
-- test/renee/test_helper.rb
+- test/session_test.rb
+- test/test_helper copy.rb
 - test/test_helper.rb
+- test/url_generation_test.rb
 has_rdoc: