syro 1.1.1 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68e7e12639d6b627c7968f0b3490f5a910d43e5a
-  data.tar.gz: 8c81dc6869e463804f9162ee1e5bb2fb27596734
+  metadata.gz: ace9e69fc974748cea5f7ba6b4c19810670e8e7f
+  data.tar.gz: 997281fce4e718304e0007db8dfdfd3feb550f83
 SHA512:
-  metadata.gz: 0f971c4823ead5c999a91c29f473513dd03dcaafb6b31f090830c16f392fc86d4727cdca61400c0e82f81e4478877d841554a7cb567f209a6d139c9bfbcfe5c4
-  data.tar.gz: 444459d6f617d91775b880d2db7b1b0abfffc3b6da4646a3d5b8b129c8c2f6b5b447ba9c8180af35f2b506f49c4e83748fec47fe0c63a22d269caa539b436068
+  metadata.gz: e139419c2ba779617205cbdce2f82867d59d9f736aa436a90d32eb5f85676922132da86e57e76b232cf73f05557017903f563ebe02e0cd96eff5d6e1fbb49ba8
+  data.tar.gz: 03580f514c3d8348c66b7a3f1ee8d7eeaf687e3b51c1e45f2057a5bb05c99dd07f38c78b05d1d915f5fbdcb96625697f5f41f998828e8695edf81a4658886eb5

data/CHANGELOG

@@ -1,3 +1,11 @@
+2.0.0.rc1
+
+* Add consume and capture primitives
+
+* Add default matcher
+
+* Revert yield of captured value (was added in 1.0.0)
+
 1.1.1
 
 * Small internal refactoring

data/README.md

@@ -48,8 +48,10 @@ app = Syro.new {
 
 The block is evaluated in a sandbox where the following methods are
 available: `env`, `req`, `res`, `path`, `inbox`, `call`, `run`,
-`halt`, `match`, `on`, `root?`, `root`,`get`, `put`, `post`, `patch`
-and `delete`.
+`halt`, `consume`, `capture`, `root?` `match`, `default`, `on`,
+`root`,`get`, `put`, `post`, `patch` and `delete`. Three other
+methods are available for customizations: `default_headers`,
+`request_class` and `response_class`.
 
 As a recommendation, user created variables should be instance
 variables. That way they won't mix with the API methods defined in
@@ -81,14 +83,21 @@ argument.
 `halt`: Terminates the request. It receives an array with the
 response as per Rack's specification.
 
+`consume`: Match and consume a path segment.
+
+`capture`: Match and capture a path segment. The value is stored in
+the inbox.
+
+`root?`: Returns true if the path yet to be consumed is empty.
+
 `match`: Receives a String, a Symbol or a boolean, and returns true
 if it matches the request.
 
+`default`: Receives a block that will be executed inconditionally.
+
 `on`: Receives a value to be matched, and a block that will be
 executed only if the request is matched.
 
-`root?`: Returns true if the path yet to be consumed is empty.
-
 `root`: Receives a block and calls it only if `root?` is true.
 
 `get`: Receives a block and calls it only if `root?` and `req.get?` are

data/lib/syro.rb

@@ -258,29 +258,37 @@ class Syro
         throw(:halt, response)
       end
 
+      def consume(arg)
+        @syro_path.consume(arg)
+      end
+
+      def capture(arg)
+        @syro_path.capture(arg, inbox)
+      end
+
+      def root?
+        @syro_path.root?
+      end
+
       def match(arg)
         case arg
-        when String then @syro_path.consume(arg)
-        when Symbol then @syro_path.capture(arg, inbox)
+        when String then consume(arg)
+        when Symbol then capture(arg)
         when true   then true
         else false
         end
       end
 
-      def on(arg)
-        if match(arg)
-          yield(inbox[arg])
-
-          halt(res.finish)
-        end
+      def default
+        yield; halt(res.finish)
       end
 
-      def root?
-        @syro_path.root?
+      def on(arg)
+        default { yield } if match(arg)
       end
 
       def root
-        on(root?) { yield }
+        default { yield } if root?
       end
 
       def get

data/syro.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "syro"
-  s.version           = "1.1.1"
+  s.version           = "2.0.0.rc1"
   s.summary           = "Simple router"
   s.description       = "Simple router for web applications"
   s.authors           = ["Michel Martens"]

data/test/all.rb

@@ -146,12 +146,6 @@ app = Syro.new {
     }
   }
 
-  on("articles") {
-    on(:id) { |id|
-      res.write(sprintf("GET /articles/%s", id))
-    }
-  }
-
   on("posts") {
     @path = path.prev
 
@@ -253,10 +247,6 @@ test "captures" do |f|
   f.get("/users/42")
   assert_equal "GET /users/42", f.last_response.body
   assert_equal 200, f.last_response.status
-
-  f.get("/articles/23")
-  assert_equal "GET /articles/23", f.last_response.body
-  assert_equal 200, f.last_response.status
 end
 
 test "post values" do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syro
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Michel Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: seg
@@ -98,9 +98,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1