sansom 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0ed3a40529913f75db37f78542ad2a6a1dde6a0
-  data.tar.gz: c9b93cde34acbcc3a3144170c75caa112192d72e
+  metadata.gz: d1548d457d044bae13692b07bcb7a8374212be88
+  data.tar.gz: 13e2ea4214d1b6a3c5b7c2c05421776f20dd9c92
 SHA512:
-  metadata.gz: 38f436abd2d865c291f9c5edb4cded8eb6928374c80aa4a51b867c2e4f9dfe2e9e0e7b95363ef6e53d17088864482f4ff43e62215215c8760bb3ca710edd1063
-  data.tar.gz: d9b5f887a2620ee55d1c9584c068c61c86a48c63a8d3babbb7106e36899798f1904f33ff03280ee3c91a6b694b68d7bff2ab375ce2e195f5a3607dee4b306749
+  metadata.gz: e097de2bf1ea1b34754d9fde63983bc374d72e36a9cb446d275302824b1fc04183f1282b944add46b364ce1b5c7241520ce388eb53a4c09b702886748ce8a51e
+  data.tar.gz: 13503646c81f33fb6ad3cb9004859fa3bd9036781ed5ac7a1b05c5797d0777303575d578b7231353e99803246736ff49ae833ba9c506d053d717b869772dc002

data/changelog.md

@@ -37,4 +37,13 @@ Here's an example
 
 - Parameterized URLs!!! (Stuff like `/user/:id/profile`)
 	* Parameterized URLs work with mounted Rack/Sansom apps
-- Improved matching efficiency
+- Improved matching efficiency
+
+0.0.6
+
+- Before block response checking
+
+0.0.7
+
+- Fixed bug where a wilcard path component would be ignored if it came last in the URL
+- Fixed a bug where async responses would be marked as bad by the fastlinter.

data/lib/rack/fastlint.rb

@@ -4,32 +4,36 @@ require "rack"
 
 module Rack
   class Fastlint
+    LintError = Class.new StandardError
     def self.response res
-      # Check response format
       return false unless res.kind_of?(Array) && res.count == 3
       
       status, headers, body = res
 
-      return false unless status.to_i >= 100
-      
+      return false unless status.to_i >= 100 || status.to_i == -1
       return false unless headers.respond_to? :each
-      headers.each { |k,v|
-        next if key =~ /^rack\..+$/
-        return false unless k.kind_of? String
-        return false unless v.kind_of? String
-        return false if k.downcase == "status"
-        return false unless k !~ /[:\n]/
-        return false unless k !~ /[-_]\z/
-        return false unless k =~ /\A[a-zA-Z][a-zA-Z0-9_-]*\z/
-      }
-      
       return false unless body.respond_to? :each
-      body.each { |part| return false unless part.kind_of? String }
       
       if body.respond_to? :to_path
         return false unless File.exist? body.to_path
       end
       
+      begin
+        headers.each { |k,v|
+          next if key =~ /^rack\..+$/
+          throw LintError unless k.kind_of? String
+          throw LintError unless v.kind_of? String
+          throw LintError if k.downcase == "status"
+          throw LintError unless k !~ /[:\n]/
+          throw LintError unless k !~ /[-_]\z/
+          throw LintError unless k =~ /\A[a-zA-Z][a-zA-Z0-9_-]*\z/
+        }
+      
+        body.each { |part| throw LintError unless part.kind_of? String }
+      rescue StandardError
+        return false
+      end
+
       true
     end
   end

data/lib/sansom/pine.rb

@@ -3,6 +3,27 @@
 # Path routing tree
 
 module Pine
+  Result = Struct.new :item, :remaining_path, :url_params
+  
+  class Content
+    attr_accessor :items, :map
+    
+    def initialize
+      @items = []
+      @map = {}
+    end
+
+    def []= k,v
+      @items << v if k == :map
+      @map[k] = v unless k == :map
+    end
+  
+    def [] k
+      @items[k] if Numeric === k
+      @map[k] unless Numeric === k
+    end
+  end
+  
   class Node
     attr_reader :name, :parent
     attr_accessor :content
@@ -23,15 +44,16 @@ module Pine
     end
     
     def wildcard?
-      @wildcard
+      @name.start_with? ":"
     end
     
     def [] k
-      return @children[k] || @children.values.first
-    #  child = @children[k] || @child.values.first
-     # return child unless child.nil?
-      
-     # @children[k] || @children.values.first.wildcard? ? @children.values.first : nil
+      child = @children[k]
+      return child unless child.nil?
+      child = @children.values.first
+      return child if child.wildcard?
+      nil
+     # return @children[k] || @children.values.first
     end
     
     def create_and_save comp
@@ -41,9 +63,8 @@ module Pine
       child
     end
     
-    def << comp      
+    def << comp
       if comp.start_with? ":"
-        @wildcard = true
         @children.clear
         create_and_save comp
       else
@@ -53,9 +74,13 @@ module Pine
       end
     end
 
-    def parse_path path
+    def parse_path path, include_root=true
       c = path.split "/"
-      c[0] = '/'
+      if include_root
+        c[0] = '/'
+      else
+        c.delete_at(0) if c[0].empty?
+      end
       c.delete_at(-1) if c[-1].empty?
       c
     end
@@ -70,14 +95,15 @@ module Pine
       matched_params = {}
       
       walk = parse_path(path).inject self do |node, comp|
-        break node if node.leaf?
-        matched_comps << comp unless comp == "/"
+        next node[comp] if node.name == "ROOT"
+        matched_comps << comp unless node.leaf?
         child = node[comp]
-        matched_params[child.name[1..-1]] = comp if node.wildcard?
+        matched_params[child.name[1..-1]] = comp if child.wildcard?
         child
       end
 
-      return nil if walk.root? rescue true
+      return nil if walk.nil?
+      return nil if walk.root? #rescue true
 
       c = walk.content
       subpath = path.sub "/#{matched_comps.join("/")}", ""
@@ -95,25 +121,4 @@ module Pine
       obj.singleton_class.include? Sansomable
     end
   end
-  
-  Result = Struct.new :item, :remaining_path, :url_params
-
-  class Content
-    attr_accessor :items, :map
-    
-    def initialize
-      @items = []
-      @map = {}
-    end
-
-    def []= k,v
-      @items << v if k == :map
-      @map[k] = v unless k == :map
-    end
-  
-    def [] k
-      @items[k] if Numeric === k
-      @map[k] unless Numeric === k
-    end
-  end
 end

data/lib/sansom.rb

@@ -21,7 +21,7 @@ module Sansomable
   def call env
     return NOT_FOUND if tree.leaf?
     
-    r = Rack::Request.new env.dup
+    r = Rack::Request.new env
     
     if @before_block
       res = @before_block.call r
@@ -29,25 +29,27 @@ module Sansomable
     end
 
     m = tree.match r.path_info, r.request_method
-    
-    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
+    if m.nil?
       NOT_FOUND
-    elsif m.item.is_a? Proc
-      m.item.call r
-    elsif m.item.respond_to? :call
-      r.env["PATH_INFO"] = m.remaining_path
-      m.item.call r.env
-    else
-      raise InvalidRouteError, "Route handlers must be blocks or valid rack apps."
+    else 
+      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.item.is_a? Proc
+        m.item.call r
+      elsif m.item.respond_to? :call
+        r.env["PATH_INFO"] = m.remaining_path
+        m.item.call r.env
+      else
+        raise InvalidRouteError, "Route handlers must be blocks or valid rack apps."
+      end
     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.0.6"
+  s.version       = "0.0.7"
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sansom
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Nathaniel Symer