dao 4.2.1 → 4.4.2

data/test/form_test.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 Testing Dao::Form do
   testing '.new' do
     form = new_form() 

data/test/helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class User < Map
   def id() self[:id] end
   def email() self[:email] end

data/test/leak.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 ##
 #
   require 'rubygems'

data/test/support_test.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 Testing Dao::Conducer do
   testing 'that dao has a root' do
     assert{ Dao.respond_to?(:root) }
@@ -24,7 +25,8 @@ Testing Dao::Conducer do
 
         'bars' => {
           'a' => 'b',
-          'hash.k' => 'v'
+          'hash.k' => 'v',
+          '~42' => 'foobar'
         }
       }
     )
@@ -39,6 +41,7 @@ Testing Dao::Conducer do
     assert{ params[:bars].is_a?(Hash) }
     assert{ params[:bars][:a] == 'b' }
     assert{ params[:bars][:hash] == {'k' => 'v'} }
+    assert{ params[:bars]['42'] == 'foobar' }
   end
 end
 

data/test/testing.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'test/unit'
 
 testdir = File.expand_path(File.dirname(__FILE__))

data/test/validations_test.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 Testing Dao::Validations do
 ## status
 #
@@ -21,33 +22,22 @@ Testing Dao::Validations do
 
 ## errors
 #
-  testing 'that clear does not drop sticky errors' do
+  testing 'that errors can relay from other each-able sources' do
     errors = Dao::Errors.new
-    errors.add! 'sticky', 'error'
-    assert{ errors['sticky'].first.sticky? }
-    errors.add 'not-sticky', 'error'
-    errors.clear
-    assert{ errors['sticky'].first == 'error' }
-    assert{ errors['not-sticky'].to_s.empty? }
-  end
 
-  testing 'that clear! ***does*** drop sticky errors' do
-    errors = Dao::Errors.new
-    errors.add! 'sticky', 'error'
-    errors.add 'not-sticky', 'error'
-    errors.clear!
-    assert{ errors['sticky'].to_s.empty? }
-    assert{ errors['not-sticky'].to_s.empty? }
-  end
+    source =
+      assert do
+        c = Class.new Hash do
+          def self.human_attribute_name(*a) a.first.to_s end
+        end
+        m = c.new 
+        e = ActiveModel::Errors.new(m)
+        e.add('foo', 'is fucked')
+      end
 
-  testing 'that global errors are sticky' do
-    errors = Dao::Errors.new
-    global = Dao::Errors::Global
-    errors.add! 'global-error'
-    errors.clear
-    assert{ errors[global].first == 'global-error' }
-    errors.clear!
-    assert{ errors[global].to_s.empty? }
+    assert{ errors.relay(source) }
+
+    assert{ errors.on(:foo) }
   end
 
 ## validations
@@ -81,7 +71,7 @@ Testing Dao::Validations do
     }
   end
 
-  testing 'that validations use instance_exec' do
+  testing 'that validations use instance_exec - as god intended' do
     return :pending
 
     a, b = nil
@@ -126,21 +116,177 @@ Testing Dao::Validations do
 
 ## validating
 #
-  testing 'that validations can be cleared and do not clobber manually added errors' do
+  testing 'that validations clear only that which they know about' do
     params = Dao::Params.new
     errors = params.errors
 
     assert{ params.validates(:email){|email| email.to_s.split(/@/).size == 2} }
     assert{ params.validates(:password){|password| password == 'pa$$w0rd'} }
 
-    params.set(:email => 'ara@dojo4.com', :password => 'pa$$w0rd')
+    params.set(:email => 'ara@dojo4.com')
+
+
+    params.set(:password => 'haxor')
+    assert{ !params.valid? }
+    assert{ !params.errors.on(:password).empty? }
+
+    params.set(:password => 'pa$$w0rd')
     assert{ params.valid? }
+    assert{ params.errors.on(:password).empty? }
+
+
+    params.errors.add 'foo', 'is fucked'
+
 
     params.set(:password => 'haxor')
-    assert{ !params.valid?(:validate => true) }
+    assert{ !params.valid? }
+    assert{ !params.errors.on(:password).empty? }
+    assert{ !params.errors.on(:foo).empty? }
+
+
+    params.set(:password => 'pa$$w0rd')
+    assert{ !params.valid? }
+    assert{ params.errors.on(:password).empty? }
+    assert{ !params.errors.on(:foo).empty? }
+  end
+
+## stand alone validations
+#
+  testing 'that validations can be used standalone' do
+    attributes = {
+      :email => 'ara@dojo4.com',
+      :password => 'pa$$w0rd'
+    }
+
+    v = assert{ Dao::Validations.for(attributes) }
+
+    assert{ v.validates(:email){|email| email.to_s.split(/@/).size == 2} }
+    assert{ v.validates(:password){|password| password == 'pa$$w0rd'} }
+    assert{ v.valid? }
+
+    v.set(:password => 'haxor')
+    assert{ !v.valid? }
+  end
+
+## prefixed validations
+#
+  testing 'nested validations' do
+  #
+    attributes = {
+      :list => [
+        {:k => :v},
+        {:K => :V}
+      ]
+    }
+
+  #
+    v = assert{ Dao::Validations.for(attributes) }
+    ran = 0
+    assert{
+      v.validates :list do |list|
+        list.size.times do |i|
+          validates i do
+            ran += 1
+          end
+        end
+        true
+      end
+    }
+    assert{ v.run_validations }
+    assert{ ran == 2 }
+
+  #
+    v = assert{ Dao::Validations.for(attributes) }
+    ran = 0
+    assert{
+      v.validates :list do |list|
+        list.each_with_index do |item, index|
+          item.each do |k,v|
+            validates index, k do |value|
+              ran += 1
+              value==v
+            end
+          end
+        end
+        true
+      end
+    }
+    assert{ v.run_validations }
+    assert{ ran == 2 }
+
+  #
+    v = assert{ Dao::Validations.for(attributes) }
+    ran = 0
+    assert{
+      v.validates_each :list do |item|
+        item.each do |k,v|
+          validates k do |value|
+            ran += 1
+            value==v
+          end
+        end
+        true
+      end
+    }
+    assert{ v.run_validations }
+    assert{ ran == 2 }
+
+  #
+    attributes = {
+      :users => [
+        {
+          :name => 'jane doe',
+
+          :roles => [
+            { :name => :admin },
+            { :name => :user },
+          ]
+        },
+        {
+          :name => 'john doe',
+
+          :roles => [
+            { :name => :user },
+          ]
+        }
+      ]
+    }
+
+    v = assert{ Dao::Validations.for(attributes) }
+    ran = 0
+    assert{
+
+      v.validates_each :users do
+        validates_presence_of :name
+        validates_presence_of :missing
+
+        validates :name do |name|
+          ran += 1
+          name =~ /doe/
+        end
+
+        validates_each :roles do |role|
+          validates_presence_of :missing
+
+          validates :name do |name|
+            ran += 1
+            name =~ /admin|user/
+          end
+        end
+      end
+
+    }
+    assert{ v.run_validations }
+    assert{ ran == 5 }
+    assert{ v.errors.on(:users, 0, :name).blank? }
+    assert{ v.errors.on(:users, 1, :name).blank? }
+
+    assert{ !v.errors.on(:users, 0, :missing).blank? }
+    assert{ !v.errors.on(:users, 1, :missing).blank? }
 
-    errors.add(:name, 'ara')
-    assert{ not params.valid? }
+    assert{ !v.errors.on(:users, 0, :roles, 0, :missing).blank? }
+    assert{ !v.errors.on(:users, 0, :roles, 1, :missing).blank? }
+    assert{ !v.errors.on(:users, 1, :roles, 0, :missing).blank? }
   end
 end
 

metadata

@@ -1,154 +1,154 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dao
-version: !ruby/object:Gem::Version 
-  hash: 53
+version: !ruby/object:Gem::Version
+  version: 4.4.2
   prerelease: 
-  segments: 
-  - 4
-  - 2
-  - 1
-  version: 4.2.1
 platform: ruby
-authors: 
+authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
+  requirement: &70096563951840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70096563951840
+- !ruby/object:Gem::Dependency
+  name: map
+  requirement: &70096563950820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '5.4'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70096563950820
+- !ruby/object:Gem::Dependency
+  name: fattr
+  requirement: &70096563949380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
-        version: "2.1"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70096563949380
+- !ruby/object:Gem::Dependency
   name: tagz
+  requirement: &70096560025800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '9.3'
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70096560025800
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70096560024480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 9
-        - 0
-        version: "9.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: fattr
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70096560024480
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: &70096560023240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: map
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70096560023240
+- !ruby/object:Gem::Dependency
+  name: wrap
+  requirement: &70096560022180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 4
-        - 4
-        version: "4.4"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: unidecode
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70096560022180
+- !ruby/object:Gem::Dependency
+  name: rails_current
+  requirement: &70096560021640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70096560021640
+- !ruby/object:Gem::Dependency
+  name: rails_nav
+  requirement: &70096560020900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
-  version_requirements: *id007
-description: "description: dao kicks the ass"
+  prerelease: false
+  version_requirements: *70096560020900
+- !ruby/object:Gem::Dependency
+  name: rails_helper
+  requirement: &70096560020140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70096560020140
+description: ! 'description: dao kicks the ass'
 email: ara.t.howard@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README
 - Rakefile
-- b.rb
 - dao.gemspec
 - lib/dao.rb
 - lib/dao/active_record.rb
 - lib/dao/api.rb
+- lib/dao/api/call.rb
 - lib/dao/api/context.rb
 - lib/dao/api/dsl.rb
-- lib/dao/api/endpoints.rb
 - lib/dao/api/initializers.rb
 - lib/dao/api/modes.rb
 - lib/dao/api/routes.rb
 - lib/dao/blankslate.rb
 - lib/dao/conducer.rb
+- lib/dao/conducer/active_model.rb
 - lib/dao/conducer/attributes.rb
-- lib/dao/conducer/crud.rb
-- lib/dao/current.rb
+- lib/dao/conducer/autocrud.rb
+- lib/dao/conducer/callback_support.rb
+- lib/dao/conducer/collection.rb
+- lib/dao/conducer/controller_support.rb
+- lib/dao/conducer/nav_support.rb
+- lib/dao/conducer/view_support.rb
 - lib/dao/data.rb
 - lib/dao/db.rb
 - lib/dao/endpoint.rb
@@ -157,13 +157,13 @@ files:
 - lib/dao/exceptions.rb
 - lib/dao/extractor.rb
 - lib/dao/form.rb
-- lib/dao/image_cache.rb
 - lib/dao/instance_exec.rb
 - lib/dao/mode.rb
 - lib/dao/mongo_mapper.rb
 - lib/dao/name.rb
 - lib/dao/params.rb
 - lib/dao/path.rb
+- lib/dao/path_map.rb
 - lib/dao/rack.rb
 - lib/dao/rack/middleware.rb
 - lib/dao/rack/middleware/params_parser.rb
@@ -173,7 +173,6 @@ files:
 - lib/dao/rails/lib/generators/dao/templates/api.rb
 - lib/dao/rails/lib/generators/dao/templates/api_controller.rb
 - lib/dao/rails/lib/generators/dao/templates/conducer.rb
-- lib/dao/rails/lib/generators/dao/templates/conducer_controller.rb
 - lib/dao/rails/lib/generators/dao/templates/dao.css
 - lib/dao/rails/lib/generators/dao/templates/dao.js
 - lib/dao/rails/lib/generators/dao/templates/dao_helper.rb
@@ -183,14 +182,16 @@ files:
 - lib/dao/status.rb
 - lib/dao/stdext.rb
 - lib/dao/support.rb
+- lib/dao/upload.rb
 - lib/dao/validations.rb
 - lib/dao/validations/callback.rb
 - lib/dao/validations/common.rb
+- lib/dao/validations/instance.rb
 - lib/dao/validations/validator.rb
 - test/active_model_conducer_lint_test.rb
 - test/api_test.rb
 - test/conducer_test.rb
-- test/db.yml
+- test/data/han-solo.jpg
 - test/form_test.rb
 - test/helper.rb
 - test/leak.rb
@@ -199,38 +200,26 @@ files:
 - test/validations_test.rb
 homepage: https://github.com/ahoward/dao
 licenses: []
-
-metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: codeforpeople
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: dao
 test_files: []
-