dao 5.3.0 → 5.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGViMmUzODVjMzE1ZTRhMjM4MjAyZjYxZTZhOGFkY2U1ODdmYjQ3Ng==
+    MjczMDcyNTc1MjA4NTgwN2E5NmEwNjNhNTI3MDI5M2QxMTA1YWM4ZA==
   data.tar.gz: !binary |-
-    ZmFhNzhhNDJmYjFkNWEzOTNlZmNhNDg5ZTQ1MmE5YTYzMzNlMjcyZg==
+    OWJkNzIzYWY0Nzg4ZjYwZWM1YjdhZGFhYTRhZDYyOThlYzg4ZTQ2NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjQ1NmU2NTYzZTFjMDgzZDFkMjE5NGZjMDZjODBjOGNkNDU4Y2NlZTJmMDY0
-    MWE0MDcxYjE5ZWJhYzE4ZDAxNjY3Nzc0Mjc5OWUzMjgzMWZlNTQzZWJkNTQ4
-    NTJiMWMwMzdiZjNmNjliZjNhMjI1NjdkZjdmMDRiMTFmZDUwYzc=
+    YzkxNjcyYTBjMjA0MGI0MjcwMjYwMzAzZWY2YWQ3YzFmN2NjN2ZlZTBiOTI4
+    YmRlNDE1OTFmMjBjYzljOGIwNDg1OGJlMTk2ODEzZTRkYjY0ZjU5ODg5NjBl
+    Y2IwZWEyMzFmODk3YTZiNGI2MzdkYTk0NWVjY2Y0MDI2MTA1OGU=
   data.tar.gz: !binary |-
-    NGUyYmFjNTk5ZDU2YTUxMjE0OGI3YWUxNzlkZDJkYzQyODVlMjNiMTU1OWUx
-    MTJhN2ZjNTI5ZTk0MTM1NWUzMzAxM2RhMWQxYzJhYzU2ZTQ3MDY0MDU5MzNm
-    ZWE3ODg2ZWFlMjRjMTA3ZWM0OGVhNDg0MmQ2MTQ4ZTViYjg2MGY=
+    OTRjN2I1MGZlYzdlNzMxNWIxZjI3NGFlOWIwZDgxY2E0MzkxYTVmYmRhODI2
+    NzY2ZWNjZDE1M2Y5NTk5OTA5ZmQ2NzBhZTQ3MDYzNDc3MGNlNjEyZDFmYzhl
+    YjM0MDU5MzEwMmQxNTdmMGJmNmYxYzMxYjJjYzAxZDhhY2RmMjI=

data/Rakefile

@@ -3,6 +3,9 @@ This.author = "Ara T. Howard"
 This.email = "ara.t.howard@gmail.com"
 This.homepage = "https://github.com/ahoward/#{ This.lib }"
 
+task :license do
+  open('LICENSE', 'w'){|fd| fd.puts "same as ruby's"}
+end
 
 task :default do
   puts((Rake::Task.tasks.map{|task| task.name.gsub(/::/,':')} - ['default']).sort)
@@ -29,7 +32,7 @@ def run_tests!(which = nil)
 
   test_rbs.each_with_index do |test_rb, index|
     testno = index + 1
-    command = "#{ File.basename(This.ruby) } -I ./lib -I ./test/lib #{ test_rb }"
+    command = "#{ This.ruby } -w -I ./lib -I ./test/lib #{ test_rb }"
 
     puts
     say(div, :color => :cyan, :bold => true)
@@ -59,8 +62,8 @@ end
 
 task :gemspec do
   ignore_extensions = ['git', 'svn', 'tmp', /sw./, 'bak', 'gem']
-  ignore_directories = ['pkg', 'db']
-  ignore_files = ['test/log', 'test/db.yml', 'a.rb', 'b.rb'] + Dir['db/*'] + %w'db'
+  ignore_directories = ['pkg']
+  ignore_files = ['test/log']
 
   shiteless = 
     lambda do |list|
@@ -87,9 +90,10 @@ task :gemspec do
   files       = shiteless[Dir::glob("**/**")]
   executables = shiteless[Dir::glob("bin/*")].map{|exe| File.basename(exe)}
   #has_rdoc    = true #File.exist?('doc')
-  test_files  = test(?e, "test/#{ lib }.rb") ? "test/#{ lib }.rb" : nil
+  test_files  = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
   summary     = object.respond_to?(:summary) ? object.summary : "summary: #{ lib } kicks the ass"
   description = object.respond_to?(:description) ? object.description : "description: #{ lib } kicks the ass"
+  license     = object.respond_to?(:license) ? object.license : "same as ruby's"
 
   if This.extensions.nil?
     This.extensions = []
@@ -100,51 +104,39 @@ task :gemspec do
   end
   extensions = [extensions].flatten.compact
 
-# TODO
-  if This.dependencies.nil?
-    dependencies = []
-  else
-    case This.dependencies
-      when Hash
-        dependencies = This.dependencies.values
-      when Array
-        dependencies = This.dependencies
-    end
-  end
-
   template = 
     if test(?e, 'gemspec.erb')
       Template{ IO.read('gemspec.erb') }
     else
       Template {
         <<-__
-          ## <%= lib %>.gemspec
+          ## #{ lib }.gemspec
           #
 
           Gem::Specification::new do |spec|
-            spec.name = <%= lib.inspect %>
-            spec.version = <%= version.inspect %>
+            spec.name = #{ lib.inspect }
+            spec.version = #{ version.inspect }
             spec.platform = Gem::Platform::RUBY
-            spec.summary = <%= lib.inspect %>
-            spec.description = <%= description.inspect %>
+            spec.summary = #{ lib.inspect }
+            spec.description = #{ description.inspect }
+            spec.license = #{ license.inspect }
 
-            spec.files =\n<%= files.sort.pretty_inspect %>
-            spec.executables = <%= executables.inspect %>
+            spec.files =\n#{ files.sort.pretty_inspect }
+            spec.executables = #{ executables.inspect }
             
             spec.require_path = "lib"
 
-            spec.test_files = <%= test_files.inspect %>
+            spec.test_files = #{ test_files.inspect }
 
-            <% dependencies.each do |lib_version| %>
-              spec.add_dependency(*<%= Array(lib_version).flatten.inspect %>)
-            <% end %>
+          ### spec.add_dependency 'lib', '>= version'
+          #### spec.add_dependency 'map'
 
-            spec.extensions.push(*<%= extensions.inspect %>)
+            spec.extensions.push(*#{ extensions.inspect })
 
-            spec.rubyforge_project = <%= This.rubyforge_project.inspect %>
-            spec.author = <%= This.author.inspect %>
-            spec.email = <%= This.email.inspect %>
-            spec.homepage = <%= This.homepage.inspect %>
+            spec.rubyforge_project = #{ This.rubyforge_project.inspect }
+            spec.author = #{ This.author.inspect }
+            spec.email = #{ This.email.inspect }
+            spec.homepage = #{ This.homepage.inspect }
           end
         __
       }
@@ -188,8 +180,8 @@ task :readme do
   end
 
   template = 
-    if test(?e, 'readme.erb')
-      Template{ IO.read('readme.erb') }
+    if test(?e, 'README.erb')
+      Template{ IO.read('README.erb') }
     else
       Template {
         <<-__
@@ -280,12 +272,6 @@ BEGIN {
   end
   This.version = version
 
-# see if dependencies are export by the module
-#
-  if This.object.respond_to?(:dependencies)
-    This.dependencies = This.object.dependencies
-  end
-
 # we need to know the name of the lib an it's version
 #
   abort('no lib') unless This.lib

data/a.rb

@@ -0,0 +1,8 @@
+
+f = Dao::Form.new
+
+f.scope_for(:foo) do
+  p f.name_for(:bar)
+  p f.key_for(:bar)
+end
+

data/dao.gemspec

@@ -3,16 +3,18 @@
 
 Gem::Specification::new do |spec|
   spec.name = "dao"
-  spec.version = "5.3.0"
+  spec.version = "5.3.2"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "dao"
-  spec.description = "description: dao kicks the ass"
+  spec.description = "presenter, conducer, api, and better form objects for you rails' pleasure"
+  spec.license = "same as ruby's"
 
   spec.files =
 ["Gemfile",
  "Gemfile.lock",
  "README",
  "Rakefile",
+ "a.rb",
  "dao.gemspec",
  "lib",
  "lib/dao",
@@ -104,27 +106,8 @@ Gem::Specification::new do |spec|
 
   spec.test_files = nil
 
-  
-    spec.add_dependency(*["rails", " >= 3.1"])
-  
-    spec.add_dependency(*["map", " >= 6.0.0"])
-  
-    spec.add_dependency(*["fattr", " >= 2.2"])
-  
-    spec.add_dependency(*["coerce", " >= 0.0.3"])
-  
-    spec.add_dependency(*["tagz", " >= 9.9.2"])
-  
-    spec.add_dependency(*["multi_json", " >= 1.0.3"])
-  
-    spec.add_dependency(*["uuidtools", " >= 2.1.2"])
-  
-    spec.add_dependency(*["wrap", " >= 1.5.0"])
-  
-    spec.add_dependency(*["rails_current", " >= 1.8.0"])
-  
-    spec.add_dependency(*["rails_errors2html", " >= 1.3.0"])
-  
+### spec.add_dependency 'lib', '>= version'
+#### spec.add_dependency 'map'
 
   spec.extensions.push(*[])
 

data/lib/dao.rb

@@ -11,7 +11,7 @@
 # dao libs
 #
   module Dao
-    Version = '5.3.0' unless defined?(Version)
+    Version = '5.3.2' unless defined?(Version)
 
     def version
       Dao::Version
@@ -32,6 +32,10 @@
       }
     end
 
+    def description
+      "presenter, conducer, api, and better form objects for you rails' pleasure"
+    end
+
     def libdir(*args, &block)
       @libdir ||= File.expand_path(__FILE__).sub(/\.rb$/,'')
       args.empty? ? @libdir : File.join(@libdir, *args)

data/lib/dao/form.rb

@@ -39,9 +39,13 @@ module Dao
   # instance methods
   #
     attr_accessor :object
+    attr_accessor :unscoped
+    attr_accessor :scope
 
     def initialize(*args)
       @object = args.shift
+      @unscoped = Map.new
+      @scope = []
     end
 
     fattr(:attributes) do
@@ -63,14 +67,15 @@ module Dao
             Map.new
         end
 
-      case attributes
-        when Map
-          attributes
-        when Hash
-          Map.new(attributes)
-        else
-          raise(ArgumentError.new("#{ attributes.inspect } (#{ attributes.class })"))
-      end
+      @unscoped[:attributes] =
+        case attributes
+          when Map
+            attributes
+          when Hash
+            Map.new(attributes)
+          else
+            raise(ArgumentError.new("#{ attributes.inspect } (#{ attributes.class })"))
+        end
     end
 
     fattr(:name) do
@@ -107,12 +112,13 @@ module Dao
             Errors.new
         end
 
-      case errors
-        when Errors
-          errors
-        else
-          raise(ArgumentError.new("#{ errors.inspect } (#{ errors.class })"))
-      end
+      @unscoped[:errors] =
+        case errors
+          when Errors
+            errors
+          else
+            raise(ArgumentError.new("#{ errors.inspect } (#{ errors.class })"))
+        end
     end
 
     fattr(:messages) do
@@ -148,351 +154,351 @@ module Dao
 
   # html generation methods 
   #
-    def element(which, *args, &block)
-      send(which, *args, &block)
-    end
-
-    def form(*args, &block)
-      options = args.extract_options!.to_options! 
-      keys = args.flatten
+    module Elements
+      def element(which, *args, &block)
+        send(which, *args, &block)
+      end
 
-      action = options.delete(:action) || './'
-      method = options.delete(:method) || 'post'
-      id = options.delete(:id) || id_for(keys)
-      klass = class_for(keys, options.delete(:class))
-      error = error_for(keys, options.delete(:error))
+      def form(*args, &block)
+        options = args.extract_options!.to_options! 
+        keys = scope(args)
 
-      content =
-        if block.nil? and !options.has_key?(:content)
-          ''
-        else
-          block ? block.call(form=self) : options.delete(:content)
-        end
-
-      form_(options_for(options, :action => action, :method => method, :class => klass, :id => id, :data_error => error)){ content }
-    end
+        action = options.delete(:action) || './'
+        method = options.delete(:method) || 'post'
+        id = options.delete(:id) || id_for(keys)
+        klass = class_for(keys, options.delete(:class))
+        error = error_for(keys, options.delete(:error))
 
-    def label(*args, &block)
-      options = args.extract_options!.to_options! 
-      keys = args.flatten
+        content =
+          if block.nil? and !options.has_key?(:content)
+            ''
+          else
+            block ? block.call(form=self) : options.delete(:content)
+          end
 
-      block ||=
-        proc do
-          options.delete(:content) ||
-          options.delete(:value) ||
-          keys.map{|key| key.to_s.titleize}.join(' ')
-        end
+        form_(options_for(options, :action => action, :method => method, :class => klass, :id => id, :data_error => error)){ content }
+      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)
+      def label(*args, &block)
+        options = args.extract_options!.to_options! 
+        keys = scope(args)
 
-      label_(options_for(options, :for => target, :class => klass, :id => id, :data_error => error), &block)
-    end
+        block ||=
+          proc do
+            options.delete(:content) ||
+            options.delete(:value) ||
+            keys.map{|key| key.to_s.titleize}.join(' ')
+          end
 
-    def input(*args, &block)
-      options = args.extract_options!.to_options! 
-      keys = args.flatten
+        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)
 
-      type = options.delete(:type) || :text
-      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))
+        label_(options_for(options, :for => target, :class => klass, :id => id, :data_error => error), &block)
+      end
 
-      value =
-        if block.nil? and !options.has_key?(:value) 
-          value_for(attributes, keys)
-        else
-          block ? block.call(attributes.get(keys)) : options.delete(:value)
-        end
+      def input(*args, &block)
+        options = args.extract_options!.to_options! 
+        keys = scope(args)
 
-      value = escape_html(value)
+        type = options.delete(:type) || :text
+        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))
 
-      input_(options_for(options, :type => type, :name => name, :value => value, :class => klass, :id => id, :data_error => error)){}
-    end
+        value =
+          if block.nil? and !options.has_key?(:value) 
+            value_for(attributes, keys)
+          else
+            block ? block.call(attributes.get(keys)) : options.delete(:value)
+          end
 
-    def submit(*args, &block)
-      options = args.extract_options!.to_options! 
-      keys = args.flatten
+        input_(options_for(options, :type => type, :name => name, :value => value, :class => klass, :id => id, :data_error => error)){}
+      end
 
-      keys.push(:submit) if keys.empty?
-      name = options.delete(:name) || name_for(keys)
+      def submit(*args, &block)
+        options = args.extract_options!.to_options! 
+        keys = scope(args)
 
-      content = block ? block.call : (args.first || 'Submit')
+        keys.push(:submit) if keys.empty?
+        name = options.delete(:name) || name_for(keys)
 
-      options[:name] ||= name
-      options[:type] ||= :submit
-      options[:value] ||= content
+        content = block ? block.call : (args.first || 'Submit')
 
-      input_(options_for(options)){}
-    end
+        options[:name] ||= name
+        options[:type] ||= :submit
+        options[:value] ||= content
 
-    def button(*args, &block)
-      options = args.extract_options!.to_options! 
-      keys = args.flatten
+        input_(options_for(options)){}
+      end
 
-      type = options.delete(:type) || :button
-      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))
+      def button(*args, &block)
+        options = args.extract_options!.to_options! 
+        keys = scope(args)
 
-      value = options.has_key?(:value) ? options.delete(:value) : value_for(attributes, keys)
+        type = options.delete(:type) || :button
+        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))
 
-      content = (block ? block.call : (options.delete(:content) || 'Submit'))
+        value = options.has_key?(:value) ? options.delete(:value) : value_for(attributes, keys)
 
-      value = escape_html(value)
-      content = escape_html(content)
+        content = (block ? block.call : (options.delete(:content) || 'Submit'))
 
-      button_(options_for(options, :type => type, :name => name, :value => value, :class => klass, :id => id, :data_error => error)){ content }
-    end
+        content = escape_html(content)
 
-    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
+        button_(options_for(options, :type => type, :name => name, :value => value, :class => klass, :id => id, :data_error => error)){ content }
       end
 
-      input_(options_for(options, :type => :radio, :name => name, :class => klass, :id => id, :data_error => error)){}
-    end
+      def radio_button(*args, &block)
+        options = args.extract_options!.to_options!
+        keys = scope(args)
+
+        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
 
-    def checkbox(*args, &block)
-      options = args.extract_options!.to_options!
-      keys = args.flatten
+        input_(options_for(options, :type => :radio, :name => name, :class => klass, :id => id, :data_error => error)){}
+      end
 
-      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)
+      def checkbox(*args, &block)
+        options = args.extract_options!.to_options!
+        keys = scope(args)
 
-      unless options.has_key?(:checked)
-        checked = Coerce.boolean(attributes.get(keys))
-        options[:checked] = checked if checked
-      end
+        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)
 
-      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}
+        unless options.has_key?(:checked)
+          checked = Coerce.boolean(attributes.get(keys))
+          options[:checked] = checked if checked
         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
+        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 reset(*args)
-      options = args.extract_options!.to_options! 
-      options[:type] = :reset
-      args.push(options)
-      button(*args)
-    end
+      def hidden(*args, &block)
+        options = args.extract_options!.to_options!
+        options[:type] = :hidden
+        args.push(options)
+        input(*args, &block)
+      end
 
-    def textarea(*args, &block)
-      options = args.extract_options!.to_options! 
-      keys = args.flatten
+      def reset(*args)
+        options = args.extract_options!.to_options! 
+        options[:type] = :reset
+        args.push(options)
+        button(*args)
+      end
 
-      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))
+      def textarea(*args, &block)
+        options = args.extract_options!.to_options! 
+        keys = scope(args)
 
-      value =
-        if block.nil? and !options.has_key?(:value) 
-          value_for(attributes, keys)
-        else
-          block ? block.call(attributes.get(keys)) : options.delete(:value)
-        end
+        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))
 
-      value = escape_html(value)
+        value =
+          if block.nil? and !options.has_key?(:value) 
+            value_for(attributes, keys)
+          else
+            block ? block.call(attributes.get(keys)) : options.delete(:value)
+          end
 
-      textarea_(options_for(options, :name => name, :class => klass, :id => id, :data_error => error)){ value }
-    end
+        value = escape_html(value)
 
-    def select(*args, &block)
-      options = args.extract_options!.to_options! 
-      keys = args.flatten
+        textarea_(options_for(options, :name => name, :class => klass, :id => id, :data_error => error)){ value }
+      end
 
-      name = options.delete(:name) || name_for(keys)
-      values = options.delete(:values) || options.delete(:options) || options.delete(:from)
+      def select(*args, &block)
+        options = args.extract_options!.to_options! 
+        keys = scope(args)
 
-      has_blank = options.has_key?(:blank) && options[:blank] != false
-      blank = options.delete(:blank)
+        name = options.delete(:name) || name_for(keys)
+        values = options.delete(:values) || options.delete(:options) || options.delete(:from)
 
-      id = options.delete(:id) || id_for(keys)
-      klass = class_for(keys, options.delete(:class))
-      error = error_for(keys, options.delete(:error))
+        has_blank = options.has_key?(:blank) && options[:blank] != false
+        blank = options.delete(:blank)
 
-      if values.nil?
-        key = keys.map{|key| "#{ key }"}
-        key.last << "_options"
-        values = attributes.get(*key) if attributes.has?(*key)
-      end
+        id = options.delete(:id) || id_for(keys)
+        klass = class_for(keys, options.delete(:class))
+        error = error_for(keys, options.delete(:error))
 
-      if options[:multiple]
-        name += '[]'
-      end
+        if values.nil?
+          key = keys.map{|key| "#{ key }"}
+          key.last << "_options"
+          values = attributes.get(*key) if attributes.has?(*key)
+        end
 
-      list = Array(values).map{|value| value.dup rescue value} # ensure list is dup'd
+        if options[:multiple]
+          name += '[]'
+        end
 
-      case list.first
-        when Hash, Array
-          nil
-        else
-          list.flatten!
-          list.compact!
-          list.map!{|element| [element, element]}
-      end
+        list = Array(values).map{|value| value.dup rescue value} # ensure list is dup'd
 
-      if has_blank
-        case blank
-          when false
-            blank = nil
-          when nil, true
-            blank = [nil, nil]
+        case list.first
+          when Hash, Array
+            nil
           else
-            blank = [Array(blank).first, '']
+            list.flatten!
+            list.compact!
+            list.map!{|element| [element, element]}
         end
-      end
 
-      selected_value =
-        if options.has_key?(:selected)
-          options.delete(:selected)
-        else
-          attributes.get(keys)
+        if has_blank
+          case blank
+            when false
+              blank = nil
+            when nil, true
+              blank = [nil, nil]
+            else
+              blank = [Array(blank).first, '']
+          end
         end
 
-      selected_values = {}
+        selected_value =
+          if options.has_key?(:selected)
+            options.delete(:selected)
+          else
+            attributes.get(keys)
+          end
 
-      Array(selected_value).flatten.compact.each do |val|
-        selected_values[val.to_s] = true
-      end
+        selected_values = {}
 
-      select_(options_for(options, :name => name, :class => klass, :id => id, :data_error => error)){
-        if blank
-          content = blank.first || ''
-          value = blank.last
-          value.nil? ? option_(){ content } : option_(:value => value){ content }
+        Array(selected_value).flatten.compact.each do |val|
+          selected_values[val.to_s] = true
         end
 
-        unless list.empty?
-          list.each do |pair|
-            returned = block ? Dao.call(block, :call, pair.first, pair.last, selected_value) : pair 
-
-            opts = Map.new
-            selected = nil
-
-            case returned
-              when Array
-                content, value, selected, *ignored = returned
-                if value.is_a?(Hash)
-                  map = Map.for(value)
-                  value = map.delete(:value)
-                  selected = map.delete(:selected)
-                  opts.update(map)
-                end
-
-              when Hash
-                content = returned[:content]
-                value = returned[:value]
-                selected = returned[:selected]
-
-              else
-                content = returned
-                value = returned
-                selected = nil
-            end
+        select_(options_for(options, :name => name, :class => klass, :id => id, :data_error => error)){
+          if blank
+            content = blank.first || ''
+            value = blank.last
+            value.nil? ? option_(){ content } : option_(:value => value){ content }
+          end
 
-            if selected.nil?
-              selected = selected_values.has_key?(value.to_s)
+          unless list.empty?
+            list.each do |pair|
+              returned = block ? Dao.call(block, :call, pair.first, pair.last, selected_value) : pair 
+
+              opts = Map.new
+              selected = nil
+
+              case returned
+                when Array
+                  content, value, selected, *ignored = returned
+                  if value.is_a?(Hash)
+                    map = Map.for(value)
+                    value = map.delete(:value)
+                    selected = map.delete(:selected)
+                    opts.update(map)
+                  end
+
+                when Hash
+                  content = returned[:content]
+                  value = returned[:value]
+                  selected = returned[:selected]
+
+                else
+                  content = returned
+                  value = returned
+                  selected = nil
+              end
+
+              if selected.nil?
+                selected = selected_values.has_key?(value.to_s)
+              end
+
+              opts[:value] = (value.nil? ? content : value)
+              opts[:selected] = Coerce.boolean(selected) if selected
+
+              option_(opts){ content }
             end
-
-            opts[:value] = (value.nil? ? content : value)
-            opts[:selected] = Coerce.boolean(selected) if selected
-
-            option_(opts){ content }
           end
-        end
-      }
-    end
+        }
+      end
 
-    def upload(*args, &block)
-      options = args.extract_options!.to_options! 
-      keys = args.flatten
+      def upload(*args, &block)
+        options = args.extract_options!.to_options! 
+        keys = scope(args)
 
-      cache_key = keys + [:cache]
-      file_key = keys + [:file]
+        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)
+        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))
+        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)
+        cache_value = attributes.get(cache_key)
 
-      tagz{
-        input_(:name => cache_name, :value => cache_value, :type => :hidden){ }
+        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)){ }
-      }
+          input_(options_for(options, :name => file_name, :class => klass, :id => id, :data_error => error, :type => :file)){ }
+        }
+      end
     end
+    include Elements
 
   # html generation support methods
   #
@@ -540,7 +546,7 @@ module Dao
             value
         end
 
-      escape_html(value)
+      value.to_s
     end
 
     def escape_html(string)
@@ -576,6 +582,38 @@ module Dao
       Form.name_for(name, *keys)
     end
 
+    def scope(*keys, &block)
+      if block.nil?
+        return [@scope, *keys].flatten.compact
+      end
+
+      #attributes = self.attributes
+      #errors = self.errors
+
+      scope = @scope
+      @scope = Coerce.list_of_strings(keys)
+
+      #@attributes = Map.for(attributes.get(*@scope))
+      #@errors = Errors.new.tap{|e| e.update(errors.get(*@scope))}
+
+#p '@scope' => @scope
+#p '@errors' => @errors
+#p '@attributes' => @attributes
+#p 'errors' => errors
+#p 'attributes' => attributes
+#puts
+#abort
+      begin
+        argv = block.arity == 0 ? [@scope] : []
+        block.call(*argv)
+      ensure
+        @scope = scope
+        #@attributes = attributes
+        #@errors = errors
+      end
+    end
+    alias_method(:scope_for, :scope)
+
     def options_for(*hashes)
       map = Map.new
 

data/test/form_test.rb

@@ -12,6 +12,36 @@ Testing Dao::Form do
     assert{ new_named_form(:foo).name_for(:a, :b) == 'dao[foo][a.b]' }
   end
 
+  testing 'scope_for' do
+    form = new_form() 
+
+    assert do
+      html = form.input(:bar)
+      scmp(
+        html,
+        '<input type="text" name="dao[form][bar]" class="dao" id="form_bar"/>'
+      )
+    end
+
+    assert do
+      form.scope_for(:foo) do
+        html = form.input(:bar)
+        scmp(
+          html,
+          '<input type="text" name="dao[form][foo.bar]" class="dao" id="form_foo-bar"/>'
+        )
+      end
+    end
+
+    assert do
+      html = form.input(:bar)
+      scmp(
+        html,
+        '<input type="text" name="dao[form][bar]" class="dao" id="form_bar"/>'
+      )
+    end
+  end
+
   testing 'Form#select' do
   #
     form = new_form() 

metadata

@@ -1,156 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: dao
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.2
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: map
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 6.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 6.0.0
-- !ruby/object:Gem::Dependency
-  name: fattr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: coerce
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.3
-- !ruby/object:Gem::Dependency
-  name: tagz
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 9.9.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 9.9.2
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.1.2
-- !ruby/object:Gem::Dependency
-  name: wrap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: rails_current
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-- !ruby/object:Gem::Dependency
-  name: rails_errors2html
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-description: ! 'description: dao kicks the ass'
+date: 2014-02-15 00:00:00.000000000 Z
+dependencies: []
+description: presenter, conducer, api, and better form objects for you rails' pleasure
 email: ara.t.howard@gmail.com
 executables: []
 extensions: []
@@ -160,6 +20,7 @@ files:
 - Gemfile.lock
 - README
 - Rakefile
+- a.rb
 - dao.gemspec
 - lib/dao.rb
 - lib/dao/active_record.rb
@@ -231,7 +92,8 @@ files:
 - test/testing.rb
 - test/validations_test.rb
 homepage: https://github.com/ahoward/dao
-licenses: []
+licenses:
+- same as ruby's
 metadata: {}
 post_install_message: 
 rdoc_options: []