sansom 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fe8ba21c0cab848b10f8484f8f38a0454d2f549
-  data.tar.gz: dccfd78c121e2b6f6bc5c01f42bce52f8809ea93
+  metadata.gz: aaef12414047fe120425a2b7d60774ff95bb7e6f
+  data.tar.gz: fa9631815362d92010c669d521334aba3b7dacbe
 SHA512:
-  metadata.gz: 773fded808375146ea57bf266e68feb8ad2c27ee584590e568d98d9517401f24b07a52f6f8dabab5da0e34114617fcce3b610a5683a77c02c17a10f33b59d93b
-  data.tar.gz: f004a23139c2dd2b1664868507815e1f149064f0511d35a5804efe818f16eabbb1e199d7afd90aa24f9a4162c090891200d24ff4cb60499a1edda90dea3bdc86
+  metadata.gz: bb88783579d57e97451d616a5dc974fd1a1d6cfd90d03b82000b65aa3bea44ddd60e17dae4f3f29f2ffbd531784569409fcff1b467e57311170d1ffbceb098f9
+  data.tar.gz: 299ac437e310dd9fa8355923bfcfdc4aa84dd5f7c295be28e482e86bab88dac728fd575cde02b825f4321718a679e74d8d3f4f82b83f12df206446280131665b

data/changelog.md

@@ -52,4 +52,9 @@ Here's an example
 
 - PUBLIC RELEASE!
 - After block added
-- Improved routing behavior & speed
+- Improved routing behavior & speed
+
+0.1.1
+
+- Fix bad bug in method_missing
+- Added better error handling (per-error handling and a generic block that gets called if no specific handler is present)

data/lib/sansom.rb

@@ -7,6 +7,7 @@ require_relative "./rack/fastlint.rb"
 module Sansomable
   InvalidRouteError = Class.new StandardError
   HTTP_VERBS = [:get,:head, :post, :put, :delete, :patch, :options, :link, :unlink, :trace].freeze
+  ROUTE_METHODS = HTTP_VERBS+[:map]
   RACK_HANDLERS = ["puma", "unicorn", "thin", "webrick"].freeze
   NOT_FOUND = [404, {}, ["Not found."]].freeze
 
@@ -20,40 +21,46 @@ module Sansomable
   
   def call env
     return NOT_FOUND if tree.leaf? && tree.root?
-    
+  
     r = Rack::Request.new env
     m = tree.match r.path_info, r.request_method
-    
+  
     return NOT_FOUND if m.nil?
     
-    if @before_block && @before_block.arity == 1
-      bres = @before_block.call r
-      return bres if Rack::Fastlint.response bres
-    end
+    begin
+      if @before_block && @before_block.arity == 1
+        bres = @before_block.call r
+        return bres if Rack::Fastlint.response bres
+      end
 
-    if m.url_params.count > 0
-      q = r.params.merge m.url_params
-      s = q.map { |p| p.join '=' }.join '&'
-      r.env["rack.request.query_hash"] = q
-      r.env["rack.request.query_string"] = s
-      r.env["QUERY_STRING"] = s
-      r.instance_variable_set "@params", r.POST.merge(q)
-    end
+      if m.url_params.count > 0
+        q = r.params.merge m.url_params
+        s = q.map { |p| p.join '=' }.join '&'
+        r.env["rack.request.query_hash"] = q
+        r.env["rack.request.query_string"] = s
+        r.env["QUERY_STRING"] = s
+        r.instance_variable_set "@params", r.POST.merge(q)
+      end
     
-    case m.item
-    when Proc then res = m.item.call r
-    else
-      raise InvalidRouteError, "Route handlers must be blocks or valid rack apps." unless m.item.respond_to? :call
-      r.env["PATH_INFO"] = m.remaining_path
-      res = m.item.call r.env
-    end
+      case m.item
+      when Proc then res = m.item.call r
+      else
+        raise InvalidRouteError, "Route handlers must be blocks or valid rack apps." unless m.item.respond_to? :call
+        r.env["PATH_INFO"] = m.remaining_path
+        res = m.item.call r.env
+      end
     
-    if @after_block && @after_block.arity == 2
-      ares = @after_block.call r, res
-      return ares if Rack::Fastlint.response ares
-    end
+      if @after_block && @after_block.arity == 2
+        ares = @after_block.call r, res
+        return ares if Rack::Fastlint.response ares
+      end
     
-    res
+      res
+    rescue StandardError => e
+      b = (@error_blocks[e.class] || @error_blocks[:default]) rescue nil
+      raise e if b.nil?
+      b.call e, r
+    end
   end
   
   def start port=3001
@@ -61,6 +68,11 @@ module Sansomable
     Rack::Handler.pick(RACK_HANDLERS).run self, :Port => port
   end
   
+  def error error_key=:default, &block
+    @error_blocks ||= {}
+    @error_blocks[error_key] = block
+  end
+  
   def before &block
     @before_block = block
   end
@@ -73,7 +85,7 @@ module Sansomable
     path, item = *args.dup.push(block)
     return super unless path && item
     return super unless item != self
-    return super unless (HTTP_VERBS+[:map]).include?(meth)
+    return super unless ROUTE_METHODS.include? meth
     tree.map_path path, item, meth
   end
 end

data/sansom.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name          = "sansom"
-  s.version       = "0.1.0"
+  s.version       = "0.1.1"
   s.authors       = ["Nathaniel Symer"]
   s.email         = ["nate@natesymer.com"]
   s.summary       = "Scientific, philosophical, abstract web 'picowork' named after Sansom street in Philly, near where it was made."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sansom
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nathaniel Symer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler