hobby 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a09d8721fee0c8b802dfc4137a45d746024a10d
-  data.tar.gz: b5eebe2c4534c37f43bfde807e243606747bb9b5
+  metadata.gz: 2a3c9210b9735f56e28762ceeb49fa621b5a5f0b
+  data.tar.gz: 8969c233002b7d0d334adb1a2457b420d07d2bb1
 SHA512:
-  metadata.gz: f985469d665eb47e06ed8fdfcfb248c08365987b07a010570cef81c2bdad00711012fa99171bccc9218482e5728215dc6146c4ea263583895282d8d13ef35826
-  data.tar.gz: 6344ca6071eb2e297b42b3171902abeb34cb3f7ecb4d148499849ab87d0ee15cca2cf9c5dfdf248e9a91365324e7620e71129cc7a1be9b675895f44bf14822cc
+  metadata.gz: 6e751d77257376799bcd4fc942294612056e259225a56b45ab24e1923d8deb744ea0539eb15568e468c9d82ba4f58d7ad9169aefd1d019d4a499332943d3d51e
+  data.tar.gz: 4c5dd14d04d1a91ddfc8e030abf63e9d8a2cae6798ac8d2e2a8260d9c9e494d52daa9167f4d0afbf948d27ca189c41b5b6bd189fee9b9d477e34068b77634807

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

data/lib/hobby/router/route.rb

@@ -2,10 +2,11 @@ class Hobby::Router
   class Route
     def initialize verb, path, &action
       @verb, @path, @action = verb, path, action
+      @params = {}
     end
 
     attr_reader :verb, :path
-    attr_accessor :action
+    attr_accessor :action, :params
 
     alias to_proc action
   end

data/lib/hobby/router.rb

@@ -15,7 +15,10 @@ module Hobby
 
     def route_for env
       route, params = @routes["#{env['REQUEST_METHOD']}#{env['PATH_INFO']}"]
-      env[:path_params] = params if params
+      
+      route = route.dup
+      route.params = params if params
+
       route
     end
   end

data/lib/hobby.rb

@@ -38,7 +38,7 @@ module Hobby
   protected
     def handle env
       catch :halt do
-        route = self.class.router.route_for (@env = env)
+        @route = self.class.router.route_for (@env = env)
 
         body = route ? (instance_exec &route) : not_found
         response.write body
@@ -48,7 +48,7 @@ module Hobby
     end
 
   private
-    attr_reader :env
+    attr_reader :env, :route
 
     def request
       @request ||= self.class.request.new env
@@ -59,7 +59,7 @@ module Hobby
     end
 
     def my
-      env.fetch :path_params, {}
+      route.params
     end
 
     def halt
@@ -69,4 +69,9 @@ module Hobby
     def not_found
       response.status = 404
     end
+
+    def content_type type
+      mime_type = Rack::Mime::MIME_TYPES.fetch ".#{type}"
+      response.add_header 'Content-Type', mime_type
+    end
 end

data/readme.adoc

@@ -193,11 +193,12 @@ The following methods are predefined:
 * `env`: a `Hash`, http://www.rubydoc.info/github/rack/rack/master/file/SPEC#The_Environment[a Rack environment].
 * `request`: a http://www.rubydoc.info/gems/rack/Rack/Request[`Rack::Request`].
 * `response`: a http://www.rubydoc.info/gems/rack/Rack/Response[`Rack::Response`].
-* `my`: a `Hash` which stores route variables. See <<routes-with-variables>> for a usage example.
+* `route`: a `Hobby::Router::Route`, the currently executing route.
+* `route.params`, or a shortcut `my`: a `Hash` which stores route params. See <<routes-params>> for a usage example.
 * `halt`: returns the `response` immediately. See <<halting>> for a usage example.
 
-[[routes-with-variables]]
-=== Routes with variables
+[[routes-params]]
+=== Routes with params
 
 [source,ruby]
 ----

data/spec/app_spec.rb

@@ -155,5 +155,13 @@ describe Hobby::App do
         assert { last_response.status == 400 }
       end
     end
+
+    describe ContentType do
+      it do
+        get '/'
+        assert { last_response.body == "alert('string');" }
+        assert { last_response.headers['Content-Type'] == 'application/javascript' }
+      end
+    end
   end
 end

data/spec/apps/ContentType.rb

@@ -0,0 +1,4 @@
+get do
+  content_type :js
+  "alert('string');"
+end

data/spec/router_matchers.rb

@@ -17,7 +17,7 @@ module RouterMatchers
       env = env_for path, verb
       route = subject.route_for env
 
-      params_are_ok = (@params ? (@params.to_a - env[:path_params].to_a).empty? : true)
+      params_are_ok = (@params ? (@params.to_a - route.params.to_a).empty? : true)
 
       route && (route.to_proc.call == SOME_ROUTE.call) && params_are_ok
     end

data/spec/router_spec.rb

@@ -37,4 +37,13 @@ describe Hobby::Router do
 
     assert { subject.instance_variable_get(:@routes).include? 'GET/hello/ololo' }
   end
+
+  it 'dups a route for each request' do
+    router = described_class.new
+    route = router.add_route 'GET', '/some_path' do :some_action end
+
+    duped_route = router.route_for env_for '/some_path'
+
+    assert { not route.equal? duped_route }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobby
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Anatoly Chernow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -44,6 +44,7 @@ files:
 - lib/hobby/router/routes.rb
 - readme.adoc
 - spec/app_spec.rb
+- spec/apps/ContentType.rb
 - spec/apps/Decorator.rb
 - spec/apps/Env.rb
 - spec/apps/Halting.rb
@@ -82,6 +83,7 @@ specification_version: 4
 summary: A minimal DSL over rack
 test_files:
 - spec/app_spec.rb
+- spec/apps/ContentType.rb
 - spec/apps/Decorator.rb
 - spec/apps/Env.rb
 - spec/apps/Halting.rb