jellyfish 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bbff880b25384a19ae38417f6318fa77b8bbc4b
-  data.tar.gz: 391a9abc638194dfb1ac7f662b57659ccba104bd
+  metadata.gz: fbbc428cd07afe7548eb82457f5f01f092198fd8
+  data.tar.gz: 5f669713f1f3bd5b1a69868116c776739cbaeb37
 SHA512:
-  metadata.gz: e1ce357a54f83f8e3f28d28e49b493ef15e7702cc28198b8d6a75d29e7983d062b8685dcdee5bb3f61d8c05b2fa3af833c656c9a24f4f8d11b1e4aa9f2f9254f
-  data.tar.gz: cbeb51d8505790c6cd404a1f3e464afbcfe5e1e8077af069a1896eb4f77a33578aadcf30d2d73708c4d9fd724a394667038e0623304f49800d78e55db454a4ed
+  metadata.gz: d3fabf40031fcf2eee773f38d4fc0a021d9d749d69e47aad0e322aa0744e611f3e1e8b69dc85a0f1a39b7bf96d5a7c629cdd2564e1b9ce992f05c557044d22ec
+  data.tar.gz: 12247188a14f764dba3e66dbf81a31ee6e5162434a376f32d29013c5a3b5910d4fef3fbaec3256d191b7179bd790fb217c7a3f581dda342da01e50a77bb43d1c

data/CHANGES.md

@@ -1,6 +1,10 @@
 # CHANGES
 
-## Jellyfish 0.9.0
+## Jellyfish 0.9.1 -- 2013-08-23
+
+* Fixed a thread safety bug for initializing exception handlers.
+
+## Jellyfish 0.9.0 -- 2013-07-11
 
 ### Enhancements for Jellyfish core
 
@@ -15,7 +19,7 @@
   it would no longer forward the request but show a 404 page. Always
   use `forward` if you intend to forward the request.
 
-## Jellyfish 0.8.0
+## Jellyfish 0.8.0 -- 2013-06-15
 
 ### Incompatible changes
 

data/README.md

@@ -53,6 +53,10 @@ Because Sinatra is too complex and inconsistent for me.
 
 ## SYNOPSIS:
 
+You could also take a look at [Saya][] as an example Jellyfish application.
+
+[Saya]: https://github.com/godfat/saya
+
 ### Hello Jellyfish, your lovely config.ru
 
 ``` ruby
@@ -701,7 +705,7 @@ class Tank
   end
 end
 
-HugeTank = Rack::Builder.new do
+HugeTank = Rack::Builder.app do
   use Rack::ContentLength
   use Rack::ContentType, 'text/plain'
   use Heater

data/Rakefile

@@ -3,8 +3,8 @@
 begin
   require "#{dir = File.dirname(__FILE__)}/task/gemgem"
 rescue LoadError
-  sh "git submodule update --init"
-  exec Gem.ruby, "-S", "rake", *ARGV
+  sh 'git submodule update --init'
+  exec Gem.ruby, '-S', 'rake', *ARGV
 end
 
 Gemgem.dir = dir
@@ -16,7 +16,7 @@ task 'gem:spec' do
     require 'jellyfish/version'
     s.name    = 'jellyfish'
     s.version = Jellyfish::VERSION
-    %w[rack bacon].each{ |g| s.add_development_dependency(g) }
+    %w[rack bacon muack].each{ |g| s.add_development_dependency(g) }
   end
 
   Gemgem.write

data/jellyfish.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "jellyfish"
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2013-07-11"
+  s.date = "2013-08-23"
   s.description = "Pico web framework for building API-centric web applications.\nFor Rack applications or Rack middlewares. Around 250 lines of code."
   s.email = ["godfat (XD) godfat.org"]
   s.files = [
@@ -41,11 +41,12 @@ Gem::Specification.new do |s|
   "test/sinatra/test_multi_actions.rb",
   "test/sinatra/test_routing.rb",
   "test/test_from_readme.rb",
-  "test/test_inheritance.rb"]
+  "test/test_inheritance.rb",
+  "test/test_threads.rb"]
   s.homepage = "https://github.com/godfat/jellyfish"
   s.licenses = ["Apache License 2.0"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.4"
+  s.rubygems_version = "2.0.6"
   s.summary = "Pico web framework for building API-centric web applications."
   s.test_files = [
   "test/sinatra/test_base.rb",
@@ -54,7 +55,8 @@ Gem::Specification.new do |s|
   "test/sinatra/test_multi_actions.rb",
   "test/sinatra/test_routing.rb",
   "test/test_from_readme.rb",
-  "test/test_inheritance.rb"]
+  "test/test_inheritance.rb",
+  "test/test_threads.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
@@ -62,12 +64,15 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rack>, [">= 0"])
       s.add_development_dependency(%q<bacon>, [">= 0"])
+      s.add_development_dependency(%q<muack>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<bacon>, [">= 0"])
+      s.add_dependency(%q<muack>, [">= 0"])
     end
   else
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<bacon>, [">= 0"])
+    s.add_dependency(%q<muack>, [">= 0"])
   end
 end

data/lib/jellyfish.rb

@@ -223,7 +223,7 @@ module Jellyfish
       handlers[e.class]
     else # or find the nearest match and cache it
       ancestors         = e.class.ancestors
-      handlers[e.class] = handlers.
+      handlers[e.class] = handlers.dup. # thread safe iteration
         inject([nil, Float::INFINITY]){ |(handler, val), (klass, block)|
           idx = ancestors.index(klass) || Float::INFINITY # lower is better
           if idx < val then [block, idx] else [handler, val] end }.first

data/lib/jellyfish/version.rb

@@ -1,4 +1,4 @@
 
 module Jellyfish
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/test/sinatra/test_routing.rb

@@ -411,12 +411,12 @@ describe 'Sinatra routing_test.rb' do
   should 'play well with other routing middleware' do
     middleware = Class.new{include Jellyfish}
     inner_app  = Class.new{include Jellyfish; get('/foo'){ 'hello' } }
-    builder    = Rack::Builder.new do
+    app = Rack::Builder.app do
       use middleware
       map('/test'){ run inner_app.new }
     end
 
-    status, _, body = get('/test/foo', builder.to_app)
+    status, _, body = get('/test/foo', app)
     status.should.eq 200
     body  .should.eq ['hello']
   end

data/test/test_from_readme.rb

@@ -27,7 +27,7 @@ describe 'from README.md' do
       pinfo, query        = uri.path, uri.query
 
       status, headers, body = File.open(File::NULL) do |input|
-        Rack::Builder.new{ eval(code) }.call(
+        Rack::Builder.app{ eval(code) }.call(
           'REQUEST_METHOD' => method, 'PATH_INFO'  => pinfo,
           'QUERY_STRING'   => query , 'rack.input' => input)
       end

data/test/test_threads.rb

@@ -0,0 +1,40 @@
+
+require 'jellyfish/test'
+require 'muack'
+
+include Muack::API
+
+describe Jellyfish do
+  after do
+    Muack.verify
+  end
+
+  app = Class.new{
+    include Jellyfish
+    handle(Exception){ |env| 0 }
+  }.new
+
+  exp = RuntimeError.new
+
+  should "no RuntimeError: can't add a new key into hash during iteration" do
+    # make static ancestors so that we could stub it
+    ancestors = RuntimeError.ancestors
+    stub(RuntimeError).ancestors{ancestors}
+    flip = true
+    stub(ancestors).index(anything).proxy.returns do |i|
+      if flip
+        flip = false
+        sleep 0.0001
+      end
+      i
+    end
+
+    2.times.map{
+      Thread.new do
+        app.send(:best_handler, exp).call({}).should.eq 0
+      end
+    }.each(&:join)
+
+    flip.should.eq false
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jellyfish
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: muack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Pico web framework for building API-centric web applications.
   For Rack applications or Rack middlewares. Around 250 lines of code.
@@ -79,6 +93,7 @@ files:
 - test/sinatra/test_routing.rb
 - test/test_from_readme.rb
 - test/test_inheritance.rb
+- test/test_threads.rb
 homepage: https://github.com/godfat/jellyfish
 licenses:
 - Apache License 2.0
@@ -99,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Pico web framework for building API-centric web applications.
@@ -111,3 +126,4 @@ test_files:
 - test/sinatra/test_routing.rb
 - test/test_from_readme.rb
 - test/test_inheritance.rb
+- test/test_threads.rb