dao 2.0.0 → 2.1.0

data/lib/dao/rails/lib/generators/dao/templates/dao_helper.rb

@@ -0,0 +1,10 @@
+module DaoHelper
+  def render_dao(result, *args, &block)
+    if result.status =~ 200 or result.status == 420
+      render(*args, &block)
+    else
+      render(:text => result.status, :status => result.status.code)
+    end
+  end
+end
+ApplicationController.send(:include, DaoHelper)

data/lib/dao/result.rb

@@ -1,10 +1,14 @@
 module Dao
   class Result < ::Map
+    include Dao::InstanceExec
+
     attr_accessor :api
-    attr_accessor :endpoint
+    attr_accessor :interface
+    attr_accessor :mode
     attr_accessor :params
     attr_accessor :validations
     attr_accessor :form
+    attr_accessor :forcing_validity
 
     def Result.for(*args, &block)
       new(*args, &block)
@@ -20,24 +24,28 @@ module Dao
       data = Data.new
 
       api = options[:api]
-      endpoint = options[:endpoint]
+      interface = options[:interface]
       params = options[:params] || Params.new
+      mode = options[:mode] || (api ? api.mode : Mode.default)
 
-      path = endpoint.path if endpoint
+      params.result = self
+      path = interface.path if interface
 
       form = Form.for(self)
       validations = Validations.for(self) 
 
       self[:path] = path
       self[:status] = status
+      self[:mode] = mode
       self[:errors] = errors
       self[:data] = data
 
       @api = api
-      @endpoint = endpoint
+      @interface = interface
       @params = params
       @form = form
       @validations = validations
+      @forcing_validity = false
     end
 
     def path
@@ -52,6 +60,14 @@ module Dao
       status(value)
     end
 
+    def mode(*args)
+      self[:mode] = Mode.for(*args) unless args.empty?
+      self[:mode]
+    end
+    def mode=(value)
+      mode(value)
+    end
+
     def errors
       self[:errors]
     end
@@ -60,28 +76,51 @@ module Dao
       self[:data]
     end
 
-    def validates(*args, &block)
-      validations.add(*args, &block)
+    def is_valid=(boolean)
+      @is_valid = !!boolean 
+    end
+
+    def is_valid(*bool)
+      @is_valid ||= nil
+      @is_valid = !!bool.first unless bool.empty?
+      @is_valid
+    end
+
+    def valid!
+      @forcing_validity = true
+    end
+
+    def valid?
+      if @forcing_validity
+        true
+      else
+        validate unless validations.ran?
+        errors.empty? and status.ok?
+      end
     end
 
     def validate(*args, &block)
       if !args.empty?
-        validates(*args, &block)
+        validations.add(*args, &block)
       else
         validations.run
-        #status(420) if(status.ok? and !errors.empty?)
+        status(420) if(status.ok? and !errors.empty?)
         errors.empty? and status.ok?
       end
     end
 
-    def valid?
-      validate
-    end
-
-    def validate!
+    def validate!(*args, &block)
+      if !args.empty?
+        validations.add(*args, &block)
+      end
+      @forcing_validity = false
       validations.run!
-      #status(420) if(status.ok? and !errors.empty?)
+      status(420) if(status.ok? and !errors.empty?)
       throw(:result, nil) unless(errors.empty? and status.ok?)
     end
+
+    def validates(*args, &block)
+      validations.add(*args, &block)
+    end
   end
 end

data/lib/dao/status.rb

@@ -1,5 +1,7 @@
 module Dao
   class Status < ::String
+  ## http://en.wikipedia.org/wiki/List_of_HTTP_status_codes
+  #
     Code2Message = (
       {
         100 => "Continue",
@@ -109,10 +111,12 @@ module Dao
     }) unless defined?(Groups)
 
     Groups.each do |code, group|
-      module_eval <<-__
+      module_eval <<-__, __FILE__, __LINE__ -1
+
         def #{ group }?()
           #{ code } == @group
         end
+
       __
     end
 
@@ -130,6 +134,15 @@ module Dao
     end
     alias_method 'error?', 'bad?'
 
+    def =~(other)
+      begin
+        other = Status.for(other)
+        self.group == other.group
+      rescue
+        false
+      end
+    end
+
     def ==(other)
       begin
         other = Status.for(other)
@@ -221,3 +234,151 @@ module Dao
     end
   end
 end
+
+__END__
+
+
+### ref: http://en.wikipedia.org/wiki/List_of_HTTP_status_codes
+
+1xx Informational
+
+Request received, continuing process.[2]
+This class of status code indicates a provisional response, consisting only of the Status-Line and optional headers, and is terminated by an empty line. Since HTTP/1.0 did not define any 1xx status codes, servers must not send a 1xx response to an HTTP/1.0 client except under experimental conditions.
+100 Continue
+This means that the server has received the request headers, and that the client should proceed to send the request body (in the case of a request for which a body needs to be sent; for example, a POST request). If the request body is large, sending it to a server when a request has already been rejected based upon inappropriate headers is inefficient. To have a server check if the request could be accepted based on the request's headers alone, a client must send Expect: 100-continue as a header in its initial request[2] and check if a 100 Continue status code is received in response before continuing (or receive 417 Expectation Failed and not continue).[2]
+101 Switching Protocols
+This means the requester has asked the server to switch protocols and the server is acknowledging that it will do so.[2]
+102 Processing (WebDAV) (RFC 2518)
+As a WebDAV request may contain many sub-requests involving file operations, it may take a long time to complete the request. This code indicates that the server has received and is processing the request, but no response is available yet.[3] This prevents the client from timing out and assuming the request was lost.
+[edit]
+
+
+2xx Success
+
+This class of status codes indicates the action requested by the client was received, understood, accepted and processed successfully.
+200 OK
+Standard response for successful HTTP requests. The actual response will depend on the request method used. In a GET request, the response will contain an entity corresponding to the requested resource. In a POST request the response will contain an entity describing or containing the result of the action.[2]
+201 Created
+The request has been fulfilled and resulted in a new resource being created.[2]
+202 Accepted
+The request has been accepted for processing, but the processing has not been completed. The request might or might not eventually be acted upon, as it might be disallowed when processing actually takes place.[2]
+203 Non-Authoritative Information (since HTTP/1.1)
+The server successfully processed the request, but is returning information that may be from another source.[2]
+204 No Content
+The server successfully processed the request, but is not returning any content.[2]
+205 Reset Content
+The server successfully processed the request, but is not returning any content. Unlike a 204 response, this response requires that the requester reset the document view.[2]
+206 Partial Content
+The server is delivering only part of the resource due to a range header sent by the client. The range header is used by tools like wget to enable resuming of interrupted downloads, or split a download into multiple simultaneous streams.[2]
+207 Multi-Status (WebDAV) (RFC 4918)
+The message body that follows is an XML message and can contain a number of separate response codes, depending on how many sub-requests were made.[4]
+[edit]
+
+
+3xx Redirection
+
+The client must take additional action to complete the request.[2]
+This class of status code indicates that further action needs to be taken by the user agent in order to fulfil the request. The action required may be carried out by the user agent without interaction with the user if and only if the method used in the second request is GET or HEAD. A user agent should not automatically redirect a request more than five times, since such redirections usually indicate an infinite loop.
+300 Multiple Choices
+Indicates multiple options for the resource that the client may follow. It, for instance, could be used to present different format options for video, list files with different extensions, or word sense disambiguation.[2]
+301 Moved Permanently
+This and all future requests should be directed to the given URI.[2]
+302 Found
+This is the most popular redirect code[citation needed], but also an example of industrial practice contradicting the standard.[2] HTTP/1.0 specification (RFC 1945) required the client to perform a temporary redirect (the original describing phrase was "Moved Temporarily"),[5] but popular browsers implemented 302 with the functionality of a 303 See Other. Therefore, HTTP/1.1 added status codes 303 and 307 to distinguish between the two behaviours. However, the majority of Web applications and frameworks still use the 302 status code as if it were the 303[6].
+303 See Other (since HTTP/1.1)
+The response to the request can be found under another URI using a GET method. When received in response to a PUT, it should be assumed that the server has received the data and the redirect should be issued with a separate GET message.[2]
+304 Not Modified
+Indicates the resource has not been modified since last requested.[2] Typically, the HTTP client provides a header like the If-Modified-Since header to provide a time against which to compare. Using this saves bandwidth and reprocessing on both the server and client, as only the header data must be sent and received in comparison to the entirety of the page being re-processed by the server, then sent again using more bandwidth of the server and client.
+305 Use Proxy (since HTTP/1.1)
+Many HTTP clients (such as Mozilla[7] and Internet Explorer) do not correctly handle responses with this status code, primarily for security reasons.[2]
+306 Switch Proxy
+No longer used.[2]
+307 Temporary Redirect (since HTTP/1.1)
+In this occasion, the request should be repeated with another URI, but future requests can still use the original URI.[2] In contrast to 303, the request method should not be changed when reissuing the original request. For instance, a POST request must be repeated using another POST request.
+[edit]
+
+
+4xx Client Error
+
+The 4xx class of status code is intended for cases in which the client seems to have erred. Except when responding to a HEAD request, the server should include an entity containing an explanation of the error situation, and whether it is a temporary or permanent condition. These status codes are applicable to any request method. User agents should display any included entity to the user. These are typically the most common error codes encountered while online.
+400 Bad Request
+The request cannot be fulfilled due to bad syntax.[2]
+401 Unauthorized
+Similar to 403 Forbidden, but specifically for use when authentication is possible but has failed or not yet been provided.[2] The response must include a WWW-Authenticate header field containing a challenge applicable to the requested resource. See Basic access authentication and Digest access authentication.
+402 Payment Required
+Reserved for future use.[2] The original intention was that this code might be used as part of some form of digital cash or micropayment scheme, but that has not happened, and this code is not usually used. As an example of its use, however, Apple's MobileMe service generates a 402 error ("httpStatusCode:402" in the Mac OS X Console log) if the MobileMe account is delinquent.
+403 Forbidden
+The request was a legal request, but the server is refusing to respond to it.[2] Unlike a 401 Unauthorized response, authenticating will make no difference.[2]
+404 Not Found
+The requested resource could not be found but may be available again in the future.[2] Subsequent requests by the client are permissible.
+405 Method Not Allowed
+A request was made of a resource using a request method not supported by that resource;[2] for example, using GET on a form which requires data to be presented via POST, or using PUT on a read-only resource.
+406 Not Acceptable
+The requested resource is only capable of generating content not acceptable according to the Accept headers sent in the request.[2]
+407 Proxy Authentication Required[2]
+408 Request Timeout
+The server timed out waiting for the request.[2] According to W3 HTTP specifications: "The client did not produce a request within the time that the server was prepared to wait. The client MAY repeat the request without modifications at any later time."
+409 Conflict
+Indicates that the request could not be processed because of conflict in the request, such as an edit conflict.[2]
+410 Gone
+Indicates that the resource requested is no longer available and will not be available again.[2]This should be used when a resource has been intentionally removed and the resource should be purged. Upon receiving a 410 status code, the client should not request the resource again in the future. Clients such as search engines should remove the resource from their indices. Most use cases do not require clients and search engines to purge the resource, and a "404 Not Found" may be used instead.
+411 Length Required
+The request did not specify the length of its content, which is required by the requested resource.[2]
+412 Precondition Failed
+The server does not meet one of the preconditions that the requester put on the request.[2]
+413 Request Entity Too Large
+The request is larger than the server is willing or able to process.[2]
+414 Request-URI Too Long
+The URI provided was too long for the server to process.[2]
+415 Unsupported Media Type
+The request entity has a media type which the server or resource does not support.[2] For example the client uploads an image as image/svg+xml, but the server requires that images use a different format.
+416 Requested Range Not Satisfiable
+The client has asked for a portion of the file, but the server cannot supply that portion.[2] For example, if the client asked for a part of the file that lies beyond the end of the file.
+417 Expectation Failed
+The server cannot meet the requirements of the Expect request-header field.[2]
+418 I'm a teapot
+This code was defined in 1998 as one of the traditional IETF April Fools' jokes, in RFC 2324, Hyper Text Coffee Pot Control Protocol, and is not expected to be implemented by actual HTTP servers.
+422 Unprocessable Entity (WebDAV) (RFC 4918)
+The request was well-formed but was unable to be followed due to semantic errors.[4]
+423 Locked (WebDAV) (RFC 4918)
+The resource that is being accessed is locked[4]
+424 Failed Dependency (WebDAV) (RFC 4918)
+The request failed due to failure of a previous request (e.g. a PROPPATCH).[4]
+425 Unordered Collection (RFC 3648)
+Defined in drafts of "WebDAV Advanced Collections Protocol",[8] but not present in "Web Distributed Authoring and Versioning (WebDAV) Ordered Collections Protocol".[9]
+444 No Response
+An Nginx HTTP server extension. The server returns no information to the client and closes the connection (useful as a deterrent for malware).
+426 Upgrade Required (RFC 2817)
+The client should switch to a different protocol such as TLS/1.0.[10]
+449 Retry With
+A Microsoft extension. The request should be retried after performing the appropriate action.[11]
+450 Blocked by Windows Parental Controls
+A Microsoft extension. This error is given when Windows Parental Controls are turned on and are blocking access to the given webpage.[12]
+499 Client Closed Request
+An Nginx HTTP server extension. This code is introduced to log the case when the connection is closed by client while HTTP server is processing its request, making server unable to send the HTTP header back.[13]
+[edit]
+
+
+5xx Server Error
+
+The server failed to fulfill an apparently valid request.[2]
+Response status codes beginning with the digit "5" indicate cases in which the server is aware that it has encountered an error or is otherwise incapable of performing the request. Except when responding to a HEAD request, the server should include an entity containing an explanation of the error situation, and indicate whether it is a temporary or permanent condition. Likewise, user agents should display any included entity to the user. These response codes are applicable to any request method.
+500 Internal Server Error
+A generic error message, given when no more specific message is suitable.[2]
+501 Not Implemented
+The server either does not recognise the request method, or it lacks the ability to fulfill the request.[2]
+502 Bad Gateway
+The server was acting as a gateway or proxy and received an invalid response from the upstream server.[2]
+503 Service Unavailable
+The server is currently unavailable (because it is overloaded or down for maintenance).[2] Generally, this is a temporary state.
+504 Gateway Timeout
+The server was acting as a gateway or proxy and did not receive a timely response from the upstream server.[2]
+505 HTTP Version Not Supported
+The server does not support the HTTP protocol version used in the request.[2]
+506 Variant Also Negotiates (RFC 2295)
+Transparent content negotiation for the request results in a circular reference.[14]
+507 Insufficient Storage (WebDAV) (RFC 4918)[4]
+509 Bandwidth Limit Exceeded (Apache bw/limited extension)
+This status code, while used by many servers, is not specified in any RFCs.
+510 Not Extended (RFC 2774)
+Further extensions to the request are required for the server to fulfill it.[15]

data/lib/dao/stdext.rb

@@ -8,3 +8,9 @@ class Array
   end
 end
 
+unless Object.new.respond_to?(:tap)
+  def tap(value, &block)
+    block.call(value)
+    value
+  end
+end

data/lib/dao/support.rb

@@ -29,13 +29,17 @@ module Dao
       def #{ method }(object, *args, &block)
         case object
           when Array
-            object.map{|element| Dao.#{ method }(element)}
+            object.map{|element| Dao.#{ method }(element, *args, &block)}
 
           else
             if object.respond_to?(:#{ method })
               object.send(:#{ method }, *args, &block)
             else
-              object
+              if object.respond_to?(:to_hash)
+                object.to_hash
+              else
+                object
+              end
             end
         end
       end
@@ -59,4 +63,8 @@ module Dao
     unindent!(s)
     s
   end
+
+  def name_for(path, *keys)
+    "#{ path }(#{ Array(keys).flatten.compact.join(',') })"
+  end
 end

data/lib/dao/validations.rb

@@ -11,8 +11,23 @@ module Dao
       def block
         self
       end
+
+      class Chain
+        def initialize
+          @chain = []
+        end
+
+        def add(callback)
+          @chain.push(callback)
+        end
+
+        def each(&block)
+          @chain.each(&block)
+        end
+      end
     end
 
+
     class << Validations
       def for(*args, &block)
         new(*args, &block)
@@ -29,16 +44,24 @@ module Dao
     end
 
     attr_accessor :result
+    attr_accessor :ran
 
     def initialize(*args, &block)
       @result = args.shift if args.first.is_a?(Result)
+      @ran = false
       super
     end
 
+    alias_method('ran?', 'ran')
+
     def params
       result.params
     end
 
+    def data
+      result.data
+    end
+
     def errors
       result.errors
     end
@@ -53,8 +76,8 @@ module Dao
       size
     end
 
-    alias_method 'count', 'size'
-    alias_method 'length', 'size'
+    alias_method('count', 'size')
+    alias_method('length', 'size')
 
     Cleared = '___CLEARED___'.freeze unless defined?(Cleared)
 
@@ -68,18 +91,45 @@ module Dao
 
       errors.clear
 
-      depth_first_each do |keys, callback|
-        next unless callback and callback.respond_to?(:to_proc)
+      depth_first_each do |keys, chain|
+        chain.each do |callback|
+          next unless callback and callback.respond_to?(:to_proc)
 
-        value = params.get(keys)
-        valid = !!callback.call(value)
-        #valid = !!params.instance_exec(value, &callback)
-        message = callback.options[:message] || (value.nil? ? 'is blank.' : 'is invalid.')
+          number_of_errors = errors.size
+          value = data.get(keys)
+          returned =
+            catch(:valid) do
+              if result
+                result.instance_exec(value, &callback)
+              else
+                callback.call(value)
+              end
+            end
 
-        unless valid
-          new_errors.push([keys, message])
-        else
-          new_errors.push([keys, Cleared])
+          case returned
+            when Hash
+              map = Dao.map(returned)
+              valid = map[:valid]
+              message = map[:message]
+
+            when TrueClass, FalseClass
+              valid = returned
+              message = nil
+
+            else
+              any_errors_added = errors.size > number_of_errors
+              valid = !any_errors_added
+              message = nil
+          end
+
+          message ||= callback.options[:message]
+          message ||= (value.to_s.strip.empty? ? 'is blank' : 'is invalid')
+
+          unless valid
+            new_errors.push([keys, message])
+          else
+            new_errors.push([keys, Cleared])
+          end
         end
       end
 
@@ -93,6 +143,7 @@ module Dao
         errors.add(keys, message)
       end
 
+      @ran = true
       return self
     end
 
@@ -108,8 +159,281 @@ module Dao
       block = args.pop if args.last.respond_to?(:call)
       block ||= NotNil
       callback = Validations::Callback.new(options, &block)
-      args.push(callback)
-      set(*args)
+      set(args => Callback::Chain.new) unless has?(args)
+      get(args).add(callback)
+      callback
+      #args.push(callback)
+      #set(*args)
+    end
+  end
+
+  module Validations::Common
+    def validates_length_of(*args)
+      options = Dao.options_for!(args)
+
+      message = options[:message]
+
+      if options[:in].is_a?(Range)
+        options[:minimum] = options[:in].begin
+        options[:maximum] = options[:in].end
+      end
+      minimum = options[:minimum] || 1
+      maximum = options[:maximum]
+
+      too_short = options[:too_short] || message || 'is too short'
+      too_long = options[:too_long] || message || 'is too long'
+
+      allow_nil = options[:allow_nil]
+      allow_blank = options[:allow_blank]
+
+      minimum = Float(minimum)
+      maximum = Float(maximum) if maximum
+
+      block =
+        lambda do |value|
+          map = Dao.map(:valid => true)
+
+          if value.nil? and allow_nil
+            map[:valid] = true
+            throw(:valid, map)
+          end
+
+          value = value.to_s.strip
+
+          if value.empty? and allow_blank
+            map[:valid] = true
+            throw(:valid, map)
+          end
+
+          if value.size < minimum
+            map[:message] = too_short
+            map[:valid] = false
+            throw(:valid, map)
+          end
+
+          if(maximum and(value.size > maximum))
+            map[:message] = too_long
+            map[:valid] = false
+            throw(:valid, map)
+          end
+
+          map
+        end
+
+      validates(*args, &block)
+    end
+
+    def validates_word_count_of(*args)
+      options = Dao.options_for!(args)
+
+      message = options[:message]
+
+      if options[:in].is_a?(Range)
+        options[:minimum] = options[:in].begin
+        options[:maximum] = options[:in].end
+      end
+      minimum = options[:minimum] || 1
+      maximum = options[:maximum]
+
+      too_short = options[:too_short] || message || 'is too short'
+      too_long = options[:too_long] || message || 'is too long'
+
+      allow_nil = options[:allow_nil]
+      allow_blank = options[:allow_blank]
+
+      minimum = Float(minimum)
+      maximum = Float(maximum) if maximum
+
+      block =
+        lambda do |value|
+          map = Dao.map(:valid => true)
+
+          if value.nil? and allow_nil
+            map[:valid] = true
+            throw(:valid, map)
+          end
+
+          value = value.to_s.strip
+
+          if value.empty? and allow_blank
+            map[:valid] = true
+            throw(:valid, map)
+          end
+
+          words = value.split(/\s+/)
+
+          if words.size < minimum
+            map[:message] = too_short
+            map[:valid] = false
+            throw(:valid, map)
+          end
+
+          if(maximum and(words.size > maximum))
+            map[:message] = too_long
+            map[:valid] = false
+            throw(:valid, map)
+          end
+
+          map
+        end
+
+      validates(*args, &block)
+    end
+
+    def validates_as_email(*args)
+      options = Dao.options_for!(args)
+
+      message = options[:message] || "doesn't look like an email (username@domain.com)"
+
+      allow_nil = options[:allow_nil]
+      allow_blank = options[:allow_blank]
+
+      block =
+        lambda do |value|
+          map = Dao.map(:valid => true)
+
+          if value.nil? and allow_nil
+            map[:valid] = true
+            throw(:valid, map)
+          end
+
+          value = value.to_s.strip
+
+          if value.empty? and allow_blank
+            map[:valid] = true
+            throw(:valid, map)
+          end
+
+          parts = value.split(/@/)
+
+          unless parts.size == 2
+            map[:valid] = false
+            throw(:valid, map)
+          end
+
+          map
+        end
+
+      args.push(:message => message)
+      validates(*args, &block)
+    end
+
+    def validates_as_url(*args)
+      options = Dao.options_for!(args)
+
+      message = options[:message] || "doesn't look like a url (http://domain.com)"
+
+      allow_nil = options[:allow_nil]
+      allow_blank = options[:allow_blank]
+
+      block =
+        lambda do |value|
+          map = Dao.map(:valid => true)
+
+          if value.nil? and allow_nil
+            map[:valid] = true
+            throw(:valid, map)
+          end
+
+          value = value.to_s.strip
+
+          if value.empty? and allow_blank
+            map[:valid] = true
+            throw(:valid, map)
+          end
+
+          parts = value.split(%r|://|)
+
+          unless parts.size >= 2
+            map[:valid] = false
+            throw(:valid, map)
+          end
+
+          map
+        end
+
+      args.push(:message => message)
+      validates(*args, &block)
+    end
+
+    def validates_as_phone(*args)
+      options = Dao.options_for!(args)
+
+      message = options[:message] || "doesn't look like a phone number (012.345.6789)"
+
+      allow_nil = options[:allow_nil]
+      allow_blank = options[:allow_blank]
+
+      block =
+        lambda do |value|
+          map = Dao.map(:valid => true)
+
+          if value.nil? and allow_nil
+            map[:valid] = true
+            throw(:valid, map)
+          end
+
+          value = value.to_s.strip
+
+          if value.empty? and allow_blank
+            map[:valid] = true
+            throw(:valid, map)
+          end
+
+          parts = value.scan(/\d+/)
+
+          unless parts.size >= 1
+            map[:valid] = false
+            throw(:valid, map)
+          end
+
+          map
+        end
+
+      args.push(:message => message)
+      validates(*args, &block)
+    end
+
+    def validates_presence_of(*args)
+      options = Dao.options_for!(args)
+
+      message = options[:message] || 'is blank or missing'
+
+      allow_nil = options[:allow_nil]
+      allow_blank = options[:allow_blank]
+
+      block =
+        lambda do |value|
+          map = Dao.map(:valid => true)
+
+          if value.nil?
+            unless allow_nil
+              map[:message] = message
+              map[:valid] = false
+              throw(:valid, map)
+            end
+          end
+
+          value = value.to_s.strip
+
+          if value.empty?
+            unless allow_blank
+              map[:message] = message
+              map[:valid] = false
+              throw(:valid, map)
+            end
+          end
+
+          map
+        end
+
+      validates(*args, &block)
+    end
+  end
+
+  def Validations.add(method_name, &block)
+    ::Dao::Validations::Common.module_eval do
+      define_method(method_name, &block)
     end
   end
 end