multibase-rails 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2c76e1338205c8ba6b875118dd85aee1ee16f64
-  data.tar.gz: f0b1578faf1a40d41576a8f224e3df9e0770219d
+  metadata.gz: 2df22da87cc57c6add9a7739e9f44da3e4b69d85
+  data.tar.gz: f6bc21988c1f37da21c131fb54b43b396bed873e
 SHA512:
-  metadata.gz: 5290d48dbbc5e58abb735e9d07d41c5eb38957d05d3e4231727dc5ad9b860237dbbcdeb734ae7ad4322a7d5ce925dcaa942bc98ef4cd63c1df28d9d806775ac6
-  data.tar.gz: 7b26870a0a5e5dcb936b4876eafced4bb8bf0ef7dbcbfec2604ebf9c205ecd0416f843b3e23c485ca689d974c6b701d785f0fa0993d0f7d1fae1dabd531697cb
+  metadata.gz: 479fb150fe878745ef156510c7ba6de96cdb060f5b503a2da649d21d05013445af5c6598a459a3c3c0bddbecf64cdb640ae14870090f805c33d861bf9d93720c
+  data.tar.gz: 82593ff3f4c292229e5d5d979ad7e14b501a291074d3a6ca26bd3ae26166c22013afc7ce6bc4cfaa40d961de67a716ec1260cddfa780072c348aae1e5c10f383

data/LICENSE

@@ -1,5 +1,6 @@
 The MIT License (MIT)
-
+Copyright (c) 2010 Karle Durante
+Copyright (c) 2016 CustomInk.com
 Copyright (c) 2017 Anatoly Nosov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/README.md

@@ -1,5 +1,7 @@
 # Multibase [![Build Status](https://travis-ci.org/jomei/multibase.svg?branch=master)](https://travis-ci.org/jomei/multibase)   [![Coverage Status](https://coveralls.io/repos/github/jomei/multibase/badge.svg?branch=master)](https://coveralls.io/github/jomei/multibase?branch=master) [![Code Climate](https://lima.codeclimate.com/github/jomei/multibase/badges/gpa.svg)](https://lima.codeclimate.com/github/jomei/multibase)
-Multiple database support for Rails
+Multiple database support for Rails. 
+
+This solution inspired by the [SecondBase](https://github.com/customink/secondbase)
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/multibase.rb

@@ -36,4 +36,4 @@ module Multibase
     end
 
   end
-end
+end

data/lib/multibase/exec.rb

@@ -2,10 +2,10 @@ module Multibase
   mattr_accessor :connected, instance_accessor: false
 
   def self.exec(key)
-    if @config.nil? || @config.key != key
-      @config = Multibase::Config.new key, Multibase::Railtie.database_configuration[key]
-      @config.apply
-    end
+    config = @config[key] if @config
+    config ||= Multibase::Config.new key, Multibase::Railtie.database_configuration[key]
+    config.apply
+
     yield
   end
 end

data/lib/multibase/railtie.rb

@@ -62,21 +62,18 @@ module Multibase
     end
 
     def self.database_configuration
+      @configuration ||= Rails.application.config.multibase.settings || load_configuration
+      @configuration
+    end
+
+    def self.load_configuration
       path = Rails.root.join config.multibase.path
       yaml = Pathname.new(path) if path
-      @configuration ||= if yaml && yaml.exist?
-                           require 'yaml'
-                           require 'erb'
-                           YAML.load(ERB.new(yaml.read).result) || {}
-                         elsif ENV['DATABASE_URL']
-                           # Value from ENV['DATABASE_URL'] is set to default database connection
-                           # by Active Record.
-                           {}
-                         else
-                           raise "Could not load database configuration.
-                           No such file - #{paths["config/database"].instance_variable_get(:@paths)}"
-                         end
-      @configuration
+      if yaml && yaml.exist?
+        require 'yaml'
+        require 'erb'
+        YAML.load(ERB.new(yaml.read).result) || {}
+      end
     end
 
   end

data/lib/multibase/tasks/database.rake

@@ -89,6 +89,10 @@ namespace :db do
           Multibase.exec(key) { Rake::Task['db:schema:load'].execute }
         end
 
+        task :dump do
+          Multibase.exec(key) { Rake::Task['db:schema:dump'].execute }
+        end
+
         namespace :cache do
           task :dump do
             Multibase.exec(key) { Rake::Task['db:schema:cache:dump'].execute }
@@ -126,7 +130,7 @@ end
 %w(
   create:all create drop:all drop purge:all purge
   migrate migrate:status abort_if_pending_migrations
-  schema:load schema:cache:dump structure:load setup seed
+  schema:dump schema:load schema:cache:dump structure:load setup seed
   test:purge test:load_schema test:load_structure test:prepare
 ).each do |name|
   task = Rake::Task["db:#{name}"]
@@ -134,5 +138,8 @@ end
 
   task.enhance do
     Rake::Task['db:load_config'].invoke
+    Multibase::Railtie.connection_keys.each do |connection|
+      Rake::Task["db:#{connection}:#{name}"].invoke
+    end
   end
 end

data/lib/multibase/version.rb

@@ -1,3 +1,3 @@
 module Multibase
-  VERSION = '0.2'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multibase-rails
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Anatoly Nosov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Rails multiple database support