jellyfish 0.5.1 → 0.5.2

data/CHANGES.md

@@ -1,5 +1,19 @@
 # CHANGES
 
+## Jellyfish 0.5.2 -- 2012-10-20
+
+### Incompatible changes
+
+* `protect` method is removed and inlined, reducing the size of call stack.
+
+### Enhancements for Jellyfish core
+
+* `log_error` is now a public method.
+
+### Enhancements for Sinatra flavored controller
+
+* Force params encoding to Encoding.default_external
+
 ## Jellyfish 0.5.1 -- 2012-10-19
 
 * Removed accidentally added sinatra files.

data/README.md

@@ -190,11 +190,12 @@ use Rack::ContentType, 'text/plain'
 run Heater.new
 ```
 
-### Sinatra flavor controller
+### Sinatra flavored controller
 
 Currently support:
 
 * Indifferent params
+* Force params encoding to Encoding.default_external
 
 ``` ruby
 require 'jellyfish'

data/jellyfish.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "jellyfish"
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2012-10-19"
+  s.date = "2012-10-20"
   s.description = "Pico web framework for building API-centric web applications.\nFor Rack applications or Rack middlewares. Under 200 lines of code."
   s.email = ["godfat (XD) godfat.org"]
   s.files = [

data/lib/jellyfish.rb

@@ -135,7 +135,11 @@ module Jellyfish
     ctrl.call(env)
   rescue NotFound => e # forward
     if app
-      protect(ctrl, env){ app.call(env) }
+      begin
+        app.call(env)
+      rescue Exception => e
+        handle(ctrl, e, env['rack.errors'])
+      end
     else
       handle(ctrl, e)
     end
@@ -143,10 +147,9 @@ module Jellyfish
     handle(ctrl, e, env['rack.errors'])
   end
 
-  def protect ctrl, env
-    yield
-  rescue Exception => e
-    handle(ctrl, e, env['rack.errors'])
+  def log_error e, stderr
+    return unless stderr
+    stderr.puts("[#{self.class.name}] #{e.inspect} #{e.backtrace}")
   end
 
   private
@@ -166,11 +169,6 @@ module Jellyfish
     end
   end
 
-  def log_error e, stderr
-    return unless stderr
-    stderr.puts("[#{self.class.name}] #{e.inspect} #{e.backtrace}")
-  end
-
   # -----------------------------------------------------------------
 
   def self.included mod

data/lib/jellyfish/sinatra.rb

@@ -7,13 +7,13 @@ module Jellyfish
     attr_reader :request, :params
     def block_call argument, block
       @request = Rack::Request.new(env)
-      @params  = indifferent_params(if argument.kind_of?(MatchData)
-      then # merge captured data from matcher into params as sinatra
+      @params  = force_encoding(indifferent_params(
+      if argument.kind_of?(MatchData)
+        # merge captured data from matcher into params as sinatra
         request.params.merge(Hash[argument.names.zip(argument.captures)])
       else
         request.params
-      end)
-
+      end))
       super
     end
 
@@ -33,5 +33,19 @@ module Jellyfish
     def indifferent_hash
       Hash.new {|hash,key| hash[key.to_s] if Symbol === key }
     end
+
+    # stolen from sinatra
+    # Fixes encoding issues by casting params to Encoding.default_external
+    def force_encoding(data, encoding=Encoding.default_external)
+      return data if data.respond_to?(:rewind) # e.g. Tempfile, File, etc
+      if data.respond_to?(:force_encoding)
+        data.force_encoding(encoding).encode!
+      elsif data.respond_to?(:each_value)
+        data.each_value{ |v| force_encoding(v, encoding) }
+      elsif data.respond_to?(:each)
+        data.each{ |v| force_encoding(v, encoding) }
+      end
+      data
+    end
   end
 end

data/lib/jellyfish/version.rb

@@ -1,4 +1,4 @@
 
 module Jellyfish
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jellyfish
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack