dao 5.1.1 → 5.1.2

data/Gemfile

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+
+
+gem 'rails'             , ' >= 3.1'
+gem 'map'               , ' >= 6.0.0'
+gem 'fattr'             , ' >= 2.2'
+gem 'coerce'            , ' >= 0.0.3'
+gem 'tagz'              , ' >= 9.8'
+gem 'multi_json'        , ' >= 1.0.3'
+gem 'uuidtools'         , ' >= 2.1.2'
+gem 'wrap'              , ' >= 1.5.0'
+gem 'rails_current'     , ' >= 1.7.0'
+gem 'rails_errors2html' , ' >= 1.3.0'
+gem 'pry'
+

data/Gemfile.lock

@@ -0,0 +1,118 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.4)
+    chronic (0.9.1)
+    coderay (1.0.9)
+    coerce (0.0.4)
+      chronic (>= 0.6.2)
+    erubis (2.7.0)
+    fattr (2.2.1)
+    hike (1.2.3)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.8.0)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    map (6.5.1)
+    method_source (0.8.1)
+    mime-types (1.23)
+    multi_json (1.7.6)
+    polyglot (0.3.3)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
+      bundler (~> 1.0)
+      railties (= 3.2.13)
+    rails_current (1.7.0)
+      map (>= 6.0.1)
+    rails_errors2html (1.4.2)
+      fattr (>= 2.2.1)
+      map (>= 6.2.0)
+      rails_view (>= 1.0.1)
+    rails_view (1.0.1)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.4)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    slop (3.4.5)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    tagz (9.8.0)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.14)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+    uuidtools (2.1.4)
+    wrap (1.5.0)
+      map (>= 4.7.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  coerce (>= 0.0.3)
+  fattr (>= 2.2)
+  map (>= 6.0.0)
+  multi_json (>= 1.0.3)
+  pry
+  rails (>= 3.1)
+  rails_current (>= 1.7.0)
+  rails_errors2html (>= 1.3.0)
+  tagz (>= 9.8)
+  uuidtools (>= 2.1.2)
+  wrap (>= 1.5.0)

data/bin/erubis

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'erubis' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('erubis', 'erubis')

data/bin/rackup

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rackup' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rack', 'rackup')

data/bin/rails

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rails' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('railties', 'rails')

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/rdoc

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rdoc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rdoc', 'rdoc')

data/bin/ri

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'ri' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rdoc', 'ri')

data/bin/sprockets

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'sprockets' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('sprockets', 'sprockets')

data/bin/thor

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'thor' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('thor', 'thor')

data/bin/tilt

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'tilt' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('tilt', 'tilt')

data/bin/tt

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'tt' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('treetop', 'tt')

data/dao.gemspec

@@ -3,14 +3,27 @@
 
 Gem::Specification::new do |spec|
   spec.name = "dao"
-  spec.version = "5.1.1"
+  spec.version = "5.1.2"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "dao"
   spec.description = "description: dao kicks the ass"
 
   spec.files =
-["README",
+["Gemfile",
+ "Gemfile.lock",
+ "README",
  "Rakefile",
+ "bin",
+ "bin/erubis",
+ "bin/rackup",
+ "bin/rails",
+ "bin/rake",
+ "bin/rdoc",
+ "bin/ri",
+ "bin/sprockets",
+ "bin/thor",
+ "bin/tilt",
+ "bin/tt",
  "dao.gemspec",
  "lib",
  "lib/dao",
@@ -95,7 +108,7 @@ Gem::Specification::new do |spec|
  "test/testing.rb",
  "test/validations_test.rb"]
 
-  spec.executables = []
+  spec.executables = ["erubis", "rackup", "rails", "rake", "rdoc", "ri", "sprockets", "thor", "tilt", "tt"]
   
   spec.require_path = "lib"
 
@@ -110,7 +123,7 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["coerce", " >= 0.0.3"])
   
-    spec.add_dependency(*["tagz", " >= 9.6"])
+    spec.add_dependency(*["tagz", " >= 9.8"])
   
     spec.add_dependency(*["multi_json", " >= 1.0.3"])
   

data/lib/dao.rb

@@ -11,7 +11,7 @@
 # dao libs
 #
   module Dao
-    Version = '5.1.1' unless defined?(Version)
+    Version = '5.1.2' unless defined?(Version)
 
     def version
       Dao::Version
@@ -23,7 +23,7 @@
         'map'               => [ 'map'               , ' >= 6.0.0' ] ,
         'fattr'             => [ 'fattr'             , ' >= 2.2'   ] ,
         'coerce'            => [ 'coerce'            , ' >= 0.0.3' ] ,
-        'tagz'              => [ 'tagz'              , ' >= 9.6'   ] ,
+        'tagz'              => [ 'tagz'              , ' >= 9.8'   ] ,
         'multi_json'        => [ 'multi_json'        , ' >= 1.0.3' ] ,
         'uuidtools'         => [ 'uuidtools'         , ' >= 2.1.2' ] ,
         'wrap'              => [ 'wrap'              , ' >= 1.5.0' ] ,

data/lib/dao/api/dsl.rb

@@ -36,16 +36,15 @@ module Dao
         @dsl ||= DSL.new(api=self)
         @dsl.evaluate(&block)
       end
+      alias_method('configure', 'evaluate')
     end
   end
 
   def Dao.api(&block)
     if block
-      api = Class.new(Api)
-      api.evaluate(&block)
-      api
+      Class.new(Api).tap{|api| api.evaluate(&block)}
     else
-      Api
+      Class.new(Api)
     end
   end
 end

data/lib/dao/api/modes.rb

@@ -33,10 +33,12 @@ module Dao
                 end
               end
             end
+            alias_method(:#{ mode.upcase }, :#{ mode })
 
             def #{ mode }?(&block)
               mode?(#{ mode.inspect }, &block)
             end
+            alias_method(:#{ mode.upcase }?, :#{ mode }?)
           __
 
           modes.push(mode)
@@ -47,6 +49,10 @@ module Dao
       end
     end
 
+    def on(mode, *args, &block)
+      send(mode.to_s.downcase, *args, &block)
+    end
+
     def mode=(mode)
       @mode = Mode.for(mode)
     end

data/lib/dao/form.rb

@@ -335,7 +335,7 @@ module Dao
           block ? block.call(attributes.get(keys)) : options.delete(:value)
         end
 
-      textarea_(options_for(options, :name => name, :class => klass, :id => id, :data_error => error)){ value.to_s }
+      textarea_(options_for(options, :name => name, :class => klass, :id => id, :data_error => error)){ value }
     end
 
     def select(*args, &block)
@@ -505,7 +505,9 @@ module Dao
 
     def value_for(map, keys)
       return nil unless map.has?(keys)
+
       value = map.get(keys)
+
       value =
         case value
           when Hash, Array
@@ -513,7 +515,6 @@ module Dao
           else
             value
         end
-      value.respond_to?(:html_safe) ? value : Tagz.escapeHTML(value)
     end
 
     def Form.prefix_for(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dao
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '9.6'
+        version: '9.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '9.6'
+        version: '9.8'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -173,12 +173,34 @@ dependencies:
         version: 1.3.0
 description: ! 'description: dao kicks the ass'
 email: ara.t.howard@gmail.com
-executables: []
+executables:
+- erubis
+- rackup
+- rails
+- rake
+- rdoc
+- ri
+- sprockets
+- thor
+- tilt
+- tt
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- Gemfile.lock
 - README
 - Rakefile
+- bin/erubis
+- bin/rackup
+- bin/rails
+- bin/rake
+- bin/rdoc
+- bin/ri
+- bin/sprockets
+- bin/thor
+- bin/tilt
+- bin/tt
 - dao.gemspec
 - lib/dao.rb
 - lib/dao/active_record.rb
@@ -260,6 +282,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 829554688336043917
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -273,4 +298,3 @@ signing_key:
 specification_version: 3
 summary: dao
 test_files: []
-has_rdoc: