hobby 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2b39e55ddd774df20a8ba6ff04156303c99bccccb90c08f8915694615faefbe
-  data.tar.gz: 4c175492dc2b6edf91844b0b826657929d373c6f5985dce4aeb39ca041d70040
+  metadata.gz: 5d444c9a283bb890d70f85ab79bbed5c094e9add8ef85b4324525f845b888ec7
+  data.tar.gz: 0a4fe7c429e59a98ba20a4f54040e0d715e7acd96f05a75370bf8d453e9642bf
 SHA512:
-  metadata.gz: 576536cd9c0e2269658a0d982a92cd2283ca553fa0e95e9725cb40067eda935f8d75753ec9c2ec21b98e0a64b6c3af983591edac6e0aded8a1a28216ec12dec0
-  data.tar.gz: 0f0e7bb9edde95240b69fcf8447a1d5421e807da3fa8bc8fb38878fc1e7d54d79819709fb18a160b8059f020843b99104bf35fae70fbc10fd27213f938f50228
+  metadata.gz: 6330ab94e89b3e0e1e53b8f00fbab0e2ca8fc6bdd7cfab85a0d52a317a176f2c74d54195e318020957e0118ba31ba503489e16e93452bf2b094a57ca4616f23a
+  data.tar.gz: 5c0480921249b1ae08c5c9f9e0293d9c593107a0bab9f48e183f806d82a1787a28ac432b5c94e54a79d414681e083a2a99cb336de3800fac315ba2912891bec9

data/docs/inject_custom_dependencies.md

@@ -0,0 +1,20 @@
+You can inject custom dependencies into your apps as follows:
+
+```ruby
+class Router < Hobby::Router
+end
+
+class Request < Rack::Request
+end
+
+class Response < Rack::Response
+end
+
+class App
+  include Hobby
+
+  self.router   = Router.new
+  self.request  = Rack::Request
+  self.response = Rack::Response
+end
+```

data/hobby.gemspec

@@ -4,10 +4,11 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'hobby'
-  spec.version       = '0.2.1'
-  spec.authors       = ['Anatoly Chernow']
+  spec.version       = '0.2.2'
+  spec.authors       = ['Anatoly Chernov']
   spec.email         = ['chertoly@gmail.com']
-  spec.summary       = %q{A professional way to create Rack applications.}
+  spec.summary       = 'A Ruby DSL over Rack.'
+  spec.description   = 'A Ruby DSL over Rack. You can create with it reusable web applications, suitable for both standalone and inside-Rails use.'
   spec.homepage      = 'https://github.com/ch1c0t/hobby'
   spec.license       = 'MIT'
 

data/lib/hobby.rb

@@ -5,7 +5,6 @@ require 'hobby/router'
 require 'hobby/helpers'
 
 module Hobby
-  App = Hobby # to stay compatible with old code
   VERBS = %w[DELETE GET HEAD OPTIONS PATCH POST PUT]
 
   def self.included app

data/lib/hobby/router.rb

@@ -27,8 +27,8 @@ module Hobby
       @uses << all
     end
 
-    def map path, app = nil, &block
-      @maps << Builder::Map.new(path, app, &block)
+    def map path, app
+      @maps << [path, app]
     end
 
     attr_accessor :app
@@ -41,14 +41,17 @@ module Hobby
 
     private
       def create_builder
-        builder = Builder.new
-        @uses.each { |all| builder.add_use *all }
-        @maps.each { |map| builder.add_map map }
+        builder = Rack::Builder.new
+
+        @uses.each { |all| builder.use *all }
+        @maps.each { |path, app|
+          builder.map path do run app end
+        }
+
         builder
       end
   end
 end
 
-require 'hobby/router/builder'
 require 'hobby/router/routes'
 require 'hobby/router/route'

data/readme.adoc

@@ -1,3 +1,8 @@
+[[introduction]]
+== Introduction
+
+A Ruby DSL over Rack. You can create with it reusable web applications, suitable for both standalone and inside-Rails use.
+
 [[installation]]
 == Installation
 
@@ -24,10 +29,8 @@ Or install it yourself as:
 $ gem install hobby
 ----
 
-[[introduction]]
-== Introduction
-
-Hobby provides a Ruby DSL to create web applications. It is well suited both for standalone and inside-Rails use.
+[[usage]]
+== Usage
 
 To create a Hobby application, you create a class and include `Hobby` in it.
 For example:
@@ -299,25 +302,6 @@ class App
 end
 ----
 
-== Custom components
-
-Hobby was designed to be very modular.
-Many components of an application can be customized or replaced.
-
-[source,ruby]
-----
-class App
-  include Hobby
-
-  self.router   = custom_router
-  self.request  = custom_request
-  self.response = custom_response
-end
-----
-
-TODO: document the API which is expected from each of these components
-and provide usage examples.
-
 == Development
 
 To run the specs:

data/spec/app_spec.rb

@@ -22,13 +22,13 @@ def build_app described_class
 
   eval %!
     Class.new do
-      include Hobby::App
+      include Hobby
       #{body}
     end
   !
 end
 
-describe Hobby::App do
+describe Hobby do
   include Rack::Test::Methods
 
   describe '.new' do
@@ -39,7 +39,7 @@ describe Hobby::App do
 
     context 'an app without nested app(s)' do
       let(:subject) { build_app(Main).new }
-      it { should be_a Hobby::App }
+      it { should be_a Hobby }
     end
   end
 
@@ -100,11 +100,6 @@ 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

data/spec/apps/Map.rb

@@ -1,5 +1,2 @@
 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/Nested.rb

@@ -1,5 +1,5 @@
 nested_app = Class.new do
-  include Hobby::App
+  include Hobby
 
   def initialize first, second
     @a = first

data/spec/helper.rb

@@ -1,5 +1,4 @@
 require 'hobby'
-require_relative 'mutant_patches' if defined? Mutant
 
 require 'minitest'
 require 'minitest-power_assert'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobby
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
-- Anatoly Chernow
+- Anatoly Chernov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-27 00:00:00.000000000 Z
+date: 2021-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,7 +24,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-description: 
+description: A Ruby DSL over Rack. You can create with it reusable web applications,
+  suitable for both standalone and inside-Rails use.
 email:
 - chertoly@gmail.com
 executables: []
@@ -35,11 +36,11 @@ files:
 - ".travis.yml"
 - Gemfile
 - LICENSE
+- docs/inject_custom_dependencies.md
 - hobby.gemspec
 - 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
@@ -61,7 +62,6 @@ files:
 - spec/apps/UseInsideInitialize.rb
 - spec/apps/WithoutPath.rb
 - spec/helper.rb
-- spec/mutant_patches.rb
 - spec/router_matchers.rb
 - spec/router_spec.rb
 homepage: https://github.com/ch1c0t/hobby
@@ -86,7 +86,7 @@ requirements: []
 rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
-summary: A professional way to create Rack applications.
+summary: A Ruby DSL over Rack.
 test_files:
 - spec/app_spec.rb
 - spec/apps/ContentType.rb
@@ -106,6 +106,5 @@ test_files:
 - spec/apps/UseInsideInitialize.rb
 - spec/apps/WithoutPath.rb
 - spec/helper.rb
-- spec/mutant_patches.rb
 - spec/router_matchers.rb
 - spec/router_spec.rb

data/lib/hobby/router/builder.rb

@@ -1,25 +0,0 @@
-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/spec/mutant_patches.rb

@@ -1,27 +0,0 @@
-# Run all the specs for any subject.
-class Mutant::Selector::Expression
-  def call _subject
-    integration.all_tests
-  end
-end
-
-# Do not silence stdout and stderr of the running mutation.
-class Mutant::Isolation::Fork
-  def result
-    yield
-  end
-end
-
-# Print the source of the current mutation.
-class Mutant::Loader
-  def call
-    source = Unparser.unparse node
-
-    puts <<~S
-      Current mutation:
-      #{source}
-    S
-
-    kernel.eval source, binding, subject.source_path.to_s, subject.source_line
-  end
-end