maestro_common 0.0.5 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: eefc532fbc9e519cdb59fee8fdcb9f6ea9f79022
+  data.tar.gz: 5401c8662ee7cec61992b53f4aebd7028ee1a547
+SHA512:
+  metadata.gz: 162f2498e5d3ef1bfe1a4adcce434c97532ee63a2a67933fd837273128948812c9f788503cc72da78ee68bc80b57bf7d470d1a8d0bbe649a8897244bb56b5258
+  data.tar.gz: 11548e5f6e8d2fc0ef3ce39e0f357ec26474519fec68887c7fe34d9c4bfd651dfcc991782dc14f05c0eb613cfe053195e2a6e5b9e529e1cfb92d273aaf44ea9a

data/.ruby-version

@@ -1 +1 @@
-jruby-1.6.8
+jruby-1.7.4

data/Rakefile

@@ -7,11 +7,6 @@ require File.expand_path('../lib/maestro_common/version', __FILE__)
 CLEAN.include('pkg')
 CLOBBER.include('.bundle', '.config', 'coverage', 'InstalledFiles', 'spec/reports', 'rdoc', 'test', 'tmp')
 
-task :default => [:clean, :bundle, :spec, :build]
+task :default => [:clean, :spec, :build]
 
 RSpec::Core::RakeTask.new
-
-desc 'Get dependencies with Bundler'
-task :bundle do
-  sh %{bundle install}
-end

data/lib/maestro_common/helpers/mq_helper.rb

@@ -30,6 +30,11 @@ module Maestro
       @@stomp
     end
 
+    # only for testing
+    def MQHelper.connection=(stomp)
+      @@stomp = stomp
+    end
+
     def MQHelper.connect
       if @@stomp.nil?
         Maestro.log.info "Request for stomp connection - creating"

data/lib/maestro_common/mq/messenger.rb

@@ -1,5 +1,6 @@
 # Copyright 2011(c) MaestroDev.  All rights reserved.
 require File.join(File.dirname(__FILE__), '..', 'helpers', 'mq_helper')
+require 'multi_json'
 
 module Maestro
   class MessageSendError < StandardError
@@ -208,7 +209,7 @@ module Maestro
 
       Maestro.log.debug "[seq #{my_seq}] Sending #{custom_text}" if debug
 
-      Maestro::MQHelper.connection.send( destination_queue, message.to_json, options ) do |r|
+      Maestro::MQHelper.connection.send( destination_queue, MultiJson.dump(message), options ) do |r|
         Maestro.log.debug "[seq #{my_seq}] Sent #{custom_text} to '#{destination_queue}'" if debug
 
         yield(r) if block

data/lib/maestro_common/version.rb

@@ -1,5 +1,5 @@
 module Maestro
   module Common
-    VERSION = '0.0.5'
+    VERSION = '1.0.0'
   end
 end

data/maestro_common.gemspec

@@ -21,13 +21,16 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'onstomp'
   spec.add_dependency 'logging', '>= 1.8.0'
   spec.add_dependency 'rubyzip', '>= 0.9.8', "< 1.0.0" # 1.0 requires newer ruby/jruby
-  spec.add_dependency 'json', '>= 1.4.6'
   spec.add_dependency 'eventmachine', ">=0.12.10"
+  spec.add_dependency 'multi_json', '>= 1.9.0'
+
+  # jrjackson is the only json parser implementation that properly converts java objects
+  # https://github.com/jruby/jruby/issues/1931
+  spec.add_development_dependency 'jrjackson'
 
-  spec.add_development_dependency 'bundler', '>= 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'jruby-openssl'
-  spec.add_development_dependency 'rspec', '>= 2.13.0'
+  spec.add_development_dependency 'jruby-openssl' if RUBY_PLATFORM == 'java'
+  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'stompserver_ng'
   spec.add_development_dependency "mocha", '>=0.10.0'
 

data/spec/messenger_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Maestro::Messenger do
+
+  shared_examples :json_parsing do
+    it 'should correctly convert json' do
+      Maestro::MQHelper.connection = double()
+
+      expect(Maestro::MQHelper.connection).to receive(:send).with(
+        nil,
+        "{\"__msg_content__\":{\"workitem\":{\"fields\":{\"__context_outputs__\":{\"list\":[]}}}},\"__msg_seq__\":1}",
+        {:persistent=>true, :content_type=>"application/json"})
+
+      subject.send_message_async(nil, message)
+    end
+  end
+
+  context 'send_message_async' do
+    let(:map) {{ 'list' => [] }}
+    let(:fields) {{ '__context_outputs__' => map }}
+    let(:workitem) {{ 'fields' => fields }}
+    let(:message) {{
+      '__msg_content__' => {
+        'workitem' => workitem
+      }
+    }}
+
+    it_behaves_like :json_parsing
+
+    context 'when using Java objects', :java do
+      require 'java'
+      let(:map) {
+        m = java.util.HashMap.new()
+        m['list'] = java.util.ArrayList.new()
+        m
+      }
+      it_behaves_like :json_parsing
+    end
+  end
+end

data/spec/mqhelper_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'tmpdir'
 
-describe Maestro::MQHelper do
+describe Maestro::MQHelper, :stomp do
   after :each do
     Maestro::MQHelper.disconnect
   end
@@ -55,9 +55,9 @@ describe Maestro::MQHelper do
   describe 'disconnect' do
     it 'should close connection, but leave object instantiated' do
       conn = Maestro::MQHelper.connect
-      conn.connected?.should be_true
+      conn.connected?.should be true
       Maestro::MQHelper.disconnect
-      conn.connected?.should be_false
+      conn.connected?.should be false
     end
   end
 

data/spec/spec_helper.rb

@@ -2,11 +2,7 @@ require 'rubygems'
 require 'rspec'
 require 'logger'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib') unless $LOAD_PATH.include?(File.dirname(__FILE__) + '/../lib')
-unless defined?(SPEC_ROOT)
-  SPEC_ROOT = File.expand_path("../", __FILE__)
-end
-
+SPEC_ROOT = File.expand_path("../", __FILE__)
 require File.join('maestro_common', 'common')
 Dir[File.join(SPEC_ROOT, 'support/**/*.rb')].each { |f| require(f) }
 include Maestro::Support::Stomp
@@ -37,16 +33,11 @@ module Maestro
 end
 
 RSpec.configure do |config|
-  config.mock_with :mocha
-
-  config.before(:suite) do
+  config.before(:context, :stomp) do
     start_stomp_server(File.join(File.dirname(__FILE__), "../log")) unless ENV['START_STOMP']=='false'
   end
 
-  config.after(:suite) do
+  config.after(:context, :stomp) do
     stop_stomp_server
   end
 end
-
-
-

metadata

@@ -1,202 +1,226 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: maestro_common
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.5
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
-  - Doug Henderson
-autorequire: 
+authors:
+- Doug Henderson
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2013-09-17 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: onstomp
-    version_requirements: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id001
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: logging
-    version_requirements: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.8.0
-    requirement: *id002
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: rubyzip
-    version_requirements: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.9.8
-        - - <
-          - !ruby/object:Gem::Version 
-            version: 1.0.0
-    requirement: *id003
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: json
-    version_requirements: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.4.6
-    requirement: *id004
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: eventmachine
-    version_requirements: &id005 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.12.10
-    requirement: *id005
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: bundler
-    version_requirements: &id006 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "1.3"
-    requirement: *id006
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rake
-    version_requirements: &id007 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id007
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: jruby-openssl
-    version_requirements: &id008 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id008
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    version_requirements: &id009 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 2.13.0
-    requirement: *id009
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: stompserver_ng
-    version_requirements: &id010 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id010
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: mocha
-    version_requirements: &id011 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.10.0
-    requirement: *id011
-    prerelease: false
-    type: :development
+date: 2014-08-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: onstomp
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logging
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.10
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.10
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: jrjackson
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: jruby-openssl
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: stompserver_ng
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: mocha
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  prerelease: false
+  type: :development
 description: A bunch of utility classes that are used in multiple places
-email: 
-  - dhenderson@maestrodev.com
+email:
+- dhenderson@maestrodev.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - .gitignore
-  - .ruby-version
-  - Gemfile
-  - README.md
-  - Rakefile
-  - lib/maestro_common/common.rb
-  - lib/maestro_common/helpers/mq_helper.rb
-  - lib/maestro_common/logging/maestro_logging.rb
-  - lib/maestro_common/mq/messenger.rb
-  - lib/maestro_common/utils/retryable.rb
-  - lib/maestro_common/version.rb
-  - maestro_common.gemspec
-  - spec/mqhelper_spec.rb
-  - spec/retryable_spec.rb
-  - spec/spec_helper.rb
-  - spec/support/stomp.rb
+files:
+- .gitignore
+- .ruby-version
+- Gemfile
+- README.md
+- Rakefile
+- lib/maestro_common/common.rb
+- lib/maestro_common/helpers/mq_helper.rb
+- lib/maestro_common/logging/maestro_logging.rb
+- lib/maestro_common/mq/messenger.rb
+- lib/maestro_common/utils/retryable.rb
+- lib/maestro_common/version.rb
+- maestro_common.gemspec
+- spec/messenger_spec.rb
+- spec/mqhelper_spec.rb
+- spec/retryable_spec.rb
+- spec/spec_helper.rb
+- spec/support/stomp.rb
 homepage: https://github.com/maestrodev/maestro-ruby-common
-licenses: 
-  - Apache 2.0
-post_install_message: 
+licenses:
+- Apache 2.0
+metadata: {}
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.24
-signing_key: 
-specification_version: 3
+rubyforge_project:
+rubygems_version: 2.2.2
+signing_key:
+specification_version: 4
 summary: Maestro common classes
-test_files: 
-  - spec/mqhelper_spec.rb
-  - spec/retryable_spec.rb
-  - spec/spec_helper.rb
-  - spec/support/stomp.rb
+test_files:
+- spec/messenger_spec.rb
+- spec/mqhelper_spec.rb
+- spec/retryable_spec.rb
+- spec/spec_helper.rb
+- spec/support/stomp.rb