syro 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d42da05d9e40f9dd247ca71a2f3b2514fdeedb0a
-  data.tar.gz: 6019c98bff4e489bcd0f1f5975dc046a3ab94193
+  metadata.gz: 024518f1cb6e65935ea456dc18ac359d1b18eae4
+  data.tar.gz: 8834daf0ca51401e82b0fe1cd05fb2f71986a5ca
 SHA512:
-  metadata.gz: 52a247d00e9b09cd152a65e8702150e8df91c50f66bc811f7ac94be90ba3dd3e9b93cb016a70474ac4c19005835ad62382c3d920edb49777b991cac7d4ab2106
-  data.tar.gz: 15c8260bae6bf88ffbb1882b2c4a9cb50ab97b4d693ba4b98ba2a254d014175c6c1c10d48ec570767039081d76395aefb0f390c96d1b80730d7934e0418aaa37
+  metadata.gz: b5fc9a10dbc89d25bc24b75ab697c03d9f6bb4407daa07505c3967c8b762074ec1769d34f802c39cd37c2f5deb21f9f8a33e0e7b8d3eeb3c22e432e0d45a1a9f
+  data.tar.gz: 586fadba5f72bcec32fb1f5498f4a15f2a655bfb5dbed9a4b9f7b7702f5272f8e64de76cbb8d34347d5a09c626236900b6f4817d68f7db7ca779197630566225

data/CHANGELOG

@@ -0,0 +1,7 @@
+0.0.3
+
+* Remove request method overriding (@larrylv)
+
+0.0.2
+
+* Defer method comparisons to Rack::Request (@pote)

data/README.md

@@ -37,8 +37,7 @@ app = Syro.new {
 
 The block is evaluated in a sandbox where the following methods are
 available: `env`, `req`, `res`, `inbox`, `call`, `run`, `halt`,
-`match`, `on`, `root?`, `root`, `get?`, `post?`, `patch?`, `delete?`,
-`get`, `post`, `patch` and `delete`.
+`match`, `on`, `root?`, `root`,`get`, `post`, `patch` and `delete`.
 
 As a recommendation, user created variables should be instance
 variables. That way they won't mix with the API methods defined in
@@ -78,24 +77,16 @@ executed only if the request is matched.
 
 `root`: Receives a block and calls it only if `root?` is true.
 
-`get?`: Returns true if the `REQUEST_METHOD` is `GET`.
-
-`get`: Receives a block and calls it only if `root?` and `get?` are
+`get`: Receives a block and calls it only if `root?` and `req.get?` are
 true.
 
-`post?`: Returns true if the `REQUEST_METHOD` is `POST`.
-
-`post`: Receives a block and calls it only if `root?` and `post?`
+`post`: Receives a block and calls it only if `root?` and `req.post?`
 are true.
 
-`patch?`: Returns true if the `REQUEST_METHOD` is `PATCH`.
-
-`patch`: Receives a block and calls it only if `root?` and `patch?`
+`patch`: Receives a block and calls it only if `root?` and `req.patch?`
 are true.
 
-`delete?`: Returns true if the `REQUEST_METHOD` is `DELETE`.
-
-`delete`: Receives a block and calls it only if `root?` and `delete?`
+`delete`: Receives a block and calls it only if `root?` and `req.delete?`
 are true.
 
 Examples

data/lib/syro.rb

@@ -1,17 +1,17 @@
 # encoding: UTF-8
 #
 # Copyright (c) 2015 Michel Martens
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,31 +24,10 @@ require "rack"
 require "seg"
 
 class Syro
-
-  # Method override parameter
-  OVERRIDE = "_method".freeze
-
-  # HTTP environment variables
-  PATH_INFO = "PATH_INFO".freeze
-  SCRIPT_NAME = "SCRIPT_NAME".freeze
-  REQUEST_METHOD = "REQUEST_METHOD".freeze
-
-  # Response headers
-  LOCATION = "Location".freeze
-  CONTENT_TYPE = "Content-Type".freeze
-  CONTENT_LENGTH = "Content-Length".freeze
-  CONTENT_TYPE_DEFAULT = "text/html".freeze
-
-  # Request methods
-  GET = 'GET'.freeze
-  POST = 'POST'.freeze
-  PATCH = 'PATCH'.freeze
-  DELETE = 'DELETE'.freeze
-
-  # Available methods
-  METHODS = [GET, POST, PATCH, DELETE].freeze
-
   class Response
+    LOCATION = "Location".freeze
+    DEFAULT = "text/html".freeze
+
     attr_accessor :status
 
     attr :body
@@ -73,16 +52,25 @@ class Syro
       s = str.to_s
 
       @length += s.bytesize
-      @headers[Syro::CONTENT_LENGTH] = @length.to_s
+      @headers[Rack::CONTENT_LENGTH] = @length.to_s
       @body << s
     end
 
     def redirect(path, status = 302)
-      @headers[Syro::LOCATION] = path
-      @status  = status
+      @headers[LOCATION] = path
+      @status = status
     end
 
     def finish
+      if @status.nil?
+        if @body.empty?
+          @status = 404
+        else
+          @headers[Rack::CONTENT_TYPE] ||= DEFAULT
+          @status = 200
+        end
+      end
+
       [@status, @headers, @body]
     end
 
@@ -124,43 +112,19 @@ class Syro
       @syro_env = env
       @syro_req = Rack::Request.new(env)
       @syro_res = Syro::Response.new
-      @syro_path = Seg.new(env.fetch(Syro::PATH_INFO))
+      @syro_path = Seg.new(env.fetch(Rack::PATH_INFO))
       @syro_inbox = inbox
 
-
-      if env[Syro::REQUEST_METHOD] == Syro::POST
-        value = @syro_req.POST[Syro::OVERRIDE]
-
-        if value != nil
-          env[Syro::REQUEST_METHOD] = value.upcase
-        end
-      end
-
-      @syro_method = Syro::METHODS.index(env[Syro::REQUEST_METHOD])
-
-      result = catch(:halt) do
+      catch(:halt) do
         instance_eval(&@syro_code)
 
-        @syro_res.status = 404
         @syro_res.finish
       end
-
-      if result[0].nil?
-        if result[2].empty?
-          result[0] = 404
-        else
-          result[1][Syro::CONTENT_TYPE] ||=
-                    Syro::CONTENT_TYPE_DEFAULT
-          result[0] = 200
-        end
-      end
-
-      result
     end
 
     def run(app, inbox = {})
-      env[Syro::PATH_INFO] = @syro_path.curr
-      env[Syro::SCRIPT_NAME] = @syro_path.prev
+      env[Rack::PATH_INFO] = @syro_path.curr
+      env[Rack::SCRIPT_NAME] = @syro_path.prev
 
       halt(app.call(env, inbox))
     end
@@ -198,24 +162,8 @@ class Syro
       end
     end
 
-    def get?
-      @syro_method == 0
-    end
-
-    def post?
-      @syro_method == 1
-    end
-
-    def patch?
-      @syro_method == 2
-    end
-
-    def delete?
-      @syro_method == 3
-    end
-
     def get
-      if root? && get?
+      if root? && req.get?
         yield
 
         halt(res.finish)
@@ -223,7 +171,7 @@ class Syro
     end
 
     def post
-      if root? && post?
+      if root? && req.post?
         yield
 
         halt(res.finish)
@@ -231,7 +179,7 @@ class Syro
     end
 
     def patch
-      if root? && patch?
+      if root? && req.patch?
         yield
 
         halt(res.finish)
@@ -239,7 +187,7 @@ class Syro
     end
 
     def delete
-      if root? && delete?
+      if root? && req.delete?
         yield
 
         halt(res.finish)

data/syro.gemspec

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

data/test/all.rb

@@ -101,6 +101,10 @@ app = Syro.new {
     get {
       res.write(@one)
     }
+
+    post {
+      res.redirect("/one")
+    }
   }
 }
 
@@ -181,3 +185,12 @@ test "leaks" do |f|
   assert_equal "", f.last_response.body
   assert_equal 200, f.last_response.status
 end
+
+test "redirect" do |f|
+  f.post("/two")
+  assert_equal 302, f.last_response.status
+
+  f.follow_redirect!
+  assert_equal "1", f.last_response.body
+  assert_equal 200, f.last_response.status
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syro
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Michel Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: seg