fix deploy

[pettanr/pettanr.git] / lib / peta / item.rb

diff --git a/lib/peta/item.rb b/lib/peta/item.rb
index 7b991bb..938437d 100644 (file)
--- a/lib/peta/item.rb
+++ b/lib/peta/item.rb
@@ -5,13 +5,22 @@ module Peta
     
     # Dynamic ClassMethods
     
-    def self._valid_encode_columns
-      self.my_manifest.valid_encode_columns
+    def self._dev?
+      Rails.env == "development"
+    end
+    
+    def self._skip_load?
+      if self._dev?
+        return true unless self.my_manifest
+        return true unless Manifest.manifest.items
+        return true unless Manifest.manifest.models
+      end
+      false
     end
     
     def self.load_manifest
-      return nil unless self.my_manifest
-      vc = self._valid_encode_columns
+      return nil if self._skip_load?
+      vc = self.my_manifest.valid_encode_columns
       define_singleton_method("valid_encode_columns") do 
         vc
       end
@@ -33,10 +42,12 @@ module Peta
     before_validation :valid_encode
     
     def self.my_peta
+      return nil unless Manifest.manifest.items
       Manifest.manifest.items[self.item_name]
     end
     
     def self.my_manifest
+      return nil unless Manifest.manifest.models
       Manifest.manifest.models[self.item_name]
     end