kenji 0.6.7 → 0.7

data/Gemfile

@@ -1,10 +1,6 @@
-gem 'inifile'
-gem 'json'
-gem 'rack'
+source 'https://rubygems.org'
 
-group :test do
-  gem 'rspec'
-  gem 'rack-test'
-end
+# Specify your gem's dependencies in factory_baby.gemspec
+gemspec
 
-source :rubygems
+gem 'inifile'

data/kenji.gemspec

@@ -2,22 +2,23 @@ $:.push File.expand_path('../lib', __FILE__)
 require 'kenji/version'
 
 Gem::Specification.new do |s|
-    s.name        = 'kenji'
-    s.version     = Kenji::VERSION
-    s.platform    = Gem::Platform::RUBY
-    s.summary     = 'Kenji'
-    s.description = 'A lightweight Ruby web framework.'
-    s.authors     = ['Kenneth Ballenegger']
-    s.email       = ['kenneth@ballenegger.com']
-    s.homepage    =
-        'https://github.com/kballenegger/kenji'
+  s.name        = 'kenji'
+  s.version     = Kenji::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.summary     = 'Kenji'
+  s.description = 'A lightweight Ruby web framework.'
+  s.authors     = ['Kenneth Ballenegger']
+  s.email       = ['kenneth@ballenegger.com']
+  s.homepage    = 'https://github.com/kballenegger/kenji'
 
-    s.add_dependency 'json'
-    s.add_dependency 'rack'
-        
-    s.files         = `git ls-files`.split("\n")
-    s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-    s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-    s.require_paths = ['lib']
+  s.add_dependency 'json'
+  s.add_dependency 'rack', '~> 1.5.2'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rack-test'
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ['lib']
 end

data/lib/kenji/controller.rb

@@ -4,14 +4,14 @@ module Kenji
 
     # use the reader freely to grab the kenji object
     attr_accessor :kenji
-  
+
     # Routes below will accept routes in the format, eg.:
     #     /hello/:id/children
     # Can contain any number of :id, but must be in their own url segment.
     # Colon-prefixed segments become variables, passed onto the given block as arguments.
-    # The name given to the variable is irrelevant, and is thrown away: /hello/:/children is equivalent to the example above. 
+    # The name given to the variable is irrelevant, and is thrown away: /hello/:/children is equivalent to the example above.
     # Given block must have correct arity.
-    
+
     # Route GET
     def self.get(path, &block)
       route(:get, path, &block)
@@ -48,7 +48,7 @@ module Kenji
     #
     # Note: this works by building a tree for the path,
     # each node being a path segment or variable segment, and the leaf @action being the block
-    
+
     def self.route(*methods, path, &block)
       # bind the block to self as an instance method, so its context is correct
       define_method(:_tmp_route_action, &block)
@@ -94,7 +94,7 @@ module Kenji
     #       # eg. ensure authentication, you can use kenji.respond in here.
     #     end
     #   end
-    #   
+    #
     def self.before(&block)
       define_method(:_tmp_before_action, &block)
       block = instance_method(:_tmp_before_action)
@@ -102,7 +102,7 @@ module Kenji
       (@befores ||= []) << block
     end
 
-    
+
     # Most likely only used by Kenji itself.
     # Override to implement your own routing, if you'd like.
     #
@@ -116,22 +116,23 @@ module Kenji
       # 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
+
+      f = fetch_passes(node, remaining_segments)
+
+      if f[:match] && f[:controller]
+        instance = f[:controller].new
         instance.kenji = kenji if instance.respond_to?(:kenji=)
-        return instance.call(method, remaining_segments.join('/'))
+        f[:variables].each do |k, v|
+          instance.instance_variable_set(:"@#{k}", v)
+        end
+        return instance.call(method, f[:remaining_segments].join('/'))
       end
 
       # regular routing
       node = self.class.routes[method] || {}
       variables = []
       searching = true
-      segments.each do |segment|                              # traverse tree to find 
+      segments.each do |segment|                              # traverse tree to find
         if searching && node[segment.to_sym]
           node = node[segment.to_sym]                         # attempt to move down to the plain text segment
         elsif searching && node[:':']
@@ -183,6 +184,28 @@ module Kenji
     def self.befores
       @befores || []
     end
+
+    def fetch_passes(node, segments)
+      variables = {}
+      match = false
+
+      while e = segments.shift
+        # return false unless node
+        key = node.keys.first
+        if match = key.to_s.match(/^\:(\w+)/)
+          node = node[key.to_sym]
+          variables[match[1].to_sym] = e
+          match = true
+        else
+          match = node.has_key?(e.to_sym)
+          node = node[e.to_sym] if match
+        end
+
+        break if node[:@controller]
+      end
+
+      { :match => match, :variables => variables, :controller => node[:@controller], :remaining_segments => segments }
+    end
   end
 end
 

data/lib/kenji/version.rb

@@ -1,5 +1,5 @@
 
 module Kenji
-  VERSION = '0.6.7'
+  VERSION = '0.7'
 end
 

data/lib/kenji.rb

@@ -110,6 +110,12 @@ module Kenji
       end
     end
 
+    # Returns the response headers
+    #
+    def response_headers
+      @headers
+    end
+
     # Fetch (and cache) the json input to the request
     # Return a Hash
     #

data/spec/4/controllers/bar.rb

@@ -0,0 +1,9 @@
+class BarController < Kenji::Controller
+  get '/' do
+    { :foo_id => @foo_id }
+  end
+
+  put '/:bar_id' do |bar_id|
+    { :bar_id => bar_id, :foo_id => @foo_id }
+  end
+end

data/spec/4/controllers/main.rb

@@ -0,0 +1,11 @@
+require File.expand_path('../bar.rb', __FILE__)
+require File.expand_path('../pass.rb', __FILE__)
+
+class MainController < Kenji::Controller
+  get '/' do
+    { :foo => 'bar' }
+  end
+
+  pass '/foo/:foo_id/pass', PassController
+  pass '/foo/:foo_id/bar', BarController
+end

data/spec/4/controllers/pass.rb

@@ -0,0 +1,9 @@
+class PassController < Kenji::Controller
+  get '/' do
+    { :foo_id => @foo_id }
+  end
+
+  put '/:pass_id' do |pass_id|
+    { :pass_id => pass_id, :foo_id => @foo_id }
+  end
+end

data/spec/kenji_spec.rb

@@ -117,7 +117,45 @@ describe Kenji::Kenji, 'expected reponses' do
       last_response.body.should == expected_response
       last_response.status.should == 302
     end
+  end
+
+  context '4' do
+    def app; app_for('4'); end
+
+    it "should use main controller" do
+      get '/main'
+      expected_response = { :foo => 'bar' }.to_json
+      last_response.body.should == expected_response
+      last_response.status.should == 200
+    end
+
+    it "should use pass controller and use get endpoint" do
+      get '/main/foo/foo_id/pass'
+      expected_response = { :foo_id => 'foo_id' }.to_json
+      last_response.body.should == expected_response
+      last_response.status.should == 200
+    end
 
+    it "should use pass controller and use put endpoint" do
+      put '/main/foo/foo_id/pass/pass_id'
+      expected_response = { :pass_id => 'pass_id', :foo_id => 'foo_id' }.to_json
+      last_response.body.should == expected_response
+      last_response.status.should == 200
+    end
+
+    it "should use pass controller and use get endpoint" do
+      get '/main/foo/foo_id/bar'
+      expected_response = { :foo_id => 'foo_id' }.to_json
+      last_response.body.should == expected_response
+      last_response.status.should == 200
+    end
+
+    it "should use pass controller and use put endpoint" do
+      put '/main/foo/foo_id/bar/bar_id'
+      expected_response = { :bar_id => 'bar_id', :foo_id => 'foo_id' }.to_json
+      last_response.body.should == expected_response
+      last_response.status.should == 200
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kenji
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: '0.7'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -29,13 +29,61 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -80,6 +128,9 @@ files:
 - spec/2/controllers/_.rb
 - spec/2/controllers/child.rb
 - spec/3/controllers/before.rb
+- spec/4/controllers/bar.rb
+- spec/4/controllers/main.rb
+- spec/4/controllers/pass.rb
 - spec/kenji_spec.rb
 homepage: https://github.com/kballenegger/kenji
 licenses: []
@@ -110,5 +161,8 @@ test_files:
 - spec/2/controllers/_.rb
 - spec/2/controllers/child.rb
 - spec/3/controllers/before.rb
+- spec/4/controllers/bar.rb
+- spec/4/controllers/main.rb
+- spec/4/controllers/pass.rb
 - spec/kenji_spec.rb
 has_rdoc: