eldr 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84ecf1db13045d463d9dd4687074cd5a190652f6
-  data.tar.gz: 8ffee557923c1872b7b6c3d14ba71e8cc7843ce3
+  metadata.gz: db52c192c7a12914d17592bb4915c1d51751aeb3
+  data.tar.gz: b8c4d24f5e8511218adc5e00b5052a98c2fde831
 SHA512:
-  metadata.gz: f1095a2e3d6d125e1876613750ea90e47a41c114817503271af2d05b58ae436a3c915b7fe51628637bce4b362cf4b2d3c7f2cb9bf7dc9381053d51a938a27512
-  data.tar.gz: 6b2bdb314b65de89b65b34f25b6e4b08cd73a21b57a08ef59cdc383bd075a5038740adbbfac08b73cb3fb1ce0b90a0bf87c7a5831e656d1063d8db49fa495229
+  metadata.gz: ee15590d689faecf60a29fc03e1536181f0c73f10ec05c4ced43490af7a0500230cf85cabb066ae00071024952e824bf2852c918e5ad4935d8b99b9978d955ca
+  data.tar.gz: 5abe4a5ab8be77188c966642704b531da0aae69b989d50f47ccda6e17aa5989539c646141497fab31917558fcf207efcdc2bb049d774fa758d5fa37b564d3621

data/.rubocop_todo.yml

@@ -1,5 +1,5 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-01-24 18:09:30 -0800 using RuboCop version 0.28.0.
+# on 2015-02-16 13:42:01 -0800 using RuboCop version 0.28.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -10,6 +10,6 @@
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 6
+# Offense count: 7
 Style/Documentation:
   Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eldr (0.0.3)
+    eldr (0.0.4)
       fast_blank (= 0.0.2)
       mustermann (= 0.4.0)
       rack (~> 1.5)
@@ -31,7 +31,7 @@ GEM
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
     rack (1.6.0)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rainbow (2.0.0)
     rake (10.4.2)
@@ -81,7 +81,7 @@ DEPENDENCIES
   bundler (~> 1.7)
   coveralls (~> 0.7)
   eldr!
-  rack-test (= 0.6.2)
+  rack-test (~> 0.6)
   rake (= 10.4.2)
   rspec (= 3.1.0)
   rubocop (= 0.28.0)

data/README.md

@@ -6,7 +6,7 @@ Eldr apps are rack apps like this:
 
 ```ruby
 class App < Eldr::App
-  get '/posts' do |params|
+  get '/posts' do
     Rack::Response.new "posts", 200
   end
 end
@@ -22,13 +22,13 @@ And when you want to combine them you can do this:
 
 ```ruby
 class Posts < Eldr::App
-  get '/' do |params|
+  get '/'
     Rack::Response.new "posts", 200
   end
 end
 
 class Tasks < Eldr::App
-  get '/' do |params|
+  get '/'
     Rack::Response.new "tasks", 200
   end
 end
@@ -131,8 +131,6 @@ I have already built and released extensions for many common tasks:
 - [eldr-assets](https://github.com/eldr-rb/eldr-assets): asset tag helpers like `js('jquery', 'app')`, `css('app')` etc
 - [eldr-responders](https://github.com/eldr-rb/eldr-responders): rails-responder like helpers
 - [eldr-action](https://github.com/eldr-rb/eldr-action): Action Objects
-- [eldr-service](https://github.com/eldr-rb/eldr-service): Action Objects for external services.
-- [eldr-cascade](https://github.com/eldr-rb/eldr-cascade): A fork of Rack::Cascade that plays well with Rack::Response and eldr-action.
 
 ## Quickstart Guides
 
@@ -154,7 +152,7 @@ Now create a new file called app.rb with the following contents:
 
 ```ruby
 class App < Eldr::App
-  get '/' do |params|
+  get '/' do
     Rack::Response.new "Hello World!", 200
   end
 end
@@ -177,7 +175,7 @@ When you visit http:///localhost:9292 in your browser you should see "Hello Worl
 
 ### Rendering a Template
 
-Eldr provides no render helper in it's core but it is easy to define your own.
+Eldr provides no render helper in its core but it is easy to define your own.
 One can use Tilt as the templating library (with your engine of choice) and then create some helper methods to handle finding the template and rendering it.
 
 Create a module with the following:
@@ -497,7 +495,7 @@ access_control do
 end
 ```
 
-The DSL pulled a route's name and it's roles into a before filter, then checked them against the current_user's roles. The filter itself was five lines.
+The DSL pulled a route's name and its roles into a before filter, then checked them against the current_user's roles. The filter itself was five lines.
 
 I soon realized that this was redundant abstraction. The DSL didn't save me any coding, it merely gave the code pretty words. I was sacrificing clarity for poetry.
 
@@ -525,7 +523,7 @@ This allows you to define a base app and allow all your controllers to share the
 For example:
 
 ```ruby
-class SimpleMiddleware
+class SimpleCounterMiddleware
   def initialize(app)
     @app = app
   end
@@ -664,9 +662,11 @@ map '/users' do
 end
 ```
 
-If we wan to define all our controllers on the root we can use [eldr-cascade](https://github.com/eldr-rb/eldr-cascade). We define the routes we want to override, Cascade will get a 404 on the ones we didn't, then call the next app until it gets a response:
+If we wan to define all our controllers on the root we can use Eldr::Cascade. We define the routes we want to override, Cascade will get a 404 on the ones we didn't, then call the next app until it gets a response:
 
 ```ruby
+require 'eldr'
+require 'eldr/cascade'
 class App
   # override the users post route but nothing else
   post '/users' do

data/TODOS

@@ -1,3 +1,4 @@
 - [ ] Rdocs
 - [ ] performance improvements
 - [ ] wiki pages
+- [ ] add Eldr::Cascade example to examples/

data/eldr.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake',      '10.4.2'
   s.add_development_dependency 'rspec',     '3.1.0'
   s.add_development_dependency 'rubocop',   '0.28.0'
-  s.add_development_dependency 'rack-test', '0.6.2'
+  s.add_development_dependency 'rack-test', '~> 0.6'
   s.add_development_dependency 'tilt',      '2.0.1'
   s.add_development_dependency 'slim',      '3.0.1'
   s.add_development_dependency 'coveralls', '~> 0.7'

data/examples/app.ru

@@ -18,7 +18,7 @@ class ExampleApp < Eldr::App
     @cats == 'Cats!'
   end
 
-  get '/posts' do |params|
+  get '/posts' do
     Rack::Response.new "posts", 200
   end
 

data/lib/eldr/app.rb

@@ -89,16 +89,15 @@ module Eldr
           handler ||= args.pop if args.last.respond_to?(:call)
           options ||= args.pop if args.last.is_a?(Hash)
           options ||= {}
-          add(verb: verb.downcase.to_sym, path: path, handler: handler, options: options)
+          add({ verb: verb.downcase.to_sym, path: path, handler: handler }.merge!(options))
         end
       end
 
-      def add(verb: :get, path: '/', options: {}, handler: nil)
-        handler = Proc.new if block_given?
-        route = Route.new(verb: verb, path: path, options: options, handler: handler)
+      def add(verb: :get, **route_attributes)
+        route = Route.new(route_attributes)
 
         route.before_filters.push(*before_filters[route.name]) if before_filters.include? route.name
-        route.after_filters.push(*after_filters[route.name]) if after_filters.include? route.name
+        route.after_filters.push(*after_filters[route.name])   if after_filters.include? route.name
 
         routes[verb] << route
         route

data/lib/eldr/cascade.rb

@@ -0,0 +1,47 @@
+# A version of Rack::Cascade that works with Rack::Response.
+# Seriously? WTF Rack::Cascade
+# TODO: Get fixes into rack and remove this entirely
+module Eldr
+  class Cascade
+    NOTFOUND = [404, { 'CONTENT-TYPE' => 'text/plain' }, []]
+
+    attr_reader :apps
+
+    def initialize(apps, catch = [404, 405])
+      @apps    = []
+      @has_app = {}
+
+      apps.each { |app| add app }
+
+      @catch = {}
+      [*catch].each { |status| @catch[status] = true }
+    end
+
+    def call(env)
+      result = NOTFOUND
+
+      last_body = nil
+
+      @apps.each do |app|
+        last_body.close if last_body.respond_to? :close
+
+        result = app.call(env).to_a
+        last_body = result[2]
+        break unless @catch.include?(result[0].to_i)
+      end
+
+      result
+    end
+
+    def add(app)
+      @has_app[app] = true
+      @apps << app
+    end
+
+    def include?(app)
+      @has_app.include? app
+    end
+
+    alias_method :<<, :add
+  end
+end

data/lib/eldr/matcher.rb

@@ -2,27 +2,15 @@ require 'mustermann'
 
 module Eldr
   class Matcher
-    PATH_DELIMITER  = '/'.freeze
-    QUERY_PREFIX    = '?'.freeze
-    QUERY_DELIMITER = '&'.freeze
-
     def initialize(path, options = {})
-      @path = path.is_a?(String) && path.empty? ? PATH_DELIMITER : path
+      @path    = path
       @capture = options.delete(:capture)
-      @default_values = options.delete(:default_values)
     end
 
     def match(pattern)
-      match_data = handler.match(pattern)
-      return match_data if match_data
-      pattern = pattern[0..-2] if mustermann? && pattern != PATH_DELIMITER && pattern.end_with?(PATH_DELIMITER)
       handler.match(pattern)
     end
 
-    def mustermann?
-      handler.instance_of?(Mustermann)
-    end
-
     def handler
       @handler ||=
       case @path

data/lib/eldr/recognizer.rb

@@ -19,6 +19,7 @@ module Eldr
 
       ret_routes = routes[verb].select { |route| !route.match(pattern).nil? }
       raise NotFound if ret_routes.empty?
+      ret_routes.sort! { |a, b| a.order <=> b.order }
       ret_routes
     end
 

data/lib/eldr/route.rb

@@ -1,73 +1,63 @@
 module Eldr
   class Route
-    attr_accessor :name, :app, :capture, :order, :options, :handler
-    attr_accessor :before_filters, :after_filters, :to
+    attr_accessor :app, :verb, :path, :name, :order, :handler, :before_filters, :after_filters
 
-    def initialize(verb: :get, path: '/', name: nil, options: {}, handler: nil, app: nil)
-      @path, @verb = path, verb.to_s.upcase
+    def initialize(verb: :get, path: '/', name: nil, order: 0, handler: nil, to: nil)
+      @verb, @path, @name, @order = verb.to_s.upcase, path, name, order
+      @before_filters, @after_filters = [], []
+      handler  ||= to
+      @handler = create_handler(handler)
+    end
 
-      @app            = app
-      @capture        = {}
-      @before_filters = []
-      @after_filters  = []
-      @name           = name
+    def create_handler(handler)
+      return handler unless handler.is_a? String
 
-      merge_with_options!(options)
+      controller, method = handler.split('#')
 
-      @handler   = handler
-      @handler ||= @to
+      proc do |env|
+        obj = Object.const_get(controller).new
+        obj.send(method.to_sym, env)
+      end
     end
 
     def call(env, app: nil)
-      # TODO: Investigate
-      # maybe if we passed this around between methods it would be more perfomant
-      # than setting the accessor?
       @app = app
 
-      app.class.before_filters[:all].each { |filter| app.instance_exec(env, &filter) } if app
-      @before_filters.each                { |filter| app.instance_exec(env, &filter) }
+      call_before_filters(env)
 
-      resp = response(env)
+      resp = call_handler(env)
 
-      app.class.after_filters[:all].each { |filter| app.instance_exec(env, &filter) } if app
-      @after_filters.each                { |filter| app.instance_exec(env, &filter) }
+      call_after_filters(env)
 
       resp
     end
 
-    def response(env)
-      if @handler.is_a? Proc
-        app.instance_exec(env, &@handler)
-      elsif @handler.is_a? String
-        rails_style_response(env)
+    def call_before_filters(env)
+      if app
+        app.class.before_filters[:all].each { |filter| app.instance_exec(env, &filter) }
+        before_filters.each                 { |filter| app.instance_exec(env, &filter) }
       else
-        @handler.call(env)
+        before_filters.each { |filter| filter.call(env) }
       end
     end
 
-    def rails_style_response(env)
-      controller, method = @handler.split('#')
-
-      obj = Object.const_get(controller).new
-
-      if method
-        obj.send(method.to_sym, env)
+    def call_after_filters(env)
+      if app
+        app.class.after_filters[:all].each { |filter| app.instance_exec(env, &filter) }
+        after_filters.each                 { |filter| app.instance_exec(env, &filter) }
       else
-        obj.call(env)
+        after_filters.each { |filter| filter.call(env) }
       end
     end
 
-    def merge_with_options!(options)
-      @options = {} unless @options
-      options.each_pair do |key, value|
-        accessor?(key) ? __send__("#{key}=", value) : (@options[key] = value)
+    def call_handler(env)
+      if app and handler.is_a? Proc
+        app.instance_exec(env, &handler)
+      else
+        handler.call(env)
       end
     end
 
-    def accessor?(key)
-      respond_to?("#{key}=") && respond_to?(key)
-    end
-
     def matcher
       @matcher ||= Matcher.new(path, capture: @capture)
     end
@@ -76,17 +66,9 @@ module Eldr
       matcher.match(pattern)
     end
 
-    def path(*args)
-      return @path if args.empty?
-      params = args[0]
-      params.delete(:captures)
-      matcher.expand(params)
-    end
-
     def params(pattern)
       params   = matcher.handler.params(pattern)
-      params ||= {}
-      params
+      params ||= {} # rubocop:disable Lint/UselessAssignment
     end
   end
 end

data/lib/eldr/version.rb

@@ -1,3 +1,3 @@
 module Eldr
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/route_spec.rb

@@ -17,28 +17,20 @@ describe Eldr::Route do
     end
 
     it 'takes options and sets them' do
-      route = Eldr::Route.new(options: { name: :cats })
+      route = Eldr::Route.new(name: :cats)
       expect(route.name).to eq(:cats)
     end
   end
 
-  describe '#response' do
-    let(:route) do
-      Eldr::Route.new(handler: proc { 'cats' })
-    end
-
-    it 'determines type of handler and calls it' do
-      expect(route.response({})).to eq('cats')
-    end
-  end
-
-  describe '#rails_style_response' do
-    let(:route) do
-      Eldr::Route.new(handler: 'CatsHandler#index')
-    end
+  describe '#create_handler' do
+    context 'rails style handler' do
+      let(:route) do
+        Eldr::Route.new(handler: 'CatsHandler#index')
+      end
 
-    it 'calls a handler using a string like Controller#action' do
-      expect(route.response({})).to eq('cats')
+      it 'wraps the handler in a proc' do
+        expect(route.create_handler('CatsHandler#index')).to be_a Proc
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eldr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - K-2052
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -112,16 +112,16 @@ dependencies:
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +200,7 @@ files:
 - lib/eldr.rb
 - lib/eldr/app.rb
 - lib/eldr/builder.rb
+- lib/eldr/cascade.rb
 - lib/eldr/configuration.rb
 - lib/eldr/matcher.rb
 - lib/eldr/recognizer.rb