db-charmer 1.6.12 → 1.6.13

data/CHANGES

@@ -1,3 +1,12 @@
+1.6.13 (2010-08-17):
+
+Starting with this version we use Rails.env instead of RAILS_ENV to auto-detect rails 
+environment. If you use DbCharmer in non-rails project, please set DbCharmer.env manually.
+
+Bugfixes: Thanks to Eric Lindvall we now allow connection names that have symbols ruby 
+wouldn't like for class names.
+
+----------------------------------------------------------------------------------------
 1.6.12 (2010-05-09):
 
 Starting with this version we use Rails.cache (memcache or whatever you use in your project)

data/README.rdoc

@@ -27,6 +27,10 @@ To install db-charmer as a Rails plugin use this:
 
   script/plugin install git://github.com/kovyrin/db-charmer.git
 
+_Notice_: If you use db-charmer in a non-rails project, you may need to set <tt>DbCharmer.env</tt> to a correct value
+before using any of its connection management methods. Correct value here is a valid <tt>database.yml</tt> 
+first-level section name.
+
 
 == Easy ActiveRecord Connection Management
 

data/VERSION

@@ -1 +1 @@
-1.6.12
+1.6.13

data/db-charmer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.6.12"
+  s.version = "1.6.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2010-05-09}
+  s.date = %q{2010-08-17}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [
@@ -50,14 +50,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/kovyrin/db-charmer}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{ActiveRecord Connections Magic}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 2.2.0"])
       s.add_runtime_dependency(%q<blankslate>, [">= 0"])
     else

data/lib/db_charmer.rb

@@ -2,7 +2,7 @@ module DbCharmer
   @@connections_should_exist = true
   mattr_accessor :connections_should_exist
 
-  @@env = defined?(RAILS_ENV) ? RAILS_ENV : 'development'
+  @@env = defined?(Rails) ? Rails.env : 'development'
   mattr_accessor :env
 
   def self.connections_should_exist?

data/lib/db_charmer/active_record_extensions.rb

@@ -4,13 +4,23 @@ module DbCharmer
 
       def establish_real_connection_if_exists(name, should_exist = false)
         name = name.to_s
-        config = configurations[DbCharmer.env][name]
+
+        # Check environment name
+        config = configurations[DbCharmer.env]
+        unless config
+          error = "Invalid environment name (does not exist in database.yml): #{DbCharmer.env}. Please set correct Rails.env or DbCharmer.env."
+          raise ArgumentError, error
+        end
+
+        # Check connection name
+        config = config[name]
         unless config
           if should_exist
             raise ArgumentError, "Invalid connection name (does not exist in database.yml): #{DbCharmer.env}/#{name}"
           end
           return # No need to establish connection - they do not want us to
         end
+
         # Pass connection name with config
         config[:connection_name] = name
         establish_connection(config)

data/lib/db_charmer/connection_factory.rb

@@ -70,7 +70,7 @@ module DbCharmer
 
     # Generates unique names for our abstract AR classes
     def self.abstract_connection_class_name(connection_name)
-      "::AutoGeneratedAbstractConnectionClass#{connection_name.to_s.camelize}"
+      "::AutoGeneratedAbstractConnectionClass#{connection_name.to_s.gsub(/\W+/, '_').camelize}"
     end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: db-charmer
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 6
-  - 12
-  version: 1.6.12
+  - 13
+  version: 1.6.13
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-09 00:00:00 -04:00
+date: 2010-08-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 2
@@ -35,9 +38,11 @@ dependencies:
   name: blankslate
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -92,23 +97,27 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ActiveRecord Connections Magic