kbaum-pickle 0.2.1.1 → 0.2.1.2

data/lib/pickle/adapter.rb

@@ -28,9 +28,13 @@ module Pickle
         klass.abstract_class? || !klass.table_exists? ||
          (defined?(CGI::Session::ActiveRecordStore::Session) && klass == CGI::Session::ActiveRecordStore::Session) ||
          (defined?(::ActiveRecord::SessionStore::Session) && klass == ::ActiveRecord::SessionStore::Session)
-      end if defined?(::ActiveRecord)
+      end if class_exists?(::ActiveRecord)
       @@model_classes ||= []
     end
+
+    def self.class_exists?(klass)
+      defined?(klass)
+    end
   
     # machinist adapter
     class Machinist < Adapter

data/lib/pickle/session.rb

@@ -45,7 +45,7 @@ module Pickle
     def find_models(factory, fields = nil)
       models_by_index(factory).clear
       model_class = pickle_config.factories[factory].klass
-      records = model_class.find(:all, :conditions => convert_models_to_attributes(model_class, parse_fields(fields)))
+      records = model_class.all(:conditions => convert_models_to_attributes(model_class, parse_fields(fields)))
       records.each {|record| store_model(factory, nil, record)}
     end
       
@@ -154,4 +154,4 @@ module Pickle
       models_by_index(factory) << record
     end
   end
-end
+end

data/pickle.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kbaum-pickle}
-  s.version = "0.2.1.1"
+  s.version = "0.2.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian White"]

data/spec/lib/pickle_adapter_spec.rb

@@ -25,6 +25,11 @@ describe Pickle::Adapter do
         Pickle::Adapter.model_classes.should_not include(ActiveRecord::SessionStore::Session)
       end
     end
+
+    it 'should tolerate active record not being defined' do
+      Pickle::Adapter.should_receive(:class_exists?).with(::ActiveRecord).and_return(false)
+      Pickle::Adapter.model_classes.should be_empty
+    end
   
     it "should not include classes without a table" do
       klass = Class.new(ActiveRecord::Base)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kbaum-pickle
 version: !ruby/object:Gem::Version 
-  version: 0.2.1.1
+  version: 0.2.1.2
 platform: ruby
 authors: 
 - Ian White