dao 5.5.0 → 8.0.0

data/lib/dao/db.rb

@@ -106,7 +106,6 @@ module Dao
         collection = (y[collection.to_s] ||= {})
         id = next_id_for(collection, data)
         collection[id] = data
-        record = collection[id]
         id
       end
     end

data/lib/dao/errors.rb

@@ -106,13 +106,13 @@ module Dao
       list.clear if clear
       list.push(message)
       list.uniq!
-      list
       self
     end
     alias_method('add!', 'add')
     alias_method('add_to_base', 'add')
     alias_method('add_to_base!', 'add!')
 
+# FIXME - this should accept an errors object
     def relay(*args)
       options = args.size > 1 ? Map.options_for!(args) : Map.new
 
@@ -123,7 +123,15 @@ module Dao
 
         errors.each do |*argv|
           msgs = Array(argv.pop)
+
+          # ref: support for key-style of https://github.com/glooko/mongoid-embedded-errors
+          #key = Array(argv.pop).flatten.compact.join('.')
+          #key = key.to_s.split('.') 
+          #key.map!{|k| k =~ /\[(\d+)\]/ ? $1 : k}
+          #key = prefix + key
+           
           key = prefix + Array(argv.pop)
+
           msgs.each{|msg| add(Array(options[:key] || key), msg, options)}
         end
       end
@@ -168,7 +176,7 @@ module Dao
       full_messages = []
 
       depth_first_each do |keys, value|
-        index = keys.pop
+        _ = keys.pop
         key = keys
         value = value.to_s
 
@@ -186,7 +194,7 @@ module Dao
 
     def each_message
       depth_first_each do |keys, message|
-        index = keys.pop
+        _ = keys.pop
         message = message.to_s.strip
         yield(keys, message)
       end
@@ -196,7 +204,7 @@ module Dao
       hash = Hash.new
 
       depth_first_each do |keys, value|
-        index = keys.pop
+        _ = keys.pop
         hash[keys] ||= []
         hash[keys].push("#{ value }")
       end
@@ -211,9 +219,8 @@ module Dao
     alias_method('each_full', 'each_full_message')
 
     def messages
-      messages =
-        (self[Global]||[]).map{|message| message}.
-        select{|message| not message.strip.empty?}
+      (self[Global] || []).map{|message| message}
+                          .select{|message| not message.strip.empty?}
     end
 
     def global
@@ -227,7 +234,7 @@ module Dao
   # html generation methods
   #
     def to_html(*args)
-      Errors.to_html(errors=self, *args)
+      Errors.to_html(self, *args)
     end
 
     def Errors.to_html(*args, &block)
@@ -239,7 +246,7 @@ module Dao
     end
 
     def Errors.errors_to_html(*args)
-      ::Errors2Html.to_html(*args)
+      Errors2Html.to_html(*args)
     end
 
     def to_s(format = :html, *args, &block)
@@ -254,7 +261,6 @@ module Dao
 
     class KeyPrefixer
       attr_accessor :object
-      attr_accessor :prefix
       attr_accessor :global
 
       def initialize(object)
@@ -299,7 +305,7 @@ module Dao
 
     def Errors.to_hash(*args)
       error = args.shift
-      options = Map.options_for!(args)
+      Map.options_for!(args)
       errors = [error, *args].flatten.compact
 
       map = Map.new

data/lib/dao/errors2html.rb

@@ -0,0 +1,128 @@
+module Dao
+  module Errors2Html
+    class View
+      def View.controller(&block)
+        controller = ::Current.controller ? ::Current.controller.dup : ::Current.mock_controller
+        block ? controller.instance_eval(&block) : controller
+      end
+
+      def View.render(*args)
+        options = args.extract_options!.to_options!
+        args.push(options)
+
+        unless options.has_key?(:layout)
+          options[:layout] = false
+        end
+
+        Array(View.controller{ render(*args) }).join.html_safe
+      end
+    end
+
+    def Errors2Html.to_html(*args)
+      if args.size == 1
+        case args.first
+          when Array, String, Symbol
+            messages = Array(args.first)
+            args = [{:base => messages}]
+        end
+      end
+
+      args.flatten!
+      args.compact!
+
+      at_least_one_error = false
+
+      errors = Map.new
+      errors[:global] = []
+      errors[:fields] = {} 
+
+      args.each do |e|
+        flatten(e).each do |key, messages|
+          Array(messages).each do |message|
+            at_least_one_error = true
+            message = message.to_s.html_safe
+
+            if Array(key).join =~ /\A(?:[*]|base)\Z/iomx
+              errors.global.push(message).uniq!
+            else
+              (errors.fields[key] ||= []).push(message).uniq!
+            end
+          end
+        end
+      end
+
+      return "" unless at_least_one_error
+
+      locals = {
+        :errors => errors,
+        :global_errors => errors.global,
+        :fields_errors => errors.fields
+      }
+
+      if template
+        View.render(:template => template, :locals => locals, :layout => false)
+      else
+        View.render(:inline => inline, :locals => locals, :layout => false)
+      end
+    end
+
+    def Errors2Html.flatten(hashlike)
+      case hashlike
+        when Map
+          hash = Hash.new
+          hashlike.depth_first_each do |key, value|
+            _ = key.pop if key.last.is_a?(Integer)
+            (hash[key] ||= []).push(value)
+          end
+          hash
+        else
+          hashlike.respond_to?(:to_hash) ? hashlike.to_hash : hashlike
+      end
+    end
+
+    Fattr(:inline) do
+      <<-erb
+        <div class="errors2html errors-summary">
+          <h4 class="errors-caption">Sorry, we encountered some errors:</h4>
+
+          <% unless errors.global.empty?  %>
+
+            <ul class="errors-global-list">
+              <% errors.global.each do |message| %>
+                <li class="errors-message">
+                  <%= message %>
+                </li>
+              <% end %>
+            </ul>
+          <% end %>
+
+          <% unless errors.fields.empty?  %>
+
+            <dl class="errors-fields-list">
+              <% 
+                errors.fields.each do |key, messages|
+                  title = Array(key).join(" ").titleize
+              %>
+                <dt class="errors-title">
+                  <%= title %>
+                </dt>
+                <% Array(messages).each do |message| %>
+                  <dd class="errors-message">
+                    <%= message %>
+                  </dd>
+
+                <% end %>
+              <% end %>
+            </dl>
+          <% end %>
+        </div>
+      erb
+    end
+
+    Fattr(:template){ nil }
+  end
+
+  ##
+  #
+    Errors2HTML = Errors2Html
+end

data/lib/dao/form.rb

@@ -12,7 +12,7 @@ module Dao
   # builder stuff for compatibity with rails' form_for()
   #
     class Builder < Form
-      def Builder.new(object_name, object, view, options, block)
+      def Builder.new(object_name, object, view, options, block=:rails_3_4_5)
         if object.respond_to?(:form)
 
           html = options[:html] || {}
@@ -40,7 +40,6 @@ module Dao
   #
     attr_accessor :object
     attr_accessor :unscoped
-    attr_accessor :scope
 
     def initialize(*args)
       @object = args.shift
@@ -173,7 +172,7 @@ module Dao
           if block.nil? and !options.has_key?(:content)
             ''
           else
-            block ? block.call(form=self) : options.delete(:content)
+            block ? block.call(self) : options.delete(:content)
           end
 
         form_(options_for(options, :action => action, :method => method, :class => klass, :id => id, :data_error => error)){ content }
@@ -275,7 +274,7 @@ module Dao
           options[:checked] = checked if checked
         end
 
-        input_(options_for(options, :type => :radio, :name => name, :class => klass, :id => id, :data_error => error)){}
+        input_(options_for(options, :type => type, :name => name, :class => klass, :id => id, :data_error => error)){}
       end
 
       def checkbox(*args, &block)
@@ -303,14 +302,14 @@ module Dao
               values.map{|k, v| h[ k =~ /t|1|on|yes/ ? true : false ] = v}
               h
             else
-              t, f, *ignored = Array(values).flatten.compact
+              t, f, *_ = Array(values).flatten.compact
               {true => t, false => f}
           end
         value_for[true] ||= '1'
         value_for[false] ||= '0'
 
         hidden_options =
-          options.dup.tap{|o| o.delete(:checked)}
+          options.dup.tap{|o| [:checked, :required, :disabled].each{|k| o.delete(k)}}
 
         tagz{
           input_(options_for(hidden_options, :type => :hidden, :name => name, :value => value_for[false])){}
@@ -320,7 +319,7 @@ module Dao
           input_(
             options_for(
               options,
-              :type => :checkbox,
+              :type => type,
               :name => name,
               :value => value_for[true],
               :class => klass,
@@ -367,7 +366,7 @@ module Dao
       end
 
       def select(*args, &block)
-        options = args.extract_options!.to_options! 
+        options = args.extract_options!.to_options!
         keys = scope(args)
 
         name = options.delete(:name) || name_for(keys)
@@ -381,7 +380,7 @@ module Dao
         error = error_for(keys, options.delete(:error))
 
         if values.nil?
-          key = keys.map{|key| "#{ key }"}
+          key = keys.map{|k| "#{k}"}
           key.last << "_options"
           values = attributes.get(*key) if attributes.has?(*key)
         end
@@ -442,7 +441,7 @@ module Dao
 
               case returned
                 when Array
-                  content, value, selected, *ignored = returned
+                  content, value, selected, *_ = returned
                   if value.is_a?(Hash)
                     map = Map.for(value)
                     value = map.delete(:value)
@@ -506,7 +505,7 @@ module Dao
   # html generation support methods
   #
     def id_for(keys)
-      id = [name, keys.join('-')].compact.join('_')
+      id = [name, keys.join('-')].compact.join('--')
       slug_for(id)
     end
 
@@ -641,7 +640,7 @@ module Dao
     end
 
     def attr_for(string)
-      slug_for(string).gsub(/_/, '-')
+      slug_for(string)
     end
 
     def data_attr_for(string)
@@ -650,10 +649,8 @@ module Dao
 
     def slug_for(string)
       string = string.to_s
-      words = string.to_s.scan(%r/\w+/)
-      words.map!{|word| word.gsub(%r/[^0-9a-zA-Z_:-]/, '')}
-      words.delete_if{|word| word.nil? or word.strip.empty?}
-      words.join('-').downcase.sub(/_+$/, '')
+      words = string.scan(%r/[^\s]+/)
+      words.join('--').downcase
     end
 
     def titleize(string)

data/lib/dao/messages.rb

@@ -57,10 +57,6 @@ module Dao
       Messages.to_html(self)
     end
 
-    def to_s(*args)
-      to_html(*args)
-    end
-
     def Messages.to_text(*args)
       to_text = []
       Messages.each(*args) do |message|

data/lib/dao/path.rb

@@ -21,7 +21,7 @@ module Dao
         path.squeeze!('/')
         path.sub!(%r|^/|, '')
         path.sub!(%r|/$|, '')
-        paths = path.split('/')
+        path.split('/')
       end
 
       def absolute_path_for(arg, *args)

data/lib/dao/route.rb

@@ -54,7 +54,7 @@ module Dao
     end
 
     def match(path)
-      match = pattern.match(path).to_a
+      pattern.match(path).to_a
     end
 
     def params_for(path)
@@ -62,7 +62,7 @@ module Dao
 
       unless match.empty?
         map = Map.new
-        ignored = match.shift
+        _ = match.shift
         @keys.each_with_index do |key, index|
           map[key] = match[index]
         end

data/lib/dao/status.rb

@@ -181,7 +181,6 @@ module Dao
           arg = args.shift
           case arg
             when Result
-              result = arg
               if arg.errors.nil? or arg.errors.empty? or arg.valid?
                 new(200)
               else
@@ -189,7 +188,7 @@ module Dao
               end
             when Status
               arg
-            when Fixnum
+            when Integer
               code = arg
               message = Code2Message[code]
               new(code, message)
@@ -276,7 +275,7 @@ module Dao
     end
 
     Groups.each do |code, group|
-      module_eval <<-__, __FILE__, __LINE__ -1
+      module_eval(<<-__, __FILE__, __LINE__ - 1)
         def Status.#{ group }
           @status_group_#{ group } ||= Status.for(#{ code })
         end
@@ -316,7 +315,7 @@ module Dao
     end
 
     def clone
-      clone = Status.for(code)
+      Status.for(code)
     end
 
     def to_json(*args, &block)

data/lib/dao/support.rb

@@ -120,6 +120,9 @@ module Dao
 
         paths_and_values.each do |path, value|
           keys = keys_for(path)
+          if map.has?(keys)
+            inc_keys!(keys)
+          end
           map.set(keys => value)
         end
 
@@ -141,9 +144,24 @@ module Dao
       digity ? stringy ? String(digits) : Integer(digits) : key
     end
   end
-
   alias_method(:key_for, :keys_for)
 
+  def inc_keys!(keys)
+    last_number_index = nil
+
+    keys.each_with_index do |k, i|
+      if k.is_a?(Numeric)
+        last_number_index = i
+      end
+    end
+
+    if last_number_index
+      keys[last_number_index] = keys[last_number_index] + 1
+    end
+
+    keys
+  end
+
   def render_json(object, options = {})
     options = options.to_options!
     controller = options[:controller] || Dao.current_controller
@@ -165,12 +183,13 @@ module Dao
   def json_for(object, options = {})
     object = object.as_json if object.respond_to?(:as_json)
 
-    options = options.empty? ? Map.for(options) : options
-    options[:pretty] = json_pretty?  unless options.has_key?(:pretty)
+    pretty = (options.delete(:pretty) || json_pretty?)
+
+    generate = pretty ? :pretty_generate : :generate
 
     begin
-      MultiJson.dump(object, options)
-    rescue Object => e
+      JSON.send(generate, object, options)
+    rescue Object => _
       YAML.load( object.to_yaml ).to_json
     end
   end
@@ -213,21 +232,9 @@ module Dao
     end
   end
 
-
-  {
-    'ffi-uuid'  => proc{|*args| FFI::UUID.generate_time.to_s},
-    'uuidtools' => proc{|*args| UUIDTools::UUID.timestamp_create.to_s},
-    'uuid'      => proc{|*args| UUID.generate.to_s},
-  }.each do |lib, implementation|
-    begin
-      require(lib)
-      define_method(:uuid, &implementation)
-      break
-    rescue LoadError
-      nil
-    end
+  def uuid
+    SecureRandom.uuid
   end
-  abort 'no suitable uuid generation library detected' unless method_defined?(:uuid)
 
   def ensure_interface!(object, *interface)
     interface.flatten.compact.each do |method|