kbaum-pickle 0.2.1.3 → 0.2.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/pickle/adapter.rb +2 -6
- data/lib/pickle/session.rb +1 -1
- data/pickle.gemspec +1 -1
- metadata +1 -1
data/lib/pickle/adapter.rb
CHANGED
|
@@ -28,14 +28,10 @@ module Pickle
|
|
|
28
28
|
klass.abstract_class? || !klass.table_exists? ||
|
|
29
29
|
(defined?(CGI::Session::ActiveRecordStore::Session) && klass == CGI::Session::ActiveRecordStore::Session) ||
|
|
30
30
|
(defined?(::ActiveRecord::SessionStore::Session) && klass == ::ActiveRecord::SessionStore::Session)
|
|
31
|
-
end if
|
|
31
|
+
end if defined?(::ActiveRecord)
|
|
32
32
|
@@model_classes ||= []
|
|
33
33
|
end
|
|
34
34
|
|
|
35
|
-
def self.class_exists?(klass)
|
|
36
|
-
defined?(klass)
|
|
37
|
-
end
|
|
38
|
-
|
|
39
35
|
# machinist adapter
|
|
40
36
|
class Machinist < Adapter
|
|
41
37
|
def self.factories
|
|
@@ -89,4 +85,4 @@ module Pickle
|
|
|
89
85
|
end
|
|
90
86
|
end
|
|
91
87
|
end
|
|
92
|
-
end
|
|
88
|
+
end
|
data/lib/pickle/session.rb
CHANGED
|
@@ -125,7 +125,7 @@ module Pickle
|
|
|
125
125
|
|
|
126
126
|
def convert_models_to_attributes(ar_class, attrs)
|
|
127
127
|
attrs.each do |key, val|
|
|
128
|
-
if val.is_a?(ActiveRecord::Base) && ar_class.column_names.include?("#{key}_id")
|
|
128
|
+
if defined?(::ActiveRecord) && val.is_a?(ActiveRecord::Base) && ar_class.column_names.include?("#{key}_id")
|
|
129
129
|
attrs["#{key}_id"] = val.id
|
|
130
130
|
attrs["#{key}_type"] = val.class.name if ar_class.column_names.include?("#{key}_type")
|
|
131
131
|
attrs.delete(key)
|
data/pickle.gemspec
CHANGED