sansom 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1548d457d044bae13692b07bcb7a8374212be88
-  data.tar.gz: 13e2ea4214d1b6a3c5b7c2c05421776f20dd9c92
+  metadata.gz: 9fe8ba21c0cab848b10f8484f8f38a0454d2f549
+  data.tar.gz: dccfd78c121e2b6f6bc5c01f42bce52f8809ea93
 SHA512:
-  metadata.gz: e097de2bf1ea1b34754d9fde63983bc374d72e36a9cb446d275302824b1fc04183f1282b944add46b364ce1b5c7241520ce388eb53a4c09b702886748ce8a51e
-  data.tar.gz: 13503646c81f33fb6ad3cb9004859fa3bd9036781ed5ac7a1b05c5797d0777303575d578b7231353e99803246736ff49ae833ba9c506d053d717b869772dc002
+  metadata.gz: 773fded808375146ea57bf266e68feb8ad2c27ee584590e568d98d9517401f24b07a52f6f8dabab5da0e34114617fcce3b610a5683a77c02c17a10f33b59d93b
+  data.tar.gz: f004a23139c2dd2b1664868507815e1f149064f0511d35a5804efe818f16eabbb1e199d7afd90aa24f9a4162c090891200d24ff4cb60499a1edda90dea3bdc86

data/README.md

@@ -6,14 +6,22 @@ Scientific, philosophical, abstract web 'picowork' named after Sansom street in
 Philosophy
 -
 
-*A piece of software should not limit you to one way of thinking.*
+***A piece of software should not limit you to one way of thinking.***
 
 You can write a `Sansomable` for each logical unit of your API, but you also don't have to.
 
-You can also mount existing Rails/Sinatra apps in your `Sansomable`. But you also don't have to.
+You can also mount existing Rails/Sinatra/Rack apps in your `Sansomable`. But you also don't have to.
 
 You can write one `Sansomable` for your entire API.
 
+Fuck it.
+
+***A piece of software should not be a magic box.***
+
+A web framework is, however simplistically, a tool to connect code to a URL's path.
+
+A web framework doesn't provide an ORM, template rendering, nor change how ruby works to the point where you're not writing Ruby code but instead `Rails` or `Sinatra` code.
+
 Installation
 -
 
@@ -160,7 +168,7 @@ Notes
 -
 
 - `Sansom` does not pollute _any_ `Object` methods, including `initialize`
-- `Sansom` is under **190** lines of code at the time of writing. This includes
+- `Sansom` is under **250** lines of code at the time of writing. This includes
 	* Rack conformity & the DSL (`sansom.rb`)
 	* Custom tree-based routing (`pine.rb`)
 

data/changelog.md

@@ -46,4 +46,10 @@ Here's an example
 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.
+- Fixed a bug where async responses would be marked as bad by the fastlinter.
+
+0.1.0
+
+- PUBLIC RELEASE!
+- After block added
+- Improved routing behavior & speed

data/lib/rack/fastlint.rb

@@ -4,7 +4,6 @@ require "rack"
 
 module Rack
   class Fastlint
-    LintError = Class.new StandardError
     def self.response res
       return false unless res.kind_of?(Array) && res.count == 3
       
@@ -21,15 +20,15 @@ module Rack
       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/
+          throw StandardError unless k.kind_of? String
+          throw StandardError unless v.kind_of? String
+          throw StandardError if k.downcase == "status"
+          throw StandardError unless k !~ /[:\n]/
+          throw StandardError unless k !~ /[-_]\z/
+          throw StandardError unless k =~ /\A[a-zA-Z][a-zA-Z0-9_-]*\z/
         }
       
-        body.each { |part| throw LintError unless part.kind_of? String }
+        body.each { |part| throw StandardError unless part.kind_of? String }
       rescue StandardError
         return false
       end

data/lib/sansom.rb

@@ -6,10 +6,10 @@ require_relative "./rack/fastlint.rb"
 
 module Sansomable
   InvalidRouteError = Class.new StandardError
-  HTTP_VERBS = [:get,:head, :post, :put, :delete, :patch, :options].freeze
-  HANDLERS = ["puma", "unicorn", "thin", "webrick"].freeze
+  HTTP_VERBS = [:get,:head, :post, :put, :delete, :patch, :options, :link, :unlink, :trace].freeze
+  RACK_HANDLERS = ["puma", "unicorn", "thin", "webrick"].freeze
   NOT_FOUND = [404, {}, ["Not found."]].freeze
-  
+
   def tree
     if @tree.nil?
       @tree = Pine::Node.new "ROOT"
@@ -19,49 +19,56 @@ module Sansomable
   end
   
   def call env
-    return NOT_FOUND if tree.leaf?
+    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
-      res = @before_block.call r
-      return res if Rack::Fastlint.response res
+    if @before_block && @before_block.arity == 1
+      bres = @before_block.call r
+      return bres if Rack::Fastlint.response bres
     end
 
-    m = tree.match r.path_info, r.request_method
-
-    if m.nil?
-      NOT_FOUND
-    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
+    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
+    
+    if @after_block && @after_block.arity == 2
+      ares = @after_block.call r, res
+      return ares if Rack::Fastlint.response ares
+    end
+    
+    res
   end
   
   def start port=3001
     raise NoRoutesError if tree.leaf?
-    Rack::Handler.pick(HANDLERS).run self, :Port => port
+    Rack::Handler.pick(RACK_HANDLERS).run self, :Port => port
   end
   
   def before &block
     @before_block = block
   end
   
+  def after &block
+    @after_block = block
+  end
+  
   def method_missing meth, *args, &block
     path, item = *args.dup.push(block)
     return super unless path && item

data/lib/sansom/pine.rb

@@ -4,35 +4,28 @@
 
 module Pine
   Result = Struct.new :item, :remaining_path, :url_params
-  
+
   class Content
-    attr_accessor :items, :map
+    attr_reader :items, :map
     
     def initialize
       @items = []
       @map = {}
     end
-
-    def []= k,v
+    
+    def set 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
-  
-    def initialize name, content=Content.new
+    attr_reader :name, :parent, :content
+
+    def initialize name
       @name = name
-      @content = content
+      @content = Content.new
       @children = {}
-      @parent = nil
     end
   
     def root?
@@ -48,45 +41,33 @@ module Pine
     end
     
     def [] k
-      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
-      child = self.class.new comp
-      child.instance_variable_set "@parent", self
-      @children[comp] = child
-      child
+      return @children[k] if @children.member? k
+      c = @children.values.first
+      return c if (c.wildcard? rescue false)
     end
     
     def << comp
-      if comp.start_with? ":"
-        @children.clear
-        create_and_save comp
-      else
-        child = @children[comp]
-        child = create_and_save comp if !child || (!child && child.leaf? && !child.wildcard?)
-        child
+      child = self[comp]
+      
+      if child.nil?
+        child = self.class.new comp
+        child.instance_variable_set "@parent", self
+        @children.reject!(&:leaf?) if child.wildcard?
+        @children[comp] = child
       end
-    end
 
-    def parse_path path, include_root=true
+      child
+    end
+    
+    def parse_path path
       c = path.split "/"
-      if include_root
-        c[0] = '/'
-      else
-        c.delete_at(0) if c[0].empty?
-      end
+      c[0] = '/'
       c.delete_at(-1) if c[-1].empty?
       c
     end
     
     def map_path path, item, key
-      parse_path(path).inject(self) { |node, comp| node << comp }.content[key] = item
+      parse_path(path).inject(self) { |node, comp| node << comp }.content.set key, item
       path
     end
     
@@ -95,15 +76,18 @@ module Pine
       matched_params = {}
       
       walk = parse_path(path).inject self do |node, 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 child.wildcard?
-        child
+        break node if node.leaf?
+        next node[comp] if node.root?
+        
+        c = node[comp]
+        break node if c.nil?
+        matched_comps << comp
+        matched_params[c.name[1..-1]] = comp if c.wildcard?
+        c
       end
 
       return nil if walk.nil?
-      return nil if walk.root? #rescue true
+      return nil if walk.root?
 
       c = walk.content
       subpath = path.sub "/#{matched_comps.join("/")}", ""

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.7"
+  s.version       = "0.1.0"
   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.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Nathaniel Symer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler