dao 5.6.1 → 7.0.0

data/lib/dao/_lib.rb

@@ -0,0 +1,46 @@
+module Dao
+  Version = '7.0.0' unless defined?(Version)
+
+  def version
+    Dao::Version
+  end
+
+  def dependencies
+    {
+      'rails'             => [ 'rails'             , ' ~> 5.2' ] ,
+      'map'               => [ 'map'               , ' ~> 6.0' ] ,
+      'fattr'             => [ 'fattr'             , ' ~> 2.2' ] ,
+      'coerce'            => [ 'coerce'            , ' ~> 0.0' ] ,
+      'tagz'              => [ 'tagz'              , ' ~> 9.9' ] ,
+      'multi_json'        => [ 'multi_json'        , ' ~> 1.0' ] ,
+      'uuidtools'         => [ 'uuidtools'         , ' ~> 2.1' ] ,
+      'wrap'              => [ 'wrap'              , ' ~> 1.5' ] ,
+      'rails_current'     => [ 'rails_current'     , ' ~> 2.0' ] ,
+    }
+  end
+
+  def description
+    "presenter, conductor, api, and better form objects for you rails' pleasure"
+  end
+
+  def libdir(*args, &block)
+    @libdir ||= File.dirname(File.expand_path(__FILE__).sub(/\.rb$/,''))
+    args.empty? ? @libdir : File.join(@libdir, *args)
+  ensure
+    if block
+      begin
+        $LOAD_PATH.unshift(@libdir)
+        block.call()
+      ensure
+        $LOAD_PATH.shift()
+      end
+    end
+  end
+
+  def load(*libs)
+    libs = libs.join(' ').scan(/[^\s+]+/)
+    Dao.libdir{ libs.each{|lib| Kernel.load(lib) } }
+  end
+
+  extend Dao
+end

data/lib/dao/active_record.rb

@@ -12,10 +12,10 @@ if defined?(ActiveRecord)
     class Base
       def Base.to_dao(*args)
         if args.first.is_a?(Base)
-          record_to_dao(record = args.shift, *args)
+          record_to_dao(args.shift, *args)
         else
           @to_dao ||= (
-            names = column_names ### + reflect_on_all_associations.map(&:name)
+            column_names ### + reflect_on_all_associations.map(&:name)
           )
           @to_dao = Array(args) unless args.empty?
           @to_dao
@@ -101,10 +101,10 @@ if defined?(ActiveRecord)
           end
 
           if attr.is_a?(Hash)
-            attr.each do |related, argv|
-              v = record.send(related)
-              value = v.respond_to?(:to_dao) ? v.to_dao(*argv) : v
-              map[related] = value
+            attr.each do |rel, _argv|
+              v = record.send(rel)
+              value = v.respond_to?(:to_dao) ? v.to_dao(*_argv) : v
+              map[rel] = value
             end
             next
           end

data/lib/dao/api/call.rb

@@ -13,13 +13,14 @@ module Dao
           :endpoints => Map.new,
           :blocks => {},
           :README => [],
-          :docs => []
+          :docs => [],
+          :paths => [],
         }
       end
 
       def call(*args, &block)
         options = Dao.options_for!(args)
-        path = Path.new(args.shift || raise(ArgumentError, "no path!"))
+        path = Path.new(args.shift || paths.shift || raise(ArgumentError, "no path!"))
 
         api = self
 
@@ -44,7 +45,12 @@ module Dao
 
         endpoints[path] = endpoint
       end
-      alias_method('endpoint', 'call')
+
+      def endpoint(path, &block)
+        paths << path.to_s
+        class_eval(&block)
+      end
+      #alias_method('endpoint', 'call')
 
       def endpoints
         state[:endpoints]
@@ -71,6 +77,10 @@ module Dao
         state[:docs]
       end
 
+      def paths
+        state[:paths]
+      end
+
       def readme(*args)
         if args.empty?
           state[:README]
@@ -233,6 +243,7 @@ module Dao
   # delgate some methods to the context
   #
     Context.attrs.each do |method|
+      next if %w[ status status! data data! index endpoints respond_to? parameter parameter! ].include?(method.to_s)
       module_eval <<-__, __FILE__, __LINE__
         def #{ method }(*args)
           context.send(#{ method.inspect }, *args)

data/lib/dao/api/dsl.rb

@@ -33,7 +33,7 @@ module Dao
 
     class << Api
       def evaluate(&block)
-        @dsl ||= DSL.new(api=self)
+        @dsl ||= DSL.new(self)
         @dsl.evaluate(&block)
       end
       alias_method('configure', 'evaluate')

data/lib/dao/conducer.rb

@@ -117,7 +117,7 @@ module Dao
             controller.send(:action_name).to_s
         end
 
-      conducer = new(Action.new(action), *args, &block)
+      new(Action.new(action), *args, &block)
     end
 
     def Conducer.call(*args, &block)
@@ -243,7 +243,7 @@ module Dao
     end
 
     def conduces?(model)
-      if @model
+      if defined?(@model)
         @model == model
       else
         self.class.conduces?(model)
@@ -348,8 +348,8 @@ module Dao
     def method_missing(method, *args, &block)
       re = /^([^=!?]+)([=!?])?$/imox
 
-      matched, key, suffix = re.match(method.to_s).to_a
-      
+      _, key, suffix = re.match(method.to_s).to_a
+
       case suffix
         when '='
           set(key, args.first)

data/lib/dao/conducer/view_support.rb

@@ -10,9 +10,7 @@ module Dao
         def install_routes!
           url_helpers = Rails.application.try(:routes).try(:url_helpers)
           include(url_helpers) if url_helpers
-          include(ActionView::Helpers) if defined?(ActionView::Helpers)
           extend(url_helpers) if url_helpers
-          extend(ActionView::Helpers) if defined?(ActionView::Helpers)
         end
       end
     end

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
 
@@ -176,7 +176,7 @@ module Dao
       full_messages = []
 
       depth_first_each do |keys, value|
-        index = keys.pop
+        _ = keys.pop
         key = keys
         value = value.to_s
 
@@ -194,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
@@ -204,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
@@ -219,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
@@ -235,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)
@@ -247,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)
@@ -262,7 +261,6 @@ module Dao
 
     class KeyPrefixer
       attr_accessor :object
-      attr_accessor :prefix
       attr_accessor :global
 
       def initialize(object)
@@ -307,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|
+            index = 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,7 +302,7 @@ 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'
@@ -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)