killbill 1.0.6 → 1.0.7

data/.travis.yml

@@ -5,7 +5,6 @@ notifications:
     - killbilling-dev@googlegroups.com
 
 rvm:
-  - jruby-18mode
   - jruby-19mode
   - jruby-head
 

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/lib/killbill.rb

@@ -1,7 +1,5 @@
 begin
-
   require 'java'
-  require 'killbill/jplugin'
 
   KILLBILL_APIS = %w(
     com.ning.billing.account.api.AccountUserApi
@@ -23,6 +21,7 @@ begin
     com.ning.billing.util.api.CustomFieldUserApi
     com.ning.billing.util.api.ExportUserApi
     com.ning.billing.util.api.TagUserApi
+    javax.servlet.http.HttpServlet
   )
 
   begin
@@ -38,11 +37,11 @@ begin
     end
   end
 
+  # jbundler needs to be loaded first!
+  require 'killbill/jplugin'
 rescue LoadError => e
   warn 'You need JRuby to run Killbill plugins'
-  #raise e
 end
 
-
 require 'killbill/notification'
 require 'killbill/payment'

data/lib/killbill/jresponse/jconverter.rb

@@ -17,7 +17,7 @@ module Killbill
         end
 
         def to_joda_date_time(time)
-          time.nil? ? nil : org.joda.time.DateTime.new(time.to_s)
+          time.nil? ? nil : org.joda.time.DateTime.new(time.to_s, org.joda.time.DateTimeZone::UTC)
         end
 
         def to_string(str)

data/spec/killbill/jresponse/jconverter_spec.rb

@@ -22,7 +22,7 @@ describe Killbill::Plugin::JConverter do
 
     it "should_test_joda_date_time_converter" do
       input_str = '2013-03-11T16:05:11-07:00'
-      expected_output_str = '2013-03-11T16:05:11.000-07:00'
+      expected_output_str = '2013-03-11T23:05:11.000Z'
       input = org.joda.time.DateTime.parse(input_str)
       output = Killbill::Plugin::JConverter.to_joda_date_time(input)
       output.should be_an_instance_of org.joda.time.DateTime
@@ -132,7 +132,7 @@ describe Killbill::Plugin::JConverter do
 
 
     it "should_test_joda_time_from_converter" do
-      input = org.joda.time.DateTime.new
+      input = org.joda.time.DateTime.new(org.joda.time.DateTimeZone::UTC)
       input = input.minus_millis(input.millis_of_second)
       output = Killbill::Plugin::JConverter.from_joda_date_time(input)
       output.should be_an_instance_of DateTime

metadata

@@ -1,104 +1,104 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 1.0.6
+  version: 1.0.7
+  prerelease: 
 platform: ruby
 authors:
 - Killbill core team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.1
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rack
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.2
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: sinatra
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.4
-    none: false
-  prerelease: false
-  type: :development
 description: Base classes to write plugins.
 email: killbilling-users@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Jarfile
 - README.md
@@ -142,34 +142,33 @@ files:
 homepage: http://www.killbilling.org
 licenses:
 - Apache License (2.0)
-post_install_message:
+post_install_message: 
 rdoc_options:
-- "--exclude"
-- "."
+- --exclude
+- .
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: 2
-      version: !binary |-
-        MA==
-  none: false
+      hash: -1416984242568449650
 requirements:
 - jar 'com.ning.billing:killbill-api'
 - jar 'com.ning.billing:killbill-util:tests'
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 1.8.24
-signing_key:
+signing_key: 
 specification_version: 3
 summary: Framework to write Killbill plugins in Ruby.
 test_files: