renee-core 0.4.0.pre1 → 0.4.0.pre2

data/.gitignore

@@ -0,0 +1,7 @@
+*.gem
+.bundle
+pkg/*
+.yardoc
+doc
+.DS_Store
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode
+  - rbx-18mode

data/Gemfile

@@ -0,0 +1,12 @@
+source :rubygems
+
+gemspec
+
+group :development do
+  gem 'minitest', '~> 2.11.1'
+  gem 'rack-test', '>= 0.5.0'
+  gem 'shotgun'
+  gem 'rake'
+  gem 'json'
+  gem 'yard', '~> 0.7.4'
+end

data/MIT-LICENSE.txt

@@ -0,0 +1,7 @@
+Copyright (c) 2011 Joshua Hull, Nathan Esquenazi, Arthur Chiu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,242 @@
+# Renee Core
+
+## Routing
+
+Routing in `Renee` is different from any web framework you are likely to have used in the past. The syntax is most familiar to Sinatra but allows
+for far more flexibility and freedom in the way that routes and actions are defined. In a Renee, routes are defined using the `path`, `var`, `query_string`, `extension`, `remainder` and request methods.
+
+**Request Methods**
+
+The bread and butter of Renee are the request verbs reminiscent of Sinatra:
+
+```ruby
+run Renee.core {
+  get    { halt "a get!"  }
+  post   { halt "a post!" }
+  put    { halt "a put!"  }
+  delete { halt "a delete!" }
+}
+```
+
+These will declare the response to "/" for each of the common request types. Notice the use of the request method to
+specify the http verb and the use of `halt` inside the block to send back the body of the response.
+
+**Path**
+
+Path is how Renee describes the basic uri path for a route:
+
+```ruby
+run Renee.core {
+  path('blog') { ... }
+}
+```
+
+All declarations inside that block will start with `/blog`. Paths can also be nested within one another:
+
+```ruby
+run Renee.core {
+  path('blog') {
+    path('foo') { get { halt "path is /blog/foo" } }
+  }
+}
+```
+
+You can also use `exact_path` for more precise path matching and/or `part` which doesn't look for leading slashes.
+
+**Query String**
+
+In addition to defining paths, you may find yourself wanting to describe the state of the query string for a request within the path:
+
+```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
+```
+
+**Variables**
+
+In Renee, you specify parameters for your request as explicit variables. Variables are declared like this:
+
+```ruby
+path('blog') {
+  var { |id| get { halt "path is /blog/#{id}" } }
+}
+```
+
+You can access the variables (passed into the request) using the local variables yielded to the block. Variables are a powerful
+way to express expected parameters for a given set of requests. You can specify variables that match a regex:
+
+```ruby
+path('blog') {
+  var(/\d+/) { |id| get { halt "path is /blog/#{id}" } }
+}
+```
+
+and even explicitly cast your variable types:
+
+```ruby
+path('blog') {
+  var :integer do |id|
+    get { halt "path is /blog/#{id} and id is an integer" }
+  end
+end
+```
+
+**Extensions**
+
+You can also use `extension` as a way to define formats:
+
+```ruby
+path '/test' do
+  extension 'html' do
+    halt 'html'
+  end
+  extension 'json' do
+    halt 'json'
+  end
+end
+```
+
+This will have `test.html` respond with 'html' and `test.json` respond with 'json'.
+
+**Remainder**
+
+In the event that no route has been matched, the `remainder` keyword makes defining the else case rather easy:
+
+```ruby
+path 'foo' do
+  path 'bar' do
+    halt "BAR!"
+  end
+
+  remainder do |rest|
+    halt "Rest was #{rest}"
+  end
+end
+```
+
+Notice this allows you to handle the cases within a particular route scope and manage them based on the "rest" of the uri yielded in the `remainder` block. You
+can handle different remainders in all the different path blocks.
+
+**Named Routes**
+
+Once you have defined your routes, you can then "register" a particular path mapping that to a symbol. This is useful for referencing routes without
+having to specify the entire path:
+
+```ruby
+run Renee.core {
+  register(:test, '/test/time')
+  register(:test_var, '/test/:id')
+}
+```
+
+You can then access these using the `path` method in a route or template:
+
+```ruby
+path(:test) # => '/test/time'
+path(:test_var, :id => 123) # => '/test/123'
+```
+
+Using named routes makes referencing and modifying routes within an application much simpler to manage.
+
+## Responding
+
+Responding to a request within a route can be managed with the `respond`, `halt`, `redirect` commands:
+
+**Respond**
+
+The `respond` command makes returning a rack response very explicit, you can respond as if you were constructing a Rack::Response
+
+```ruby
+run Renee.core {
+  get { respond!("hello!", 403, "foo" => "bar") }
+}
+```
+
+or use the block DSL for convenience:
+
+```ruby
+run Renee.core {
+  get { respond! { status 403; headers :foo => "bar"; body "hello!" } }
+}
+```
+
+**Halt**
+
+Halting is the easiest way to render data within a route:
+
+```ruby
+run Renee.core {
+  get { halt 'easy' }
+}
+```
+
+This will return a 200 status code and 'easy' as the body. You can also specify status code and header explicitly in the halt response:
+
+```ruby
+get { halt [200, {}, 'body'] }
+```
+
+This will set the status code to 200, pass no headers and return 'body'. You can also use several variations of halt:
+
+```ruby
+# Return just status code
+halt 200
+
+# Return status with symbol
+halt :not_found
+
+# Return 200 with body
+halt "hello!"
+
+# Return 500 with body
+halt 500, "hello!"
+```
+
+Halt is the most straightforward way to control the response for a request.
+
+**Redirect**
+
+A redirect is a common action within a web route and can be achieved with the convenience method `redirect` command:
+
+```ruby
+get {
+  halt redirect('/hello')
+}
+```
+
+You can also specify the status code for the redirect:
+
+```ruby
+get {
+  halt redirect('/hello', 303)
+}
+```

data/Rakefile

@@ -0,0 +1,24 @@
+require 'rake/testtask'
+require 'bundler/gem_tasks'
+require 'yard'
+
+ROOT = File.expand_path(File.dirname(__FILE__))
+
+task :default => :test
+
+Rake::TestTask.new do |t|
+  t.libs.push "lib"
+  t.test_files = FileList[File.expand_path("../test/**/*_test.rb", __FILE__)]
+  t.verbose = true
+end
+
+YARD::Rake::YardocTask.new do |t|
+  t.options = [
+    '-o', File.expand_path("../site/public/docs/core", __FILE__),
+    '--readme', 'README.md',
+    '--no-private',
+    '--markup', 'markdown'
+  ]
+  t.files   = 'lib/**/*.rb'
+end
+

data/lib/renee/core/chaining.rb

@@ -51,7 +51,6 @@ module Renee
             define_method(:"#{m}_chainable") { }
           end
         end
-
       end
 
       def create_chain_proxy(method_name, *args)

data/lib/renee/core/rack_interaction.rb

@@ -19,7 +19,7 @@ module Renee
       #     get { halt build { use Rack::ContentLength; run proc { |env| Rack::Response.new("Hello!").finish } } }
       #
       def build!(&blk)
-        halt build(&blk)
+        halt! build(&blk)
       end
 
       # Runs a rack application. You must either use `app` or `blk`.
@@ -28,7 +28,7 @@ module Renee
       #
       #
       # @example
-      #     get { halt run proc { |env| Renee::Core::Response.new("Hello!").finish } }
+      #     get { halt run proc { |env| Rack::Response.new("Hello!").finish } }
       #
       def run(app = nil, &blk)
         raise "You cannot supply both a block and an app" unless app.nil? ^ blk.nil?
@@ -40,10 +40,10 @@ module Renee
       #
       # @see #run!
       # @example
-      #     get { run proc { |env| Renee::Core::Response.new("Hello!").finish } }
+      #     get { run proc { |env| Rack::Response.new("Hello!").finish } }
       #
       def run!(app = nil, &blk)
-        halt run(app, &blk)
+        halt! run(app, &blk)
       end
     end
   end

data/lib/renee/core/responding.rb

@@ -11,10 +11,10 @@ module Renee
         :created => 201,
         :accepted => 202,
         :no_content => 204,
-        :no_content => 204,
         :bad_request => 400,
         :unauthorized => 401,
-        :payment_required => 403,
+        :payment_required => 402,
+        :forbidden => 403,
         :not_found => 404,
         :method_not_found => 405,
         :not_acceptable => 406,
@@ -29,6 +29,14 @@ module Renee
         throw :halt, interpret_response(response.size == 1 ? response.first : response)
       end
 
+      # Halts current processing to the top-level calling Renee application and uses that as a response.
+      # This version of halt does not pass your response through #interpret_response.
+      # @param [Object] response The response to use.
+      # @see #interpret_response, #halt
+      def halt!(response)
+        throw :halt, response
+      end
+
       ##
       # Creates a response by allowing the response header, body and status to be passed into the block.
       #
@@ -41,23 +49,52 @@ module Renee
       #  respond { status 200; body "Yay!" }
       #  respond("Hello", 200, "foo" => "bar")
       #
-      def respond(body=[], status=200, header={}, &blk)
-        response = Renee::Core::Response.new(body, status, header)
-        response.instance_eval(&blk) if block_given?
-        response.finish
+      def respond(response_body = nil, response_status = nil, response_headers = nil)
+        body(response_body) if response_body
+        status(response_status) if response_status
+        headers(response_headers) if response_headers
+        yield if block_given?
+        raise NoResponseSetError unless @body or @status or @headers
+        Rack::Response.new(@body || [], @status || 200, @headers || {})
       end
 
-      ##
-      # Creates a response by allowing the response header, body and status to be passed into the block.
-      #
-      # @example
-      #  respond! { status 200; body "Yay!" }
-      #
-      # @param  (see #respond)
-      # @see #respond
-      def respond!(*args, &blk)
-        halt respond(*args, &blk)
+      def respond!(response_body = nil, response_status = nil, response_headers = nil, &blk)
+        halt! respond(response_body, response_status, response_headers, &blk)
+      end
+
+      def status(code)
+        @status = code
+      end
+
+      def status!(code)
+        status code
+        respond!
+      end
+
+      def body(*args)
+        @body ||= []
+        @body.concat(args) unless args.empty?
+        @body
+      end
+
+      def body!(*args)
+        body *args
+        respond!
+      end
+
+      def header(headers)
+        @headers ||= {}
+        headers.each do |k, v|
+          @headers[k.to_s] = v.to_s
+        end
+      end
+      alias_method :headers, :header
+
+      def header!(headers)
+        header headers
+        respond!
       end
+      alias_method :headers!, :header!
 
       # Interprets responses returns by #halt.
       #
@@ -74,13 +111,13 @@ module Renee
         when Array   then
           case response.size
           when 3 then response
-          when 2 then Renee::Core::Response.new(response[1], HTTP_CODES[response[0]] || response[0]).finish
+          when 2 then Rack::Response.new(response[1], HTTP_CODES[response[0]] || response[0]).finish
           else raise "I don't know how to render #{response.inspect}"
           end
-        when String  then Renee::Core::Response.new(response).finish
-        when Integer then Renee::Core::Response.new("Status code #{response}", response).finish
+        when String  then Rack::Response.new(response).finish
+        when Integer then Rack::Response.new("Status code #{response}", response).finish
         when Symbol  then interpret_response(HTTP_CODES[response] || response.to_s)
-        when Proc    then instance_eval(&response)
+        when Proc    then response.call
         else              response # pass through response
         end
       end