pinky 0.1.2-java → 0.1.3-java

data/Gemfile

@@ -13,7 +13,6 @@ gem 'json'
 platform :jruby do
   # energizer
   gem 'hot_bunnies'
-  gem 'mailbox'
 end
 
 group :test, :development do

data/Gemfile.lock

@@ -12,11 +12,8 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    jretlang (0.3.0)
     json (1.7.5)
     json (1.7.5-java)
-    mailbox (0.2.7)
-      jretlang
     multi_json (1.3.6)
     multi_xml (0.5.1)
     rake (0.9.2.2)
@@ -42,7 +39,6 @@ DEPENDENCIES
   httparty
   jeweler (~> 1.8.4)
   json
-  mailbox
   rdoc (~> 3.12)
   rspec (>= 2.11.0)
   timecop

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/pinky.rb

@@ -3,6 +3,5 @@ require 'httparty'
 require 'date'
 
 require 'hot_bunnies'
-require 'mailbox'
 
 Dir[File.join(File.dirname(__FILE__), 'pinky', '**', '*.rb')].sort.each { |f| require f }

data/lib/pinky/energizer_bunny/subscription.rb

@@ -1,15 +1,16 @@
 module Pinky
   module EnergizerBunny
     class Subscription
-      include Mailbox
-      mailbox_thread_pool_size 1
+      import java.util.concurrent.Executors
 
       def initialize queue, subscription_opts, logger, handle_message
         @queue, @subscription_opts, @logger, @handle_message = queue, subscription_opts, logger, handle_message
+        @subscription_opts[:executor] = executor  unless @subscription_opts[:executor]
         listen!
       end
 
       def close
+        close_executor
         return if @subscription.nil?
         @subscription.shutdown!
         @subscription = nil
@@ -23,7 +24,6 @@ module Pinky
         self
       end
 
-      mailslot :exception => :log_error
       def handle_message_on_other_thread headers, msg
         @handle_message.call headers.properties.headers, msg
         headers.ack
@@ -32,6 +32,20 @@ module Pinky
       def log_error e
         @logger.error "An error has occured on another thread: #{e}#{$/}#{e.backtrace}"
       end
+
+      def thread_pool_size
+        @thread_pool_size ||= (@subscription_opts.delete(:thread_pool_size) || 1)
+      end
+
+      def executor
+        @executor ||= Executors.new_fixed_thread_pool(thread_pool_size)
+      end
+
+      def close_executor
+        return unless @executor
+        @executor.shutdown_now
+        @executor = nil
+      end
     end
   end
 end

data/pinky.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "pinky"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
   s.platform = "java"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Friedman"]
-  s.date = "2012-12-06"
+  s.date = "2012-12-07"
   s.description = "Cache your api objects in member easier, with associations."
   s.email = "asher.friedman@gmail.com"
   s.extra_rdoc_files = [
@@ -56,7 +56,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<hot_bunnies>, [">= 0"])
-      s.add_runtime_dependency(%q<mailbox>, [">= 0"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.11.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
@@ -66,7 +65,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<hot_bunnies>, [">= 0"])
-      s.add_dependency(%q<mailbox>, [">= 0"])
       s.add_dependency(%q<timecop>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.11.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -77,7 +75,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<hot_bunnies>, [">= 0"])
-    s.add_dependency(%q<mailbox>, [">= 0"])
     s.add_dependency(%q<timecop>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.11.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

metadata

@@ -2,14 +2,14 @@
 name: pinky
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.2
+  version: 0.1.3
 platform: java
 authors:
 - Joel Friedman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -65,24 +65,6 @@ dependencies:
     none: false
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: mailbox
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: timecop
   version_requirements: !ruby/object:Gem::Requirement