pinky 0.2.11-java → 0.3.0-java

data/Gemfile

@@ -7,14 +7,8 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 
 gem 'httparty'
-gem 'uuid', '2.3.6'
 gem 'json'
 
-platform :jruby do
-  # energizer
-  gem 'hot_bunnies'
-end
-
 group :test, :development do
   #gem 'fakeweb'
   gem 'timecop'

data/Gemfile.lock

@@ -3,7 +3,6 @@ GEM
   specs:
     diff-lcs (1.1.3)
     git (1.2.5)
-    hot_bunnies (1.3.8-java)
     httparty (0.9.0)
       multi_json (~> 1.0)
       multi_xml
@@ -14,8 +13,6 @@ GEM
       rdoc
     json (1.7.5)
     json (1.7.5-java)
-    macaddr (1.6.1)
-      systemu (~> 2.5.0)
     multi_json (1.3.6)
     multi_xml (0.5.1)
     rake (0.9.2.2)
@@ -29,10 +26,7 @@ GEM
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
-    systemu (2.5.2)
     timecop (0.5.2)
-    uuid (2.3.6)
-      macaddr (~> 1.0)
 
 PLATFORMS
   java
@@ -40,11 +34,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (> 1.0.0)
-  hot_bunnies
   httparty
   jeweler (~> 1.8.4)
   json
   rdoc (~> 3.12)
   rspec (>= 2.11.0)
   timecop
-  uuid (= 2.3.6)

data/lib/pinky/exceptions.rb

@@ -1,7 +1,7 @@
 module Pinky
-  class NotFoundException < Exception
+  class NotFoundException < StandardError
   end
 
-  class TooManyFoundException < Exception
+  class TooManyFoundException < StandardError
   end
 end

data/lib/pinky.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'httparty'
 require 'date'
+require 'uuid'
 
 require 'hot_bunnies'
 

data/pinky.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "pinky"
-  s.version = "0.2.11"
+  s.version = "0.3.0"
   s.platform = "java"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
@@ -29,8 +29,6 @@ Gem::Specification.new do |s|
     "lib/pinky.rb",
     "lib/pinky/associations.rb",
     "lib/pinky/cache.rb",
-    "lib/pinky/energizer_bunny/connection.rb",
-    "lib/pinky/energizer_bunny/subscription.rb",
     "lib/pinky/exceptions.rb",
     "lib/pinky/has_caches.rb",
     "lib/pinky/model.rb",
@@ -54,9 +52,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
-      s.add_runtime_dependency(%q<uuid>, ["= 2.3.6"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<hot_bunnies>, [">= 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"])
@@ -64,9 +60,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
       s.add_dependency(%q<httparty>, [">= 0"])
-      s.add_dependency(%q<uuid>, ["= 2.3.6"])
       s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<hot_bunnies>, [">= 0"])
       s.add_dependency(%q<timecop>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.11.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -75,9 +69,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<httparty>, [">= 0"])
-    s.add_dependency(%q<uuid>, ["= 2.3.6"])
     s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<hot_bunnies>, [">= 0"])
     s.add_dependency(%q<timecop>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.11.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

metadata

@@ -2,7 +2,7 @@
 name: pinky
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.2.11
+  version: 0.3.0
 platform: java
 authors:
 - Joel Friedman
@@ -29,22 +29,6 @@ dependencies:
     none: false
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: uuid
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.6
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.6
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: json
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,24 +47,6 @@ dependencies:
     none: false
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: hot_bunnies
-  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
@@ -184,8 +150,6 @@ files:
 - lib/pinky.rb
 - lib/pinky/associations.rb
 - lib/pinky/cache.rb
-- lib/pinky/energizer_bunny/connection.rb
-- lib/pinky/energizer_bunny/subscription.rb
 - lib/pinky/exceptions.rb
 - lib/pinky/has_caches.rb
 - lib/pinky/model.rb
@@ -210,9 +174,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: !binary |-
         MA==
-      segments:
-      - 0
-      hash: 2
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:

data/lib/pinky/energizer_bunny/connection.rb

@@ -1,94 +0,0 @@
-require File.expand_path('../subscription', __FILE__)
-
-module Pinky
-  module EnergizerBunny
-    class Connection
-
-      def initialize config, logger = Rails.logger
-        @config = config
-        @logger = logger
-        return unless enabled?
-        at_exit { close }
-        @exchanges = Hash.new { |exchanges, topic_key| exchanges[topic_key] = create_exchange topic_key }
-        @queues    = Hash.new { |queues, topic_key|    queues[topic_key]    = create_queue topic_key }
-        @subscriptions = []
-        create_connection
-      end
-
-      def subscribe topic_key, subscription_opts = {}, &block
-        return unless enabled?
-        @subscriptions << Subscription.new(@queues[topic_key], subscription_opts, @logger, block)
-      end
-
-      def publish topic_key, message, opts = {}
-        add_message_id_to_header! opts
-        @exchanges[topic_key].publish message, opts if enabled?
-      end
-
-      def connected?
-        @connection && @connection.open?
-      end
-
-      def enabled?
-        @config[:enabled]
-      end
-
-      def connection_url
-        @config[:broker][:url]
-      end
-
-      private
-      def create_exchange topic_key
-        exchange_hash = @config[:exchanges][topic_key]
-        channel.exchange exchange_hash[:name], exchange_hash[:opts]
-      end
-
-      def create_connection
-        url = connection_url
-        raise Exception.new('Please set a broker url for RabbitMQ') if enabled? && url.nil?
-        @logger.info "Connecting bunny to: #{url}"
-        @connection = HotBunnies.connect :uri => url
-      end
-
-      #TODO: is having one channel bad, should this be one per exchange?
-      def channel
-        @channel ||= @connection.create_channel.tap { |c| c.prefetch = (@config.delete(:prefetch_count) || 1) }
-      end
-
-      def create_queue topic_key
-        queue_hash = @config[:queues][topic_key]
-        raise Exception.new("Cannot find queue configuration for queue: #{topic_key}") if queue_hash.nil?
-        queue_opts = queue_hash[:opts]
-        queue_opts[:durable] = true unless queue_opts.key? :durable
-        channel.queue(queue_hash[:name], queue_opts).tap do |queue|
-          queue_bind_opts = queue_hash[:bind_opts] || {}
-          Array(queue_hash[:bindings]).each do |binding|
-            binding_opts = queue_bind_opts.merge(binding[:binding_opts] || {})
-            queue.bind @exchanges[binding[:exchange_topic_key]], binding_opts
-          end
-        end
-      end
-
-      def close
-        @logger.info 'Closing rabbit connection'
-        @subscriptions.each &:close
-        return unless connected?
-        if @channel
-          @channel.close
-          @channel = nil
-        end
-        @connection.close
-        @connection = nil
-      end
-
-      def add_message_id_to_header!(opts)
-        opts[:headers] ||= {}
-        opts[:headers]['message_id'] ||= guid_generator.generate
-      end
-
-      def guid_generator
-        @guid_generator ||= UUID.new
-      end
-    end
-  end
-end

data/lib/pinky/energizer_bunny/subscription.rb

@@ -1,54 +0,0 @@
-module Pinky
-  module EnergizerBunny
-    class Subscription
-      import java.util.concurrent.Executors
-
-      def initialize queue, subscription_opts, logger, handle_message
-        @queue, @subscription_opts, @logger, @handle_message = queue, subscription_opts.dup, logger, handle_message
-        @reraise_errors = @subscription_opts.delete(:reraise_errors)
-        @subscription_opts[:executor] = executor unless @subscription_opts[:executor]
-        listen!
-      end
-
-      def close
-        close_executor
-        return if @subscription.nil?
-        @subscription.shutdown!
-        @subscription = nil
-      end
-
-      private
-      def listen!
-        @subscription = @queue.subscribe(@subscription_opts) do |headers, msg|
-          begin
-            @handle_message.call headers.properties.headers, msg
-            headers.ack
-          rescue => e
-            @logger.error "!!!Error handling message: #{e.message}"
-            headers.reject
-            raise if @reraise_errors
-          end
-        end
-        self
-      end
-
-      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