hobby 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42e7f7a0e7818909ac5d95c50484655aab19fac1
-  data.tar.gz: 7b0f857a9f4ceb6dfdb0eff86d6d546d2b285a6a
+  metadata.gz: d7bc8b664dad60ba755a291e2b6ecac6e330b227
+  data.tar.gz: 2dce16045fe1301e04a45b6057787b2b036b9332
 SHA512:
-  metadata.gz: d2f3740ca3b95e942af4bf6dc4fb5f8d5acfdd21bd6c48f0544b8f262de0f004856a31547f3739ad440a11195c80a0348e4c4237afb026d4fa566dc6cb138ad2
-  data.tar.gz: fe87a3f5ca1be2c5ee1a346cdeb9e26800c642e4de8251217f8461ba91c8dbb63c7b52ea1a208edb35f6851d27b47e385df4bfb153849065e826fc1b2ace1fed
+  metadata.gz: fd1088888933b0786921737b63f546110078a91372bfc59db7b266efdfcf8e796c59f3e4cc28c5678030541583d9f59ea7d61b633b2e1f8e5c2f169fc16e85f3
+  data.tar.gz: 2874923dffc328ff549ba1d7e2104ba170722a2a5a0f93ffb6276607153489a1b9ca7bd67f263a3b9c4274e80eab9cd302ec558ad762c7b3e3255a40c563ffba

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'devtools', github: 'mbj/devtools'
+gem 'devtools'
 gem 'minitest'
 gem 'minitest-power_assert'
 gem 'rack-test'

data/LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2013 Patricio Mac Adden
-Copyright (c) 2015 Anatoly Cherno
+Copyright (c) 2015 Anatoly Chernow
 
 MIT License
 

data/hobby.gemspec

@@ -4,9 +4,9 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'hobby'
-  spec.version       = '0.0.1'
-  spec.authors       = ['Anatoly Cherno']
-  spec.email         = ['anatoly.cherno@gmail.com']
+  spec.version       = '0.0.2'
+  spec.authors       = ['Anatoly Chernow']
+  spec.email         = ['chertoly@gmail.com']
   spec.summary       = %q{A minimal DSL over rack}
   spec.homepage      = 'https://github.com/ch1c0t/hobby'
   spec.license       = 'MIT'

data/lib/hobby/app.rb

@@ -17,9 +17,9 @@ module Hobby
       extend Forwardable
       delegate [:map, :use] => :builder
 
-      Verbs.each do |verb|
-        define_method verb.downcase do |path = '/', &route|
-          router.add_route verb, path, &route
+      VERBS.each do |verb|
+        define_method verb.downcase do |path = '/', &action|
+          router.add_route verb, path, &action
         end
       end
     end

data/lib/hobby/router/route.rb

@@ -0,0 +1,12 @@
+class Hobby::Router
+  class Route
+    def initialize verb, path, &action
+      @verb, @path, @action = verb, path, action
+    end
+
+    attr_reader :verb, :path
+    attr_accessor :action
+
+    alias to_proc action
+  end
+end

data/lib/hobby/router/routes.rb

@@ -0,0 +1,24 @@
+class Hobby::Router
+  class Routes < Hash
+    def initialize
+      @patterns = {}
+      super { |hash, key| hash[key] = find key }
+    end
+
+    def []= key, route
+      if key.include? ?:
+        string = key.gsub(/(:\w+)/) { "(?<#{$1[1..-1]}>[^/?#]+)" }
+        @patterns[/^#{string}$/] = route
+      else
+        super and super "#{key}/", route
+      end
+    end
+
+    private
+
+    def find key
+      _, route = @patterns.find { |pattern, _| pattern.match key }
+      [route, $~.names.map(&:to_sym).zip($~.captures).to_h] if route
+    end
+  end
+end

data/lib/hobby/router.rb

@@ -4,9 +4,13 @@ module Hobby
       @routes = Routes.new
     end
 
-    def add_route verb, path, &route
+    def add_route verb, path, &action
+      route = Route.new verb, path, &action
+
       path = nil if path.eql? '/'
       @routes["#{verb}#{path}"] = route
+
+      route
     end
 
     def route_for env
@@ -14,28 +18,8 @@ module Hobby
       env[:path_params] = params if params
       route
     end
-
-    class Routes < Hash
-      def initialize
-        @patterns = {}
-        super { |hash, key| hash[key] = find key }
-      end
-
-      def []= key, route
-        if key.include? ?:
-          string = key.gsub(/(:\w+)/) { "(?<#{$1[1..-1]}>[^/?#]+)" }
-          @patterns[/^#{string}$/] = route
-        else
-          super and super "#{key}/", route
-        end
-      end
-
-      private
-
-      def find key
-        _, route = @patterns.find { |pattern, _| pattern.match key }
-        [route, $~.names.map(&:to_sym).zip($~.captures).to_h] if route
-      end
-    end
   end
 end
+
+require 'hobby/router/routes'
+require 'hobby/router/route'

data/lib/hobby/rspec/router.rb

@@ -1,7 +1,7 @@
 module Hobby::RSpec
   module Router
     extend self
-    SOME_ROUTE = ->{}
+    SOME_ROUTE = ->{:some_route}
 
     def env_for path, verb = 'GET'
       {'REQUEST_METHOD' => verb, 'PATH_INFO' => path }
@@ -20,7 +20,7 @@ module Hobby::RSpec
 
         params_are_ok = (@params ? (@params.to_a - env[:path_params].to_a).empty? : true)
 
-        (route == SOME_ROUTE) && params_are_ok
+        route && (route.to_proc.call == SOME_ROUTE.call) && params_are_ok
       end
 
       chain :and_set_params do |**params|

data/lib/hobby.rb

@@ -2,7 +2,7 @@ require 'rack'
 require 'forwardable'
 
 module Hobby
-  Verbs = %w!DELETE GET HEAD OPTIONS PATCH POST PUT!
+  VERBS = %w[DELETE GET HEAD OPTIONS PATCH POST PUT]
 end
 
 require 'hobby/router'

data/spec/app_spec.rb

@@ -142,5 +142,12 @@ describe Hobby::App do
         assert { last_response.body == 'a:b:c' }
       end
     end
+
+    describe Decorator do
+      it do
+        get '/route'
+        assert { last_response.body == 'GET:initial:/route' }
+      end
+    end
   end
 end

data/spec/apps/Decorator.rb

@@ -0,0 +1,6 @@
+route = get '/route' do
+  'initial'
+end
+
+action = route.action
+route.action = ->{ "#{route.verb}:#{instance_exec &action}:#{route.path}" }

data/spec/apps/Main.rb

@@ -1,4 +1,4 @@
-Hobby::Verbs.each do |verb|
+Hobby::VERBS.each do |verb|
   class_eval "#{verb.downcase}('/') { '#{verb}' }"
   class_eval "#{verb.downcase}('/:name') { my[:name] }"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
-- Anatoly Cherno
+- Anatoly Chernow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -26,7 +26,7 @@ dependencies:
         version: '0'
 description: 
 email:
-- anatoly.cherno@gmail.com
+- chertoly@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -42,8 +42,11 @@ files:
 - lib/hobby.rb
 - lib/hobby/app.rb
 - lib/hobby/router.rb
+- lib/hobby/router/route.rb
+- lib/hobby/router/routes.rb
 - lib/hobby/rspec/router.rb
 - spec/app_spec.rb
+- spec/apps/Decorator.rb
 - spec/apps/Env.rb
 - spec/apps/Main.rb
 - spec/apps/Map.rb
@@ -74,12 +77,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A minimal DSL over rack
 test_files:
 - spec/app_spec.rb
+- spec/apps/Decorator.rb
 - spec/apps/Env.rb
 - spec/apps/Main.rb
 - spec/apps/Map.rb