activerecord-fb-adapter 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2678bd6b3b5635e1bdae1638babacb97d42af498
-  data.tar.gz: ee672fe8d0e86cc4ae2e86b633492cc4d7db888e
+  metadata.gz: fd91257c22642692e91cfd7a15de3bc0684d3148
+  data.tar.gz: 28371fa7615afc66fcbf322ea08b77810390fe05
 SHA512:
-  metadata.gz: fc9b1a2711bfca2a744eb83066f3b79ca96f4ddfd64f302c656cd77ec023fa1484b848d028a2f4c90daa6474fa3058ebc13dcdecb4a70a73d0815e38c7a64e1c
-  data.tar.gz: d720204fe3cca4a0689089c7841f329776e4bd693b9ca536cf70e1042fc04ec4a294b745a615d71b062e52335cbb8d482ae1f3bd651db62c28f9c1edc453cdb4
+  metadata.gz: 76431db22cf5caf52185ab189ab48295dcbe62e8bba1863ecb21c7213c5ab228d78c87b19a10d3f872741e2247ab40ef3130404db3bb0b8c93acdcdc9083a2ca
+  data.tar.gz: 732da63410df05ae6416c6f38d7c4e3ff322a0b5a49a66cd61930db5a4ec2835508c26c081477c48b962e96daf2bd76e423d82524aade7d3f404ee012a65250f

data/lib/active_record/fb_base.rb

@@ -1,13 +1,8 @@
 module ActiveRecord
   class Base
     def self.fb_connection(config) # :nodoc:
-      config = config.symbolize_keys.reverse_merge(:downcase_names => true)
-      fail ArgumentError, 'No database specified. Missing argument: database.' unless config[:database]
-      if db_host = config[:host]
-        config[:database] = File.expand_path(config[:database]) if db_host =~ /localhost/i
-        config[:database].prepend "#{db_host}/#{config[:port] || 3050}:"
-      end
       require 'fb'
+      config = fb_connection_config(config)
       db = ::Fb::Database.new(config)
       begin
         connection = db.connect
@@ -21,5 +16,15 @@ module ActiveRecord
       end
       ConnectionAdapters::FbAdapter.new(connection, logger, config)
     end
+
+    def self.fb_connection_config(config)
+      config = config.symbolize_keys.reverse_merge(:downcase_names => true, :port => 3050)
+      fail ArgumentError, 'No database specified. Missing argument: database.' if !config[:database]
+      if config[:host].nil? || config[:host] =~ /localhost/i
+        config[:database] = File.expand_path(config[:database], defined?(Rails) && Rails.root)
+      end
+      config[:database] = "#{config[:host]}/#{config[:port]}:#{config[:database]}" if config[:host]
+      config
+    end
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-fb-adapter
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Brent Rowland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 description: 
@@ -64,20 +64,19 @@ 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:
 - Firebird library fb
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: ActiveRecord Firebird Adapter for Rails 3 and 4 with support for migrations.
 test_files: []
-has_rdoc: false