multi_config 0.1.8 → 0.1.9

data/.travis.yml

@@ -2,4 +2,6 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.2
-  - 1.9.3
+  - 1.9.3
+  - ruby-head
+  - ree

data/CHANGELOG.md

@@ -1,8 +1,12 @@
-Unreleased ([changes](https://github.com/shadabahmed/multi_config/v0.1.8...master))
+Unreleased ([changes](https://github.com/shadabahmed/multi_config/v0.1.9...master))
 -------------------
 **Note: Not implemented yet**
   * Add generators for migrations
 
+v0.1.9, 2012-09-18 ([changes](https://github.com/shadabahmed/multi_config/compare/v0.1.8...v0.1.9))
+-------------------
+  * Refactored class variables
+
 v0.1.8, 2012-09-10 ([changes](https://github.com/shadabahmed/multi_config/compare/v0.1.6...v0.1.8))
 -------------------
   * Test for initializers added. Coverage results now 100%

data/lib/multi_config/orms/active_record.rb

@@ -8,8 +8,8 @@ module MultiConfig
       # Calls mod.extend with param ClassMethods so that methods in ClassMethods module become class methods of the class.
       def self.included(mod)
         mod.extend ClassMethods
-        # Setting @@db_configs in the including class. This will help us keep track of database configuration files already included
-        mod.send(:class_variable_set, :'@@db_configs', Hash.new { |h, k| h[k] = [] })
+        # Setting @@_multi_config_db_configs in the including class. This will help us keep track of database configuration files already included
+        mod.send(:class_variable_set, :'@@_multi_config_db_configs', Hash.new { |h, k| h[k] = [] })
       end
 
       # This `acts_as` style extension provides the capabilities for using multiple database configuration files. Any
@@ -55,7 +55,7 @@ module MultiConfig
         # same namespace. For .e.g. Models A and B specify config file 'other_db', then other_db.yml will be read only once.
         def add_db_config(file_name, namespace)
           # Read class var from the including class
-          db_configs = class_variable_get(:'@@db_configs')
+          db_configs = class_variable_get(:'@@_multi_config_db_configs')
 
           # Don't do anything if the namespace has already been added
           unless db_configs.include?(namespace)
@@ -85,7 +85,8 @@ module MultiConfig
               hash["#{namespace}_#{k}"]=v
               hash
             end
-          rescue Exception => exc
+          # ruby 1.9 raises SyntaxError exception which is not subclass of
+          rescue StandardError, SyntaxError
             raise "File #{path file_name} does not exist in config" unless File.exists?(path(file_name))
             raise "Invalid config file #{path file_name}"
           end

data/lib/multi_config/version.rb

@@ -1,4 +1,4 @@
 module MultiConfig
   # Gem version
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/active_record/class_methods_spec.rb

@@ -24,12 +24,12 @@ describe MultiConfig::ORMs::ActiveRecord::ClassMethods do
       end
     end
 
-    describe "modifies class variable @@db_configs" do
+    describe "modifies class variable @@_multi_config_db_configs" do
       before do
-        test_class.send(:class_variable_get, '@@db_configs').should == {}
+        test_class.send(:class_variable_get, '@@_multi_config_db_configs').should == {}
         test_class.config_file = 'other'
       end
-      subject { test_class.send(:class_variable_get, '@@db_configs') }
+      subject { test_class.send(:class_variable_get, '@@_multi_config_db_configs') }
       it { should == {"other" => ["test_class"]} }
     end
 

data/spec/active_record_spec.rb

@@ -14,7 +14,7 @@ describe ActiveRecord::Base, "methods" do
   end
 
   it "should have @@db_config class variable set" do
-    ActiveRecord::Base.send(:class_variable_get, '@@db_configs').should == {}
+    ActiveRecord::Base.send(:class_variable_get, '@@_multi_config_db_configs').should == {}
   end
 
 end

data/spec/models/uses_other_yml_spec.rb

@@ -10,7 +10,7 @@ describe UsesOtherYml do
     UsesOtherYml.connection.instance_variable_get(:@config)[:database].split('/').last.should == "other_db"
   end
 
-  it "the @@db_configs should have entry for this class" do
-    UsesOtherYml.send(:class_variable_get, :'@@db_configs').should == {"other" => ["UsesOtherYml"]}
+  it "the @@_multi_config_db_configs should have entry for this class" do
+    UsesOtherYml.send(:class_variable_get, :'@@_multi_config_db_configs').should == {"other" => ["UsesOtherYml"]}
   end
 end

metadata

@@ -1,136 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: multi_config
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.1.9
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 8
-  version: 0.1.8
 platform: ruby
-authors: 
+authors:
 - Shadab Ahmed
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: autotest
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem lets you specify different config file for an ActiveRecord Model
-email: 
-- ""
+email:
+- ''
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -161,38 +160,29 @@ files:
 - spec/support/rails_config.rb
 homepage: https://github.com/shadabahmed/multi_config
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Use this gem to use multiple db config files
-test_files: 
+test_files:
 - spec/active_record/class_methods_spec.rb
 - spec/active_record/config_spec.rb
 - spec/active_record_spec.rb