kenji 0.3.1 → 0.4

data/bin/kenji-init

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-path = '.' << '/' << (ARGV.first || '.')
+path = File.expand_path('.' << '/' << (ARGV.first || '.'))
 app_name =  File.basename(path)
 
 Dir.mkdir(path) unless File.directory?(path)

data/inited/.gitignore

@@ -1,2 +1 @@
 tmp
-Gemfile.lock

data/lib/kenji/controller.rb

@@ -76,24 +76,35 @@ module Kenji
       segments = segments.drop(1) if segments.first == ''     # discard leading /'s empty segment
       node = self.class.routes[method]
       variables = []
+      searching = true
       segments.each do |segment|                              # traverse tree to find 
-        if node[segment.to_sym]
+        if searching && node[segment.to_sym]
           node = node[segment.to_sym]                         # attempt to move down to the plain text segment
-        else
+        elsif searching && node[:':']
           node = node[:':']                                   # attempt to find a variable segment
           variables << segment                                # either we've found a variable, or the `unless` below will trigger
+        else
+          variables << segment                                # dump the remaining segments if we cannot drill down further
+          searching = false
         end
-        break unless node                                     # break if as an instance method nil, fallback below
       end
       if node && action = node[:@action]                      # the block is stored in the @action leaf
-        return action.bind(self).call(*variables)
+        begin
+          return action.bind(self).call(*variables)
+        rescue ArgumentError                                  # assuming argument error means route not defined
+          return attempt_fallback(path)                       # TODO: might want to check arity instead
+        end
       else                                                    # or, fallback if necessary store the block for each method
-        if respond_to? :fallback
-          if self.class.instance_method(:fallback).arity == 1
-            return fallback(path)
-          else
-            return fallback
-          end
+        return attempt_fallback(path)
+      end
+    end
+
+    def attempt_fallback(path)
+      if respond_to? :fallback
+        if self.class.instance_method(:fallback).arity == 1
+          return fallback(path)
+        else
+          return fallback
         end
       end
     end

data/lib/kenji/version.rb

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

data/lib/kenji.rb

@@ -37,6 +37,9 @@ module Kenji
             out = controller.call(@env['REQUEST_METHOD'].downcase.to_sym, '/'+segments.join('/')).to_json
           rescue KenjiRespondControlFlowInterrupt => e
             out = e.response
+          rescue Exception => e
+            p e, e.backtrace                                   # log exceptions
+            raise e
           end
           break
         end

metadata

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