dao 4.4.4 → 4.6.4

data/README

@@ -146,6 +146,7 @@ READING
   http://www.paperplanes.de/2010/5/7/activerecord_callbacks_ruined_my_life.html
   http://google-styleguide.googlecode.com/svn/trunk/jsoncstyleguide.xml
   http://pragdave.blogs.pragprog.com/pragdave/2007/03/the_radar_archi.html
+  http://borisstaal.com/post/22586260753/mvc-in-a-browser-vs-reality
 
 
 INSTALL
@@ -161,3 +162,4 @@ HISTORY
     - drop custom form encoding.  just use a rack-like approach.
     - dao form parameter encoding has changed slightly to 'dao[/api/path][x,y,z]=42'
     - dao form paramters are now preparsed in a before filter
+ 

data/dao.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "dao"
-  spec.version = "4.4.4"
+  spec.version = "4.6.4"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "dao"
   spec.description = "description: dao kicks the ass"
@@ -88,6 +88,7 @@ Gem::Specification::new do |spec|
  "test/conducer_test.rb",
  "test/data",
  "test/data/han-solo.jpg",
+ "test/errors_test.rb",
  "test/form_test.rb",
  "test/helper.rb",
  "test/leak.rb",
@@ -104,11 +105,13 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["rails", " >= 3.1"])
   
-    spec.add_dependency(*["map", " >= 5.4"])
+    spec.add_dependency(*["map", " >= 6.0.0"])
   
     spec.add_dependency(*["fattr", " >= 2.2"])
   
-    spec.add_dependency(*["tagz", " >= 9.3"])
+    spec.add_dependency(*["coerce", " >= 0.0.3"])
+  
+    spec.add_dependency(*["tagz", " >= 9.6"])
   
     spec.add_dependency(*["multi_json", " >= 1.0.3"])
   
@@ -116,11 +119,11 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["wrap", " >= 1.5.0"])
   
-    spec.add_dependency(*["rails_current", " >= 1.6"])
+    spec.add_dependency(*["rails_current", " >= 1.7.0"])
   
-    spec.add_dependency(*["rails_nav", " >= 1.1.0"])
+    spec.add_dependency(*["rails_nav", " >= 1.3.0"])
   
-    spec.add_dependency(*["rails_helper", " >= 1.3.0"])
+    spec.add_dependency(*["rails_errors2html", " >= 1.3.0"])
   
 
   spec.extensions.push(*[])

data/lib/dao.rb

@@ -6,11 +6,12 @@
   require 'fileutils'
   require 'cgi'
   require 'tmpdir'
+  require 'yaml'
 
 # dao libs
 #
   module Dao
-    Version = '4.4.4' unless defined?(Version)
+    Version = '4.6.4' unless defined?(Version)
 
     def version
       Dao::Version
@@ -18,16 +19,17 @@
 
     def dependencies
       {
-        'rails'         => [ 'rails'         , ' >= 3.1'   ] ,
-        'map'           => [ 'map'           , ' >= 5.4'   ] ,
-        'fattr'         => [ 'fattr'         , ' >= 2.2'   ] ,
-        'tagz'          => [ 'tagz'          , ' >= 9.3'   ] ,
-        'multi_json'    => [ 'multi_json'    , ' >= 1.0.3' ] ,
-        'uuidtools'     => [ 'uuidtools'     , ' >= 2.1.2' ] ,
-        'wrap'          => [ 'wrap'          , ' >= 1.5.0' ] ,
-        'rails_current' => [ 'rails_current' , ' >= 1.6'   ] ,
-        'rails_nav'     => [ 'rails_nav'     , ' >= 1.1.0' ] ,
-        'rails_helper'  => [ 'rails_helper'  , ' >= 1.3.0' ]
+        'rails'             => [ 'rails'             , ' >= 3.1'   ] ,
+        'map'               => [ 'map'               , ' >= 6.0.0' ] ,
+        'fattr'             => [ 'fattr'             , ' >= 2.2'   ] ,
+        'coerce'            => [ 'coerce'            , ' >= 0.0.3' ] ,
+        'tagz'              => [ 'tagz'              , ' >= 9.6'   ] ,
+        'multi_json'        => [ 'multi_json'        , ' >= 1.0.3' ] ,
+        'uuidtools'         => [ 'uuidtools'         , ' >= 2.1.2' ] ,
+        'wrap'              => [ 'wrap'              , ' >= 1.5.0' ] ,
+        'rails_current'     => [ 'rails_current'     , ' >= 1.7.0' ] ,
+        'rails_nav'         => [ 'rails_nav'         , ' >= 1.3.0' ] ,
+        'rails_errors2html' => [ 'rails_errors2html' , ' >= 1.3.0' ] ,
       }
     end
 
@@ -115,6 +117,13 @@
     upload.rb
   ]
 
+
+  unless defined?(::UUIDTools::Config)
+    ::UUIDTools.module_eval do
+      Config = ::RbConfig # shuts up warnings...
+    end
+  end
+
 # protect against rails' too clever reloading
 #
 =begin

data/lib/dao/api/call.rb

@@ -228,7 +228,7 @@ module Dao
 
   # validations 
   #
-    include Validations
+    include Dao::Validations
 
   # delgate some methods to the context
   #

data/lib/dao/conducer.rb

@@ -65,90 +65,134 @@ module Dao
             raise Error.new(*args, &block)
         end
       end
-    end
 
-  ## crud-y lifecycle ctors
-  #
-    def Conducer.for(action, *args, &block)
-      allocate.tap do |conducer|
-        action = Action.new(action, conducer)
-        Dao.call(conducer, :init, action, *args, &block)
-        Dao.call(conducer, :initialize, *args, &block)
+      def conduces?(model)
+        model_class = model.is_a?(Class) ? model : model.class
+        model_class.model_name == (self.conduces || self).model_name
       end
-    end
 
-    def Conducer.call(*args, &block)
-      self.for(*args, &block)
-    end
-
-    %w( new create edit update destroy ).each do |action|
-      module_eval <<-__, __FILE__, __LINE__
-        def Conducer.for_#{ action }(*args, &block)
-          Conducer.for(#{ action.inspect }, *args, &block)
+      def conduces(*args)
+        unless args.blank?
+          @conduces = args.shift
+          raise(ArgumentError, @conduces.inspect) unless @conduces.respond_to?(:model_name)
         end
-      __
-    end
+        @conduces ||= nil
+      end
 
-  ## ctor
-  #
-    def Conducer.new(*args, &block)
-      allocate.tap do |conducer|
-        Dao.call(conducer, :init, *args, &block)
-        Dao.call(conducer, :initialize, *args, &block)
+      def conduces=(model)
+        conduces(model)
       end
     end
 
+  # instance methods
+  #
     %w[
-      name
       attributes
       form
       params
       errors
-      status
       models
       model
       conduces
     ].each{|attr| fattr(attr)}
 
-  ## init runs *before* initialize - aka inside allocate
+  # ctors
   #
-    def init(*args, &block)
+    def Conducer.new(*args, &block)
+      allocate.tap do |conducer|
+        args = Dao.call(conducer, :process_arguments, *args)
+
+        Dao.call(conducer, :before_initialize, *args, &block)
+        Dao.call(conducer, :initialize, *args, &block)
+        Dao.call(conducer, :after_initialize, *args, &block)
+      end
+    end
+
+    def Conducer.for(*args, &block)
+      action =
+        case args.first
+          when Action, Symbol, String
+            args.shift.to_s
+          else
+            controller.send(:action_name).to_s
+        end
+
+      conducer = new(Action.new(action), *args, &block)
+    end
+
+    def Conducer.call(*args, &block)
+      self.for(*args, &block)
+    end
+
+    %w( new create edit update destroy ).each do |action|
+      class_eval <<-__, __FILE__, __LINE__
+        def Conducer.for_#{ action }(*args, &block)
+          Conducer.for(#{ action.inspect }, *args, &block)
+        end
+      __
+    end
+
+    def process_arguments(*args)
       controllers, args = args.partition{|arg| arg.is_a?(ActionController::Base)}
       actions, args = args.partition{|arg| arg.is_a?(Action)}
+
+      controller = controllers.shift || Dao.current_controller || Dao.mock_controller
+      action = actions.shift
+
+      set_controller(controller) if controller
+      set_action(action) if action
+
+      args.map{|arg| arg.class == Hash ? Map.for(arg) : arg}
+    end
+
+    def before_initialize(*args, &block)
       models, args = args.partition{|arg| arg.respond_to?(:persisted?) }
-      hashes, args = args.partition{|arg| arg.is_a?(Hash)}
+      params, args = args.partition{|arg| arg.is_a?(Hash)}
 
-      @name = self.class.model_name.singular.sub(/_+$/, '')
+      @params = Map.new
       @attributes = Attributes.for(self)
+
       @form = Form.for(self)
-      @params = Map.new
+      @form.name = self.class.model_name.singular.sub(/_+$/, '')
 
       @errors = validator.errors
-      @status = validator.status
-
-      set_controller(controllers.shift || Dao.current_controller || Dao.mock_controller)
-
-      set_action(actions.shift) unless actions.empty?
 
       set_models(models)
 
       set_mounts(self.class.mounted)
 
-      update_params(hashes)
+      update_params(*params) unless params.empty?
+
+      @initialize_overridden = true
+    end
+
+    def initialize(*args, &block)
+      @initialize_overridden = false
+      update_models(models) unless models.empty?
+    end
 
-      @default_initialize = nil
+    def after_initialize(*args, &block)
+      unless @initialize_overridden
+        initialize_for_action(*args, &block)
+        update_attributes(params) unless params.empty?
+      end
     end
 
+    def initialize_for_action(*args, &block)
+      @action.call(:initialize, *args, &block)
+    end
+
+  #
     def set_models(*models)
       @models =
         models.flatten.compact
 
       candidates =
-        @models.select{|model| model.class.model_name == self.class.model_name}
+        @models.select{|model| conduces?(model)}
 
       @model =
-        case candidates.size == 1
-          when 1
+        case
+          when candidates.size == 1
             candidates.first
           else
             @models.first
@@ -161,22 +205,13 @@ module Dao
       end
     end
 
-    def update_params(*hashes)
-      hashes.flatten.compact.each{|hash| @params.apply(hash)}
-    end
-
-  ## a sane initialize is provided for you.  you are free to override it
-  # *** without *** calling super
-  #
-    def initialize(*args, &block)
-      initialize_for_action(*args, &block)
-      update_models(models) unless models.empty?
-      update_attributes(params) unless params.empty?
-    end
-
-    def set_mounts(list)
-      list.each do |args, block|
-        mount(*args, &block)
+    def update_models(*models)
+      models.flatten.compact.each do |model|
+        if conduces?(model)
+          update_attributes(model.attributes)
+        else
+          update_attributes(model_key_for(model), model.attributes)
+        end
       end
     end
 
@@ -189,10 +224,7 @@ module Dao
       end.demodulize.underscore
     end
 
-    def initialize_for_action(*args, &block)
-      @action.call(:initialize, *args, &block)
-    end
-
+  #
     def conduces(*args)
       if args.empty?
         @model
@@ -210,19 +242,42 @@ module Dao
     end
 
     def conduces?(model)
-      conduces == model
+      if @model
+        @model == model
+      else
+        self.class.conduces?(model)
+      end
     end
 
-    def update_models(*models)
-      models.flatten.compact.each do |model|
-        if conduces?(model)
-          update_attributes(model.attributes)
-        else
-          update_attributes(model_key_for(model), model.attributes)
-        end
+  #
+    def set_mounts(list)
+      list.each do |args, block|
+        mount(*args, &block)
       end
     end
 
+    def mount(object, *args, &block)
+      mounted = object.mount(self, *args, &block)
+    ensure
+      if mounted
+        Dao.ensure_interface!(mounted, :_set, :_key, :_value, :_clear)
+        self.mounted.push(mounted)
+      end
+    end
+
+    def mounted
+      @mounted ||= []
+    end
+
+    def self.mount(*args, &block)
+      mounted.push([args, block])
+    end
+
+    def self.mounted
+      @mounted ||= []
+    end
+
+  #
     def update_attributes(*args, &block)
       attributes =
         case
@@ -238,7 +293,7 @@ module Dao
             end
         end
 
-      @attributes.set(attributes)
+      @attributes.add(attributes)
 
       update_mounted_attributes!
 
@@ -250,6 +305,7 @@ module Dao
 
       deepest_mounts_first.each do |mount|
         value = @attributes.get(mount._key)
+        next if(value.nil? or value.object_id == mount.object_id)
         mount._set(value) if mount.respond_to?(:_set)
         @attributes.set(mount._key => mount)
       end
@@ -310,7 +366,14 @@ module Dao
       end
     end
 
-  ## id support 
+  #
+    def update_params(*hashes)
+      hashes.flatten.compact.each do |hash|
+        @params.add(hash)
+      end
+    end
+
+  # id support 
   #
     def id(*args)
       if args.blank?
@@ -342,19 +405,19 @@ module Dao
       object.respond_to?(:persisted?)
     end
 
-  ## mixin controller support
+  # mixin controller support
   #
-    module_eval(&ControllerSupport)
+    class_eval(&ControllerSupport)
 
-  ## mixin callback support
+  # mixin callback support
   #
-    module_eval(&CallbackSupport)
+    class_eval(&CallbackSupport)
 
-  ## mixin view support
+  # mixin view support
   #
-    module_eval(&ViewSupport)
+    class_eval(&ViewSupport)
 
-  ##
+  # persistence
   #
     def save
       default_save
@@ -408,29 +471,8 @@ module Dao
       true
     end
 
-  ## misc
+  # misc
   #
-    def mount(object, *args, &block)
-      mounted = object.mount(self, *args, &block)
-    ensure
-      if mounted
-        Dao.ensure_interface!(mounted, :_set, :_key, :_value, :_clear)
-        self.mounted.push(mounted)
-      end
-    end
-
-    def mounted
-      @mounted ||= []
-    end
-
-    def self.mount(*args, &block)
-      mounted.push([args, block])
-    end
-
-    def self.mounted
-      @mounted ||= []
-    end
-
     def key_for(key)
       Dao.key_for(key)
     end
@@ -439,10 +481,6 @@ module Dao
       validator.errors
     end
 
-    def status
-      validator.status
-    end
-
     def model_name
       self.class.model_name
     end
@@ -451,6 +489,10 @@ module Dao
       @form
     end
 
+    def form_builder
+      Form::Builder
+    end
+
     def helper
       @helper ||= ::Helper.new
     end
@@ -468,11 +510,15 @@ module Dao
     end
 
     def inspect
-      "#{ self.class.name }(#{ @attributes.inspect.chomp })"
+      "#{ self.class.name }(#{ @attributes.inspect.strip })"
     end
 
     def to_s
       inspect
     end
   end
+
+  Resource = Conducer
+  Presenter = Conducer
+  Conductor = Conducer
 end