kbaum-pickle 0.2.1.3 → 0.2.1.4

data/lib/pickle/adapter.rb

@@ -28,14 +28,10 @@ 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 class_exists?(::ActiveRecord)
+      end if defined?(::ActiveRecord)
       @@model_classes ||= []
     end
 
-    def self.class_exists?(klass)
-      defined?(klass)
-    end
-  
     # machinist adapter
     class Machinist < Adapter
       def self.factories
@@ -89,4 +85,4 @@ module Pickle
       end
     end
   end
-end
+end

data/lib/pickle/session.rb

@@ -125,7 +125,7 @@ module Pickle
 
     def convert_models_to_attributes(ar_class, attrs)
       attrs.each do |key, val|
-        if val.is_a?(ActiveRecord::Base) && ar_class.column_names.include?("#{key}_id")
+        if defined?(::ActiveRecord) && val.is_a?(ActiveRecord::Base) && ar_class.column_names.include?("#{key}_id")
           attrs["#{key}_id"] = val.id
           attrs["#{key}_type"] = val.class.name if ar_class.column_names.include?("#{key}_type")
           attrs.delete(key)

data/pickle.gemspec

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

metadata

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