gin 1.1.1 → 1.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e20fe42824dc7458a51fe9ea96b09f99c679529a
+  data.tar.gz: f44971595636a3b44b0a5d0c8c53b29b85b10506
+SHA512:
+  metadata.gz: bf9d2e7fd479e59041b0ff4da58526b5e6e9ea95d9b2ab93eb2a824f99a2bcf87894d030d8e2fc382e21961bf2b154309793ced6afca92881d209a5c672423b6
+  data.tar.gz: 6ce807b68799d40b56c41c3ca4fa4681e6271dcca623e3fbf22b47533492cd82def91f95139b6ed2cc93e9442f4e1ec94b854884be1e35668fbbb4d9d1a11dca

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 1.1.2 / 2013-07-19
+
+* Minor Enhancements
+  * User the Ruby Logger instead of $stdout as the default logger
+
+* Bugfixes
+  * Fixes to the RWLock which made reads blocking in some instances
+
 === 1.1.1 / 2013-07-11
 
 * Bugfixes

data/TODO.rdoc

@@ -1,7 +1,4 @@
-- Extend router functionality to allow multiple %s per node.
-
 = Maybe
-- Custom environment names for dev, test, stage, and prod
 - Find a better default non-locking logger
 - Bundler-runtime-free
   - script/server equivalent

data/lib/gin.rb

@@ -1,8 +1,9 @@
+require 'logger'
 require 'rack'
 require 'tilt'
 
 class Gin
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 
   LIB_DIR    = File.expand_path("..", __FILE__)            #:nodoc:
   PUBLIC_DIR = File.expand_path("../../public/", __FILE__) #:nodoc:

data/lib/gin/app.rb

@@ -52,7 +52,7 @@ class Gin::App
     @options[:environment]    = ENV['RACK_ENV'] || ENV_DEV
     @options[:error_delegate] = Gin::Controller
     @options[:middleware]     = []
-    @options[:logger]         = $stdout
+    @options[:logger]         = Logger.new($stdout)
     @options[:router]         = Gin::Router.new
     @options[:session_secret] = SESSION_SECRET
     @options[:protection]     = false

data/lib/gin/config.rb

@@ -47,7 +47,7 @@ class Gin::Config
 
   def initialize environment, opts={}
     @environment = environment
-    @logger      = opts[:logger] || $stdout
+    @logger      = opts[:logger] || Logger.new($stdout)
     @ttl         = opts[:ttl]    || false
     @dir         = opts[:dir]    || "./config"
 

data/lib/gin/rw_lock.rb

@@ -34,7 +34,7 @@ class Gin::RWLock
   class WriteTimeout < StandardError; end
 
   TIMEOUT_MSG = "Took too long to lock all config mutexes. \
-Try increasing the value of Config#write_timeout."
+Try increasing the value of write_timeout."
 
   # The amount of time to wait for writer threads to get all the read locks.
   attr_accessor :write_timeout
@@ -45,30 +45,24 @@ Try increasing the value of Config#write_timeout."
     @write_timeout = write_timeout || 0.05
     @mutex_id      = :"rwlock_#{self.object_id}"
     @mutex_owned_id = :"#{@mutex_id}_owned"
+    @rmutex_owned_id = :"#{@mutex_id}_r_owned"
   end
 
 
   def write_sync
     lock_mutexes = []
-    relock_curr  = false
     was_locked   = Thread.current[@mutex_owned_id]
 
-    curr_mutex = read_mutex
-
     write_mutex.lock unless was_locked
     Thread.current[@mutex_owned_id] = true
 
-    # Protect against same-thread deadlocks
-    if curr_mutex && curr_mutex.locked?
-      relock_curr = curr_mutex.unlock rescue false
-    end
-
     start = Time.now
 
     Thread.list.each do |t|
       mutex = t[@mutex_id]
-      next if !mutex || !relock_curr && t == Thread.current
+      next if !mutex || t == Thread.current
       until mutex.try_lock
+        Thread.pass
         raise WriteTimeout, TIMEOUT_MSG if Time.now - start > @write_timeout
       end
       lock_mutexes << mutex
@@ -77,7 +71,6 @@ Try increasing the value of Config#write_timeout."
     yield
   ensure
     lock_mutexes.each(&:unlock)
-    curr_mutex.try_lock if relock_curr
     unless was_locked
       Thread.current[@mutex_owned_id] = false
       write_mutex.unlock
@@ -86,11 +79,17 @@ Try increasing the value of Config#write_timeout."
 
 
   def read_sync
-    was_locked = read_mutex.locked?
-    read_mutex.lock unless was_locked
+    was_locked = Thread.current[@rmutex_owned_id]
+    unless was_locked
+      read_mutex.lock
+      Thread.current[@rmutex_owned_id] = true
+    end
     yield
   ensure
-    read_mutex.unlock if was_locked
+    if !was_locked
+      Thread.current[@rmutex_owned_id] = false
+      read_mutex.unlock
+    end
   end
 
 
@@ -104,6 +103,10 @@ Try increasing the value of Config#write_timeout."
 
   def read_mutex
     return Thread.current[@mutex_id] if Thread.current[@mutex_id]
-    @wmutex.synchronize{ Thread.current[@mutex_id] = Mutex.new }
+    if Thread.current[@mutex_owned_id]
+      Thread.current[@mutex_id] = Mutex.new
+    else
+      @wmutex.synchronize{ Thread.current[@mutex_id] = Mutex.new }
+    end
   end
 end

data/lib/gin/test.rb

@@ -210,7 +210,7 @@ module Gin::Test::Assertions
 
 
   ##
-  # Checks that a specific layout was use to render the response.
+  # Checks that a specific layout was used to render the response.
 
   def assert_layout layout, msg=nil
     path = @controller.template_path(layout, true)
@@ -314,11 +314,6 @@ Run the following command and try again: gem install #{gemname}"
   end
 
 
-  def correct_302_redirect?
-    self.class.correct_302_redirect?
-  end
-
-
   ##
   # The App instance being used for the requests.
 

data/test/test_cache.rb

@@ -17,13 +17,18 @@ class CacheTest < Test::Unit::TestCase
 
   def test_write_thread_safe
     @cache[:num] = 0
+    @mutex = Mutex.new
+    @num = 0
+
     threads = []
-    10.times do
+    30.times do
       threads << Thread.new{ @cache[:num] += 1 }
     end
-    threads.each(&:join)
+    threads.each do |t|
+      t.join
+    end
 
-    assert_equal 10, @cache[:num]
+    assert_equal 30, @cache[:num]
   end
 
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: gin
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.1.2
 platform: ruby
 authors:
 - Jeremie Castagna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,23 +55,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,22 +111,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
-description: ! 'Gin is a small Ruby web framework, built on Rack, which borrows from
-
-  Sinatra expressiveness, and targets larger applications.'
+        version: '3.6'
+description: |-
+  Gin is a small Ruby web framework, built on Rack, which borrows from
+  Sinatra expressiveness, and targets larger applications.
 email:
 - yaksnrainbows@gmail.com
 executables:
@@ -211,6 +194,7 @@ files:
 - .gemtest
 homepage: http://yaks.me/gin
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -218,25 +202,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3379788584365895606
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: gin
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Gin is a small Ruby web framework, built on Rack, which borrows from Sinatra
   expressiveness, and targets larger applications.
 test_files: