dao 4.4.4 → 4.6.4

data/lib/dao/rails.rb

@@ -27,6 +27,10 @@ if defined?(Rails)
       #initializer "dao.middleware" do |app|
         #app.middleware.use Dao::Middleware::ParamsParser
       #end
+       
+      config.after_initialize do
+        Dao::Conducer.install_routes!
+      end
 
     # yes yes, this should probably be somewhere else...
     #

data/lib/dao/rails/lib/generators/dao/templates/dao.css

@@ -1,28 +1,18 @@
-/* dao errors */
+/* dao form errors */
 
-  .dao.errors {
-    font-weight: normal;
+  .errors-summary {
+    box-sizing: border-box;
     width: 100%;
-    border-bottom: 1px solid #ccc;
-    background-color: #ffe;
-    padding: 0.5em;
+    height: auto;
+    color: #666;
+    background-color: #fffff6;
+    padding: 1em;
   }
-
-  .dao.errors .caption {
+  .errors-caption {
     font-weight: bold;
-    color: #333;
-    font-style: italic;
-    text-align: left;
-    margin-bottom: 0.5em;
   }
-
-  .dao.errors .title {
-    padding-left: 1em;
-    color: #666;
+  .errors-title {
   }
-
-  .dao.errors .message {
-    font-style: italic;
-    font-weight: bold;
-    width: 100%;
+  .errors-message {
   }
+

data/lib/dao/rails/lib/generators/dao/templates/dao_helper.rb

@@ -1,52 +1,27 @@
 # -*- encoding : utf-8 -*-
 module DaoHelper
   def dao_form_for(*args, &block)
-    options = args.extract_options!.to_options!
-
-    model = args.flatten.detect{|arg| arg.respond_to?(:persisted?)}
-
-    if model
-      first = args.shift
-      url = args.shift || options.delete(:url)
+    model = args.flatten.select{|arg| arg.respond_to?(:persisted?)}.last
 
-      method = options.delete(:method)
-      html = dao_form_attrs(options)
-
-      options.clear
+    options = args.extract_options!.to_options!
 
-      if model.persisted?
-        method ||= :put
-      else
-        method ||= :post
-      end
+    options[:builder] = Dao::Form::Builder
 
-      url =
-        case method
-          when :put
-            url_for(:action => :update)
-          when :post
-            url_for(:action => :create)
-          else
-            './'
-        end
+    if options[:post] or model.blank?
+      options[:url] ||= (options.delete(:post) || request.fullpath)
+      options[:method] ||= :post
+    end
 
-      options[:url] = url
-      options[:html] = html.dup.merge(:method => method)
-      #options[:builder] = Dao::Form::Builder
+    args.push(options)
 
-      args.push(model)
-      args.push(options)
-      
-      form_for(*args) do
-        block.call(model.form)
-      end
-    else
-      args.push(request.fullpath) if args.empty?
-      args.push(dao_form_attrs(options))
-      form_tag(*args, &block)
+    if model.blank?
+      name = 'form'
+      model = Class.new(Dao::Conducer){ model_name(name) }.new(params[name])
+      args.unshift(model)
     end
-  end
 
+    form_for(*args, &block)
+  end
   alias_method(:dao_form, :dao_form_for)
 
   def dao_form_attrs(*args)
@@ -92,11 +67,10 @@ module DaoHelper
 
     @dao = api.send(mode, path, params)
     @dao.route = request.fullpath
-    #@dao.mode = mode
 
-    #unless options[:error!] == false
-      @dao.error! unless @dao.status.ok?
-    #end
+    unless options[:error!] == false
+      @dao.error! unless(@dao.status =~ or @dao.status == 420)
+    end
 
     block ? block.call(@dao) : @dao
   end

data/lib/dao/route.rb

@@ -20,7 +20,7 @@ module Dao
       def pattern_for(route)
         route = Path.absolute_path_for(route.to_s)
         re = route.gsub(%r{/:[^/]+}, '/([^/]+)')
-        /#{ re }/ioux
+        /#{ re }/iux
       end
 
       def path_for(route, params = {})
@@ -59,7 +59,8 @@ module Dao
 
     def params_for(path)
       match = pattern.match(path).to_a
-      if match
+
+      unless match.empty?
         map = Map.new
         ignored = match.shift
         @keys.each_with_index do |key, index|
@@ -79,7 +80,7 @@ module Dao
       def match(name)
         each do |route|
           match = route.match(name)
-          return route if match
+          return route unless match.empty?
         end
         return nil
       end

data/lib/dao/upload.rb

@@ -152,6 +152,13 @@ class Upload < ::Map
       end
     end
 
+    def path_for(arg)
+      [:original_path, :original_filename, :path, :filename, :pathname].
+        map{|msg| arg.send(msg).to_s if arg.respond_to?(msg)}.
+        compact.
+        first or raise("could not find path_for(#{ arg.inspect })")
+    end
+
     alias_method('mount', 'new')
   end
 
@@ -161,7 +168,7 @@ class Upload < ::Map
   attr_accessor :hidden_key
   attr_accessor :name
   attr_accessor :value
-  attr_accessor :path
+  attr_reader :path
   attr_accessor :dirname
   attr_accessor :basename
   attr_accessor :io
@@ -192,6 +199,8 @@ class Upload < ::Map
   end
 
   def _set(value)
+    return unless value
+
     value =
       case
         when value.is_a?(Hash)
@@ -216,6 +225,8 @@ class Upload < ::Map
     url = @value ? File.join(Upload.url, @value) : @placeholder.url
 
     update(:file => @io, :cache => @value, :url => url)
+
+    set_path(Upload.path_for(@io)) rescue nil
   end
 
   def _key
@@ -280,7 +291,7 @@ class Upload < ::Map
     copied = false
 
     Upload.rewind(io) do
-      src = io.path
+      src = Upload.path_for(io)
       dst = path
 
       strategies = [
@@ -305,15 +316,26 @@ class Upload < ::Map
   end
 
   def gcopen(path)
-    @path = path
-    @dirname, @basename = File.split(@path)
-    @value = File.join(File.basename(@dirname), @basename).strip
+    set_path(path)
     @io = open(@path, 'rb')
     IOs[object_id] = @io.fileno
     ObjectSpace.define_finalizer(self, Upload.method(:finalizer).to_proc)
     @io
   end
 
+  def set_path(path)
+    if path
+      @path = path.to_s.strip
+      @dirname, @basename = File.split(@path)
+      @value = File.join(File.basename(@dirname), @basename).strip
+      @path
+    else
+      @path, @dirname, @basename, @value = nil
+    end
+  end
+
+  alias_method('path=', 'set_path')
+
   def inspect
     {
       Upload.name =>

data/lib/dao/validations.rb

@@ -63,7 +63,6 @@ module Dao
         valid?
         forcing_validity?
         errors
-        status
       ).each do |method|
         module_eval <<-__, __FILE__, __LINE__
           def #{ method }(*args, &block)

data/lib/dao/validations/validator.rb

@@ -17,7 +17,9 @@ module Dao
 
       class << Validator
         def mixin(*args, &block)
-          new(*args, &block).tap{|validator| validator.mixin = true}
+          new(*args, &block).tap do |validator|
+            validator.mixin = true
+          end
         end
       end
 
@@ -58,6 +60,8 @@ module Dao
           @object.validator = self
         end
 
+        @errors.object = @object
+
         #@object.extend(InstanceExec) unless @object.respond_to?(:instance_exec)
       end
 

data/test/conducer_test.rb

@@ -30,10 +30,39 @@ Testing Dao::Conducer do
       assert{ c.models == [comment, post, user] }
       assert{ c.model == comment }
       assert{ c.model == c.conduces }
+    end
+
+  #
+    testing 'that the conduced model can be declared at the class level' do
+      user = User.new
+      post = Post.new
+      comment = Comment.new
+      params = {}
+
+      args = [comment, post, user, params]
+
+      c = new_conducer(*args){ conduces User }
 
-      assert{ c.conduces(post) }
-      assert{ c.models == [post, comment, user] }
-      assert{ c.model == post }
+      assert{ c.models == [comment, post, user] }
+      assert{ c.model == user }
+      assert{ c.model == c.conduces }
+    end
+
+  #
+    testing 'that the conduced model can be declared at the instance level' do
+      user = User.new
+      post = Post.new
+      comment = Comment.new
+      params = {}
+
+      args = [comment, post, user, params]
+
+      c = new_conducer(*args)
+
+      c.conduces(user)
+
+      assert{ c.models == [user, comment, post] }
+      assert{ c.model == user }
       assert{ c.model == c.conduces }
     end
   end
@@ -80,10 +109,10 @@ Testing Dao::Conducer do
       assert{ c.instance_variable_get('@post') == post }
 
       expected = Map.new
-      expected.update :user => user.attributes
-      expected.update :post => post.attributes
-      expected.update comment.attributes
-      expected.update params
+      expected.add :user => user.attributes
+      expected.add :post => post.attributes
+      expected.add comment.attributes
+      expected.add params
 
       assert{ c.attributes =~ expected }
       assert{ c.instance_variable_get('@comment') == comment }
@@ -151,6 +180,15 @@ Testing Dao::Conducer do
     end
   end
 
+ #
+    testing 'that conducers *fold* in attributes' do
+      c = new_conducer
+
+      assert{ c.update_attributes :key => {:a => :b} }
+      assert{ c.update_attributes :key => {:nested => {:a => :b}} }
+      assert{ c.attributes =~ {:key => {:a => :b, :nested => {:a => :b}}}  }
+    end
+
 ##
 #
   context :teh_default_save do
@@ -451,6 +489,8 @@ Testing Dao::Conducer do
 
   #
     testing 'that the default save uses the mounted _value and _clears it' do
+begin
+$pry=true
       conducer_class =
         new_conducer_class do
           mount Dao::Upload, :up, :placeholder => '/images/foo.jpg'
@@ -461,7 +501,7 @@ Testing Dao::Conducer do
       up = Upload.new(path)
       comment = Comment.new
 
-      c = conducer_class.new( comment, :up => {:file => up} ) 
+      c = conducer_class.new( comment, :up => {:file => Upload.new(path)} ) 
 
       upload = assert{ c.get(:up) }
       assert{ upload.is_a?(Dao::Upload) }
@@ -476,6 +516,9 @@ Testing Dao::Conducer do
       value_was_cleared = assert{ !test(?f, upload.path) }
 
       assert{ test(?s, path) }
+ensure
+$pry=false
+end
     end
   end
 
@@ -607,6 +650,10 @@ protected
     def initialize(path)
       super(IO.read(@path = path))
     end
+
+    def dup
+      self.class.new(path)
+    end
   end
 
   class Model
@@ -670,7 +717,7 @@ protected
     end
 
     def inspect(*args, &block)
-      "#{ self.class.name }( #{ attributes.inspect } )"
+      "#{ self.class.name }(#{ attributes.inspect.strip })"
     end
 
     def errors

data/test/errors_test.rb

@@ -0,0 +1,81 @@
+# -*- encoding : utf-8 -*-
+Testing Dao::Errors do
+
+  testing 'that conducer-less error objects scopes keys in a generic fashion' do
+    e = Dao::Errors.new
+
+    e.add 'is fucked'
+    e.add 'foo is fucked'
+
+    actual = e.to_text 
+
+    expected = <<-__
+      ---
+      global:
+      - is fucked
+      - foo is fucked
+    __
+
+    assert compress(actual) == compress(expected)
+  end
+
+  testing 'that conducer-based error objects scope keys in a model_name based fashion' do
+    c = new_foo_conducer
+
+    e = c.errors 
+
+    e.add 'is fucked'
+    e.add 'foo is fucked'
+    e.add :first_name, 'is fucked'
+    e.add :last_name, 'is fucked'
+
+    actual = e.to_text 
+
+    expected = <<-__
+      ---
+      foo:
+      - is fucked
+      - foo is fucked
+      foo.first_name:
+        - is fucked
+      foo.last_name:
+        - is fucked
+    __
+
+    assert compress(actual) == compress(expected)
+  end
+
+
+
+protected
+  def compress(string)
+    string.to_s.gsub(/\s/, '')
+  end
+  def new_foo_conducer_class(&block)
+    const = :FooConducer
+    Object.send(:remove_const, const) if Object.send(:const_defined?, const)
+    name = const.to_s
+    c = assert{ Class.new(Dao::Conducer){ self.name = name } }
+    Object.send(:const_set, const, c)
+    assert{ c.name == 'FooConducer' }
+    assert{ c.model_name == 'Foo' }
+    assert{ c.table_name == 'foos' && c.collection_name == 'foos' }
+    assert{ c.class_eval(&block); true } if block
+    c
+  end
+  alias_method :new_conducer_class, :new_foo_conducer_class
+
+  def new_foo_conducer(*args, &block)
+    assert{ new_foo_conducer_class(&block).new(*args) }
+  end
+  alias_method :new_conducer, :new_foo_conducer
+end
+
+BEGIN {
+  testdir = File.dirname(File.expand_path(__FILE__))
+  rootdir = File.dirname(testdir)
+  libdir = File.join(rootdir, 'lib')
+  require File.join(libdir, 'dao')
+  require File.join(testdir, 'testing')
+  require 'stringio'
+}