kenji 0.4 → 0.5

data/Gemfile

@@ -2,4 +2,9 @@ gem 'inifile'
 gem 'json'
 gem 'rack'
 
+group :test do
+  gem 'rspec'
+  gem 'rack-test'
+end
+
 source :rubygems

data/Rakefile

@@ -1,2 +1,7 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+require 'rspec/core'
+require 'rspec/core/rake_task'
+task :default => :spec
+RSpec::Core::RakeTask.new(:spec)
+

data/lib/kenji/controller.rb

@@ -68,12 +68,46 @@ module Kenji
       nil # void method
     end
 
+    # This lets us pass the routing down to another controller for a sub-path.
+    #
+    #   class MyController < Kenji::Controller
+    #     pass '/admin/*', AdminController
+    #     # regular routes
+    #   end
+    #
+    def self.pass(path, controller)
+      node = (@passes ||= {})
+      segments = path.split('/')
+      segments = segments.drop(1) if segments.first == ''     # discard leading /'s empty segment
+      segments.each do |segment|
+        node = (node[segment.to_sym] ||= {})
+        break if segment == '*'
+      end
+      node[:@controller] = controller
+    end
+
     
     # Most likely only used by Kenji itself.
     # Override to implement your own routing, if you'd like.
+    #
     def call(method, path)
       segments = path.split('/')
       segments = segments.drop(1) if segments.first == ''     # discard leading /'s empty segment
+
+      # check for passes
+      node = self.class.passes
+      remaining_segments = segments.dup
+      while s = remaining_segments.shift
+        next unless node[s.to_sym]
+        node = node[s.to_sym]
+        break
+      end
+      if node[:@controller]
+        instance = node[:@controller].new
+        return instance.call(method, remaining_segments.join('/'))
+      end
+
+      # regular routing
       node = self.class.routes[method]
       variables = []
       searching = true
@@ -114,6 +148,9 @@ module Kenji
     def self.routes
       @routes || {}
     end
+    def self.passes
+      @passes || {}
+    end
   end
 end
 

data/lib/kenji/version.rb

@@ -1,5 +1,5 @@
 
 module Kenji
-  VERSION = '0.4'
+  VERSION = '0.5'
 end
 

data/lib/kenji.rb

@@ -8,6 +8,13 @@ module Kenji
 
     attr_reader :env, :root
 
+    # Setting `kenji.status = 203` will affect the status code of the response.
+    attr_accessor :status
+
+    # Methods for rack!
+
+    # Constructor...
+    #
     def initialize(env, root)
       @headers = {
         'Content-Type' => 'application/json'
@@ -17,6 +24,8 @@ module Kenji
       @env = env
     end
 
+    # This method does all the work!
+    #
     def call
       path = @env['PATH_INFO']
       
@@ -28,6 +37,7 @@ module Kenji
       # new routing code
       segments = path.split('/')
       segments = segments.drop(1) if segments.first == ''       # discard leading /'s empty segment
+      segments.unshift('')
 
       acc = ''; out = 'null'
       while head = segments.shift
@@ -56,6 +66,7 @@ module Kenji
     # Sets one or multiple headers, as named arametres. eg.
     # 
     #   kenji.header 'Content-Type' => 'hello/world'
+    #
     def header(hash={})
       hash.each do |key, value|
         @headers[key] = value
@@ -64,19 +75,21 @@ module Kenji
 
     # Fetch (and cache) the json input to the request
     # Return a Hash
+    #
     def input_as_json
       return @json_input if @json_input
       require 'json'
       raw = @env['rack.input'].read if @env['rack.input']
       begin
         return @json_input = JSON.parse(raw)
-      rescue JSON::ParserError => e
+      rescue JSON::ParserError
       end if raw
       {} # default return value
     end
     
     # Respond to the request
-    def respond code, message, hash={}
+    #
+    def respond(code, message, hash={})
       @status = code
       response = {            # default structure. TODO: figure out if i really want to keep this 
         :status => code,
@@ -89,13 +102,16 @@ module Kenji
 
 
     # Private methods
+    private
 
     # Will attempt to fetch the controller, and verify that it is a implements call 
-    def controller_for subpath
+    #
+    def controller_for(subpath)
+      subpath = '/_' if subpath == '/'
       path = "#{@root}controllers#{subpath}.rb"
       return nil unless File.exists?(path)
       require path
-      controller_name = subpath.split('/').last
+      controller_name = subpath.split('/').last.sub(/^_/, 'Root')
       controller_class = Object.const_get(controller_name.to_s.to_camelcase+'Controller')
       return unless controller_class.method_defined?(:call) && controller_class.instance_method(:call).arity == 2 # ensure protocol compliance
       controller = controller_class.new

data/spec/1/controllers/main.rb

@@ -0,0 +1,19 @@
+
+class MainController < Kenji::Controller
+
+  get '/hello' do
+    {status: 200, hello: :world}
+  end
+
+  post '/' do
+    {status:1337}
+  end
+
+  put '/' do
+    {status:1337}
+  end
+
+  delete '/' do
+    {status:1337}
+  end
+end

data/spec/2/controllers/_.rb

@@ -0,0 +1,9 @@
+
+require File.expand_path(File.dirname(__FILE__)+'/child.rb')
+
+class RootController < Kenji::Controller
+  get '/' do
+    {status: 200, controller_used: :root}
+  end
+  pass '/child', ChildController
+end

data/spec/2/controllers/child.rb

@@ -0,0 +1,8 @@
+
+
+class ChildController < Kenji::Controller
+
+  get '/foo' do
+    {status: 200, foo: :bar}
+  end
+end

data/spec/kenji_spec.rb

@@ -0,0 +1,65 @@
+
+require 'rack'
+require 'rack/test'
+require 'rspec'
+
+require 'kenji'
+
+
+# NOTE: these tests make use of the controllers defined in test/controllers.
+
+def app_for(path)
+    lambda do |env|
+      Kenji::Kenji.new(env, File.dirname(__FILE__)+'/'+path).call
+    end
+end
+
+describe Kenji do
+
+  include Rack::Test::Methods
+  def app; app_for('1'); end
+
+
+  it 'should return "null" for unknown routes' do
+    get '/sdlkjhb'
+    last_response.body.should == 'null'
+  end
+
+  it 'should route a GET call to a defined get call' do
+    get '/main/hello'
+    expected_response = {status: 200, hello: :world}.to_json
+    last_response.body.should == expected_response
+  end
+
+  [:post, :put, :delete].each do |method|
+
+    it "should route a #{method.to_s.upcase} to a defined #{method.to_s} call" do
+      send(method, '/main')
+      expected_response = {status: 1337}.to_json
+      last_response.body.should == expected_response
+    end
+  end
+
+  it 'should return "null" for unsupported methods' do
+    post '/main/hello'
+    last_response.body.should == 'null'
+  end
+
+end
+
+describe Kenji do
+  include Rack::Test::Methods
+  def app; app_for('2'); end
+
+  it 'should use root controller' do
+    get '/'
+    expected_response = {status: 200, controller_used: :root}.to_json
+    last_response.body.should == expected_response
+  end
+
+  it 'should pass routing down to child controllers' do
+    get '/child/foo'
+    expected_response = {status: 200, foo: :bar}.to_json
+    last_response.body.should == expected_response
+  end
+end

metadata

@@ -1,57 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kenji
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  version: "0.4"
+version: !ruby/object:Gem::Version
+  version: '0.5'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Kenneth Ballenegger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-05 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A lightweight Ruby web framework.
-email: 
+email:
 - kenneth@ballenegger.com
-executables: 
+executables:
 - kenji-init
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -77,37 +76,37 @@ files:
 - lib/kenji/controller.rb
 - lib/kenji/string_extensions.rb
 - lib/kenji/version.rb
-has_rdoc: true
+- spec/1/controllers/main.rb
+- spec/2/controllers/_.rb
+- spec/2/controllers/child.rb
+- spec/kenji_spec.rb
 homepage: https://github.com/kballenegger/kenji
 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 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Kenji
-test_files: []
-
+test_files:
+- spec/1/controllers/main.rb
+- spec/2/controllers/_.rb
+- spec/2/controllers/child.rb
+- spec/kenji_spec.rb
+has_rdoc: