ohm.rb in padrino-gen-0.11.0

- old
+ new

@@ -18,28 +18,75 @@
 # case Padrino.env
 #  when :development then Ohm.connect(:db => 0)
 #  when :production then Ohm.connect(:db => 1)
 #  when :test then Ohm.connect(:db => 2)
 # end
+
+# This monkey patch provides traditional (hash of arrays) error handling for ohm models
+# Also add compatiblity with admin generator.
+module Ohm
+  class Model
+
+    alias_method :old_errors, :errors
+    def errors
+      @errors ||= ErrorsHash.new(self.class.to_reference, self.old_errors)
+    end
+
+    def update_attributes(attrs)
+      attrs.each do |key, value|
+        send(:"\#{key}=", value)
+      end if attrs
+    end
+
+    class << self
+      alias_method :old_attribute, :attribute
+      def attribute(name, cast=nil)
+        attributes << name
+        old_attribute(name, cast)
+      end
+
+      def attributes
+        @_attributes ||= []
+      end
+    end
+
+    class ErrorsHash < Hash
+      def initialize(scope, errors)
+        @scope  = scope
+        self.replace Hash.new { |hash, key| hash[key] = [] }
+
+        errors.each do |key, value|
+          self[key] << value
+        end
+      end
+
+      def push(arr)
+        self[arr[0]] << arr[1]
+      end
+
+      def full_messages
+        self.map do |key, value|
+          value.uniq.map do |reason|
+            I18n::t("ohm.%s.%s.%s" % [@scope, key, reason])
+          end.join(', ')
+        end
+      end
+    end
+  end
+end # unless Ohm::Model.new.errors.is_a?(Hash)
 OHM
 
 def setup_orm
-  ohm = OHM
-  require_dependencies 'json'
-  require_dependencies 'ohm', :require => 'ohm'
-  require_dependencies 'ohm-contrib', :require => 'ohm/contrib'
-  create_file("config/database.rb", ohm)
+  require_dependencies 'ohm'
+  create_file("config/database.rb", OHM)
 end
 
 OHM_MODEL = (<<-MODEL) unless defined?(OHM_MODEL)
 class !NAME! < Ohm::Model
-  include Ohm::Timestamping
-  include Ohm::Typecast
-
   # Examples:
   # attribute :name
-  # attribute :email, String
+  # attribute :email
   # reference :venue, Venue
   # set :participants, Person
   # counter :votes
   #
   # index :name
@@ -54,10 +101,10 @@
 
 # options => { :fields => ["title:string", "body:string"], :app => 'app' }
 def create_model_file(name, options={})
     model_path = destination_root(options[:app], 'models', "#{name.to_s.underscore}.rb")
     field_tuples = options[:fields].map { |value| value.split(":") }
-    column_declarations = field_tuples.map { |field, kind| "attribute :#{field}, #{kind.underscore.camelize}" }.join("\n  ")
+    column_declarations = field_tuples.map { |field, kind| "attribute :#{field}" }.join("\n  ")
     model_contents = OHM_MODEL.gsub(/!NAME!/, name.to_s.underscore.camelize)
     model_contents.gsub!(/!FIELDS!/, column_declarations)
     create_file(model_path, model_contents)
 end
 