hobby 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cbd33582464fb0f4abb35050547d8aab1e8b55ca
-  data.tar.gz: 25e21f5fdc989cdae29cac8bf6666ed9dcc04add
+SHA256:
+  metadata.gz: 5d444c9a283bb890d70f85ab79bbed5c094e9add8ef85b4324525f845b888ec7
+  data.tar.gz: 0a4fe7c429e59a98ba20a4f54040e0d715e7acd96f05a75370bf8d453e9642bf
 SHA512:
-  metadata.gz: cca58be4bf771c560092b6171b2882f68249bc9361ea3a4ef943f3003e6efdb415d0e850ef07412f29f098fa19c59ede7eaa7095d6c738b293fca47d20d6bdc9
-  data.tar.gz: 6a56b251d310c6b42df0e0dc5142ec3a50ee2184375ac27230d801fd87ac370c45e2fc5093cdd960895d097365045d7d2946dfd2ac192fd851e3bcf3d75034fe
+  metadata.gz: 6330ab94e89b3e0e1e53b8f00fbab0e2ca8fc6bdd7cfab85a0d52a317a176f2c74d54195e318020957e0118ba31ba503489e16e93452bf2b094a57ca4616f23a
+  data.tar.gz: 5c0480921249b1ae08c5c9f9e0293d9c593107a0bab9f48e183f806d82a1787a28ac432b5c94e54a79d414681e083a2a99cb336de3800fac315ba2912891bec9

data/.travis.yml

@@ -1,6 +1,7 @@
 ---
 language: ruby
 rvm:
+  - 2.5
   - 2.4
   - 2.3
 script: bundle exec rspec

data/Gemfile

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

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.1.1'
-  spec.authors       = ['Anatoly Chernow']
+  spec.version       = '0.2.2'
+  spec.authors       = ['Anatoly Chernov']
   spec.email         = ['chertoly@gmail.com']
-  spec.summary       = %q{A minimal DSL over rack}
+  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'
 
@@ -16,5 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rack'
+  spec.add_dependency 'rack', '~> 2'
+
+  spec.required_ruby_version = '>= 2.6.6'
 end

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
@@ -42,7 +41,7 @@ module Hobby
       catch :halt do
         @route = router.route_for (@env = env)
         fill_body
-        response
+        response.to_a
       end
     end
 

data/lib/hobby/helpers.rb

@@ -27,7 +27,7 @@ module Hobby
     end
 
     def halt
-      throw :halt, response
+      throw :halt, response.to_a
     end
 
     def not_found
@@ -42,5 +42,9 @@ module Hobby
     def status status
       response.status = status
     end
+
+    def script_name
+      env.fetch 'SCRIPT_NAME'
+    end
   end
 end

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,11 +29,8 @@ Or install it yourself as:
 $ gem install hobby
 ----
 
-[[introduction]]
-== Introduction
-
-Hobby features a Sinatra-like DSL, but in contrast to Sinatra,
-Hobby applications behave like usual Ruby classes.
+[[usage]]
+== Usage
 
 To create a Hobby application, you create a class and include `Hobby` in it.
 For example:
@@ -40,9 +42,9 @@ require 'hobby'
 class C
   include Hobby
 
-  get("/hello") {
+  get "/hello" do
     "Hello, world."
-  }
+  end
 end
 ----
 
@@ -74,9 +76,9 @@ class C
     @name = name
   end
 
-  get("/hello") {
+  get "/hello" do
     "Hello, #{@name}."
-  }
+  end
 end
 ----
 
@@ -95,9 +97,9 @@ class C
     @name.upcase
   end
 
-  get("/hello") {
+  get "/hello" do
     "Hello, #{name}."
-  }
+  end
 end
 ----
 
@@ -133,29 +135,12 @@ For common HTTP verbs, Hobby provides the route definers(methods named according
 class App
   include Hobby
 
-  get '/' do
-    # ...
-  end
-
-  post '/' do
-    # ...
-  end
-
-  put '/' do
-    # ...
-  end
-
-  patch '/' do
-    # ...
-  end
-
-  delete '/' do
-    # ...
-  end
-
-  options '/' do
-    # ...
-  end
+  get { 'Some string.' }
+  post { 'Some string.' }
+  put { 'Some string.' }
+  patch { 'Some string.' }
+  delete { 'Some string.' }
+  # TODO: find a good example for `options`
 end
 ----
 
@@ -317,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:
@@ -344,10 +310,3 @@ To run the specs:
 ----
 bundle exec rspec
 ----
-
-To perform mutation analysis:
-
-[source,bash]
-----
-bundle exec mutant --use rspec 'Hobby*'
-----

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
@@ -272,5 +267,15 @@ describe Hobby::App do
         assert { last_response.content_type == 'application/html' }
       end
     end
+
+    describe ScriptName do
+      it do
+        get '/'
+        assert { last_response.body == '' }
+
+        get '/some/path'
+        assert { last_response.body == '/some/path' }
+      end
+    end
   end
 end

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/apps/ScriptName.rb

@@ -0,0 +1,12 @@
+get do
+  script_name
+end
+
+app = Class.new do
+  include Hobby
+  get do
+    script_name
+  end
+end
+
+map '/some/path', app.new

data/spec/helper.rb

@@ -1,38 +1,9 @@
-require 'devtools/spec_helper'
-
 require 'hobby'
 
 require 'minitest'
 require 'minitest-power_assert'
 Minitest::Assertions.prepend Minitest::PowerAssert::Assertions
 
-if defined? Mutant
-  class Mutant::Selector::Expression
-    def call _subject
-      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 }

data/spec/router_matchers.rb

@@ -18,7 +18,7 @@ module RouterMatchers
       route && (route.to_proc.call == SOME_ROUTE.call) && params_are_ok
     end
 
-    chain :and_set_params do |**params|
+    chain :and_set_params do |params|
       @params = params
     end
   end

metadata

@@ -1,30 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: hobby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
-- Anatoly Chernow
+- Anatoly Chernov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2021-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: 
+        version: '2'
+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
@@ -53,6 +54,7 @@ files:
 - spec/apps/MapInsideInitialize.rb
 - spec/apps/Nested.rb
 - spec/apps/OneRouteRouter.rb
+- spec/apps/ScriptName.rb
 - spec/apps/Status.rb
 - spec/apps/UnshareableRouterMaps.rb
 - spec/apps/UnshareableRouterUses.rb
@@ -74,18 +76,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
-summary: A minimal DSL over rack
+summary: A Ruby DSL over Rack.
 test_files:
 - spec/app_spec.rb
 - spec/apps/ContentType.rb
@@ -97,6 +98,7 @@ test_files:
 - spec/apps/MapInsideInitialize.rb
 - spec/apps/Nested.rb
 - spec/apps/OneRouteRouter.rb
+- spec/apps/ScriptName.rb
 - spec/apps/Status.rb
 - spec/apps/UnshareableRouterMaps.rb
 - spec/apps/UnshareableRouterUses.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