hobby 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7bc8b664dad60ba755a291e2b6ecac6e330b227
-  data.tar.gz: 2dce16045fe1301e04a45b6057787b2b036b9332
+  metadata.gz: 4b0ae0b8efe38c2fa31277c8170148944aef182b
+  data.tar.gz: ad2dd203359e369d4df8a17836e099f97f00a7e8
 SHA512:
-  metadata.gz: fd1088888933b0786921737b63f546110078a91372bfc59db7b266efdfcf8e796c59f3e4cc28c5678030541583d9f59ea7d61b633b2e1f8e5c2f169fc16e85f3
-  data.tar.gz: 2874923dffc328ff549ba1d7e2104ba170722a2a5a0f93ffb6276607153489a1b9ca7bd67f263a3b9c4274e80eab9cd302ec558ad762c7b3e3255a40c563ffba
+  metadata.gz: 60dc8490104a8edbad0ec129d0fe916984bafecdabc8f234952521d2f39bc067c916d4d3e8c1afa5e4c82a8caeeed7eb73b5f4024593b8acdf73684728088513
+  data.tar.gz: 646a11c3a09a480b3ab53bcf4c99df141786c4d708e64fe8e975e9cea8eeabbbef60cfe66f777f527b9d6854b1ec4edcea865e318d8299f54c99d4385cdede9a

data/hobby.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'hobby'
-  spec.version       = '0.0.2'
+  spec.version       = '0.0.3'
   spec.authors       = ['Anatoly Chernow']
   spec.email         = ['chertoly@gmail.com']
   spec.summary       = %q{A minimal DSL over rack}

data/lib/hobby.rb

@@ -1,9 +1,65 @@
 require 'rack'
 require 'forwardable'
 
+require 'hobby/router'
+
 module Hobby
+  App = Hobby # to stay compatible old code
   VERBS = %w[DELETE GET HEAD OPTIONS PATCH POST PUT]
-end
 
-require 'hobby/router'
-require 'hobby/app'
+  def self.included app
+    app.extend Singleton
+    app.builder, app.router = Rack::Builder.new, Router.new
+    app.request, app.response = Rack::Request, Rack::Response
+  end
+
+  module Singleton
+    attr_accessor :builder, :router, :request, :response
+
+    def new (*)
+      builder.run super
+      builder.to_app
+    end
+
+    extend Forwardable
+    delegate [:map, :use] => :builder
+
+    VERBS.each do |verb|
+      define_method verb.downcase do |path = '/', &action|
+        router.add_route verb, path, &action
+      end
+    end
+  end
+
+  def call env
+    dup.handle env
+  end
+
+  protected
+    def handle env
+      route = self.class.router.route_for (@env = env)
+
+      if route
+        response.write instance_exec &route
+      else
+        response.status = 404
+      end
+
+      response
+    end
+
+  private
+    attr_reader :env
+
+    def request
+      @request ||= self.class.request.new env
+    end
+
+    def response
+      @response ||= self.class.response.new
+    end
+
+    def my
+      env.fetch :path_params, {}
+    end
+end

data/spec/helper.rb

@@ -1,7 +1,6 @@
 require 'devtools/spec_helper'
 
 require 'hobby'
-require 'hobby/rspec/router'
 
 require 'minitest'
 require 'minitest-power_assert'
@@ -17,5 +16,4 @@ end
 
 RSpec.configure do |config|
   config.expect_with :rspec, :minitest
-  config.include Hobby::RSpec::Router, type: :router
 end

data/spec/router_matchers.rb

@@ -0,0 +1,33 @@
+module RouterMatchers
+  extend self
+  SOME_ROUTE = ->{:some_route}
+
+  def env_for path, verb = 'GET'
+    {'REQUEST_METHOD' => verb, 'PATH_INFO' => path }
+  end
+
+  def add_routes *routes
+    routes.each { |route| subject.add_route 'GET', route, &SOME_ROUTE }
+  end
+
+  extend RSpec::Matchers::DSL
+
+  define :find_route do |path, verb = 'GET'|
+    match do |subject|
+      env = env_for path, verb
+      route = subject.route_for env
+
+      params_are_ok = (@params ? (@params.to_a - env[:path_params].to_a).empty? : true)
+
+      route && (route.to_proc.call == SOME_ROUTE.call) && params_are_ok
+    end
+
+    chain :and_set_params do |**params|
+      @params = params
+    end
+  end
+
+  def self.included example_group
+    example_group.extend self
+  end
+end

data/spec/router_spec.rb

@@ -1,6 +1,9 @@
 require 'helper'
+require 'router_matchers'
+
+describe Hobby::Router do
+  include RouterMatchers
 
-describe Hobby::Router, type: :router do
   routes = %w!
     /with.dot
     /with-hyphen

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Anatoly Chernow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -40,11 +40,9 @@ files:
 - Rakefile
 - hobby.gemspec
 - 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
@@ -55,7 +53,7 @@ files:
 - spec/apps/Use.rb
 - spec/apps/WithoutPath.rb
 - spec/helper.rb
-- spec/router_group_spec.rb
+- spec/router_matchers.rb
 - spec/router_spec.rb
 homepage: https://github.com/ch1c0t/hobby
 licenses:
@@ -92,5 +90,5 @@ test_files:
 - spec/apps/Use.rb
 - spec/apps/WithoutPath.rb
 - spec/helper.rb
-- spec/router_group_spec.rb
+- spec/router_matchers.rb
 - spec/router_spec.rb

data/lib/hobby/app.rb

@@ -1,59 +0,0 @@
-module Hobby
-  module App
-    def self.included app
-      app.extend Singleton
-      app.builder, app.router = Rack::Builder.new, Router.new
-      app.request, app.response = Rack::Request, Rack::Response
-    end
-
-    module Singleton
-      attr_accessor :builder, :router, :request, :response
-
-      def new (*)
-        builder.run super
-        builder.to_app
-      end
-
-      extend Forwardable
-      delegate [:map, :use] => :builder
-
-      VERBS.each do |verb|
-        define_method verb.downcase do |path = '/', &action|
-          router.add_route verb, path, &action
-        end
-      end
-    end
-
-    def call env
-      dup.handle env
-    end
-
-    protected
-      def handle env
-        route = self.class.router.route_for (@env = env)
-
-        if route
-          response.write instance_exec &route
-        else
-          response.status = 404
-        end
-
-        response
-      end
-
-    private
-      attr_reader :env
-
-      def request
-        @request ||= self.class.request.new env
-      end
-
-      def response
-        @response ||= self.class.response.new
-      end
-
-      def my
-        env.fetch :path_params, {}
-      end
-  end
-end

data/lib/hobby/rspec/router.rb

@@ -1,35 +0,0 @@
-module Hobby::RSpec
-  module Router
-    extend self
-    SOME_ROUTE = ->{:some_route}
-
-    def env_for path, verb = 'GET'
-      {'REQUEST_METHOD' => verb, 'PATH_INFO' => path }
-    end
-
-    def add_routes *routes
-      routes.each { |route| subject.add_route 'GET', route, &SOME_ROUTE }
-    end
-
-    extend RSpec::Matchers::DSL
-    
-    define :find_route do |path, verb = 'GET'|
-      match do |subject|
-        env = env_for path, verb
-        route = subject.route_for env
-
-        params_are_ok = (@params ? (@params.to_a - env[:path_params].to_a).empty? : true)
-
-        route && (route.to_proc.call == SOME_ROUTE.call) && params_are_ok
-      end
-
-      chain :and_set_params do |**params|
-        @params = params
-      end
-    end
-
-    def self.included example_group
-      example_group.extend self
-    end
-  end
-end

data/spec/router_group_spec.rb

@@ -1,46 +0,0 @@
-require 'helper'
-
-describe Hobby::RSpec::Router do
-  before do
-    @Group = Class.new do
-      def subject
-        @router ||= Hobby::Router.new
-      end
-    end.include described_class
-  end
-
-  it 'contains a few helpers in its singleton' do
-    [:env_for, :add_routes, :find_route].each do |name|
-      assert { @Group.respond_to? name }
-    end
-  end
-
-  describe 'env_for' do
-    context 'two arguments passed' do
-      it 'returns an environment' do
-        env = { "REQUEST_METHOD" => 'POST', "PATH_INFO" => '/some_path' }
-        assert { env == (@Group.env_for '/some_path', 'POST') }
-      end
-    end
-
-    context 'one argument passed' do
-      it 'defaults to GET' do
-        env = { "REQUEST_METHOD" => 'GET', "PATH_INFO" => '/some_path' }
-        assert { env == (@Group.env_for '/some_path') }
-      end
-    end
-  end
-
-  describe 'add_routes' do
-    it do
-      routes = %w! first second third!
-      group = @Group.new
-
-      group.add_routes *routes
-
-      routes.each do |route|
-        expect(group.subject.route_for group.env_for 'first').to be_truthy
-      end
-    end
-  end
-end