ianwhite-pickle 0.1.8 → 0.1.9

data/History.txt

@@ -1,3 +1,9 @@
+== 0.1.9 - 29 Jan 2009
+
+* 1 minor enhancement
+  * Pickle::Adapter.model_classes excludes those without tables
+
+
 == 0.1.8 - 29 Jan 2009
 
 * API change

data/lib/pickle/adapter.rb

@@ -23,9 +23,9 @@ module Pickle
     self.model_classes = nil
     
     def self.model_classes
-      # remove abstract and framework classes
+      # remove abstract, framework, and non-table classes
       @@model_classes ||= ::ActiveRecord::Base.send(:subclasses).reject do |klass|
-        klass.abstract_class? ||
+        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

data/lib/pickle/version.rb

@@ -2,7 +2,7 @@ module Pickle
   module Version
     Major = 0
     Minor = 1
-    Tiny  = 8
+    Tiny  = 9
     
     String = [Major, Minor, Tiny].join('.')
   end

data/spec/lib/pickle_adapter_spec.rb

@@ -9,15 +9,32 @@ describe Pickle::Adapter do
     lambda{ Pickle::Adapter.new.create }.should raise_error(NotImplementedError)
   end
   
-  if defined?(CGI::Session::ActiveRecordStore::Session)
-    it ".model_classes should not include CGI::Session::ActiveRecordStore::Session" do
-      Pickle::Adapter.model_classes.should_not include(CGI::Session::ActiveRecordStore)
+  describe ".model_classes" do
+    before do
+      Pickle::Adapter.model_classes = nil
+    end
+    
+    if defined?(CGI::Session::ActiveRecordStore::Session)
+      it "should not include CGI::Session::ActiveRecordStore::Session" do
+        Pickle::Adapter.model_classes.should_not include(CGI::Session::ActiveRecordStore)
+      end
     end
-  end
   
-  if defined?(ActiveRecord::SessionStore::Session)
-    it ".model_classes should not include ActiveRecord::SessionStore::Session" do
-      Pickle::Adapter.model_classes.should_not include(ActiveRecord::SessionStore::Session)
+    if defined?(ActiveRecord::SessionStore::Session)
+      it "should not include ActiveRecord::SessionStore::Session" do
+        Pickle::Adapter.model_classes.should_not include(ActiveRecord::SessionStore::Session)
+      end
+    end
+  
+    it "should not include classes without a table" do
+      klass = Class.new(ActiveRecord::Base)
+      Pickle::Adapter.model_classes.should_not include(klass)
+    end
+
+    it "should not include abstract classes without a table" do
+      klass = Class.new(ActiveRecord::Base)
+      klass.abstract_class = true
+      Pickle::Adapter.model_classes.should_not include(klass)
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ianwhite-pickle
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Ian White