hobby 0.0.12 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d2d480ccdf4a60839072589bfaa58309a00bf4a
-  data.tar.gz: e69b2439193e69c2f53adc780dac6666f71a01e6
+  metadata.gz: 1c820bc2f67ffcbd87d4de89a2e8ad53a6f83da9
+  data.tar.gz: e56880e61b2d283537bf44bd019709440dde9118
 SHA512:
-  metadata.gz: ff31f1f11344235dec85b8d021008a1b89a18ab65b8e4743add83b8e8e8e3104af567c8bdb01a5e84d6a78c5c9248a95272e3de7f3ac88fc6c60180a3e7266ee
-  data.tar.gz: 723ba318c713c9d21c44c3bf8397e48a7204a562c7294545aedd7a26634a402887269878618cc61e91b3a2dcbe3454a0aa590dfde07f1cc51532c0d8123a0f2f
+  metadata.gz: f14f9c47364424a1826184cd11a670eed4509e315bb83b6f978e05022fd17da57d3fc139d1e40c62ea33c06ebf59c38996f4dfb90ea0bef779b2a67b837321b5
+  data.tar.gz: 27b2ac428b2a8a7b51941a4e4dd7bab6d9c28e1cbbb4e77d49c282ce58638e0500913b6320f2090511a4a5ca7793b9ba1afd9099748ba17b67afde31214b3142

data/Gemfile

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

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.12'
+  spec.version       = '0.1.0'
   spec.authors       = ['Anatoly Chernow']
   spec.email         = ['chertoly@gmail.com']
   spec.summary       = %q{A minimal DSL over rack}

data/lib/hobby.rb

@@ -10,20 +10,19 @@ module Hobby
 
   def self.included app
     app.extend Singleton
-    app.builder, app.router = Rack::Builder.new, Router.new
+    app.router = Router.new
     app.request, app.response = Rack::Request, Rack::Response
   end
 
   module Singleton
-    attr_accessor :builder, :router, :request, :response
+    attr_accessor :router, :request, :response
 
     def new (*)
-      builder.run super
-      builder.to_app
+      super.router.to_rack_app
     end
 
     extend Forwardable
-    delegate [:map, :use] => :builder
+    delegate [:map, :use] => :router
 
     VERBS.each do |verb|
       define_method verb.downcase do |path = '/', &action|
@@ -41,7 +40,7 @@ module Hobby
   protected
     def handle env
       catch :halt do
-        @route = self.class.router.route_for (@env = env)
+        @route = router.route_for (@env = env)
         fill_body
         response
       end

data/lib/hobby/helpers.rb

@@ -1,7 +1,19 @@
 module Hobby
   module Helpers
+    extend Forwardable
+
     attr_reader :env, :route
 
+    def router
+      @router ||= begin
+                    router = self.class.router.clone
+                    router.app = self
+                    router
+                  end
+    end
+
+    delegate [:map, :use] => :router
+
     def request
       @request ||= self.class.request.new env
     end

data/lib/hobby/router.rb

@@ -2,6 +2,12 @@ module Hobby
   class Router
     def initialize
       @routes = Routes.new
+      @uses, @maps = [], []
+    end
+
+    def initialize_copy _router
+      @uses = instance_variable_get(:@uses).dup
+      @maps = instance_variable_get(:@maps).dup
     end
 
     def add_route verb, path, &action
@@ -17,8 +23,33 @@ module Hobby
       route, params = @routes["#{env['REQUEST_METHOD']}#{env['PATH_INFO']}"]
       params ? route.with_params(params) : route
     end
+
+    def use *all
+      @uses << all
+    end
+
+    def map path, app = nil, &block
+      @maps << Builder::Map.new(path, app, &block)
+    end
+
+    attr_accessor :app
+
+    def to_rack_app
+      builder = create_builder
+      builder.run app
+      builder.to_app
+    end
+
+    private
+      def create_builder
+        builder = Builder.new
+        @uses.each { |all| builder.add_use *all }
+        @maps.each { |map| builder.add_map map }
+        builder
+      end
   end
 end
 
+require 'hobby/router/builder'
 require 'hobby/router/routes'
 require 'hobby/router/route'

data/lib/hobby/router/builder.rb

@@ -0,0 +1,25 @@
+module Hobby
+  class Router
+    class Builder < Rack::Builder
+      # To work around
+      # https://github.com/mbj/mutant#the-crash--stuck-problem-mri
+      alias add_use use
+      alias add_map2 map
+
+      def add_map map
+        if map.app
+          add_map2 map.path do run map.app end
+        else
+          add_map2 map.path, &map.block
+        end
+      end
+
+      class Map
+        attr_reader :path, :app, :block
+        def initialize path, app, &block
+          @path, @app, @block = path, app, block
+        end
+      end
+    end
+  end
+end

data/readme.adoc

@@ -285,8 +285,8 @@ to '/anatoly' and '/patricio' routes:
 class App
   include Hobby
 
-  map('/anatoly') { run C.new 'Anatoly' }
-  map('/patricio') { run C.new 'Patricio' }
+  map '/anatoly', C.new('Anatoly')
+  map '/patricio', C.new('Patricio')
 
   get '/' do
     'Mapping app.'
@@ -327,7 +327,6 @@ Many components of an application can be customized or replaced.
 class App
   include Hobby
 
-  self.builder  = custom_builder
   self.router   = custom_router
   self.request  = custom_request
   self.response = custom_response

data/spec/app_spec.rb

@@ -75,6 +75,17 @@ describe Hobby::App do
     end
   end
 
+  describe '#router' do
+    it 'gives a distinct router to each app' do
+      app = Class.new { include Hobby }
+
+      first_instance = app.new
+      second_instance = app.new
+
+      assert { not first_instance.router.equal? second_instance.router }
+    end
+  end
+
   describe :integration do
     before do
       described_class.app = build_app described_class
@@ -89,6 +100,51 @@ describe Hobby::App do
         get '/map'
         assert { last_response.body == 'from map' }
       end
+
+      it 'mounts an application to the rack stack with old deprecated syntax' do
+        get '/deprecated_map'
+        assert { last_response.body == 'from deprecated map' }
+      end
+    end
+
+    describe MapInsideInitialize do
+      describe 'without any passed arguments' do
+        def app
+          described_class.app.new
+        end
+
+        it do
+          get '/'
+          assert { last_response.body == 'hello world' }
+          get '/first_map'
+          assert { last_response.body == 'first mapapp' }
+          get '/second_map'
+          assert { last_response.body == 'second mapapp' }
+        end
+      end
+
+      describe 'with passed routes' do
+        def app
+          some_app = Class.new {
+            include Hobby
+            get { 'Some string.' }
+          }
+          routes = { '/third_map' => some_app.new }
+          described_class.app.new routes
+        end
+
+        it do
+          get '/'
+          assert { last_response.body == 'hello world' }
+          get '/first_map'
+          assert { last_response.body == 'first mapapp' }
+          get '/second_map'
+          assert { last_response.body == 'second mapapp' }
+
+          get '/third_map'
+          assert { last_response.body == 'Some string.' }
+        end
+      end
     end
 
     describe Use do
@@ -98,6 +154,13 @@ describe Hobby::App do
       end
     end
 
+    describe UseInsideInitialize do
+      it do
+        get '/'
+        assert { last_response.content_type == 'application/json' }
+      end
+    end
+
     describe WithoutPath do
       it 'is accessible as /' do
         get '/'
@@ -171,5 +234,43 @@ describe Hobby::App do
         assert { last_response.body == 'Created.' }
       end
     end
+
+    describe UnshareableRouterMaps do
+      it do
+        get '/1/first'
+        assert { last_response.body == 'The name is A.' }
+        get '/1/second'
+        assert { last_response.body == 'The name is B.' }
+        get '/1/third'
+        assert { last_response.body == '404' }
+
+        get '/2/first'
+        assert { last_response.body == 'The name is A.' }
+        get '/2/second'
+        assert { last_response.body == 'The name is B.' }
+        get '/2/third'
+        assert { last_response.body == 'The name is C.' }
+
+        get '/3/first'
+        assert { last_response.body == 'The name is A.' }
+        get '/3/second'
+        assert { last_response.body == 'The name is B.' }
+        get '/3/third'
+        assert { last_response.body == '404' }
+      end
+    end
+
+    describe UnshareableRouterUses do
+      it do
+        get '/1'
+        assert { last_response.content_type == 'application/html' }
+        
+        get '/2'
+        assert { last_response.content_type == 'application/json' }
+
+        get '/3'
+        assert { last_response.content_type == 'application/html' }
+      end
+    end
   end
 end

data/spec/apps/Map.rb

@@ -1,5 +1,5 @@
-map '/map' do
-  run Proc.new { |env| [200, {}, ['from map']] }
+map '/map', Proc.new { |env| [200, {}, ['from map']] }
+map '/deprecated_map' do
+  run Proc.new { |env| [200, {}, ['from deprecated map']] }
 end
-
 get('/') { 'hello world' }

data/spec/apps/MapInsideInitialize.rb

@@ -0,0 +1,13 @@
+first_app = Proc.new { |env| [200, {}, ['first mapapp']] }
+second_app = Proc.new { |env| [200, {}, ['second mapapp']] }
+
+map '/first_map', first_app
+map '/second_map', second_app
+
+get('/') { 'hello world' }
+
+def initialize hash = {}
+  hash.each do |route, app|
+    map route, app
+  end
+end

data/spec/apps/Nested.rb

@@ -1,17 +1,15 @@
-map('/nested') do
-  nested_app = Class.new do
-    include Hobby::App
+nested_app = Class.new do
+  include Hobby::App
 
-    def initialize first, second
-      @a = first
-      @b = second
-      @c = yield
-    end
-
-    get do
-      "#{@a}:#{@b}:#{@c}"
-    end
+  def initialize first, second
+    @a = first
+    @b = second
+    @c = yield
   end
 
-  run nested_app.new(:a, :b) { :c }
+  get do
+    "#{@a}:#{@b}:#{@c}"
+  end
 end
+
+map '/nested', nested_app.new(:a, :b) { :c }

data/spec/apps/OneRouteRouter.rb

@@ -5,4 +5,12 @@ self.router = Class.new {
   def route_for _request
     -> { 'for any route' }
   end
+
+  attr_accessor :app
+
+  def to_rack_app
+    builder = Rack::Builder.new
+    builder.run app
+    builder.to_app
+  end
 }.new

data/spec/apps/UnshareableRouterMaps.rb

@@ -0,0 +1,29 @@
+mapped_app = Class.new do
+  include Hobby
+
+  def initialize name
+    @name = name
+  end
+  
+  get { "The name is #{@name}." }
+end
+
+mapping_app = Class.new do
+  include Hobby
+
+  map '/first', mapped_app.new('A')
+  map '/second', mapped_app.new('B')
+
+  def initialize routes = {}
+    routes.each do |route, app|
+      map route, app
+    end
+  end
+end
+
+map '/1', mapping_app.new
+
+routes = { '/third' => mapped_app.new('C') }
+map '/2', mapping_app.new(routes)
+
+map '/3', mapping_app.new

data/spec/apps/UnshareableRouterUses.rb

@@ -0,0 +1,16 @@
+require 'json'
+
+app = Class.new do
+  include Hobby
+  get { 'hello world'.to_json }
+
+  use Rack::ContentType, 'application/html'
+
+  def initialize middleware_with_arguments = nil
+    use *middleware_with_arguments if middleware_with_arguments
+  end
+end
+
+map '/1', app.new
+map '/2', app.new([Rack::ContentType, 'application/json'])
+map '/3', app.new

data/spec/apps/UseInsideInitialize.rb

@@ -0,0 +1,7 @@
+require 'json'
+
+get { 'hello world'.to_json }
+
+def initialize
+  use Rack::ContentType, 'application/json'
+end

data/spec/helper.rb

@@ -12,8 +12,34 @@ if defined? Mutant
       integration.all_tests
     end
   end
+
+  class Mutant::Isolation::Fork
+    def result
+      yield
+    end
+  end
+
+  class Mutant::Loader
+    def call
+      source = Unparser.unparse node
+
+      puts <<~S
+        Current mutantion:
+        #{source}
+      S
+
+      kernel.eval source, binding, subject.source_path.to_s, subject.source_line
+    end
+  end
+end
+
+module EnvFor
+  def env_for path, verb = 'GET'
+    {'REQUEST_METHOD' => verb, 'PATH_INFO' => path }
+  end
 end
 
 RSpec.configure do |config|
   config.expect_with :rspec, :minitest
+  config.include EnvFor
 end

data/spec/router_matchers.rb

@@ -2,10 +2,6 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobby
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors:
 - Anatoly Chernow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-23 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -39,6 +39,7 @@ files:
 - lib/hobby.rb
 - lib/hobby/helpers.rb
 - lib/hobby/router.rb
+- lib/hobby/router/builder.rb
 - lib/hobby/router/route.rb
 - lib/hobby/router/routes.rb
 - readme.adoc
@@ -49,10 +50,14 @@ files:
 - spec/apps/Halting.rb
 - spec/apps/Main.rb
 - spec/apps/Map.rb
+- spec/apps/MapInsideInitialize.rb
 - spec/apps/Nested.rb
 - spec/apps/OneRouteRouter.rb
 - spec/apps/Status.rb
+- spec/apps/UnshareableRouterMaps.rb
+- spec/apps/UnshareableRouterUses.rb
 - spec/apps/Use.rb
+- spec/apps/UseInsideInitialize.rb
 - spec/apps/WithoutPath.rb
 - spec/helper.rb
 - spec/router_matchers.rb
@@ -77,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A minimal DSL over rack
@@ -89,10 +94,14 @@ test_files:
 - spec/apps/Halting.rb
 - spec/apps/Main.rb
 - spec/apps/Map.rb
+- spec/apps/MapInsideInitialize.rb
 - spec/apps/Nested.rb
 - spec/apps/OneRouteRouter.rb
 - spec/apps/Status.rb
+- spec/apps/UnshareableRouterMaps.rb
+- spec/apps/UnshareableRouterUses.rb
 - spec/apps/Use.rb
+- spec/apps/UseInsideInitialize.rb
 - spec/apps/WithoutPath.rb
 - spec/helper.rb
 - spec/router_matchers.rb