hobby 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a3c9210b9735f56e28762ceeb49fa621b5a5f0b
-  data.tar.gz: 8969c233002b7d0d334adb1a2457b420d07d2bb1
+  metadata.gz: 39a8b0ef69f89a30fb7a7874d6c3a607d874bf35
+  data.tar.gz: 35a6b8e0c5429b648243eb6b2c17834aa216292a
 SHA512:
-  metadata.gz: 6e751d77257376799bcd4fc942294612056e259225a56b45ab24e1923d8deb744ea0539eb15568e468c9d82ba4f58d7ad9169aefd1d019d4a499332943d3d51e
-  data.tar.gz: 4c5dd14d04d1a91ddfc8e030abf63e9d8a2cae6798ac8d2e2a8260d9c9e494d52daa9167f4d0afbf948d27ca189c41b5b6bd189fee9b9d477e34068b77634807
+  metadata.gz: c4cd9d81e9db2ff98e0386bb4ae6803ab616edd637275ee957d95302b09d13ac4a415f56e849720d2d006625a79176875601053afa31cf8d02d551f93889e772
+  data.tar.gz: 7feec3a54880470f1a511a5817168780990c78a6129367dbdb506a03caac7a2ab7d0f853a0107b847430a8cb7b3d9a7d9b8505588e990fdaf78147040957ccf5

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

data/lib/hobby/router/routes.rb

@@ -7,7 +7,7 @@ class Hobby::Router
 
     def []= key, route
       if key.include? ?:
-        string = key.gsub(/(:\w+)/) { "(?<#{$1[1..-1]}>[^/?#]+)" }
+        string = key.gsub(/(:\w+)/) { "(?<#{$1[1..-1]}>[^/?#.]+)" }
         @patterns[/^#{string}$/] = route
       else
         super and super "#{key}/", route

data/readme.adoc

@@ -166,6 +166,8 @@ When an incoming request matches a route,
 the action is executed and a response is sent back to the client.
 The return value of the action will be the `body` of the response.
 
+=== Default route
+
 If a path was omitted
 [source,ruby]
 ----
@@ -184,6 +186,22 @@ end
 
 were called.
 
+=== Route params
+
+Can be accessed with `route.params` (or a shortcut `my`):
+
+[source,ruby]
+----
+# will match '/index', '/hobby', '/purpose', etc.
+get '/:name' do
+  route.params[:name]
+end
+
+# will match '/index.css', '/index.js', etc.
+get '/:name.:ext' do
+  "The name is #{my[:name]} and the ext is #{my[:ext]}."
+end
+----
 
 [[default-methods]]
 == Default methods
@@ -194,23 +212,9 @@ The following methods are predefined:
 * `request`: a http://www.rubydoc.info/gems/rack/Rack/Request[`Rack::Request`].
 * `response`: a http://www.rubydoc.info/gems/rack/Rack/Response[`Rack::Response`].
 * `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.
+* `route.params`, or a shortcut `my`: a `Hash` which stores route params. See <<route-params>> for a usage example.
 * `halt`: returns the `response` immediately. See <<halting>> for a usage example.
 
-[[routes-params]]
-=== Routes with params
-
-[source,ruby]
-----
-class App
-  include Hobby
-  # matches both /hi/hobbit and /hi/patricio
-  get '/hi/:name' do
-    "Hello #{my[:name]}"
-  end
-end
-----
-
 [[halting]]
 === Halting
 

data/spec/router_spec.rb

@@ -11,6 +11,8 @@ describe Hobby::Router do
     /say/:something/to/:someone
     /route/:id.json
     /existent/only/for/GET
+    /js/:name.js
+    /dot/:first.:second
   !
 
   before { add_routes *routes }
@@ -31,6 +33,12 @@ describe Hobby::Router do
            and_set_params(something: 'nothing', someone: 'no_one')
   end
 
+  it { should find_route('/js/with-js.js').and_set_params(name: 'with-js') }
+  it do
+    should find_route('/dot/aa.wtf').
+           and_set_params(first: 'aa', second: 'wtf')
+  end
+
 
   it 'memoizes requests with params' do
     subject.route_for env_for '/hello/ololo'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobby
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Anatoly Chernow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack