data_store 0.0.8 → 0.0.9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+##0.0.9
+
+ * Bug fix: connect to database in case of a DATABASE_URL now works wiht JRuby as well
+
 ##0.0.8
 
  * Connect to database in case of a DATABASE_URL environment variable (used with Heroku)

data/lib/data_store/connector.rb

@@ -36,10 +36,10 @@ module DataStore
     # Return the database object to which its connected.
     def database
       @database ||= begin
-        if RUBY_PLATFORM == 'java'
-          Sequel.connect(jdbc_settings)
-        elsif ENV['DATABASE_URL']
+        if ENV['DATABASE_URL']
           Sequel.connect(ENV['DATABASE_URL'])
+        elsif RUBY_PLATFORM == 'java'
+          Sequel.connect(jdbc_settings)
         else
           Sequel.connect(database_settings)
         end

data/lib/data_store/version.rb

@@ -1,3 +1,3 @@
 module DataStore
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/test/connector_test.rb

@@ -31,12 +31,23 @@ class ConnectorTest < Test::Unit::TestCase
 
   context 'Database on Heroku' do
 
-    should 'connect on the base of the DATABASE_URL environment variable in exist' do
-      ENV['DATABASE_URL'] = 'postgres://postgres@localhost/data_store_test'
+    setup do
+      ENV['DATABASE_URL'] = if RUBY_PLATFORM == 'java'
+       "jdbc:postgresql://localhost/data_store_test?user=postgres"
+      else
+       'postgres://postgres@localhost/data_store_test'
+      end
+    end
+
+    should 'connect on the base of the DATABASE_URL environment variable if exists' do
       DataStore.configuration.stubs(:database_config_file).returns('')
-      connector = DataStore::Connector.new
-      assert connector.database.inspect.match(ENV['DATABASE_URL'])
-      connector.database.disconnect
+      @connector = DataStore::Connector.new
+      assert @connector.database.inspect.gsub('?','').match(ENV['DATABASE_URL']) #Remove ? otherwise match fails
+    end
+
+    teardown do
+      @connector.database.disconnect
+      ENV['DATABASE_URL'] = nil
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_store
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 210819487432911081
+      hash: 2320272369353145046
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 210819487432911081
+      hash: 2320272369353145046
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24