mustermann 0.4.0 → 1.0.0.beta2

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mustermann
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: tool
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
+date: 2016-08-22 00:00:00.000000000 Z
+dependencies: []
 description: library implementing patterns that behave like regular expressions
 email: konstantin.mailinglists@googlemail.com
 executables: []
@@ -49,6 +35,8 @@ files:
 - lib/mustermann/ast/validation.rb
 - lib/mustermann/caster.rb
 - lib/mustermann/composite.rb
+- lib/mustermann/concat.rb
+- lib/mustermann/equality_map.rb
 - lib/mustermann/error.rb
 - lib/mustermann/expander.rb
 - lib/mustermann/extension.rb
@@ -59,16 +47,18 @@ files:
 - lib/mustermann/regexp.rb
 - lib/mustermann/regexp_based.rb
 - lib/mustermann/regular.rb
-- lib/mustermann/router.rb
-- lib/mustermann/router/rack.rb
-- lib/mustermann/router/simple.rb
 - lib/mustermann/simple_match.rb
 - lib/mustermann/sinatra.rb
+- lib/mustermann/sinatra/parser.rb
+- lib/mustermann/sinatra/safe_renderer.rb
+- lib/mustermann/sinatra/try_convert.rb
 - lib/mustermann/to_pattern.rb
 - lib/mustermann/version.rb
 - mustermann.gemspec
 - spec/ast_spec.rb
 - spec/composite_spec.rb
+- spec/concat_spec.rb
+- spec/equality_map_spec.rb
 - spec/expander_spec.rb
 - spec/extension_spec.rb
 - spec/identity_spec.rb
@@ -77,8 +67,6 @@ files:
 - spec/pattern_spec.rb
 - spec/regexp_based_spec.rb
 - spec/regular_spec.rb
-- spec/router/rack_spec.rb
-- spec/router/simple_spec.rb
 - spec/simple_match_spec.rb
 - spec/sinatra_spec.rb
 - spec/to_pattern_spec.rb
@@ -94,32 +82,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: use patterns like regular expressions
-test_files:
-- spec/ast_spec.rb
-- spec/composite_spec.rb
-- spec/expander_spec.rb
-- spec/extension_spec.rb
-- spec/identity_spec.rb
-- spec/mapper_spec.rb
-- spec/mustermann_spec.rb
-- spec/pattern_spec.rb
-- spec/regexp_based_spec.rb
-- spec/regular_spec.rb
-- spec/router/rack_spec.rb
-- spec/router/simple_spec.rb
-- spec/simple_match_spec.rb
-- spec/sinatra_spec.rb
-- spec/to_pattern_spec.rb
+test_files: []
 has_rdoc: 

data/lib/mustermann/router.rb

@@ -1,9 +0,0 @@
-require 'mustermann/router/simple'
-require 'mustermann/router/rack'
-
-module Mustermann
-  # @see Mustermann::Router::Simple
-  # @see Mustermann::Router::Rack
-  module Router
-  end
-end

data/lib/mustermann/router/rack.rb

@@ -1,47 +0,0 @@
-require 'mustermann/router/simple'
-
-module Mustermann
-  module Router
-    # Simple pattern based router that allows matching paths to a given Rack application.
-    #
-    # @example config.ru
-    #    router = Mustermann::Rack.new do
-    #      on '/' do |env|
-    #        [200, {'Content-Type' => 'text/plain'}, ['Hello World!']]
-    #      end
-    #
-    #      on '/:name' do |env|
-    #        name = env['mustermann.params']['name']
-    #        [200, {'Content-Type' => 'text/plain'}, ["Hello #{name}!"]]
-    #      end
-    #
-    #      on '/something/*', call: SomeApp
-    #    end
-    #
-    #    # in a config.ru
-    #    run router
-    class Rack < Simple
-      def initialize(env_prefix: "mustermann", params_key: "#{env_prefix}.params", pattern_key: "#{env_prefix}.pattern", **options, &block)
-        @params_key, @pattern_key = params_key, pattern_key
-        options[:default] = [404, {"Content-Type" => "text/plain", "X-Cascade" => "pass"}, ["Not Found"]] unless options.include? :default
-        super(**options, &block)
-      end
-
-      def invoke(callback, env, params, pattern)
-        params_was, pattern_was             = env[@params_key], env[@pattern_key]
-        env[@params_key], env[@pattern_key] = params, pattern
-        response = callback.call(env)
-        response[1].each { |k,v| throw :pass if k.downcase == 'x-cascade' and v == 'pass' }
-        response
-      ensure
-        env[@params_key], env[@pattern_key] = params_was, pattern_was
-      end
-
-      def string_for(env)
-        env['PATH_INFO']
-      end
-
-      private :invoke, :string_for
-    end
-  end
-end

data/lib/mustermann/router/simple.rb

@@ -1,142 +0,0 @@
-require 'mustermann'
-
-module Mustermann
-  module Router
-    # Simple pattern based router that allows matching a string to a given callback.
-    #
-    # @example
-    #   require 'mustermann/router/simple'
-    #
-    #   router = Mustermann::Router::Simple.new do
-    #     on ':name/:sub' do |string, params|
-    #       params['sub']
-    #     end
-    #
-    #     on 'foo' do
-    #       "bar"
-    #     end
-    #   end
-    #
-    #   router.call("foo") # => "bar"
-    #   router.call("a/b") # => "b"
-    #   router.call("bar") # => nil
-    class Simple
-      # Default value for when no pattern matches
-      attr_accessor :default
-
-      # @example with a default value
-      #   require 'mustermann/router/simple'
-      #
-      #   router = Mustermann::Router::Simple.new(default: 42)
-      #   router.on(':name', capture: :digit) { |string| string.to_i }
-      #   router.call("23")      # => 23
-      #   router.call("example") # => 42
-      #
-      # @example block with implicit receiver
-      #   require 'mustermann/router/simple'
-      #
-      #   router = Mustermann::Router::Simple.new do
-      #     on('/foo') { 'foo' }
-      #     on('/bar') { 'bar' }
-      #   end
-      #
-      # @example block with explicit receiver
-      #   require 'mustermann/router/simple'
-      #
-      #   router = Mustermann::Router::Simple.new(type: :rails) do |r|
-      #     r.on('/foo') { 'foo' }
-      #     r.on('/bar') { 'bar' }
-      #   end
-      #
-      # @param default value to be returned if nothing matches
-      # @param options [Hash] pattern options
-      # @return [Mustermann::Router::Simple] new router instance
-      def initialize(default: nil, **options, &block)
-        @options = options
-        @map     = []
-        @default = default
-
-        block.arity == 0 ? instance_eval(&block) : yield(self) if block
-      end
-
-      # @example
-      #   require 'mustermann/router/simple'
-      #
-      #   router = Mustermann::Router::Simple.new
-      #   router.on(':a/:b') { 42 }
-      #   router['foo/bar'] # => <#Proc:...>
-      #   router['foo_bar'] # => nil
-      #
-      # @return [#call, nil] callback for given string, if a pattern matches
-      def [](string)
-        string = string_for(string) unless string.is_a? String
-        @map.detect { |p,v| p === string }[1]
-      end
-
-      # @example
-      #   require 'mustermann/router/simple'
-      #
-      #   router = Mustermann::Router::Simple.new
-      #   router['/:name'] = proc { |string, params| params['name'] }
-      #   router.call('/foo') # => "foo"
-      #
-      # @param pattern [String, Mustermann::Pattern] matcher
-      # @param callback [#call] callback to call on match
-      # @see #on
-      def []=(pattern, callback)
-        on(pattern, call: callback)
-      end
-
-      # @example with block
-      #   require 'mustermann/router/simple'
-      #
-      #   router = Mustermann::Router::Simple.new
-      #
-      #   router.on(':a/:b') { 42 }
-      #   router.call('foo/bar') # => 42
-      #   router.call('foo_bar') # => nil
-      #
-      # @example with callback option
-      #   require 'mustermann/router/simple'
-      #
-      #   callback = proc { 42 }
-      #   router   = Mustermann::Router::Simple.new
-      #
-      #   router.on(':a/:b', call: callback)
-      #   router.call('foo/bar') # => 42
-      #   router.call('foo_bar') # => nil
-      #
-      # @param patterns [Array<String, Pattern>]
-      # @param call [#call] callback object, need to hand in block if missing
-      # @param options [Hash] pattern options
-      def on(*patterns, call: Proc.new, **options)
-        patterns.each do |pattern|
-          pattern = Mustermann.new(pattern.to_str, **options, **@options) if pattern.respond_to? :to_str
-          @map << [pattern, call]
-        end
-      end
-
-      # Finds the matching callback and calls `call` on it with the given input and the params.
-      # @return the callback's return value
-      def call(input)
-        @map.each do |pattern, callback|
-          catch(:pass) do
-            next unless params = pattern.params(string_for(input))
-            return invoke(callback, input, params, pattern)
-          end
-        end
-        @default
-      end
-
-      def invoke(callback, input, params, pattern)
-        callback.call(input, params)
-      end
-
-      def string_for(input)
-        input.to_str
-      end
-
-      private :invoke, :string_for
-    end
-  end
-end

data/spec/router/rack_spec.rb

@@ -1,39 +0,0 @@
-require 'mustermann/router/rack'
-
-describe Mustermann::Router::Rack do
-  include Rack::Test::Methods
-  subject(:app) { Mustermann::Router::Rack.new }
-
-  context 'matching' do
-    before { app.on('/foo') { [418, {'Content-Type' => 'text/plain'}, 'bar'] } }
-    example { get('/foo').status.should be == 418 }
-    example { get('/bar').status.should be == 404 }
-  end
-
-  context "params" do
-    before { app.on('/:name') { |e| [200, {'Content-Type' => 'text/plain'}, e['mustermann.params']['name']] } }
-    example { get('/foo').body.should be == 'foo' }
-    example { get('/bar').body.should be == 'bar' }
-  end
-
-  context 'X-Cascade: pass' do
-    before do
-      app.on('/') { [200, { 'X-Cascade'    => 'pass'       }, ['a']] }
-      app.on('/') { [200, { 'x-cascade'    => 'pass'       }, ['b']] }
-      app.on('/') { [200, { 'Content-Type' => 'text/plain' }, ['c']] }
-      app.on('/') { [200, { 'Content-Type' => 'text/plain' }, ['d']] }
-    end
-
-    example { get('/').body.should be == 'c' }
-  end
-
-  context 'throw :pass' do
-    before do
-      app.on('/') { throw :pass }
-      app.on('/') { [200, { 'Content-Type' => 'text/plain' }, ['b']] }
-      app.on('/') { [200, { 'Content-Type' => 'text/plain' }, ['c']] }
-    end
-
-    example { get('/').body.should be == 'b' }
-  end
-end

data/spec/router/simple_spec.rb

@@ -1,32 +0,0 @@
-require 'mustermann/router/simple'
-
-describe Mustermann::Router::Simple do
-  describe :initialize do
-    context "with implicit receiver" do
-      subject(:router) { Mustermann::Router::Simple.new { on('/foo') { 'bar' } } }
-      example { router.call('/foo').should be == 'bar' }
-    end
-
-    context "with explicit receiver" do
-      subject(:router) { Mustermann::Router::Simple.new { |r| r.on('/foo') { 'bar' } } }
-      example { router.call('/foo').should be == 'bar' }
-    end
-
-    context "with default" do
-      subject(:router) { Mustermann::Router::Simple.new(default: 'bar') }
-      example { router.call('/foo').should be == 'bar' }
-    end
-  end
-
-  describe :[]= do
-    subject(:router) { Mustermann::Router::Simple.new }
-    before { router['/:name'] = proc { |*a| a } }
-    example { router.call('/foo').should be == ['/foo', "name" => 'foo'] }
-  end
-
-  describe :[] do
-    subject(:router) { Mustermann::Router::Simple.new }
-    before { router.on('/x') { 42 } }
-    example { router['/x'].call.should be == 42 }
-  end
-end