dao 4.2.1 → 4.4.2

data/lib/dao/exceptions.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Dao
   class Dao::Error < ::StandardError; end
 

data/lib/dao/extractor.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Dao
   class Extractor < BlankSlate
     attr :target

data/lib/dao/form.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Dao
   class Form
   # for html generation
@@ -8,6 +9,14 @@ module Dao
       include Tagz.globally
     end
 
+  # builder stuff for compatibity with rails' form_for()
+  #
+    class Builder
+      def Builder.new(object_name, object, view, options, block)
+        form = Form.new(object)
+      end
+    end
+
   # class methods
   #
     class << Form 
@@ -144,18 +153,18 @@ module Dao
       options = args.extract_options!.to_options! 
       keys = args.flatten
 
-      id = options.delete(:id) || id_for(keys)
-      klass = class_for(keys, options.delete(:class))
-      error = error_for(keys, options.delete(:error))
-      target = options.delete(:for) || id_for(keys)
-
       content =
-        if block.nil? and !options.has_key?(:content)
-          titleize(keys.last)
+        if block.nil?
+          keys.map{|key| key.to_s.titleize}.join(' ')
         else
-          block ? block.call() : options.delete(:content)
+          block ? block.call() : (options.delete(:content) || options.delete(:value))
         end
 
+      id = options.delete(:id) || id_for(keys + [:label])
+      klass = class_for(keys, options.delete(:class))
+      error = error_for(keys, options.delete(:error))
+      target = options.delete(:for) || id_for(keys)
+
       label_(options_for(options, :for => target, :class => klass, :id => id, :data_error => error)){ content }
     end
 
@@ -191,7 +200,7 @@ module Dao
       input_(options_for(options)){}
     end
 
-    def button(*args)
+    def button(*args, &block)
       options = args.extract_options!.to_options! 
       keys = args.flatten
 
@@ -211,6 +220,91 @@ module Dao
       button_(options_for(options, :type => type, :name => name, :value => value, :class => klass, :id => id, :data_error => error)){}
     end
 
+    def radio_button(*args, &block)
+      options = args.extract_options!.to_options!
+      keys = args.flatten
+
+      type = options.delete(:type) || :radio
+      name = options.delete(:name) || name_for(keys)
+      id = options.delete(:id) || id_for(keys)
+      klass = class_for(keys, options.delete(:class))
+      error = error_for(keys, options.delete(:error))
+
+      unless options.has_key?(:checked)
+        checked =
+          if options.has_key?(:value) and attributes.has?(keys)
+            a = attributes.get(keys)
+            b = options[:value]
+            a==b or a.to_s==b.to_s
+          else
+            false
+          end
+        options[:checked] = checked if checked
+      end
+
+      input_(options_for(options, :type => :radio, :name => name, :class => klass, :id => id, :data_error => error)){}
+    end
+
+    def checkbox(*args, &block)
+      options = args.extract_options!.to_options!
+      keys = args.flatten
+
+      type = options.delete(:type) || :checkbox
+      name = options.delete(:name) || name_for(keys)
+      id = options.delete(:id) || id_for(keys)
+      klass = class_for(keys, options.delete(:class))
+      error = error_for(keys, options.delete(:error))
+      values = options.delete(:values) || options.delete(:checked)
+
+      unless options.has_key?(:checked)
+        checked = !!attributes.get(keys)
+        options[:checked] = checked if checked
+      end
+
+      value_for =
+        case values
+          when false, nil
+            {true => '1', false => '0'}
+          when Hash
+            h = {}
+            values.map{|k, v| h[ k =~ /t|1|on|yes/ ? true : false ] = v}
+            h
+          else
+            t, f, *ignored = Array(values).flatten.compact
+            {true => t, false => f}
+        end
+      value_for[true] ||= '1'
+      value_for[false] ||= '0'
+
+      hidden_options =
+        options.dup.tap{|o| o.delete(:checked)}
+
+      tagz{
+        input_(options_for(hidden_options, :type => :hidden, :name => name, :value => value_for[false])){}
+
+        __
+
+        input_(
+          options_for(
+            options,
+            :type => :checkbox,
+            :name => name,
+            :value => value_for[true],
+            :class => klass,
+            :id => id,
+            :data_error => error
+          )
+        ){}
+      }
+    end
+
+    def hidden(*args, &block)
+      options = args.extract_options!.to_options!
+      options[:type] = :hidden
+      args.push(options)
+      input(*args, &block)
+    end
+
     def reset(*args)
       options = args.extract_options!.to_options! 
       options[:type] = :reset
@@ -242,7 +336,7 @@ module Dao
       keys = args.flatten
 
       name = options.delete(:name) || name_for(keys)
-      from = options.delete(:from) || options.delete(:options) || attributes.get(*keys)
+      from = options.delete(:from) || options.delete(:options)
       blank = options.delete(:blank)
 
       selected =
@@ -301,17 +395,19 @@ module Dao
 
           case returned
             when Array
-              value, content, selected, *ignored = returned
+              content, value, selected, *ignored = returned
             when Hash
+              content = returned[:content]
               value = returned[:value]
-              content = returned[:content] || value
               selected = returned[:selected]
             else
-              value = returned
               content = returned
+              value = returned
               selected = nil
           end
 
+          value ||= content
+
           if selected.nil?
             selected = value.to_s==selected_value.to_s
           end
@@ -323,6 +419,31 @@ module Dao
       }
     end
 
+    def upload(*args, &block)
+      options = args.extract_options!.to_options! 
+      keys = args.flatten
+
+      cache_key = keys + [:cache]
+      file_key = keys + [:file]
+
+      cache_name = options.delete(:cache_name) || name_for(cache_key)
+      file_name = options.delete(:file_name) || options.delete(:name) || name_for(file_key)
+
+      id = options.delete(:id) || id_for(keys)
+      klass = class_for(keys, options.delete(:class))
+      error = error_for(keys, options.delete(:error))
+
+      cache_value = attributes.get(cache_key)
+
+      tagz{
+        input_(:name => cache_name, :value => cache_value, :type => :hidden){ }
+
+        __
+
+        input_(options_for(options, :name => file_name, :class => klass, :id => id, :data_error => error, :type => :file)){ }
+      }
+    end
+
   # html generation support methods
   #
     def id_for(keys)
@@ -366,11 +487,32 @@ module Dao
           else
             value
         end
-      Tagz.escapeHTML(value)
+      value.respond_to?(:html_safe) ? value : Tagz.escapeHTML(value)
+    end
+
+    def Form.prefix_for(name)
+      "dao[#{ name }]"
     end
 
     def Form.name_for(name, *keys)
-      "dao[#{ name }][#{ Array(keys).flatten.compact.join('.') }]"
+      "#{ prefix_for(name) }[#{ key_for(*keys) }]"
+    end
+
+    def Form.key_for(*keys)
+      keys.flatten.compact.map do |key|
+        case
+          when Integer === key
+            key
+          when key =~ /^\d+$/
+            "~#{ key }"
+          else
+            key
+        end
+      end.join('.')
+    end
+
+    def key_for(*keys)
+      Form.key_for(name, *keys)
     end
 
     def name_for(*keys)
@@ -380,11 +522,28 @@ module Dao
     def options_for(*hashes)
       map = Map.new
       hashes.flatten.each do |h|
-        h.each{|k,v| map[attr_for(k)] = v unless v.nil?}
+        case((data = h.delete(:data) || h.delete('data')))
+          when Hash
+            data.each{|k,v| map[data_attr_for(k)] = v unless v.nil?}
+          else
+            h[:data] = data
+        end
+
+        h.each do |k,v|
+          map[attr_for(k)] = v unless v.nil?
+        end
       end
       map
     end
 
+    def attr_for(string)
+      slug_for(string).gsub(/_/, '-')
+    end
+
+    def data_attr_for(string)
+      "data-#{ attr_for(string) }"
+    end
+
     def slug_for(string)
       string = string.to_s
       words = string.to_s.scan(%r/\w+/)
@@ -393,10 +552,6 @@ module Dao
       words.join('-').downcase.sub(/_+$/, '')
     end
 
-    def attr_for(string)
-      slug_for(string).gsub(/_/, '-')
-    end
-
     def titleize(string)
       string = string.to_s
       string = string.titleize if string.respond_to?(:titleize)

data/lib/dao/instance_exec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Dao
   module InstanceExec
     Code = proc do

data/lib/dao/mode.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Dao
   class Mode < ::String
   # class methods

data/lib/dao/mongo_mapper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 begin
   MongoMapper
 rescue NameError

data/lib/dao/name.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Dao
   class Name < ::String
     def Name.for(name)

data/lib/dao/params.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Dao
   class Params < ::Map
   # mixins
@@ -36,7 +37,7 @@ module Dao
   # look good for inspect
   #
     def inspect
-      ::JSON.pretty_generate(self, :max_nesting => 0)
+      Dao.json_for(self)
     end
 
   # support updates with dao-ish objects

data/lib/dao/path.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Dao
   class Path < ::String
     class Error < ::StandardError; end

data/lib/dao/path_map.rb

@@ -0,0 +1,24 @@
+# -*- encoding : utf-8 -*-
+module Dao
+  class PathMap < ::Map
+    def to_json(*args, &block)
+      as_json.to_json(*args, &block)
+    end
+
+    def as_json
+      inject(Map.new){|json, kv| json.update(json_key_for(kv.first) => kv.last)}
+    end
+
+    def json_key_for(key)
+      Array(key).join('.').gsub(/\.(\d+)(\.)?/, '[\1]\2')
+    end
+  end
+end
+
+
+if $0 == __FILE__
+  pm = Dao::PathMap.new
+  pm[[:array, 0, :key]] = 'value'
+  pm[[:key]] = 'value'
+  p pm.as_json
+end

data/lib/dao/rack.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 if defined?(Rack)
   Dao.load %w[ rack/middleware.rb ]
 end

data/lib/dao/rack/middleware.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Dao
   module Middleware 
     Dao.load %w[ rack/middleware/params_parser.rb ]

data/lib/dao/rack/middleware/params_parser.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Dao
   module Middleware 
     class ParamsParser

data/lib/dao/rails.rb

@@ -1,11 +1,12 @@
+# -*- encoding : utf-8 -*-
 if defined?(Rails)
 
   module Dao
   ## support unloadable
   #
-    def Api.before_remove_const
-      unload!
-    end
+    #def Api.before_remove_const
+      #unload!
+    #end
 
   ##
   #
@@ -17,8 +18,7 @@ if defined?(Rails)
 
       paths.path = ROOT_DIR
 
-      config.autoload_paths += %w( app/models app )
-
+      ### config.autoload_paths += %w( app/models app )
       ### config.autoload_paths << APP_DIR
       ### $LOAD_PATH.push(File.join(Rails.root.to_s, 'app'))
 
@@ -30,39 +30,19 @@ if defined?(Rails)
 
     # yes yes, this should probably be somewhere else...
     #
-      config.after_initialize do
+      config.before_initialize do
 
         ActionController::Base.module_eval do
-
-          before_filter do |controller|
-          # set the dao controller
-          #
-            Dao.current_controller = controller
-
-          # pre-parse any obvious dao params
-          #
-            controller.instance_eval do
-              Dao.normalize_parameters(params)
-            end
-          end
-
-        # you will likely want to override this!
+        # normalize dao params
         #
-          def current_api
-            @api ||= ( 
-              api = Api.new
-              %w( real_user effective_user current_user ).each do |attr|
-                getter, setter = "#{ attr }", "#{ attr }="
-                api.send(setter, send(getter)) if(respond_to?(getter) and api.respond_to?(setter))
-              end
-              api
-            )
+          before_filter do |controller|
+            Dao.current_controller ||= controller
+            Dao.normalize_parameters(controller.send(:params))
           end
-          helper_method(:current_api)
-          alias_method(:api, :current_api)
-          helper_method(:api)
 
         # setup sane rescuing from dao errors with crap statuses
+        #
+        #   raise(Dao::Error::Result.new(result))
         #
           rescue_from(Dao::Error::Result) do |error|
             result = error.result