dao 5.2.1 → 5.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmZkMGJlMTI0MmUwZDM0OTBlMDY4YWU2NTI1OTc0MDU1YTQwOGI5Ng==
+    MGViMmUzODVjMzE1ZTRhMjM4MjAyZjYxZTZhOGFkY2U1ODdmYjQ3Ng==
   data.tar.gz: !binary |-
-    M2NlYjJiYjUxNzhmMGFiY2U0OTc2MWMxZmY0YTViOTRiZDRiN2FiZA==
+    ZmFhNzhhNDJmYjFkNWEzOTNlZmNhNDg5ZTQ1MmE5YTYzMzNlMjcyZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjBjYzI3MGUxNGZmZTZlMjgwMmRhN2YwMjBjYTNjMzEzMTg5MTliNzQ3ZWUy
-    YzA3MTE5Njc0MzM4ZTQxMGU4YzBmYjBiMGZlODU1NTAxYmU5MDQwZDJmOGEx
-    YTRjYWFhZjI4YmYzMDAxZWEwMTI1Y2IxMjg5ZDdiY2MxYmY2NzQ=
+    YjQ1NmU2NTYzZTFjMDgzZDFkMjE5NGZjMDZjODBjOGNkNDU4Y2NlZTJmMDY0
+    MWE0MDcxYjE5ZWJhYzE4ZDAxNjY3Nzc0Mjc5OWUzMjgzMWZlNTQzZWJkNTQ4
+    NTJiMWMwMzdiZjNmNjliZjNhMjI1NjdkZjdmMDRiMTFmZDUwYzc=
   data.tar.gz: !binary |-
-    NmUyYjZjZjFkNWJjOGViNDdiZmI2NzFkZDc5MDJhZDEwYzU4YmNjYWMzMjA1
-    MTc4NmUyMjdmNjdlOWU1MmUyOGFlMWVmOGE0ZjQ5MGEwYTBhZTc3ZmE5YjZj
-    NWIyZThkMTIyYjc2OTQxZmJmMjM4ODVkZWIyYWQ0MDkzNWU5MDE=
+    NGUyYmFjNTk5ZDU2YTUxMjE0OGI3YWUxNzlkZDJkYzQyODVlMjNiMTU1OWUx
+    MTJhN2ZjNTI5ZTk0MTM1NWUzMzAxM2RhMWQxYzJhYzU2ZTQ3MDY0MDU5MzNm
+    ZWE3ODg2ZWFlMjRjMTA3ZWM0OGVhNDg0MmQ2MTQ4ZTViYjg2MGY=

data/Gemfile.lock

@@ -90,7 +90,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    tagz (9.8.0)
+    tagz (9.9.1)
     thor (0.18.1)
     tilt (1.4.1)
     treetop (1.4.14)

data/dao.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "dao"
-  spec.version = "5.2.1"
+  spec.version = "5.3.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "dao"
   spec.description = "description: dao kicks the ass"
@@ -45,6 +45,7 @@ Gem::Specification::new do |spec|
  "lib/dao/extractor.rb",
  "lib/dao/form.rb",
  "lib/dao/instance_exec.rb",
+ "lib/dao/messages.rb",
  "lib/dao/mode.rb",
  "lib/dao/mongo_mapper.rb",
  "lib/dao/name.rb",
@@ -112,7 +113,7 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["coerce", " >= 0.0.3"])
   
-    spec.add_dependency(*["tagz", " >= 9.9.1"])
+    spec.add_dependency(*["tagz", " >= 9.9.2"])
   
     spec.add_dependency(*["multi_json", " >= 1.0.3"])
   
@@ -120,7 +121,7 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["wrap", " >= 1.5.0"])
   
-    spec.add_dependency(*["rails_current", " >= 1.7.0"])
+    spec.add_dependency(*["rails_current", " >= 1.8.0"])
   
     spec.add_dependency(*["rails_errors2html", " >= 1.3.0"])
   

data/lib/dao.rb

@@ -11,7 +11,7 @@
 # dao libs
 #
   module Dao
-    Version = '5.2.1' unless defined?(Version)
+    Version = '5.3.0' unless defined?(Version)
 
     def version
       Dao::Version
@@ -23,11 +23,11 @@
         'map'               => [ 'map'               , ' >= 6.0.0' ] ,
         'fattr'             => [ 'fattr'             , ' >= 2.2'   ] ,
         'coerce'            => [ 'coerce'            , ' >= 0.0.3' ] ,
-        'tagz'              => [ 'tagz'              , ' >= 9.9.1' ] ,
+        'tagz'              => [ 'tagz'              , ' >= 9.9.2' ] ,
         'multi_json'        => [ 'multi_json'        , ' >= 1.0.3' ] ,
         'uuidtools'         => [ 'uuidtools'         , ' >= 2.1.2' ] ,
         'wrap'              => [ 'wrap'              , ' >= 1.5.0' ] ,
-        'rails_current'     => [ 'rails_current'     , ' >= 1.7.0' ] ,
+        'rails_current'     => [ 'rails_current'     , ' >= 1.8.0' ] ,
         'rails_errors2html' => [ 'rails_errors2html' , ' >= 1.3.0' ] ,
       }
     end
@@ -94,6 +94,7 @@
     status.rb
     path_map.rb
     errors.rb
+    messages.rb
     form.rb
     validations.rb
     data.rb

data/lib/dao/conducer.rb

@@ -90,6 +90,7 @@ module Dao
       form
       params
       errors
+      messages
       models
       model
       conduces
@@ -150,6 +151,7 @@ module Dao
 
       @params = Map.new
       @attributes = Attributes.for(self)
+      @messages = Messages.for(self)
 
       @form = Form.for(self)
       @form.name = self.class.model_name.singular.sub(/_+$/, '')
@@ -524,4 +526,5 @@ module Dao
   Resource = Conducer
   Presenter = Conducer
   Conductor = Conducer
+  Model = Conducer
 end

data/lib/dao/conducer/active_model.rb

@@ -24,10 +24,12 @@ module Dao
         return send('model_name=', args.first.to_s) unless args.empty?
         @model_name ||= default_model_name
       end
+      alias_method('resource_name', 'model_name')
 
       def model_name=(model_name)
         @model_name = model_name_for(model_name)
       end
+      alias_method('resource_name=', 'model_name=')
 
       def model_name_for(model_name)
         ActiveModel::Name.new(Map[:name, model_name])

data/lib/dao/errors.rb

@@ -262,7 +262,7 @@ module Dao
 
         @prefix =
           if @object && @object.respond_to?(:model_name)
-            @object.model_name.underscore
+            @object.model_name.to_s.underscore
           else
             nil
           end

data/lib/dao/form.rb

@@ -46,26 +46,21 @@ module Dao
 
     fattr(:attributes) do
       attributes =
-        catch(:attributes) do
-          if @object.respond_to?(:attributes)
-            throw :attributes, @object.attributes
-          end
-          if @object.instance_variable_defined?('@attributes')
-            throw :attributes, @object.instance_variable_get('@attributes')
-          end
-          if @object.is_a?(Map)
-            throw :attributes, @object
-          end
-          if @object.respond_to?(:to_map)
-            throw :attributes, Map.new(@object.to_map)
-          end
-          if @object.is_a?(Hash)
-            throw :attributes, Map.new(@object)
-          end
-          if @object.respond_to?(:to_hash)
-            throw :attributes, Map.new(@object.to_hash)
-          end
-          Map.new
+        case
+          when @object.respond_to?(:attributes)
+            @object.attributes
+          when @object.instance_variable_defined?('@attributes')
+            @object.instance_variable_get('@attributes')
+          when @object.is_a?(Map)
+            @object
+          when @object.respond_to?(:to_map)
+            Map.new(@object.to_map)
+          when @object.is_a?(Hash)
+            Map.new(@object)
+          when @object.respond_to?(:to_hash)
+            Map.new(@object.to_hash)
+          else
+            Map.new
         end
 
       case attributes
@@ -103,14 +98,13 @@ module Dao
 
     fattr(:errors) do
       errors =
-        catch(:errors) do
-          if @object.respond_to?(:errors)
-            throw :errors, @object.errors
-          end
-          if @object.instance_variable_defined?('@errors')
-            throw :errors, @object.instance_variable_get('@errors')
-          end
-          Errors.new
+        case
+          when @object.respond_to?(:errors)
+            @object.errors
+          when @object.instance_variable_defined?('@errors')
+            @object.instance_variable_get('@errors')
+          else
+            Errors.new
         end
 
       case errors
@@ -121,6 +115,25 @@ module Dao
       end
     end
 
+    fattr(:messages) do
+      messages =
+        case
+          when @object.respond_to?(:messages)
+            @object.messages
+          when @object.instance_variable_defined?('@messages')
+            @object.instance_variable_get('@messages')
+          else
+            Messages.new
+        end
+
+      case messages
+        when Messages
+          messages
+        else
+          raise(ArgumentError.new("#{ messages.inspect } (#{ messages.class })"))
+      end
+    end
+
   # support for rails' forms...
   #
     fattr(:multipart){ true }
@@ -202,10 +215,14 @@ module Dao
 
     def submit(*args, &block)
       options = args.extract_options!.to_options! 
+      keys = args.flatten
+
+      keys.push(:submit) if keys.empty?
+      name = options.delete(:name) || name_for(keys)
 
       content = block ? block.call : (args.first || 'Submit')
 
-      options[:name] ||= :submit
+      options[:name] ||= name
       options[:type] ||= :submit
       options[:value] ||= content
 
@@ -266,7 +283,7 @@ module Dao
       id = options.delete(:id) || id_for(keys)
       klass = class_for(keys, options.delete(:class))
       error = error_for(keys, options.delete(:error))
-      values = options.delete(:values) || options.delete(:checked)
+      values = options.delete(:values)
 
       unless options.has_key?(:checked)
         checked = Coerce.boolean(attributes.get(keys))

data/lib/dao/messages.rb

@@ -0,0 +1,107 @@
+# -*- encoding : utf-8 -*-
+module Dao
+  class Messages < ::Array
+    include Tagz.globally
+
+    class << Messages
+      include Tagz.globally
+    end
+
+    class Message < ::String
+      attr_accessor(:type)
+
+      def initialize(string, type = nil)
+        super("#{ string }")
+      ensure
+        @type = type ? "#{ type }" : nil
+      end
+    end
+
+    attr_accessor :object
+
+    def initialize(*args)
+      @object = args.shift
+    end
+
+    def Messages.for(object)
+      new(object)
+    end
+
+    def Messages.to_html(*args, &block)
+      if block
+        define_method(:to_html, &block)
+      else
+        at_least_one = false
+
+        html =
+          div_(:class => "dao dao-messages"){
+            Messages.each(*args) do |message|
+              at_least_one = true
+              slug = Slug.for(message.type)
+
+              div_(:class => "dao dao-message alert alert-block alert-#{ slug }"){
+                tagz << Tagz.html_safe(message) << ' '
+
+                a_(:href => "#", :class => "close", :data_dismiss => "alert", :onClick => "javascript:$(this).closest('div').remove();false;"){
+                  Tagz.html_safe('&times;')
+                }
+              }
+            end
+          }
+
+        at_least_one ? html : ''
+      end
+    end
+
+    def to_html(*args)
+      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|
+        to_text.push([message.type, message].compact.join(': '))
+      end
+      to_text.join("\n")
+    end
+
+    def to_text
+      Messages.to_text(self)
+    end
+
+    def Messages.each(*args, &block)
+      args.flatten.compact.each do |arg|
+        message = arg.is_a?(Message) ? arg : Message.new(arg)
+        block.call(message)
+      end
+    end
+
+    def to_s(format = :html, *args, &block)
+      case format.to_s
+        when /html/
+          to_html(*args, &block)
+        when /text/
+          to_text(*args, &block)
+      end
+    end
+
+    def add(message, type = nil)
+      push(Message.new(message, type))
+      self
+    end
+
+    def method_missing(method, *args, &block)
+      if block.nil?
+        type = method.to_s
+        message = args.join
+        add(message, type)
+      else
+        super
+      end
+    end
+  end
+end

data/lib/dao/rails/lib/generators/dao/templates/dao.js

@@ -18,103 +18,12 @@ if(!window.Dao){
     };
     Dao.Api.route = '/api';
     Dao.Api.modes = ["options", "get", "head", "post", "put", "delete", "trace", "connect"];
-
-  // single call interface
-  //
-    Dao.Api.prototype.call = function(){
-      var api = this;
-      var options = {};
-
-      if(arguments.length == 1){
-        var arg = arguments[0];
-
-        if(typeof(arg)=='string'){
-          options.path = arg;
-        } else {
-          options = arg;
-        }
-      }
-
-      if(arguments.length > 1){
-        options.path = arguments[0];
-
-        if(typeof(arguments[1])=='function'){
-          options.success = arguments[1];
-          options.params = arguments[2];
-        } else {
-          options.params = arguments[1];
-          options.success = arguments[2];
-        }
-      }
-
-      if(!options.path){
-        options.path = '/ping';
-      }
-
-      if(!options.params){
-        options.params = {};
-      }
-
-      var url = api.route + options.path;
-      var data = options.params;
-
-      if(options.success){
-
-        var returned = api;
-        var success = function(result){
-          var result = new Dao.Result(result);
-          options.success(result);
-        };
-
-        var ajax = {'url' : url, 'data' : data, 'success' : success, 'async' : true};
-
-        Dao[api.mode](ajax);
-        return(returned);
-
-      } else {
-
-        var returned = null;
-        var success = function(result){
-          returned = new Dao.Result(result);
-        };
-
-        var ajax = {'url' : url, 'data' : data, 'success' : success, 'async' : false};
-
-        Dao[api.mode](ajax);
-        return(returned);
-
-      };
-    };
-    Dao.Api.modes = ["options", "get", "head", "post", "put", "delete", "trace", "connect"];
     Dao.Api.result = null;
     Dao.Api.results = [];
     Dao.Api.defaults = {};
     Dao.Api.defaults.type = 'get';
     Dao.Api.defaults.url = '/';
 
-  // meta-program Dao.Api.get(...), Dao.ajax.post(...)
-  //
-    for(var i = 0; i < Dao.Api.modes.length; i++){
-      (function(){
-        var mode = Dao.Api.modes[i];
-
-        Dao.Api.prototype[mode] = function(){
-          var args = Array.prototype.slice.call(arguments);
-          var api = this;
-          var default_type = Dao.Api.defaults.type;
-          Dao.Api.defaults.type = mode.toUpperCase();
-          var result = api.apply(api, args);
-          Dao.Api.defaults.type = default_type;
-          return(result);
-        };
-      })();
-    }
-
-  // short-cuts for read and write
-  // 
-    Dao.Api.prototype['read'] = Dao.Api.prototype['get'];
-    Dao.Api.prototype['write'] = Dao.Api.prototype['post'];
-
   // a thin wrapper on results for now.  TODO - make it smarter
   //
     Dao.Result = function(options){
@@ -162,6 +71,90 @@ if(!window.Dao){
       })();
     }
 
+  // http method generator
+  //
+    Dao.Api.generate_method = function(mode){
+      var method = Dao[mode];
+
+      return function(){
+        var api = this;
+        var options = {};
+
+        if(arguments.length == 1){
+          var arg = arguments[0];
+
+          if(typeof(arg)=='string'){
+            options.path = arg;
+          } else {
+            options = arg;
+          }
+        }
+
+        if(arguments.length > 1){
+          options.path = arguments[0];
+
+          if(typeof(arguments[1])=='function'){
+            options.success = arguments[1];
+            options.params = arguments[2];
+          } else {
+            options.params = arguments[1];
+            options.success = arguments[2];
+          }
+        }
+
+        if(!options.path){
+          options.path = '/ping';
+        }
+
+        if(!options.params){
+          options.params = {};
+        }
+
+        var url = api.route + options.path;
+        var data = options.params;
+
+        if(options.success){
+
+          var returned = api;
+          var success = function(result){
+            var result = new Dao.Result(result);
+            options.success(result);
+          };
+
+          var ajax = {'url' : url, 'data' : data, 'success' : success, 'async' : true};
+
+          method(ajax);
+          return(returned);
+
+        } else {
+
+          var returned = null;
+          var success = function(result){
+            returned = new Dao.Result(result);
+          };
+
+          var ajax = {'url' : url, 'data' : data, 'success' : success, 'async' : false};
+
+          method(ajax);
+          return(returned);
+        };
+      };
+    };
+
+
+  // meta-program Dao.Api.get(...), Dao.ajax.post(...)
+  //
+    for(var i = 0; i < Dao.Api.modes.length; i++){
+      (function(){
+        var mode = Dao.Api.modes[i];
+        Dao.Api.prototype[mode] = Dao.Api.generate_method(mode);
+      })();
+    }
+    Dao.Api.prototype['call'] = Dao.Api.prototype['get'];
+    Dao.Api.prototype['read'] = Dao.Api.prototype['get'];
+    Dao.Api.prototype['write'] = Dao.Api.prototype['post'];
+
+
     Dao.api = new Dao.Api();
     window.api = window.api || Dao.api;
   }());

data/lib/dao/validations/validator.rb

@@ -67,26 +67,21 @@ module Dao
 
       def extract_attributes!(object = @object)
         attributes =
-          catch(:attributes) do
-            if object.respond_to?(:attributes)
-              throw :attributes, object.attributes
-            end
-            if object.instance_variable_defined?('@attributes')
-              throw :attributes, object.instance_variable_get('@attributes')
-            end
-            if object.is_a?(Map)
-              throw :attributes, object
-            end
-            if object.respond_to?(:to_map)
-              throw :attributes, Map.new(object.to_map)
-            end
-            if object.is_a?(Hash)
-              throw :attributes, Map.new(object)
-            end
-            if object.respond_to?(:to_hash)
-              throw :attributes, Map.new(object.to_hash)
-            end
-            raise ArgumentError.new("found no attributes on #{ object.inspect }(#{ object.class.name })")
+          case
+            when object.respond_to?(:attributes)
+              object.attributes
+            when object.instance_variable_defined?('@attributes')
+              object.instance_variable_get('@attributes')
+            when object.is_a?(Map)
+              object
+            when object.respond_to?(:to_map)
+              Map.new(object.to_map)
+            when object.is_a?(Hash)
+              Map.new(object)
+            when object.respond_to?(:to_hash)
+              Map.new(object.to_hash)
+            else
+              raise ArgumentError.new("found no attributes on #{ object.inspect }(#{ object.class.name })")
           end
 
         @attributes =

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dao
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.3.0
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 9.9.1
+        version: 9.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 9.9.1
+        version: 9.9.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rails_errors2html
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +188,7 @@ files:
 - lib/dao/extractor.rb
 - lib/dao/form.rb
 - lib/dao/instance_exec.rb
+- lib/dao/messages.rb
 - lib/dao/mode.rb
 - lib/dao/mongo_mapper.rb
 - lib/dao/name.rb