dao 5.1.2 → 5.2.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmZkMGJlMTI0MmUwZDM0OTBlMDY4YWU2NTI1OTc0MDU1YTQwOGI5Ng==
+  data.tar.gz: !binary |-
+    M2NlYjJiYjUxNzhmMGFiY2U0OTc2MWMxZmY0YTViOTRiZDRiN2FiZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NjBjYzI3MGUxNGZmZTZlMjgwMmRhN2YwMjBjYTNjMzEzMTg5MTliNzQ3ZWUy
+    YzA3MTE5Njc0MzM4ZTQxMGU4YzBmYjBiMGZlODU1NTAxYmU5MDQwZDJmOGEx
+    YTRjYWFhZjI4YmYzMDAxZWEwMTI1Y2IxMjg5ZDdiY2MxYmY2NzQ=
+  data.tar.gz: !binary |-
+    NmUyYjZjZjFkNWJjOGViNDdiZmI2NzFkZDc5MDJhZDEwYzU4YmNjYWMzMjA1
+    MTc4NmUyMjdmNjdlOWU1MmUyOGFlMWVmOGE0ZjQ5MGEwYTBhZTc3ZmE5YjZj
+    NWIyZThkMTIyYjc2OTQxZmJmMjM4ODVkZWIyYWQ0MDkzNWU5MDE=

data/dao.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "dao"
-  spec.version = "5.1.2"
+  spec.version = "5.2.1"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "dao"
   spec.description = "description: dao kicks the ass"
@@ -13,17 +13,6 @@ Gem::Specification::new do |spec|
  "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",
@@ -108,7 +97,7 @@ Gem::Specification::new do |spec|
  "test/testing.rb",
  "test/validations_test.rb"]
 
-  spec.executables = ["erubis", "rackup", "rails", "rake", "rdoc", "ri", "sprockets", "thor", "tilt", "tt"]
+  spec.executables = []
   
   spec.require_path = "lib"
 
@@ -123,7 +112,7 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["coerce", " >= 0.0.3"])
   
-    spec.add_dependency(*["tagz", " >= 9.8"])
+    spec.add_dependency(*["tagz", " >= 9.9.1"])
   
     spec.add_dependency(*["multi_json", " >= 1.0.3"])
   

data/lib/dao.rb

@@ -11,7 +11,7 @@
 # dao libs
 #
   module Dao
-    Version = '5.1.2' unless defined?(Version)
+    Version = '5.2.1' 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.8'   ] ,
+        'tagz'              => [ 'tagz'              , ' >= 9.9.1' ] ,
         'multi_json'        => [ 'multi_json'        , ' >= 1.0.3' ] ,
         'uuidtools'         => [ 'uuidtools'         , ' >= 2.1.2' ] ,
         'wrap'              => [ 'wrap'              , ' >= 1.5.0' ] ,

data/lib/dao/conducer.rb

@@ -496,6 +496,10 @@ module Dao
       @helper ||= ::Helper.new
     end
 
+    def h(*args)
+      CGI.escapeHTML(args.join(' '))
+    end
+
     def raise!(*args, &block)
       self.class.raise!(*args, &block)
     end

data/lib/dao/conducer/active_model.rb

@@ -38,7 +38,7 @@ module Dao
 
         suffixes = /(Conducer|Resource|Importer|Presenter|Conductor|Cell)\Z/o
 
-        name = self.name.to_s
+        name = self.name.split('::').last.to_s
         name.sub!(suffixes, '') unless name.sub(suffixes, '').blank?
         name.sub!(/(:|_)+$/, '')
 

data/lib/dao/form.rb

@@ -195,6 +195,8 @@ module Dao
           block ? block.call(attributes.get(keys)) : options.delete(:value)
         end
 
+      value = escape_html(value)
+
       input_(options_for(options, :type => type, :name => name, :value => value, :class => klass, :id => id, :data_error => error)){}
     end
 
@@ -224,6 +226,9 @@ module Dao
 
       content = (block ? block.call : (options.delete(:content) || 'Submit'))
 
+      value = escape_html(value)
+      content = escape_html(content)
+
       button_(options_for(options, :type => type, :name => name, :value => value, :class => klass, :id => id, :data_error => error)){ content }
     end
 
@@ -335,6 +340,8 @@ module Dao
           block ? block.call(attributes.get(keys)) : options.delete(:value)
         end
 
+      value = escape_html(value)
+
       textarea_(options_for(options, :name => name, :class => klass, :id => id, :data_error => error)){ value }
     end
 
@@ -515,6 +522,12 @@ module Dao
           else
             value
         end
+
+      escape_html(value)
+    end
+
+    def escape_html(string)
+      Tagz.escape_html(string)
     end
 
     def Form.prefix_for(name)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: dao
 version: !ruby/object:Gem::Version
-  version: 5.1.2
-  prerelease: 
+  version: 5.2.1
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: map
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fattr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coerce
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,23 +69,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tagz
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '9.8'
+        version: 9.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '9.8'
+        version: 9.9.1
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: wrap
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_current
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_errors2html
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,24 +146,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
 description: ! 'description: dao kicks the ass'
 email: ara.t.howard@gmail.com
-executables:
-- erubis
-- rackup
-- rails
-- rake
-- rdoc
-- ri
-- sprockets
-- thor
-- tilt
-- tt
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -191,16 +160,6 @@ files:
 - 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
@@ -272,29 +231,25 @@ files:
 - test/validations_test.rb
 homepage: https://github.com/ahoward/dao
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 829554688336043917
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: codeforpeople
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: dao
 test_files: []

data/bin/erubis

@@ -1,16 +0,0 @@
-#!/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

@@ -1,16 +0,0 @@
-#!/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

@@ -1,16 +0,0 @@
-#!/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

@@ -1,16 +0,0 @@
-#!/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

@@ -1,16 +0,0 @@
-#!/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

@@ -1,16 +0,0 @@
-#!/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

@@ -1,16 +0,0 @@
-#!/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

@@ -1,16 +0,0 @@
-#!/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

@@ -1,16 +0,0 @@
-#!/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

@@ -1,16 +0,0 @@
-#!/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')