dao 2.2.3 → 3.1.0

data/lib/dao/api/modes.rb

@@ -1,4 +1,3 @@
-
 module Dao
   class Api
     class << Api
@@ -13,34 +12,37 @@ module Dao
       end
 
       def add_mode(mode)
-        modes.push(mode = Mode.for(mode)).uniq!
-
-        module_eval(<<-__, __FILE__, __LINE__ - 1)
+        mode = Mode.for(mode)
 
-          def #{ mode }(*args, &block)
-            if args.empty?
-              if catching_results?
-                if self.mode == #{ mode.inspect }
+        unless modes.include?(mode)
+          module_eval(<<-__, __FILE__, __LINE__ - 1)
+            def #{ mode }(*args, &block)
+              if args.empty?
+                if catching_results?
+                  if self.mode.case_of?(Mode.for(#{ mode.inspect }))
+                    mode(#{ mode.inspect }, &block)
+                    return!
+                  end
+                else
                   mode(#{ mode.inspect }, &block)
-                  return!
                 end
               else
-                mode(#{ mode.inspect }, &block)
-              end
-            else
-              mode(#{ mode.inspect }) do
-                call(*args, &block)
+                mode(#{ mode.inspect }) do
+                  call(*args, &block)
+                end
               end
             end
-          end
 
-          def #{ mode }?(&block)
-            mode?(#{ mode.inspect }, &block)
-          end
-
-        __
+            def #{ mode }?(&block)
+              mode?(#{ mode.inspect }, &block)
+            end
+          __
 
-        mode
+          modes.push(mode)
+          mode
+        else
+          false
+        end
       end
     end
 
@@ -70,8 +72,7 @@ module Dao
     end
 
     def mode?(mode, &block)
-      condition = self.mode == mode
-
+      condition = mode.case_of?(self.mode)
       if block.nil?
         condition
       else

data/lib/dao/api/routes.rb

@@ -0,0 +1,9 @@
+module Dao
+  class Api
+    class << Api
+      def routes
+        @routes ||= Route::List.new
+      end
+    end
+  end
+end

data/lib/dao/data.rb

@@ -1,13 +1,20 @@
 module Dao
   class Data < ::Map
+  # look good for inspect
+  #
+    def inspect
+      ::JSON.pretty_generate(self, :max_nesting => 0)
+    end
+
+  # support updates with dao-ish objects
+  #
     add_conversion_method!(:to_dao)
     add_conversion_method!(:as_dao)
 
     def update(*args, &block)
       if args.size==1 and args.first.respond_to?(:to_dao)
         to_dao = args.first.to_dao
-        update(to_dao)
-        return(to_dao)
+        return super(to_dao)
       end
       super
     end

data/lib/dao/errors.rb

@@ -1,14 +1,22 @@
 module Dao
   class Errors < ::Map
+  # for html generation
+  #
     include Tagz.globally
 
     class << Errors
       include Tagz.globally
     end
 
+  # you can tweak these if you want
+  #
     Global = '*' unless defined?(Global)
-    Separator = '⇒' unless defined?(Separator)
+    #Separator = '⇒' unless defined?(Separator)
+    Separator = "\342\207\222" unless defined?(Separator)  ### this is an "Open-outlined rightward arrow" - http://en.wikipedia.org/wiki/List_of_Unicode_characters#Supplemental_arrows-A
 
+
+  # string message support class - knows when it's sticky...
+  #
     class Message < ::String
       attr_accessor :sticky
 
@@ -28,6 +36,8 @@ module Dao
       end
     end
 
+  # class methods
+  #
     class << Errors
       def global_key
         [Global]
@@ -36,17 +46,10 @@ module Dao
       def for(*args, &block)
         new(*args, &block)
       end
-
-      def cast(*args)
-        if args.size == 1
-          value = args.first
-          value.is_a?(self) ? value : self.for(value)
-        else
-          self.for(*args)
-        end
-      end
     end
 
+  # instance methods
+  #
     def add(*args)
       options = Dao.map_for(args.last.is_a?(Hash) ? args.pop : {})
       sticky = options[:sticky]
@@ -113,7 +116,6 @@ module Dao
       clone
     end
 
-
     def update(other, options = {})
       options = Dao.map_for(options)
       prefix = Array(options[:prefix]).flatten.compact
@@ -197,6 +199,8 @@ module Dao
         select{|message| not message.strip.empty?}
     end
 
+  # html generation methods
+  #
     def to_html(*args)
       Errors.to_html(errors=self, *args)
     end

data/lib/dao/form.rb

@@ -1,41 +1,41 @@
 module Dao
   class Form
+  # for html generation
+  #
     include Tagz.globally
 
+    class << Form 
+      include Tagz.globally
+    end
+
+  # class methods
+  #
     class << Form 
       def for(*args, &block)
         new(*args, &block)
       end
-
-      def cast(*args)
-        if args.size == 1
-          value = args.first
-          value.is_a?(self) ? value : self.for(value)
-        else
-          self.for(*args)
-        end
-      end
     end
 
-    attr_accessor :result
+  # instance methods
+  #
+    attr_accessor :map
 
     def initialize(*args, &block)
-      @result = args.shift if args.first.is_a?(Result)
-      super
-    end
-
-    def data
-      result.data
+      @map = args.first.is_a?(Map) ? args.shift : Map.new
     end
 
     def errors
-      result.errors
+      @map.errors
     end
 
-    def ==(other)
-      result == other.result
+    def path
+      @map.path
     end
 
+
+
+  # html generation methods 
+  #
     def form(*args, &block)
       options = Dao.map_for(args.last.is_a?(Hash) ? args.pop : {})
       keys = args.flatten
@@ -87,9 +87,9 @@ module Dao
 
       value =
         if block.nil? and !options.has_key?(:value) 
-          value_for(data, keys)
+          value_for(@map, keys)
         else
-          block ? block.call(data.get(keys)) : options.delete(:value)
+          block ? block.call(@map.get(keys)) : options.delete(:value)
         end
 
       input_(options_for(options, :type => type, :name => name, :value => value, :class => klass, :id => id, :data_error => error)){}
@@ -119,9 +119,9 @@ module Dao
 
       value =
         if block.nil? and !options.has_key?(:value) 
-          value_for(data, keys)
+          value_for(@map, keys)
         else
-          block ? block.call(data.get(keys)) : options.delete(:value)
+          block ? block.call(@map.get(keys)) : options.delete(:value)
         end
 
       button_(options_for(options, :type => type, :name => name, :value => value, :class => klass, :id => id, :data_error => error)){}
@@ -145,9 +145,9 @@ module Dao
 
       value =
         if block.nil? and !options.has_key?(:value) 
-          value_for(data, keys)
+          value_for(@map, keys)
         else
-          block ? block.call(data.get(keys)) : options.delete(:value)
+          block ? block.call(@map.get(keys)) : options.delete(:value)
         end
 
       textarea_(options_for(options, :name => name, :class => klass, :id => id, :data_error => error)){ value.to_s }
@@ -159,12 +159,13 @@ module Dao
 
       name = options.delete(:name) || name_for(keys)
       from = options.delete(:from) || options.delete(:options)
+      blank = options.delete(:blank)
 
       selected =
         if options.has_key?(:selected)
           options.delete(:selected)
         else
-          value_for(data, keys)
+          value_for(@map, keys)
         end
 
       id = options.delete(:id) || id_for(keys)
@@ -176,7 +177,7 @@ module Dao
       if from.nil?
         key = keys.map{|key| "#{ key }"}
         key.last << "_options"
-        from = data.get(*key) if data.has?(*key)
+        from = @map.get(*key) if @map.has?(*key)
       end
 
       list = Array(from)
@@ -190,6 +191,15 @@ module Dao
           list.map!{|element| [element, element]}
       end
 
+      case blank
+        when nil, false
+          nil
+        when true
+          list.push(nil)
+        else
+          list.unshift(blank)
+      end
+
       selected_value =
         case selected
           when Array
@@ -229,14 +239,16 @@ module Dao
       }
     end
 
+  # html generation support methods
+  #
     def id_for(keys)
-      id = [result.path, keys.join('-')].compact.join('_')
+      id = [path, keys.join('-')].compact.join('_')
       slug_for(id)
     end
 
     def class_for(keys, klass = nil)
       klass = 
-        if result.errors.on?(keys)
+        if errors.on?(keys)
           [klass, 'dao', 'errors'].compact.join(' ')
         else
           [klass, 'dao'].compact.join(' ')
@@ -245,14 +257,12 @@ module Dao
     end
 
     def error_for(keys, klass = nil)
-      if result.errors.on?(keys)
-        result.errors.get(keys)
-      end
+      errors.get(keys) if errors.on?(keys)
     end
 
-    def value_for(data, keys)
-      return nil unless data.has?(keys)
-      value = Tagz.escapeHTML(data.get(keys))
+    def value_for(map, keys)
+      return nil unless map.has?(keys)
+      value = Tagz.escapeHTML(map.get(keys))
     end
 
     def Form.name_for(path, *keys)
@@ -270,9 +280,8 @@ module Dao
       params.keys.any?{|key| name_re =~ key.to_s}
     end
 
-
     def name_for(keys)
-      Form.name_for(result.path, keys)
+      Form.name_for(path, keys)
     end
 
     def options_for(*hashes)

data/lib/dao/interface.rb

@@ -1,6 +1,6 @@
 module Dao
   class Interface
-    Attrs = %w( api path method doc )
+    Attrs = %w( api path route method doc )
     Attrs.each{|attr| attr_accessor(attr)}
 
     def initialize(options = {})

data/lib/dao/mode.rb

@@ -1,41 +1,66 @@
 module Dao
   class Mode < ::String
+  # class methods
+  #
     class << Mode
       def for(mode)
-        mode.is_a?(Mode) ? mode : Mode.new(mode.to_s)
+        return mode if mode.is_a?(Mode)
+        mode = mode.to_s
+        return Mode.send(mode) if Mode.respond_to?(mode)
+        Mode.new(mode)
       end
 
       def list
-        List
+        @list ||= []
       end
 
-      def default
-        Mode.for(:read)
-      end
-    end
+      def add(mode)
+        mode = new(mode.to_s)
 
-    Verbs = %w( options get head post put delete trace connect )
+        unless list.include?(mode)
+          list.push(mode)
+          singleton_class =
+            class << Mode
+              self
+            end
+          singleton_class.module_eval do
+            attr_accessor mode
+          end
+          Mode.send("#{ mode }=", mode)
+          mode
+        end
+      end
 
-    Verbs.each do |verb|
-      const = verb.downcase.capitalize
-      unless const_defined?(const)
-        mode = Mode.for(verb.downcase)
-        const_set(const, mode)
+      def default
+        @default ||= Mode.for(:read)
       end
     end
 
-    Read = Get unless defined?(Read)
-    Write = Post unless defined?(Write)
+  # instance methods
+  #
+    def cases
+      @cases ||= []
+    end
 
-    List = Verbs + %w( read write )
+    def case_of?(other)
+      self == other or other.cases.include?(self)
+    end
 
-    List.each do |method|
-      const = method.downcase.capitalize
-      define_method(method){ const_get(const) }
+    def ===(other)
+      case_of?(other)
     end
 
-    def ==(other)
-      super(Mode.for(other))
+    Read = %w( options get head )
+    Write = %w( post put delete trace connect )
+    Http = Read + Write
+    Http.each do |verb|
+      Mode.add(verb)
     end
+
+    Mode.add(:read)
+    Read.each{|m| Mode.read.cases.push(Mode.send(m))}
+
+    Mode.add(:write)
+    Write.each{|m| Mode.write.cases.push(Mode.send(m))}
   end
 end