spawnling 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26aa7286ca5e508bb9bec2971336151f68d64225
-  data.tar.gz: e70bf1b0865d216b5d3a197268eff1af8021e70f
+  metadata.gz: 46683af41ff0f9b4d4078d02a1009371670f1c0e
+  data.tar.gz: 114aa427aabb0bfc096967528b53fb1ca6a2aed8
 SHA512:
-  metadata.gz: 01315192fee03920aba467775e9f59801340dce832a3ba6c32b2a3643b7b0f730a8ac58a92b674b11a22ea09ee748688539d43f008cb9da0f6c55bd1a9a15814
-  data.tar.gz: e03db92b7c3c476190a89b032160928541c31f15d9068578b19c421bf8669e50d99c40ced3cbe97621270fc4165d021929af381002a878ab739f6122c55747c6
+  metadata.gz: fefb1f49fa3a27b0b3fd8d5d645738fe27623881e01e804946e4c9645231443067fea45df43e26be5f5f92b4626165dbf81f22e510f3809a1b22b9946a72745a
+  data.tar.gz: 8601bbf865be9fac8277b402d25418e4125305d0bd01b573f86a0a67bbabd2f429f9bb08bd2e8c49eb6fbd714c00339a209e84ba76a911717398050d0b1e9f4a

data/.gitignore

@@ -1,2 +1,4 @@
 *~
 *.gem
+.project
+foo

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format documentation
+--backtrace

data/.travis.yml

@@ -5,15 +5,14 @@ rvm:
   - 2.0
   - 2.1
 gemfile:
-  - gemfiles/rails2.gemfile
   - gemfiles/rails3.gemfile
   - gemfiles/rails4.gemfile
+env:
+  - NONE=true
+  - RAILS=true
+  - RAILS=true MEMCACHE=true
 matrix:
   exclude:
-    - rvm: 2.0
-      gemfile: gemfiles/rails2.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails2.gemfile
     - rvm: 1.8.7
       gemfile: gemfiles/rails4.gemfile
 script: "bundle exec rake coverage"

data/lib/patches.rb

@@ -2,7 +2,11 @@ if defined?(ActiveRecord)
   # see activerecord/lib/active_record/connection_adaptors/abstract/connection_specification.rb
   class ActiveRecord::Base
     # reconnect without disconnecting
-    if ::Spawnling::RAILS_3_x || ::Spawnling::RAILS_2_2
+    if ::Spawnling::RAILS_3_x
+      def self.spawn_reconnect(klass=self)
+        ActiveRecord::Base.connection.reconnect!
+      end
+    elsif ::Spawnling::RAILS_2_2
       def self.spawn_reconnect(klass=self)
         # keep ancestors' connection_handlers around to avoid them being garbage collected in the forked child
         @@ancestor_connection_handlers ||= []
@@ -130,6 +134,8 @@ if need_passenger_patch
   end
 end
 
-if defined?(::ActiveSupport::Cache::MemCacheStore)
-  ::ActiveSupport::Cache::MemCacheStore.delegate :reset, :to => :@data
+if defined?(Rails)
+  if defined?(::ActiveSupport::Cache::MemCacheStore) && Rails.cache.class.name == 'ActiveSupport::Cache::MemCacheStore'
+    ::ActiveSupport::Cache::MemCacheStore.delegate :reset, :to => :@data
+  end
 end

data/lib/spawnling.rb

@@ -95,7 +95,7 @@ class Spawnling
   # :method => :thread or override the default behavior in the environment by setting
   # 'Spawnling::method :thread'.
   def initialize(opts = {}, &block)
-    self.class.run(opts, &block)
+    @type, @handle = self.class.run(opts, &block)
   end
 
   def self.run(opts = {}, &block)
@@ -109,15 +109,13 @@ class Spawnling
     elsif options[:method] == :thread
       # for versions before 2.2, check for allow_concurrency
      if allow_concurrency?
-       @type = :thread
-       @handle = thread_it(options) { yield }
+       return :thread, thread_it(options) { yield }
       else
         @@logger.error("spawn(:method=>:thread) only allowed when allow_concurrency=true")
         raise "spawn requires config.active_record.allow_concurrency=true when used with :method=>:thread"
       end
     else
-      @type = :fork
-      @handle = fork_it(options) { yield }
+      return :fork, fork_it(options) { yield }
     end
   end
 
@@ -125,7 +123,7 @@ class Spawnling
     return true if RAILS_2_2
     if defined?(ActiveRecord) && ActiveRecord::Base.respond_to?(:allow_concurrency)
       ActiveRecord::Base.allow_concurrency
-    elsif defined?(Rails)
+    elsif defined?(Rails) && Rails.application
       Rails.application.config.allow_concurrency
     else
       true # assume user knows what they are doing
@@ -146,7 +144,7 @@ class Spawnling
       end
     end
     # clean up connections from expired threads
-    ActiveRecord::Base.verify_active_connections!() if defined?(ActiveRecord)
+    clean_connections
   end
 
   protected
@@ -218,11 +216,11 @@ class Spawnling
 
   def self.thread_it(options)
     # clean up stale connections from previous threads
-    ActiveRecord::Base.verify_active_connections!() if defined?(ActiveRecord)
+    clean_connections
     thr = Thread.new do
       # run the long-running code block
       if defined?(ActiveRecord)
-        ActiveRecord::Base.connection_pool.with_connection { yield  }
+        ActiveRecord::Base.connection_pool.with_connection { yield }
       else
         yield
       end
@@ -231,6 +229,12 @@ class Spawnling
     return thr
   end
 
+  def self.clean_connections
+    return unless defined? ActiveRecord
+    ActiveRecord::Base.verify_active_connections! if ActiveRecord::Base.respond_to?(:verify_active_connections!)
+    ActiveRecord::Base.clear_active_connections! if ActiveRecord::Base.respond_to?(:clear_active_connections!)
+  end
+
   # In case we don't have rails, can't call opts.symbolize_keys
   def self.symbolize_options(hash)
     hash.inject({}) do |new_hash, (key, value)|

data/lib/spawnling/version.rb

@@ -1,3 +1,3 @@
 class Spawnling
-  VERSION = '2.1.4'
+  VERSION = '2.1.5'
 end

data/spawnling.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   s.name          = "spawnling"
   s.version       = Spawnling::VERSION
 
-  s.authors       = ['Tom Anderson']
-  s.email         = ['tom@squeat.com']
+  s.authors       = ['Tom Anderson', 'Michael Noack']
+  s.email         = ['tom@squeat.com', 'michael+spawnling@noack.com.au']
 
   s.homepage      = %q{http://github.com/tra/spawnling}
   s.license       = "MIT"
@@ -29,6 +29,10 @@ threads (see lib/patches.rb).}
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 2.0'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'simplecov-rcov'
   s.add_development_dependency 'coveralls'
   s.add_development_dependency 'rails'
+  s.add_development_dependency 'activerecord-nulldb-adapter'
+  s.add_development_dependency 'dalli'
 end

data/spec/spawn/spawn_spec.rb

@@ -14,32 +14,32 @@ describe Spawnling do
         object.do_something
       end
     end
-  
+
     it "should be able to yield directly" do
       spawn!.should == "hello"
     end
   end
-  
+
   describe "override" do
     before(:each) do
       Spawnling::default_options :method => proc{ "foo" }
     end
-    
+
     it "should be able to return a proc" do
       spawn!.should == "foo"
     end
-    
+
   end
-  
+
   describe "delegate to a proc" do
     before(:each) do
       Spawnling::default_options :method => proc{ |block| block }
     end
-    
+
     it "should be able to return a proc" do
       spawn!.should be_kind_of(Proc)
     end
-  
+
     it "should be able to return a proc" do
       spawn!.call.should == "hello"
     end
@@ -57,8 +57,18 @@ describe Spawnling do
       sleep(0.1) # wait for file to finish writing
       Store.flag.should be_truthy
     end
+
+    it "instance should have a type" do
+      instance = Spawnling.new{}
+      instance.type.should be(:thread)
+    end
+
+    it "instance should have a handle" do
+      instance = Spawnling.new{}
+      instance.handle.should_not be_nil
+    end
   end
-  
+
   describe "fork it" do
     before(:each) do
       Store.reset!
@@ -71,6 +81,16 @@ describe Spawnling do
       sleep(0.1) # wait for file to finish writing
       Store.flag.should be_truthy
     end
+
+    it "instance should have a type" do
+      instance = Spawnling.new{}
+      instance.type.should be(:fork)
+    end
+
+    it "instance should have a handle" do
+      instance = Spawnling.new{}
+      instance.handle.should_not be_nil
+    end
   end
 
   def spawn!
@@ -84,5 +104,5 @@ describe Spawnling do
       Store.flag!
     end
   end
-  
+
 end

data/spec/spec_helper.rb

@@ -5,18 +5,41 @@ require 'rspec'
 $:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
 
 require 'store'
+if ENV['RAILS']
+  require 'rails'
+  require 'active_record'
+end
+ActiveRecord::Base.establish_connection :adapter => :nulldb if defined?(ActiveRecord)
+
+MINIMUM_COVERAGE = 53
+
+if ENV['RAILS']
+  class Application < Rails::Application
+    config.log_level = :warn
+    config.logger = Logger.new(STDOUT)
+  end
+  Application.initialize!
+  Application.config.allow_concurrency = true
+end
 
-MINIMUM_COVERAGE = 40
+if ENV['MEMCACHE']
+  Application.config.cache_store = :mem_cache_store
+end
 
 if ENV['COVERAGE']
   require 'simplecov'
+  require 'simplecov-rcov'
   require 'coveralls'
   Coveralls.wear!
 
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::RcovFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
   SimpleCov.start do
     add_filter '/vendor/'
     add_filter '/spec/'
+    add_filter '/lib/patches.rb'
     add_group 'lib', 'lib'
   end
   SimpleCov.at_exit do
@@ -31,4 +54,3 @@ end
 
 require 'spawnling'
 
-Spawnling.logger = nil

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spawnling
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Tom Anderson
+- Michael Noack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +53,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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'
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  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'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +109,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord-nulldb-adapter
+  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'
+- !ruby/object:Gem::Dependency
+  name: dalli
+  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: |-
   This plugin provides a 'Spawnling' class to easily fork OR
   thread long-running sections of code so that your application can return
@@ -90,11 +147,13 @@ description: |-
   threads (see lib/patches.rb).
 email:
 - tom@squeat.com
+- michael+spawnling@noack.com.au
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CHANGELOG
 - Gemfile