syro 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef99afaf8d8d2f03d42a66cf16b3aa8e76c91a66
-  data.tar.gz: 416d45ed7ca4d2c8e995e1b71d7a603f6b655d80
+  metadata.gz: f857bcf1e2b031415f2d9182a062f6dd242f17a0
+  data.tar.gz: 13fb027d2ee19067a1e1da120ee80af13c56d3fe
 SHA512:
-  metadata.gz: c755f0d05b8c8c8e7ffa3b1b811e658c7b9182a0632d9b5d15031414295cd97630166c773fc505d87c186d2c2a92e437512b8da6880bd8ae0c903223de7d98c6
-  data.tar.gz: 4cf42a210e82910a6997a7f7b54273ff98c2c0442978797d87f98a22aeac21355962f1eaca8024ae9b316a0aa0378e913fab54d41ac3d8ee308edd9052c27993
+  metadata.gz: fd3d9434647854b6a12c0b543772a0c01141bf52cf653858216132ead9494d9bbf08d7f644d3bc1c767ddda46feff973a9aab30be7e6784aa1f38674e060cc38
+  data.tar.gz: e728e0711a44eaae11c440f2989998f288e50a7668db1ad0ed0a5cda0ad61b6a992ed6a0682c2d20631e0db19830ba8af34179c27eb54ce02070f2944779acab

data/CHANGELOG

@@ -1,3 +1,7 @@
+2.1.1
+
+* Change gemspec to accept pre-release versions of Rack 2
+
 2.1.0
 
 * Add matchers for head and options

data/README.md

@@ -33,17 +33,17 @@ Usage
 An example of a modular application would look like this:
 
 ```ruby
-admin = Syro.new {
-  get {
+Admin = Syro.new do
+  get do
     res.write "Hello from admin!"
-  }
-}
-
-app = Syro.new {
-  on("admin") {
-    run(admin)
-  }
-}
+  end
+end
+
+App = Syro.new do
+  on "admin" do
+    run(Admin)
+  end
+end
 ```
 
 The block is evaluated in a sandbox where the following methods are
@@ -138,11 +138,11 @@ class TextualDeck < Syro::Deck
   end
 end
 
-App = Syro.new(TextualDeck) {
-  get {
+App = Syro.new(TextualDeck) do
+  get do
     text("hello world")
-  }
-}
+  end
+end
 ```
 
 The example is simple enough to showcase the concept, but maybe too
@@ -159,47 +159,47 @@ In the following examples, the response string represents
 the request path that was sent.
 
 ```ruby
-app = Syro.new {
-  get {
+App = Syro.new do
+  get do
     res.write "GET /"
-  }
+  end
 
-  post {
+  post do
     res.write "POST /"
-  }
+  end
 
-  on("users") {
-    on(:id) {
+  on "users" do
+    on :id do
 
       # Captured values go to the inbox
       @user = User[inbox[:id]]
 
-      get {
+      get do
         res.write "GET /users/42"
-      }
+      end
 
-      put {
+      put do
         res.write "PUT /users/42"
-      }
+      end
 
-      patch {
+      patch do
         res.write "PATCH /users/42"
-      }
+      end
 
-      delete {
+      delete do
         res.write "DELETE /users/42"
-      }
-    }
+      end
+    end
 
-    get {
+    get do
       res.write "GET /users"
-    }
+    end
 
-    post {
+    post do
       res.write "POST /users"
-    }
-  }
-}
+    end
+  end
+end
 ```
 
 Matches
@@ -234,9 +234,9 @@ a slash and until either another slash or the end of the string.
 The captured value is stored in the `inbox` hash under the key that
 was provided as the argument to `on`. For example, after a call to
 `on(:user_id)`, the value for the segment will be stored at
-`inbox[:user_id]`. When mounting an application called `users` with
-the command `run(users)`, an inbox can be provided as the second
-argument: `run(users, inbox)`. That allows apps to share previous
+`inbox[:user_id]`. When mounting an application called `Users` with
+the command `run(Users)`, an inbox can be provided as the second
+argument: `run(Users, inbox)`. That allows apps to share previous
 captures.
 
 Security
@@ -259,15 +259,15 @@ Syro doesn't support Rack middleware out of the box. If you need them,
 just use `Rack::Builder`:
 
 ```ruby
-app = Rack::Builder.new do
+App = Rack::Builder.new do
 
   use Rack::Session::Cookie, secret: "..."
 
-  run Syro.new {
-    get {
+  run Syro.new do
+    get do
       res.write("Hello, world")
-    }
-  }
+    end
+  end
 
 end
 ```

data/syro.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "syro"
-  s.version           = "2.1.0"
+  s.version           = "2.1.1"
   s.summary           = "Simple router"
   s.description       = "Simple router for web applications"
   s.authors           = ["Michel Martens"]
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   s.add_dependency "seg"
-  s.add_dependency "rack", "~> 1.6.0"
+  s.add_dependency "rack", ">= 1.6.0", "< 2.0.0"
   s.add_development_dependency "cutest"
   s.add_development_dependency "rack-test"
 end

data/test/all.rb

@@ -41,159 +41,159 @@ class CustomRequestAndResponse < Syro::Deck
   end
 end
 
-textual = Syro.new(TextualDeck) {
-  get {
+textual = Syro.new(TextualDeck) do
+  get do
     text("GET /textual")
-  }
-}
+  end
+end
 
-default_headers = Syro.new(DefaultHeaders) { }
+default_headers = Syro.new(DefaultHeaders) do end
 
-json = Syro.new(CustomRequestAndResponse) {
-  root {
+json = Syro.new(CustomRequestAndResponse) do
+  root do
     params = req.params
 
     res.write(params)
-  }
-}
+  end
+end
 
-admin = Syro.new {
-  get {
+admin = Syro.new do
+  get do
     res.write("GET /admin")
-  }
-}
+  end
+end
 
-platforms = Syro.new {
+platforms = Syro.new do
   @id = inbox.fetch(:id)
 
-  get {
+  get do
     res.write "GET /platforms/#{@id}"
-  }
-}
+  end
+end
 
-comments = Syro.new {
-  get {
+comments = Syro.new do
+  get do
     res.write sprintf("GET %s/%s/comments",
       inbox[:path],
       inbox[:post_id])
-  }
-}
+  end
+end
 
-app = Syro.new {
-  get {
+app = Syro.new do
+  get do
     res.write "GET /"
-  }
+  end
 
-  post {
-    on(req.POST["user"] != nil) {
+  post do
+    on req.POST["user"] != nil do
       res.write "POST / (user)"
-    }
+    end
 
-    on(true) {
+    on true do
       res.write "POST / (none)"
-    }
-  }
+    end
+  end
 
-  on("foo") {
-    on("bar") {
-      on("baz") {
+  on "foo" do
+    on "bar" do
+      on "baz" do
         res.write("error")
-      }
+      end
 
-      get {
+      get do
         res.write("GET /foo/bar")
-      }
+      end
 
-      put {
+      put do
         res.write("PUT /foo/bar")
-      }
+      end
 
-      head {
+      head do
         res.write("HEAD /foo/bar")
-      }
+      end
 
-      post {
+      post do
         res.write("POST /foo/bar")
-      }
+      end
 
-      patch {
+      patch do
         res.write("PATCH /foo/bar")
-      }
+      end
 
-      delete {
+      delete do
         res.write("DELETE /foo/bar")
-      }
+      end
 
-      options {
+      options do
         res.write("OPTIONS /foo/bar")
-      }
-    }
-  }
+      end
+    end
+  end
 
-  on("bar/baz") {
-    get {
+  on "bar/baz" do
+    get do
       res.write("GET /bar/baz")
-    }
-  }
+    end
+  end
 
-  on("admin") {
+  on "admin" do
     run(admin)
-  }
+  end
 
-  on("platforms") {
+  on "platforms" do
     run(platforms, id: 42)
-  }
+  end
 
-  on("rack") {
+  on "rack" do
     run(RackApp.new)
-  }
+  end
 
-  on("users") {
-    on(:id) {
+  on "users" do
+    on :id do
       res.write(sprintf("GET /users/%s", inbox[:id]))
-    }
-  }
+    end
+  end
 
-  on("posts") {
+  on "posts" do
     @path = path.prev
 
-    on(:post_id) {
-      on("comments") {
+    on :post_id do
+      on "comments" do
         run(comments, inbox.merge(path: @path))
-      }
-    }
-  }
+      end
+    end
+  end
 
-  on("one") {
+  on "one" do
     @one = "1"
 
-    get {
+    get do
       res.write(@one)
-    }
-  }
+    end
+  end
 
-  on("two") {
-    get {
+  on "two" do
+    get do
       res.write(@one)
-    }
+    end
 
-    post {
+    post do
       res.redirect("/one")
-    }
-  }
+    end
+  end
 
-  on("textual") {
+  on "textual" do
     run(textual)
-  }
+  end
 
-  on("headers") {
+  on "headers" do
     run(default_headers)
-  }
+  end
 
-  on("json") {
+  on "json" do
     run(json)
-  }
-}
+  end
+end
 
 setup do
   Driver.new(app)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syro
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Michel Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-12 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: seg
@@ -28,16 +28,22 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement