syro 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7b8d0d24032087e88045df823a3b61adb898e85af19d22cd17b7bf05ed50449
-  data.tar.gz: 426037f8eb05e2f24f490d81c2f423c22e7d6ea4036e6de7bedcff3ff4ab8007
+  metadata.gz: 7c431564114919bd3cb431153267795d9a959a621d0cdafc20949a6b1fc23810
+  data.tar.gz: 3b8d7e682fec564707d320a351eb3d76f7a044e23619a4d15962cb45ac1cb2db
 SHA512:
-  metadata.gz: 974c67998f9d13ea7999065ce3099c9980cb5014ec1baba55de43eb59eabac80f2b2f1357f799116350d2466245d9a664d63ef3e6751f749d9c0acff242f9b18
-  data.tar.gz: a610effd762f148f833ba5de540c40015e1f583c95d3354057d9d36facdebccdca4ccf0b84f0f11382893235fff699a0dc93df4d032fa732ecc59cb38790a340
+  metadata.gz: aafde14a3978fa175bee9e566d2d7157e62c498dbb78bc704ee022791650eab39f22edf9b49a71de7658741e531e0d975a3738a68eb59c36d37fd2c6dd7da4a3
+  data.tar.gz: 16f2d0621fee223a20f1b669d61c9596577c5e23b00e50b93ed9bc5dd69fed7646bab7127ee49453a8fd6301c5475108447f7cc14d5b4a0e58836ec4a1a35095

data/lib/syro.rb

@@ -209,11 +209,23 @@ class Syro
   end
 
   class Deck
-    module API
-      def initialize(code)
-        @syro_code = code
+
+    # Attaches the supplied block to a subclass of Deck as #dispatch!
+    # Returns the subclassed Deck.
+    def self.implement(&code)
+      Class.new(self) do
+        define_method(:dispatch!, code)
+        private :dispatch!
+
+        # Instead of calling inspect on this anonymous class,
+        # defer to the superclass which is likely Syro::Deck.
+        define_method(:inspect) do
+          self.class.superclass.inspect
+        end
       end
+    end
 
+    module API
       def env
         @syro_env
       end
@@ -268,7 +280,7 @@ class Syro
         @syro_inbox = inbox
 
         catch(:halt) do
-          instance_eval(&@syro_code)
+          dispatch!
           finish!
         end
       end
@@ -420,11 +432,10 @@ class Syro
   end
 
   def initialize(deck = Deck, &code)
-    @deck = deck
-    @code = code
+    @deck = deck.implement(&code)
   end
 
   def call(env, inbox = env.fetch(Syro::INBOX, {}))
-    @deck.new(@code).call(env, inbox)
+    @deck.new.call(env, inbox)
   end
 end

data/syro.gemspec

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

data/test/all.rb

@@ -117,6 +117,10 @@ script_name = Syro.new do
   end
 end
 
+exception = Syro.new do
+  get { res.text(this_method_does_not_exist) }
+end
+
 app = Syro.new do
   get do
     res.write "GET /"
@@ -260,6 +264,10 @@ app = Syro.new do
   on "script" do
     run(script_name)
   end
+
+  on "exception" do
+    run(exception)
+  end
 end
 
 setup do
@@ -443,3 +451,10 @@ test "script name and path info" do |f|
   assert_equal 200, f.last_response.status
   assert_equal "/script/path", f.last_response.body
 end
+
+test "deck exceptions reference a named class" do |f|
+  f.get("/exception")
+rescue NameError => exception
+ensure
+  assert exception.to_s.include?("Syro::Deck")
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syro
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Michel Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: seg
@@ -102,8 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Simple router