renee-core 0.2.0 → 0.3.0

data/test/responding_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../test_helper', __FILE__)
 
-describe Renee::Core::Application::Responding do
+describe Renee::Core::Responding do
   describe "#interpret_response" do
     it "should render from a number" do
       mock_app do

data/test/routing_test.rb

@@ -1,9 +1,9 @@
 require File.expand_path('../test_helper', __FILE__)
 
-describe Renee::Core::Application::Routing do
+describe Renee::Core::Routing do
 
   def renee_for(path, options = {}, &block)
-    Renee::Core.new(&block).call(Rack::MockRequest.env_for(path, options))
+    Renee.core(&block).call(Rack::MockRequest.env_for(path, options))
   end
 
   describe "with paths" do
@@ -118,7 +118,7 @@ describe Renee::Core::Application::Routing do
       it "should not ignore trailing slashes if told not to" do
         type = { 'Content-Type' => 'text/plain' }
         mock_app do
-          exact_path('test') { get { halt [200,type,['test']] } }
+          path('test').empty { get { halt [200,type,['test']] } }
         end
         get '/test/'
         assert_equal 404,    response.status
@@ -403,7 +403,7 @@ describe Renee::Core::Application::Routing do
       type = { 'Content-Type' => 'text/plain' }
       mock_app do
         path 'test' do
-          halt run Renee::Core.new {
+          halt run Renee.core {
             path 'time' do
               halt halt [200,type,['test']]
             end
@@ -419,7 +419,7 @@ describe Renee::Core::Application::Routing do
       type = { 'Content-Type' => 'text/plain' }
       mock_app do
         path 'test' do
-          run! Renee::Core.new {
+          run! Renee.core {
             path 'time' do
               halt halt [200,type,['test']]
             end

data/test/test_helper.rb

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

data/test/url_generation_test.rb

@@ -4,7 +4,7 @@ require File.expand_path('../test_helper', __FILE__)
 
 describe Renee::Core::URLGeneration do
   it "should allow registration and generation of paths" do
-    r = Renee::Core.new
+    r = Renee.core()
     r.register(:test, '/test/time')
     r.register(:test_var, '/test/:id')
     assert_equal '/test/time', r.path(:test)
@@ -13,41 +13,41 @@ describe Renee::Core::URLGeneration do
   end
 
   it "should allow registration and generation of urls" do
-    r = Renee::Core.new
+    r = Renee.core()
     r.register(:test, 'http://localhost:8080/test/:time')
     assert_equal 'http://localhost:8080/test/123', r.url(:test, 123)
     assert_equal 'http://localhost:8080/test/654', r.url(:test, :time => '654')
   end
 
   it "should escape values when generating" do
-    r = Renee::Core.new
+    r = Renee.core()
     r.register(:test, '/:test')
     assert_equal '/f%C3%B8%C3%B8', r.path(:test, "føø")
   end
 
   it "should encode extra values as query string params" do
-    r = Renee::Core.new
+    r = Renee.core()
     r.register(:test, '/:test')
     assert_equal '/foo?bar=baz', r.path(:test, 'foo', :bar => :baz)
     assert_equal '/foo?bar=baz', r.path(:test, :test => 'foo', :bar => :baz)
   end
 
   it "should allow default values" do
-    r = Renee::Core.new
+    r = Renee.core()
     r.register(:test, '/:test', :test => 'foo')
     assert_equal '/foo', r.path(:test)
     assert_equal '/baz', r.path(:test, :test => 'baz')
   end
 
   it "should include default vars as query string vars" do
-    r = Renee::Core.new
+    r = Renee.core()
     r.register(:test, '/:foo', :test => 'foo')
     assert_equal '/foo?test=foo', r.path(:test, 'foo')
     assert_equal '/foo?test=foo', r.path(:test, :foo => 'foo')
   end
 
   it "should allow #prefix calls for nesting common path parts" do
-    r = Renee::Core.new
+    r = Renee.core()
     r.prefix('/foo') do
       r.register(:foo_bar, '/bar')
     end
@@ -55,7 +55,7 @@ describe Renee::Core::URLGeneration do
   end
 
   it "should allow passing defaults and overriding them on a per-register basis" do
-    r = Renee::Core.new
+    r = Renee.core()
     r.prefix('/foo', :bar => 'baz') do
       register(:foo_bar, '/bar', :bar => 'bam')
       register(:foo_baz, '/baz')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: renee-core
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Josh Hull
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 Z
+date: 2011-10-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -114,22 +114,22 @@ files:
 - .yardopts
 - README.md
 - Rakefile
-- lib/renee-core.rb
-- lib/renee-core/application.rb
-- lib/renee-core/application/chaining.rb
-- lib/renee-core/application/rack_interaction.rb
-- lib/renee-core/application/request_context.rb
-- lib/renee-core/application/responding.rb
-- lib/renee-core/application/routing.rb
-- lib/renee-core/application/transform.rb
-- lib/renee-core/exceptions.rb
-- lib/renee-core/matcher.rb
-- lib/renee-core/response.rb
-- lib/renee-core/settings.rb
-- lib/renee-core/url_generation.rb
-- lib/renee-core/version.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/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
@@ -171,6 +171,7 @@ 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

data/lib/renee-core.rb

@@ -1,78 +0,0 @@
-require 'rack'
-require 'renee-core/version'
-require 'renee-core/matcher'
-require 'renee-core/settings'
-require 'renee-core/response'
-require 'renee-core/application'
-require 'renee-core/url_generation'
-require 'renee-core/exceptions'
-
-# Top-level Renee constant
-class Renee
-  # The top-level class for creating core application.
-  # For convience you can also used a method named #Renee
-  # for decalaring new instances.
-  #
-  # @example
-  #     Renee::Core.new { path('/hello') { halt :ok } }
-  #
-  class Core
-    include URLGeneration
-
-    # The application block used to initialize this application.
-    attr_reader :application_block
-    # The {Settings} object used to initialize this application. 
-    attr_reader :settings
-
-    # @param [Proc] application_block The block of code that will be executed on each invocation of call #call.
-    #                                 Each time #call is called, a new instance of {Renee::Core::Application} will
-    #                                 be created. The block given will be #instance_eval 'd within
-    #                                 the context of that new instance.
-    #
-    def initialize(base_application_class = Application, &application_block)
-      @base_application_class = base_application_class
-      @application_block = application_block
-      @settings = Settings.new
-    end
-
-    # This is a rack-compliant `Rack#call`.
-    #
-    # @param [Hash] env The environment hash.
-    #
-    # @return [Array] A rack compliant return.
-    #
-    # @see http://rack.rubyforge.org/doc/SPEC.html
-    #
-    def call(env)
-      application_class.new(settings, &application_block).call(env)
-    end
-
-    ##
-    # Configure settings for your Renee application. Accepts a settings file path
-    # or a block containing the configuration settings.
-    #
-    # @example
-    #  Renee::Core.new { ... }.setup { views_path "./views" }
-    #
-    # @api public
-    def setup(path = nil, &blk)
-      raise "You cannot supply both an argument and a block to the method." unless path.nil? ^ blk.nil?
-      case path
-      when nil      then settings.instance_eval(&blk)
-      when Settings then @settings = path
-      when String   then File.exist?(path) ? settings.instance_eval(File.read(path), path, 1) : raise("The settings file #{path} does not exist")
-      else               raise "Could not setup with #{path.inspect}"
-      end
-      self
-    end
-
-    private
-    def application_class
-      @application_class ||= begin
-        app_cls = Class.new(@base_application_class)
-        settings.includes.each { |inc| app_cls.send(:include, inc) }
-        app_cls
-      end
-    end
-  end
-end

data/lib/renee-core/application.rb

@@ -1,32 +0,0 @@
-require "renee-core/application/request_context"
-require "renee-core/application/chaining"
-require "renee-core/application/routing"
-require "renee-core/application/responding"
-require "renee-core/application/rack_interaction"
-require "renee-core/application/transform"
-
-class Renee
-  class Core
-    # This is the main class used to do the respond to requests. {Routing} provides route helpers.
-    # {RequestContext} adds the RequestContext#call method to respond to Rack applications.
-    # {Responding} defines the method Responding#halt which stops processing within a {Renee::Application}.
-    # It also has methods to interpret arguments to #halt and redirection response helpers.
-    # {RackInteraction} adds methods for interacting with Rack.
-    class Application
-      include Chaining
-      include RequestContext
-      include Routing
-      include Responding
-      include RackInteraction
-      include Transform
-
-      attr_reader :application_block, :settings
-
-      # @param [Proc] application_block The block that will be #instance_eval'd on each invocation to #call
-      def initialize(settings, &application_block)
-        @settings = settings
-        @application_block = application_block
-      end
-    end
-  end
-end

data/lib/renee-core/application/chaining.rb

@@ -1,73 +0,0 @@
-require 'set'
-
-class Renee
-  class Core
-    class Application
-      # Module for creating chainable methods. To use this within your own modules, first `include Chaining`, then,
-      # mark methods you want to be available with `chain_method :method_name`.
-      # @example
-      #    module MoreRoutingMethods
-      #      include Chaining
-      #      def other_routing_method
-      #        # ..
-      #      end
-      #      chain_method :other_routing_method
-      #
-      module Chaining
-        # @private
-        class ChainingProxy
-          def initialize(target, proxy_blk)
-            @target, @proxy_blk, @calls = target, proxy_blk, []
-          end
-
-          def method_missing(m, *args, &blk)
-            @calls << [m, *args]
-            if blk.nil? && @target.class.private_method_defined?(:"#{m}_without_chain")
-              self
-            else
-              ret = nil
-              @proxy_blk.call(proc do |*inner_args|
-                callback = proc do |*callback_args|
-                  inner_args.concat(callback_args)
-                  if @calls.size == 0
-                    return blk.call(*inner_args) if blk
-                  else
-                    call = @calls.shift
-                    ret = @target.send(call.at(0), *call.at(1), &callback)
-                  end
-                end
-                call = @calls.shift
-                ret = @target.send(call.at(0), *call.at(1), &callback)
-              end)
-              ret
-            end
-          end
-        end
-
-        # @private
-        module ClassMethods
-          def chain_method(*methods)
-            methods.each do |m|
-              class_eval <<-EOT, __FILE__, __LINE__ + 1
-                alias_method :#{m}_without_chain, :#{m}
-                def #{m}(*args, &blk)
-                  chain(blk) { |subblk| #{m}_without_chain(*args, &subblk) }
-                end
-                private :#{m}_without_chain
-              EOT
-            end
-          end
-        end
-
-        private
-        def chain(blk, &proxy)
-          blk ? yield(blk) : ChainingProxy.new(self, proxy)
-        end
-
-        def self.included(o)
-          o.extend(ClassMethods)
-        end
-      end
-    end
-  end
-end

data/lib/renee-core/application/rack_interaction.rb

@@ -1,45 +0,0 @@
-class Renee
-  class Core
-    class Application
-      # A module that defines useful Rack interaction methods.
-      module RackInteraction
-
-        # Creates an ad-hoc Rack application within the context of a Rack::Builder.
-        # @example
-        #     get { halt build { use Rack::ContentLength; run proc { |env| Rack::Response.new("Hello!").finish } } }
-        #
-        def build(&blk)
-          run Rack::Builder.new(&blk).to_app
-        end
-
-        # Creates an ad-hoc Rack application within the context of a Rack::Builder that immediately halts when done.
-        # @see #run!
-        # @example
-        #     get { halt build { use Rack::ContentLength; run proc { |env| Rack::Response.new("Hello!").finish } } }
-        #
-        def build!(&blk)
-          run! build(&blk)
-        end
-
-        # Runs a rack application
-        # @example
-        #     get { halt run proc { |env| Renee::Core::Response.new("Hello!").finish } }
-        #
-        def run(app = nil, &blk)
-          raise "You cannot supply both a block and an app" unless app.nil? ^ blk.nil?
-          (app || blk).call(env)
-        end
-
-        # Runs a rack application and halts immediately.
-        #
-        # @see #run
-        # @example
-        #     get { run proc { |env| Renee::Core::Response.new("Hello!").finish } }
-        #
-        def run!(*args)
-          halt run(*args)
-        end
-      end
-    end
-  end
-end

data/lib/renee-core/application/request_context.rb

@@ -1,29 +0,0 @@
-class Renee
-  class Core
-    class Application
-      # This module deals with the Rack#call compilance. It defines #call and also defines several critical methods
-      # used by interaction by other application modules.
-      module RequestContext
-        attr_reader :env, :request, :detected_extension, :is_index_request
-        alias_method :is_index_request?, :is_index_request
-
-        # Provides a rack interface compliant call method.
-        # @param[Hash] env The rack environment.
-        def call(env)
-          @env, @request = env, Rack::Request.new(env)
-          @detected_extension = env['PATH_INFO'][/\.([^\.\/]+)$/, 1]
-          @is_index_request = env['PATH_INFO'][/^\/?$/]
-          # TODO clear template cache in development? `template_cache.clear`
-          catch(:halt) do
-            begin
-              instance_eval(&application_block)
-            rescue ClientError => e
-              e.response ? instance_eval(&e.response) : halt("There was an error with your request", 400)
-            end
-            Renee::Core::Response.new("Not found", 404).finish
-          end
-        end # call
-      end
-    end
-  end
-end