addressive 0.1.0.alpha → 0.1.0

data/addressive.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'addressive'
-  s.version = '0.1.0.alpha'
-  s.date = '2011-11-23'
+  s.version = '0.1.0'
+  s.date = Time.now.strftime('%Y-%m-%d')
   s.authors = ["HannesG"]
   s.email = %q{hannes.georg@googlemail.com}
   s.summary = 'A system which should help bringing different Rack applications together.'
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   
   s.files = Dir.glob('lib/**/**/*.rb') + ['addressive.gemspec']
   
-  s.add_dependency 'uri_template', '~> 0.1.4'
-  
+  s.add_dependency 'uri_template', '>= 0.5.1'
+
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'yard'

data/lib/addressive.rb

@@ -15,10 +15,11 @@
 #    (c) 2011 by Hannes Georg
 #
 
-$LOAD_PATH << File.expand_path('../../uri_template7/lib/',File.dirname(__FILE__))
-require File.expand_path('../../uri_template7/lib/uri_template',File.dirname(__FILE__))
+require 'uri_template'
 require 'ostruct'
 
+require File.expand_path('addressive/backports', File.dirname(__FILE__))
+
 # Addressive is library which should make it possible for different rack-applications to live together on the same server.
 # To accomplish this, addressive supplies you with:
 #   - A model for a graph in which each node is one application.
@@ -37,6 +38,8 @@ module Addressive
 
   ADDRESSIVE_ENV_KEY = 'addressive'.freeze
 
+  DEFAULT_ACTION = :default
+
   class Error < StandardError
   
   end
@@ -48,7 +51,14 @@ module Addressive
     
     def initialize(builder)
       @builder = builder
-      super("No URISpec found for #{builder.inspect}. Only got: #{builder.node.uri_specs.keys.join(', ')}")
+      super([
+        "No URISpec found for #{builder.inspect}. Only got:",
+        *builder.node.uri_specs.map{|key,specs|
+          ["\t#{key.inspect} :",
+            *specs.select{|spec| spec.valid? and spec.emit != false }.map{|spec| "\t\t#{spec.template.inspect}" }
+          ].join("\n")
+        }
+      ].join("\n"))
     end
   
   end
@@ -83,6 +93,12 @@ module Addressive
     # 
     # @example
     #   node = Addressive::Node.new
+    #   node.uri_spec << Addressive::URISpec.new( URITemplate.new('/an/uri/with/{var}') )
+    #   bldr = Addressive::URIBuilder.new(node)
+    #   bldr.uri('var'=>'VAR!').to_s #=> '/an/uri/with/VAR%21'
+    #
+    # @example
+    #   node = Addressive::Node.new
     #   node.uri_spec(:show) << Addressive::URISpec.new( URITemplate.new('/an/uri/with/{var}') )
     #   bldr = Addressive::URIBuilder.new(node)
     #   bldr.uri(:show, 'var'=>'VAR!').to_s #=> '/an/uri/with/VAR%21'
@@ -90,14 +106,20 @@ module Addressive
     # @return URIBuilder
     def uri(*args)
       return uri_builder_delegate.uri(*args) if uri_builder_delegate
-      hashes, path = args.collect_concat{|a| a.respond_to?(:to_addressive) ? a.to_addressive : [a] }.partition{|x| x.kind_of? Hash}
+      argz = args.collect_concat{|a| a.respond_to?(:to_addressive) ? a.to_addressive : [a] }
+      hashes, path = argz.partition{|x| x.kind_of? Hash}
       node = self.node
       action = self.action
       if path.size >= 1
         node = node.traverse(*path[0..-2])
-        action = path.last
+        if node.edge? path.last
+          node = node.traverse(path.last)
+          action = DEFAULT_ACTION
+        else
+          action = path.last
+        end
       end
-      derive_uri_builder(action, hashes.inject(self.variables || {}, &:merge), node)
+      derive_uri_builder(action, hashes.map{|hsh| Hash[hsh.map{|k,v| [k.to_s,v] }] }.inject(&:merge!), node)
     end
     
     private
@@ -116,7 +138,7 @@ module Addressive
     attr_reader :origin,:node,:variables,:action
 
     # @private
-    def initialize(origin, action=:default, vars={}, node=origin)
+    def initialize(origin, action=DEFAULT_ACTION, vars={}, node=origin)
       @origin = origin
       @node = node
       @action = action
@@ -153,7 +175,7 @@ module Addressive
     def uri_builder_specs
       return @specs ||= begin
         varnames = (self.variables || {} ).keys
-        self.node.uri_spec(self.action).select{|s| s.valid? and (s.variables - varnames).none? }.sort_by{|s| (varnames - s.variables).size }
+        self.node.uri_spec(self.action).select{|s| s.valid? and s.emit != false and (s.variables - varnames).none? }.sort_by{|s| (varnames - s.variables).size }
       end
     end
   end
@@ -170,14 +192,32 @@ module Addressive
     def variables
       @template ? @template.variables : []
     end
-    
+
+    def prefix!(with, op=:/)
+      return self unless valid?
+      @template = URITemplate.apply(with, op, @template )
+      return self
+    end
+
+    def set_unless(key, value)
+      send("#{key}=".to_sym, send(key) || value)
+    end
+
     def initialize(template, *args)
       @template = template
       super(*args)
     end
+
+    def hash
+      @template.hash ^ super
+    end
+
+    def ==(other)
+      @template == other.template && super
+    end
     
     def inspect
-      ['#<',self.class.name,': ',template.inspect,*@table.map{|k,v| " #{k}=#{v.inspect}"},'>'].join
+      ( ['#<',self.class.name,': ',template.inspect ] + @table.map{|k,v| " #{k}=#{v.inspect}"} + ['>'] ).join
     end
     
   end
@@ -190,11 +230,11 @@ module Addressive
     def converter(defaults = self.all_defaults)
       lambda{|spec|
         if spec.kind_of? URISpec
-          [ normalize( spec.dup, defaults ) ]
+          normalize( spec.dup, defaults )
         elsif spec.kind_of? URITemplate
-          [ normalize( URISpec.new( spec ) , defaults) ]
+          normalize( URISpec.new( spec ) , defaults)
         elsif spec.kind_of? String
-          [ normalize( URISpec.new( URITemplate.new(spec) ) , defaults) ]
+          normalize( URISpec.new( URITemplate.new(spec) ) , defaults)
         elsif spec.kind_of? Array
           spec.map(&self.converter(defaults))
         elsif spec.kind_of? Hash
@@ -209,13 +249,11 @@ module Addressive
     protected :converter
   
     def normalize( spec, defaults = self.all_defaults )
-      if defaults.key? :app 
-        spec.app = defaults[:app]
+      defaults.each do |key,value|
+        spec.set_unless( key, value)
       end
-      unless spec.template.absolute?
-        if defaults[:prefix]
-          spec.template = URITemplate.apply( defaults[:prefix] , :/ ,  spec.template)
-        end
+      if defaults[:rewrite]
+        spec = Array( defaults[:rewrite].call(spec) )
       end
       return spec
     end
@@ -223,8 +261,9 @@ module Addressive
     attr_reader :defaults
     
     def initialize(defaults, parent = nil)
-      @defaults = defaults
+      @defaults = defaults.dup
       @parent = parent
+      validate!
     end
     
     def convert(*args)
@@ -236,10 +275,18 @@ module Addressive
     def all_defaults
       @parent ? @parent.all_defaults.merge(defaults) : defaults
     end
-    
+
     def derive(nu_defaults)
       self.class.new(nu_defaults, self)
     end
+
+  private
+
+    def validate!(defaults = self.all_defaults)
+      if defaults[:rewrite] && !defaults[:rewrite].respond_to?(:call)
+        raise ArgumentError.new("Expected option :rewrite to respond to :call ( got: #{defaults[:rewrite].inspect} ).")
+      end
+    end
   
   end
   
@@ -314,8 +361,17 @@ module Addressive
         raise NoEdgeFound.new(self, args.first)
       end
     end
-    
-    def uri_spec(name)
+
+    def edge?(name)
+      return edges.key?(name)
+    end
+
+    def uri_spec?(name = DEFAULT_ACTION)
+      @uri_specs.key? name
+    end
+
+
+    def uri_spec(name = DEFAULT_ACTION)
       @uri_specs[name]
     end
     
@@ -341,14 +397,17 @@ module Addressive
   # @example
   #   node = Addressive.node do 
   #     edge( :another ) do
-  #       default :prefix, '/another'
-  #       uri :default ,'/'
+  #       default :rewrite, lambda{|spec|
+  #         spec.template = URITemplate.new('/another') / spec.template
+  #         spec
+  #       }
+  #       uri '/'
   #     end
-  #     uri :default ,'/'
+  #     uri '/'
   #   end
   #   
   #   node.uri.to_s #=> '/'
-  #   node.uri(:another,:default).to_s #=> '/another/'
+  #   node.uri(:another).to_s #=> '/another/'
   #
   # @param name [Symbol] a name for this node
   # @yield {NodeBuilder}

data/lib/addressive/{graphviz.rb → backports.rb}

@@ -12,10 +12,17 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-#    (c) 2011 by Hannes Georg
+#    (c) 2012 by Hannes Georg
 #
 
-module Addressive
-
-  # A module to visualize 
-  module Graphviz
+unless [].respond_to? :collect_concat
+  Enumerable.class_eval do
+    def collect_concat
+      result = []
+      each do |e|
+        result += yield e
+      end
+      return result
+    end
+  end
+end

data/lib/addressive/builder.rb

@@ -0,0 +1,8 @@
+module Addressive
+
+  class Builder < Rack::Builder
+
+
+  end
+
+end

data/lib/addressive/graph.rb

@@ -12,7 +12,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-#    (c) 2011 by Hannes Georg
+#    (c) 2011 - 2012 by Hannes Georg
 #
 
 module Addressive
@@ -21,27 +21,43 @@ module Addressive
   # Graphs are only used to generate nodes and their relations.
   # They will be GCed when they are done.
   class Graph
-    
+
+    require 'addressive/graph/builds_uris'
+    require 'addressive/graph/middleware'
+
     # An app builder is used to add uris for a certain app to a node.
     class AppBuilder
-    
+
+      include BuildsURIs
+
+      attr :spec_factory, :node, :defaults
+
       # @private
       def initialize(node, factory, app)
         @node = node
         @app = app
         @spec_factory = factory
+        @callback = nil
+        @defaults = {}
+        @middleware = Middleware::End
       end
-      
-      # Sets a default value for an option.
-      def default(name, value)
-        @spec_factory.defaults[name] = value
+
+      def spec_factory_with_options(overrides)
+        if overrides.key? :app
+          cb = @middleware.unwind(overrides[:app])
+        else
+          cb = (@callback ||= @middleware.unwind(@app))
+        end
+        super( {:callback => cb}.merge(overrides) )
       end
-      
-      # Adds one or more uri specs for a given name. It uses the current app as the default app for all specs.
-      def uri(name,*args)
-        specs = @node.uri_spec(name)
-        specs << @spec_factory.convert(*args)
-        return specs
+
+      def use(middleware, *args, &block)
+        if middleware.respond_to? :call
+          @middleware <<= proc{|app| proc{|env| middleware.call(env, app, *args, &block) } }
+        else
+          @middleware <<= proc{|app| middleware.new(app,*args, &block) }
+        end
+        @callback = nil
       end
     
     end
@@ -49,14 +65,17 @@ module Addressive
     # A NodeBuilder is used to build a Node inside a Graph.
     # This class should not be generated directly, it's created for you by {Builder#node}.
     class NodeBuilder
-  
-      attr_reader :node
-      
+
+      include BuildsURIs
+
+      attr :spec_factory, :node, :defaults
+
       # @private
       def initialize(network,node)
         @network = network
         @node = node
-        @spec_factory = network.spec_factory.derive({})
+        @defaults = {}
+        @spec_factory = network.spec_factory
       end
       
       # Adds an edge from the current node to a node with the given name.
@@ -90,17 +109,6 @@ module Addressive
       
       alias ref edge
       
-      # Sets a default value for an option.
-      def default(name, value)
-        @spec_factory.defaults[name] = value
-      end
-      
-      # Adds one or more uri specs for a given name.
-      def uri(name,*args)
-        @node.uri_spec(name) << @spec_factory.convert(args)
-        return @node.uri_spec(name)
-      end
-      
       # Adds an rack-application to this node.
       #
       # @example
@@ -142,7 +150,9 @@ module Addressive
         end
         return builder
       end
-      
+
+      alias run app
+
     end
   
     # A Builder is used to construct a network.

data/lib/addressive/graph/builds_uris.rb

@@ -0,0 +1,47 @@
+# -*- encoding : utf-8 -*-
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the Affero GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    (c) 2011 - 2012 by Hannes Georg
+#
+
+module Addressive; module Graph::BuildsURIs
+
+  # Adds one or more uri specs for a given name.
+  def uri(name_or_uri,*args)
+    if name_or_uri.kind_of? Symbol
+      name = name_or_uri
+    else
+      name = DEFAULT_ACTION
+      args.unshift( name_or_uri )
+    end
+    specs = node.uri_spec(name)
+    options = {}
+    if args.size > 1 && args.last.kind_of?(Hash)
+      options = args.pop
+    end
+    specs << spec_factory_with_options(options).convert(*args)
+    return specs
+  end
+
+
+  def spec_factory_with_options(overrides={})
+    return spec_factory.derive( defaults.merge(overrides) )
+  end
+
+  # Sets a default value for an option.
+  def default(name, value)
+    defaults[name] = value
+  end
+
+end; end

data/lib/addressive/graph/middleware.rb

@@ -0,0 +1,38 @@
+# -*- encoding : utf-8 -*-
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the Affero GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    (c) 2011 - 2012 by Hannes Georg
+#
+
+module Addressive; class Graph::Middleware
+
+  def initialize(proc, rest = End)
+    @proc, @rest = proc, rest
+  end
+
+  def unwind(app)
+    @proc.call( @rest.unwind(app) )
+  end
+
+  def <<(proc)
+    self.class.new(proc, self)
+  end
+
+  End = self.new(nil,nil)
+
+  def End.unwind(app)
+    return app
+  end
+
+end ; end

data/lib/addressive/router.rb

@@ -17,6 +17,7 @@
 
 require 'rack/request'
 require 'thread'
+require 'enumerator'
 
 module Addressive
 
@@ -54,7 +55,7 @@ module Addressive
           @routes = []
         end
       
-        def preroute(path, uri)
+        def preroute(*_)
           return self
         end
         
@@ -72,21 +73,25 @@ module Addressive
         
         def done!
           # compile *gnihihi*
-          code = ['def each(path,uri); routes = Enumerator.new(@routes);',
-            *@routes.each_with_index.map{|r,i|
+          code = ( 
+            ['def each(proto,host,path)',
+              'routes = @routes.to_enum',
+              'host_path = host + path; proto_host_path = proto + host + path'] +
+            @routes.each_with_index.map{|r,i|
               "route = routes.next
-              vars = route.template.extract(#{r.template.absolute? ? 'uri' : 'path'})
+              vars = route.template.extract(#{r.template.scheme? ? 'proto_host_path' : (r.template.host? ? 'host_path' : 'path')})
               if vars
-                yield( route, vars, #{i} )
+                yield( route, vars, #{i+1} )
               end
               "
-            } ,'; end'].join
+            } + [ 'end']).join("\n")
           instance_eval(code)
         end
         
-        def each(path,uri)
+        def each(proto,host,path)
+          host_path = host + path; proto_host_path = proto + host + path
           @routes.each_with_index do |route,i|
-            vars = route.template.extract(route.template.absolute? ? uri : path)
+            vars = route.template.extract(route.template.scheme? ? proto_host_path : (route.template.host? ? host_path : path) )
             if vars
               yield( route, vars, i )
             end
@@ -103,8 +108,8 @@ module Addressive
           @partitions = partitions
         end
         
-        def preroute(path,uri)
-          @partitions[ uri.include?(@substring) ? 0 : 1 ].preroute(uri,path)
+        def preroute(proto,host,path)
+          @partitions[ (host+path).include?(@substring) ? 0 : 1 ].preroute(proto,host,path)
         end
         
         def <<(spec)
@@ -137,8 +142,8 @@ module Addressive
           @partitions = partitions
         end
         
-        def preroute(path,uri)
-          @partitions[ path.start_with?(@prefix) ? 0 : 1 ].preroute(uri,path)
+        def preroute(proto, host, path)
+          @partitions[ path.start_with?(@prefix) ? 0 : 1 ].preroute(proto, host, path)
         end
         
         def <<(spec)
@@ -225,14 +230,14 @@ module Addressive
       l = env['rack.logger']
       db = l ? l.method(:debug) : DEBUG_NULL
       db.call(DEBUG_NAME) do
-        "[ ? ] #{rr.url.inspect}"
+        "[ ? ] url: #{rr.url.inspect}, path: #{rr.fullpath.inspect}"
       end
-      matches = routes_for(rr.path, rr.url)
+      matches = routes_for(rr.fullpath, rr.url)
       result = nil
       matches.each do |addressive|
         env[ADDRESSIVE_ENV_KEY] = addressive
         begin
-          result = addressive.spec.app.call(env)
+          result = (addressive.spec.callback || addressive.spec.app).call(env)
           db.call(DEBUG_NAME) do
             "[#{result[0]}] #{addressive.spec.template.pattern} with #{addressive.variables.inspect} on #{addressive.spec.app} ( route #{addressive.data[:'routes.scanned']} / #{addressive.data[:'routes.total']} ) after #{'%.6f' % addressive.data[:duration]}"
           end
@@ -260,15 +265,15 @@ module Addressive
       include Enumerable
     
       # @private
-      def initialize(routes,path,url,actions)
-        @routes,@path,@url,@actions = routes, path, url, actions
+      def initialize(routes,proto,host,path,actions)
+        @routes,@proto,@host,@path,@actions = routes, proto, host,path, actions
       end
       
       # @yield {Addressive::Match}
       def each
         total = @routes.size
         scan_time = Time.now
-        @routes.each(@path,@url) do |spec, vars, scanned|
+        @routes.each(@proto,@host,@path) do |spec, vars, scanned|
           node, action = @actions[spec];
           t = Time.now
           yield Match.new(node, action, vars, spec, {:'routes.scanned'=>scanned,:'routes.total'=>total,:duration => (t - scan_time)})
@@ -279,14 +284,19 @@ module Addressive
       end
     
     end
-    
+
+    URI_SPLITTER = %r{\A([a-z]+:)(//[^/\n]+)(/[^\n]+)\z}
+
     #
     # @param path String the path to look for
     # @param uri String the full uri
     # @return {RouteEnumerator} an enumerator which yields the requested routes
-    def routes_for(path, uri)
+    def routes_for(path=nil, uri)
+      _, *parts = URI_SPLITTER.match(uri).to_a
+      raise ArgumentError.new("Expected a valid URI but got #{uri.inspect}") if parts.size != 3
+      parts.map!(&:to_s)
       materialize!
-      return RouteEnumerator.new(@tree.preroute(path,uri),path,uri,@actions)
+      return RouteEnumerator.new(@tree.preroute(*parts),*parts,@actions)
     end
     
     # @private
@@ -323,9 +333,9 @@ module Addressive
       return unless @immaterial
       @mutex.synchronize do
         return unless @immaterial
-        @routes.sort_by!{|spec| spec.template.static_characters }.reverse!
+        routes = @routes.sort_by{|spec| [ -spec.template.static_characters, spec.variables.size ] }
         @tree.clear!
-        @routes.each do |spec|
+        routes.each do |spec|
           @tree << spec
         end
         @tree.done!

data/lib/addressive/static.rb

@@ -31,7 +31,7 @@ module Addressive
   #   # Create a file, so this won't be a 404:
   #   File.new('/tmp/baz','w').close
   #   router = Addressive::Router.new.add(node)
-  #   status,headers,body = router.call('rack.url_scheme'=>'http','PATH_INFO'=>'/baz','HTTP_HOST'=>'example.example')
+  #   status,headers,body = router.call('rack.url_scheme'=>'http','PATH_INFO'=>'/baz','HTTP_HOST'=>'example.example','REQUEST_METHOD'=>'GET')
   #   body.class #=> Rack::File
   #   body.path #=> "/tmp/baz"
   #

metadata

@@ -1,82 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: addressive
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha
-  prerelease: 6
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - HannesG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-23 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uri_template
-  requirement: &7411800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *7411800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &7408500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7408500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7407760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7407760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &7460580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7460580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &7459920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7459920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email: hannes.georg@googlemail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/addressive/request.rb
-- lib/addressive/graphviz.rb
-- lib/addressive/graph.rb
+- lib/addressive/rack_ext.rb
 - lib/addressive/router.rb
+- lib/addressive/graph.rb
+- lib/addressive/graph/middleware.rb
+- lib/addressive/graph/builds_uris.rb
+- lib/addressive/backports.rb
 - lib/addressive/static.rb
+- lib/addressive/request.rb
+- lib/addressive/builder.rb
 - lib/addressive.rb
 - addressive.gemspec
 homepage: https://github.com/hannesg/addressive
@@ -88,18 +117,18 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A system which should help bringing different Rack applications together.