hobby 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1c820bc2f67ffcbd87d4de89a2e8ad53a6f83da9
-  data.tar.gz: e56880e61b2d283537bf44bd019709440dde9118
+SHA256:
+  metadata.gz: d2b39e55ddd774df20a8ba6ff04156303c99bccccb90c08f8915694615faefbe
+  data.tar.gz: 4c175492dc2b6edf91844b0b826657929d373c6f5985dce4aeb39ca041d70040
 SHA512:
-  metadata.gz: f14f9c47364424a1826184cd11a670eed4509e315bb83b6f978e05022fd17da57d3fc139d1e40c62ea33c06ebf59c38996f4dfb90ea0bef779b2a67b837321b5
-  data.tar.gz: 27b2ac428b2a8a7b51941a4e4dd7bab6d9c28e1cbbb4e77d49c282ce58638e0500913b6320f2090511a4a5ca7793b9ba1afd9099748ba17b67afde31214b3142
+  metadata.gz: 576536cd9c0e2269658a0d982a92cd2283ca553fa0e95e9725cb40067eda935f8d75753ec9c2ec21b98e0a64b6c3af983591edac6e0aded8a1a28216ec12dec0
+  data.tar.gz: 0f0e7bb9edde95240b69fcf8447a1d5421e807da3fa8bc8fb38878fc1e7d54d79819709fb18a160b8059f020843b99104bf35fae70fbc10fd27213f938f50228

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/hobby.gemspec

@@ -4,10 +4,10 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'hobby'
-  spec.version       = '0.1.0'
+  spec.version       = '0.2.1'
   spec.authors       = ['Anatoly Chernow']
   spec.email         = ['chertoly@gmail.com']
-  spec.summary       = %q{A minimal DSL over rack}
+  spec.summary       = %q{A professional way to create Rack applications.}
   spec.homepage      = 'https://github.com/ch1c0t/hobby'
   spec.license       = 'MIT'
 
@@ -16,5 +16,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

@@ -42,7 +42,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

@@ -6,8 +6,7 @@ module Hobby
     end
 
     def initialize_copy _router
-      @uses = instance_variable_get(:@uses).dup
-      @maps = instance_variable_get(:@maps).dup
+      @uses, @maps = @uses.dup, @maps.dup
     end
 
     def add_route verb, path, &action

data/readme.adoc

@@ -27,8 +27,7 @@ $ gem install hobby
 [[introduction]]
 == Introduction
 
-Hobby features a Sinatra-like DSL, but in contrast to Sinatra,
-Hobby applications behave like usual Ruby classes.
+Hobby provides a Ruby DSL to create web applications. It is well suited both for standalone and inside-Rails use.
 
 To create a Hobby application, you create a class and include `Hobby` in it.
 For example:
@@ -40,9 +39,9 @@ require 'hobby'
 class C
   include Hobby
 
-  get("/hello") {
+  get "/hello" do
     "Hello, world."
-  }
+  end
 end
 ----
 
@@ -74,9 +73,9 @@ class C
     @name = name
   end
 
-  get("/hello") {
+  get "/hello" do
     "Hello, #{@name}."
-  }
+  end
 end
 ----
 
@@ -95,9 +94,9 @@ class C
     @name.upcase
   end
 
-  get("/hello") {
+  get "/hello" do
     "Hello, #{name}."
-  }
+  end
 end
 ----
 
@@ -133,29 +132,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
 ----
 
@@ -344,10 +326,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

@@ -272,5 +272,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/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,10 @@
-require 'devtools/spec_helper'
-
 require 'hobby'
+require_relative 'mutant_patches' if defined? Mutant
 
 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/mutant_patches.rb

@@ -0,0 +1,27 @@
+# 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

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,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hobby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Anatoly Chernow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2021-03-27 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'
+        version: '2'
 description: 
 email:
 - chertoly@gmail.com
@@ -53,6 +53,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
@@ -60,6 +61,7 @@ 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
@@ -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 professional way to create Rack applications.
 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
@@ -104,5 +106,6 @@ 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