dkastner-moneta 1.0.1 → 1.0.2

data/lib/moneta/adapters/active_record.rb

@@ -13,9 +13,12 @@ module Moneta
         @options = options
         unless self.class.const_defined?('Store')
           self.class.const_set('Store', Class.new(::ActiveRecord::Base)) # this prevents loading issues when active_record gem is unavailable
+          Store.set_table_name(@options[:table] || 'moneta_store')
+        end
+
+        if @options[:connection]
+          Store.establish_connection @options[:connection]
         end
-        Store.establish_connection(@options[:connection] || raise("Must specify :connection"))
-        Store.set_table_name(@options[:table] || 'moneta_store')
       end
 
       def migrate

data/lib/moneta/version.rb

@@ -1,3 +1,3 @@
 module Moneta
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/moneta_active_record_spec.rb

@@ -4,18 +4,34 @@ require 'moneta/adapters/active_record'
 
 if defined?(ActiveRecord)
   describe 'Moneta::ActiveRecord' do
-    before(:each) do
-      @cache = Moneta::Adapters::ActiveRecord.new(:connection => {
-        :adapter  => 'sqlite3',
-        :database => 'reports_test.sqlite3'
-      })
-      @cache.migrate
-      @cache.clear
-    end
     after :all do
       FileUtils.rm_f File.expand_path('../reports_test.sqlite3', File.dirname(__FILE__))
     end
 
-    it_should_behave_like "a read/write Moneta cache"
+    context 'with connection option set' do
+      before(:each) do
+        @cache = Moneta::Adapters::ActiveRecord.new(:connection => {
+          :adapter  => 'sqlite3',
+          :database => 'reports_test.sqlite3'
+        })
+        @cache.migrate
+        @cache.clear
+      end
+
+      it_should_behave_like "a read/write Moneta cache"
+    end
+
+    context 'using preexisting ActiveRecord connection' do
+      describe '#initialize' do
+        it 'uses an existing connection' do
+          ActiveRecord::Base.establish_connection :adapter => 'sqlite3',
+            :database => 'reports_test.sqlite3'
+          
+          cache = Moneta::Adapters::ActiveRecord.new
+          cache.migrate
+          Moneta::Adapters::ActiveRecord::Store.table_exists?.should be_true
+        end
+      end
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3802511716438480578
+      hash: -2240309769819464001
       segments: 
       - 0
       version: "0"
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3802511716438480578
+      hash: -2240309769819464001
       segments: 
       - 0
       version: "0"