sansom 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c54015af146ba89239c6199fa38f6d32674f274
-  data.tar.gz: 01b09122f5014d586311449942d84962a51b1a89
+  metadata.gz: 83d66dba113385fce6c56f322029124339fd7b95
+  data.tar.gz: b8bd60af145d70fa86659611cbb68cfc7b406377
 SHA512:
-  metadata.gz: 806566785d4903fb29413b9c4606f259b154b2f6dc946139e20341ed69a08385c533818bbd1a5eab8553c3622387a22e51261a910b309e0e22810c0eba4f6733
-  data.tar.gz: 5805d9c95195d8b5b9ce80f20b0dbee5df425877f28ff63dba3f34dee3198969fd3ce4ee57282ec84e8f2c5f82aca291aa71be03fd8df5bc1aedb6542b4d3914
+  metadata.gz: 848745905809706be2a7fe194f017249053296ddd858b6f380425ed9d5c89bd92eab1049c9b33b4a00b7cf943d311d2ea6ffce33e1efb641dca4c26518495fda
+  data.tar.gz: 566b2bf914317d9c64df03cef8518be605d7b26835bf10602f0883ce960ec62ccc45072434d177acdebcb411c2e55f77a5f3ba2efc9ff719af9de46cdc5a436a

data/changelog.md

@@ -0,0 +1,30 @@
+Changelog
+=
+
+0.0.1
+
+(yanked due to bad name in Gemfile)
+
+0.0.2
+
+- Initial release
+
+0.0.3
+
+- Wrote custom tree implementation called Pine to replace RubyTree
+- Added `before` block
+
+Here's an example
+
+    s = Sansom.new
+
+    s.before do |r|
+      # Caveat: routes are mapped before this block is called
+      # Code executed before mapped route
+    end
+    
+    s.get "/" do |r|
+      [200, {}, ["Hello!"]]
+    end
+    
+    s.start 2000

data/examples/before.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require_relative "../lib/sansom"
+
+s = Sansom.new
+
+s.before do |r|
+  puts "(#{s.class.to_s}) #{r.request_method.upcase} #{r.path_info}"
+  [200, {}, ["Hijacked by before!"]] if Random.new.rand(2) == 1
+end
+
+s.get "/" do |r|
+  [200, { "Content-Type" => "text/plain"}, ["root"]]
+end
+
+s.get "/something" do |r|
+  [200, { "Content-Type" => "text/plain" }, ["something"]]
+end
+
+s.start 2000

data/examples/generic.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
 require "json"
-require "sansom"
+#require "sansom"
+require_relative "../lib/sansom"
 
 class Sansom
   def food_response r

data/lib/sansom/pine.rb

@@ -0,0 +1,118 @@
+#!/usr/bin/env ruby
+
+# Path routing tree
+
+# Custom tree implementation for path routing
+
+# Custom features:
+# 1. Trimming: Limit a node to a single element
+
+module Pine
+  class Node
+    attr_reader :name
+    attr_accessor :content
+    attr_accessor :parent
+  
+    def initialize name, content=Content.new
+      @name = name
+      @content = content
+      @children = {}
+      @parent = nil
+      @trimmed = false
+    end
+  
+    # returns a node for chaining
+    def <<(node)
+      if trimmed?
+        # Add to first child
+        children.first << node
+      else
+        node.parent = self
+        @children[node.name] = node
+        node
+      end
+    end
+    
+    def create_if_necessary name
+      unless @children.keys.include? name
+        child = self.class.new name
+        child.parent = self
+        @children[name] = child
+      end
+      @children[name]
+    end
+  
+    def root
+      n = self
+      n = n.parent while !n.root?
+      n
+    end
+    
+    def children
+      @children.values
+    end
+    
+    def trim(node)
+      @trimmed = true
+      @children.clear
+      @children[node.name] = node
+      self
+    end
+    
+    def []=(k,v)
+      self << Node.new(k, v)
+    end
+  
+    def [](k)
+      @children[k]
+    end
+  
+    def root?
+      @parent.nil?
+    end
+  
+    def leaf?
+      @children.count == 0
+    end
+    
+    def trimmed?
+      @trimmed
+    end
+    
+    def inspect(level=0)
+      if root?
+        print "*"
+      else
+        print "|" unless parent.parent.children.last == parent rescue false
+        print(' ' * level * 4)
+        print(parent.children.last == self ? "+" : "|")
+        print "---"
+        print(leaf? ? ">" : "+")
+      end
+
+      puts " #{name} #{content.map rescue "fuck"}" 
+
+      children.each { |child| child.inspect(level + 1) if child } # Child might be 'nil'
+    end
+  end
+  
+  class Content
+    attr_accessor :items
+    attr_accessor :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

@@ -1,73 +1,55 @@
 #!/usr/bin/env ruby
 
 require "rack"
-require "tree" # rubytree
+require_relative "./sansom/pine"
 
 module Sansomable
-  class TreeContent
-    attr_accessor :items
-    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
-  
   InvalidRouteError = Class.new StandardError
-  NoRoutesError = Class.new StandardError
-  InclusionError = Class.new StandardError
   
-  HTTP_VERBS = ["GET","HEAD","POST","PUT","DELETE","PATCH","OPTIONS"].freeze
+  HTTP_VERBS = [:get,:head, :post, :put, :delete, :patch, :options].freeze
   HANDLERS = ["puma", "unicorn", "thin", "webrick"].freeze
   NOT_FOUND = [404, {"Content-Type" => "text/plain"}, ["Not found."]].freeze
 
   def tree
     @tree ||= nil
     if @tree.nil?
-      @tree = Tree::TreeNode.new("ROOT", "ROOT")
+      @tree = Pine::Node.new("ROOT", nil)
       template if respond_to? :template
     end
     @tree
   end
+  
+  def before_block
+    @before_block ||= nil
+  end
 
-  def match http_method, path
+  def match verb, path
     components = s_parse_path(path)
     matched_components = []
+    matched_parameters = {}
     
-    walk = components.inject(tree) do |node, component| 
-      child = node[component]
-      
-      if child.nil?
+    walk = components.inject(tree) do |node, component|
+      if node.leaf?
         node
       else
         matched_components << component unless component == "/"
-        child
+        node[component]
       end
     end
-
-    tc = walk.content
-    
-    return nil if tc == "ROOT"
     
+    return nil if walk.root?
+
+    c = walk.content
     matched_path = "/" + matched_components.join("/")
 
-    match = tc[http_method] # Check for route
-    match ||= tc.items.select(&method(:sansom?)).reject { |item| item.match(http_method, s_truncate_path(path, matched_path)).nil? }.first rescue nil # Check subsansoms
-    match ||= tc.items.reject(&method(:sansom?)).first rescue nil # Check for mounted rack apps
+    match = c[verb.downcase.to_sym] # Check for route
+    match ||= c.items.select(&method(:sansom?)).reject { |item| item.match(verb, path.sub(matched_path, "")).nil? }.first rescue nil # Check subsansoms
+    match ||= c.items.reject(&method(:sansom?)).first rescue nil # Check for mounted rack apps
     [match, matched_path]
   end
   
   def call env
-    return NOT_FOUND if tree.children.empty?
+    return NOT_FOUND if tree.leaf?
     
     r = Rack::Request.new env
 
@@ -76,12 +58,20 @@ module Sansomable
     
     if item.nil?
       NOT_FOUND
-    elsif Proc === item
-      item.call r
-    elsif sansom? item
-      item.call(env.dup.merge({ "PATH_INFO" => s_truncate_path(r.path_info, m.last) }))
     else
-      raise InvalidRouteError, "Invalid route handler, it must be a block (proc/lambda) or a subclass of Sansom."
+      if before_block
+        res = before_block.call r
+        return res if res[0].is_a?(Numeric) && res[1].is_a?(Hash) && res[2].respond_to?(:each) rescue false
+      end
+      
+      if item.is_a? Proc
+        item.call r
+      elsif sansom? item
+        r.path_info.sub! m[1], ""
+        item.call(r.env)
+      else
+        raise InvalidRouteError, "Invalid route handler, it must be a block (proc/lambda) or a subclass of Sansom."
+      end
     end
   end
   
@@ -90,49 +80,31 @@ module Sansomable
     Rack::Handler.pick(HANDLERS).run self, :Port => port
   end
   
+  def before(&block)
+    @before_block = block
+  end
+  
   def method_missing(meth, *args, &block)
-    _args = args.dup.push block
-    super unless _args.count >= 2 
-    
-    path = _args[0].dup
-    item = _args[1].dup
-    
+    path, item = *args.dup.push(block)
+    return super unless path && item
     return super if item == self
+    return super unless HTTP_VERBS.include?(meth) || meth == :map
     
-    verb = meth.to_s.strip.upcase
-    return super unless HTTP_VERBS.include?(verb) || meth == :map
-    verb = :map if meth == :map
-    
-    components = s_parse_path path
-    components.each_with_index.inject(tree) do |node,(component, idx)|
-      child = node[component]
-
-      if child.nil?
-        newvalue = Tree::TreeNode.new(component, TreeContent.new)
-        node << newvalue
-        child = newvalue
-      end
-
-      child.content[verb] = item if idx == components.count-1
-      child
-    end
+    n = s_parse_path(path).inject(tree) { |node, comp| node.create_if_necessary comp }
+    n.content[meth] = item
   end
   
   private
   
   def sansom? obj
-    return true if Sansom === obj
+    return true if obj.is_a? Sansom
     return true if obj.class.included_modules.include? Sansomable
     false
   end
-  
+
   def s_parse_path path
     path.split("/").reject(&:empty?).unshift("/")
   end
-  
-  def s_truncate_path truncated, truncator
-    "/" + s_parse_path(truncated)[s_parse_path(truncator).count..-1].join("/")
-  end
 end
 
 Sansom = Class.new Object

data/sansom.gemspec

@@ -1,23 +1,21 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'sansom/version'
 
-Gem::Specification.new do |spec|
-  spec.name          = "sansom"
-  spec.version       = Sansom::VERSION
-  spec.authors       = ["Nathaniel Symer"]
-  spec.email         = ["nate@natesymer.com"]
-  spec.summary       = %q{Flexible, versatile, light web framework named after Sansom street in Philly.}
-  spec.description   = %q{Flexible, versatile, light web framework named after Sansom street in Philly. It's under 140 lines of code & and it's lightning fast.}
-  spec.homepage      = "http://github.com/fhsjaagshs/sansom"
-  spec.license       = "MIT"
+Gem::Specification.new do |s|
+  s.name          = "sansom"
+  s.version       = "0.0.3"
+  s.authors       = ["Nathaniel Symer"]
+  s.email         = ["nate@natesymer.com"]
+  s.summary       = "Flexible, versatile, light web framework named after Sansom street in Philly."
+  s.description   = s.summary + "It's under 140 lines of code & and it's lightning fast. It uses tree-based route resolution."
+  s.homepage      = "http://github.com/fhsjaagshs/sansom"
+  s.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  s.files         = `git ls-files -z`.split("\x0")
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_dependency "rubytree", "~> 0.9"
+  s.add_development_dependency "bundler", "~> 1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sansom
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nathaniel Symer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,22 +24,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: rubytree
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 description: Flexible, versatile, light web framework named after Sansom street in
-  Philly. It's under 140 lines of code & and it's lightning fast.
+  Philly.It's under 140 lines of code & and it's lightning fast. It uses tree-based
+  route resolution.
 email:
 - nate@natesymer.com
 executables: []
@@ -50,10 +37,12 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- changelog.md
+- examples/before.rb
 - examples/generic.rb
 - examples/mixin.rb
 - lib/sansom.rb
-- lib/sansom/version.rb
+- lib/sansom/pine.rb
 - sansom.gemspec
 homepage: http://github.com/fhsjaagshs/sansom
 licenses:

data/lib/sansom/version.rb

@@ -1,3 +0,0 @@
-module Sansom
-  VERSION = "0.0.2"
-end