dao 2.1.0 → 2.2.3

data/README

@@ -105,6 +105,7 @@ READING
   http://www.codefutures.com/data-access-object/
   http://java.sun.com/blueprints/corej2eepatterns/Patterns/DataAccessObject.html
   http://www.paperplanes.de/2010/5/7/activerecord_callbacks_ruined_my_life.html
+  http://google-styleguide.googlecode.com/svn/trunk/jsoncstyleguide.xml
 
 INSTALL
   gem 'dao', :path => File.expand_path('..') ### Gemfile

data/TODO

@@ -0,0 +1,39 @@
+todo:
+
+- auto apply?
+
+- pre-condition and parameter code
+
+
+- class level nested AR conversions
+    to_dao(:a, :b => [:foo, :bar])
+
+
+
+done:
+    - engine-ify the rails stuff?  or what
+      - generator api
+      - controller
+      - helper
+      - json/pretty fix baked in? (yajl might simply this...)
+  - description/doc logic
+  - api.index
+  - to_alpo -> to_dao
+  - tests!
+  - #call auto parses data iff appropriate
+      @result = api.read.call('/posts/new(', params)  ### check keys for '/posts/new'
+  - re-visit how parameters are parsed, perhaps we just use rack?
+  - next 'data' => {}
+  - check the db layer
+  - make sure one can call route based method (/foo/:bar) methods with params...
+  - Path==Route ??
+  - add result.rb, params.rb
+  - name -> path
+  - tagz for html methods?
+  - data aquires the name/path of the method?
+  - interfaces are objects that respond to call.  namespaces respond to call.
+    api responds to call
+  - nested namespaces
+  - routing for path_info + mode 
+      route(path_info, :mode => mode, :params => params)
+  - call() on namespaces AND interfaces... why?

data/dao.gemspec

@@ -3,12 +3,12 @@
 
 Gem::Specification::new do |spec|
   spec.name = "dao" 
-  spec.version = "2.1.0"
+  spec.version = "2.2.3"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "dao"
   spec.description = "description: dao kicks the ass"
 
-  spec.files = ["dao.gemspec", "lib", "lib/dao", "lib/dao/active_record.rb", "lib/dao/api", "lib/dao/api/context.rb", "lib/dao/api/dsl.rb", "lib/dao/api/endpoints.rb", "lib/dao/api/initializers.rb", "lib/dao/api/interfaces.rb", "lib/dao/api/modes.rb", "lib/dao/api.rb", "lib/dao/blankslate.rb", "lib/dao/data.rb", "lib/dao/db.rb", "lib/dao/endpoint.rb", "lib/dao/engine.rb", "lib/dao/errors.rb", "lib/dao/exceptions.rb", "lib/dao/form.rb", "lib/dao/instance_exec.rb", "lib/dao/interface.rb", "lib/dao/mode.rb", "lib/dao/mongo_mapper.rb", "lib/dao/params.rb", "lib/dao/path.rb", "lib/dao/rails", "lib/dao/rails/app", "lib/dao/rails/app/api.rb", "lib/dao/rails/app/controllers", "lib/dao/rails/app/controllers/api_controller.rb", "lib/dao/rails/engine", "lib/dao/rails/lib", "lib/dao/rails/lib/generators", "lib/dao/rails/lib/generators/dao", "lib/dao/rails/lib/generators/dao/api_generator.rb", "lib/dao/rails/lib/generators/dao/dao_generator.rb", "lib/dao/rails/lib/generators/dao/templates", "lib/dao/rails/lib/generators/dao/templates/api.rb", "lib/dao/rails/lib/generators/dao/templates/api_controller.rb", "lib/dao/rails/lib/generators/dao/templates/dao.css", "lib/dao/rails/lib/generators/dao/templates/dao.js", "lib/dao/rails/lib/generators/dao/templates/dao_helper.rb", "lib/dao/rails/lib/generators/dao/USAGE", "lib/dao/rails.rb", "lib/dao/result.rb", "lib/dao/slug.rb", "lib/dao/status.rb", "lib/dao/stdext.rb", "lib/dao/support.rb", "lib/dao/validations.rb", "lib/dao.rb", "Rakefile", "README", "sample", "sample/rails_app", "sample/rails_app/app", "sample/rails_app/app/api.rb", "sample/rails_app/app/controllers", "sample/rails_app/app/controllers/api_controller.rb", "sample/rails_app/app/controllers/application_controller.rb", "sample/rails_app/app/helpers", "sample/rails_app/app/helpers/application_helper.rb", "sample/rails_app/app/mailers", "sample/rails_app/app/models", "sample/rails_app/app/views", "sample/rails_app/app/views/layouts", "sample/rails_app/app/views/layouts/application.html.erb", "sample/rails_app/config", "sample/rails_app/config/application.rb", "sample/rails_app/config/boot.rb", "sample/rails_app/config/database.yml", "sample/rails_app/config/environment.rb", "sample/rails_app/config/environments", "sample/rails_app/config/environments/development.rb", "sample/rails_app/config/environments/production.rb", "sample/rails_app/config/environments/test.rb", "sample/rails_app/config/initializers", "sample/rails_app/config/initializers/backtrace_silencers.rb", "sample/rails_app/config/initializers/inflections.rb", "sample/rails_app/config/initializers/mime_types.rb", "sample/rails_app/config/initializers/secret_token.rb", "sample/rails_app/config/initializers/session_store.rb", "sample/rails_app/config/locales", "sample/rails_app/config/locales/en.yml", "sample/rails_app/config/routes.rb", "sample/rails_app/config.ru", "sample/rails_app/db", "sample/rails_app/db/development.sqlite3", "sample/rails_app/db/seeds.rb", "sample/rails_app/doc", "sample/rails_app/doc/README_FOR_APP", "sample/rails_app/Gemfile", "sample/rails_app/Gemfile.lock", "sample/rails_app/lib", "sample/rails_app/lib/tasks", "sample/rails_app/log", "sample/rails_app/log/development.log", "sample/rails_app/log/production.log", "sample/rails_app/log/server.log", "sample/rails_app/log/test.log", "sample/rails_app/pubic", "sample/rails_app/pubic/javascripts", "sample/rails_app/pubic/javascripts/dao.js", "sample/rails_app/public", "sample/rails_app/public/404.html", "sample/rails_app/public/422.html", "sample/rails_app/public/500.html", "sample/rails_app/public/favicon.ico", "sample/rails_app/public/images", "sample/rails_app/public/images/rails.png", "sample/rails_app/public/index.html", "sample/rails_app/public/javascripts", "sample/rails_app/public/javascripts/application.js", "sample/rails_app/public/javascripts/controls.js", "sample/rails_app/public/javascripts/dragdrop.js", "sample/rails_app/public/javascripts/effects.js", "sample/rails_app/public/javascripts/prototype.js", "sample/rails_app/public/javascripts/rails.js", "sample/rails_app/public/robots.txt", "sample/rails_app/public/stylesheets", "sample/rails_app/Rakefile", "sample/rails_app/README", "sample/rails_app/script", "sample/rails_app/script/rails", "sample/rails_app/test", "sample/rails_app/test/fixtures", "sample/rails_app/test/functional", "sample/rails_app/test/integration", "sample/rails_app/test/performance", "sample/rails_app/test/performance/browsing_test.rb", "sample/rails_app/test/test_helper.rb", "sample/rails_app/test/unit", "sample/rails_app/tmp/cache", "sample/rails_app/tmp/pids", "sample/rails_app/tmp/sessions", "sample/rails_app/tmp/sockets", "sample/rails_app/vendor", "sample/rails_app/vendor/plugins", "test", "test/dao_test.rb", "test/helper.rb", "test/testing.rb", "test/units"]
+  spec.files = ["dao.gemspec", "lib", "lib/dao", "lib/dao/active_record.rb", "lib/dao/api", "lib/dao/api/context.rb", "lib/dao/api/dsl.rb", "lib/dao/api/endpoints.rb", "lib/dao/api/initializers.rb", "lib/dao/api/interfaces.rb", "lib/dao/api/modes.rb", "lib/dao/api.rb", "lib/dao/blankslate.rb", "lib/dao/data.rb", "lib/dao/db.rb", "lib/dao/endpoint.rb", "lib/dao/engine.rb", "lib/dao/errors.rb", "lib/dao/exceptions.rb", "lib/dao/form.rb", "lib/dao/instance_exec.rb", "lib/dao/interface.rb", "lib/dao/mode.rb", "lib/dao/mongo_mapper.rb", "lib/dao/params.rb", "lib/dao/path.rb", "lib/dao/presenter.rb", "lib/dao/rails", "lib/dao/rails/app", "lib/dao/rails/app/api.rb", "lib/dao/rails/app/controllers", "lib/dao/rails/app/controllers/api_controller.rb", "lib/dao/rails/lib", "lib/dao/rails/lib/generators", "lib/dao/rails/lib/generators/dao", "lib/dao/rails/lib/generators/dao/api_generator.rb", "lib/dao/rails/lib/generators/dao/dao_generator.rb", "lib/dao/rails/lib/generators/dao/templates", "lib/dao/rails/lib/generators/dao/templates/api.rb", "lib/dao/rails/lib/generators/dao/templates/api_controller.rb", "lib/dao/rails/lib/generators/dao/templates/dao.css", "lib/dao/rails/lib/generators/dao/templates/dao.js", "lib/dao/rails/lib/generators/dao/templates/dao_helper.rb", "lib/dao/rails/lib/generators/dao/USAGE", "lib/dao/rails.rb", "lib/dao/result.rb", "lib/dao/slug.rb", "lib/dao/status.rb", "lib/dao/stdext.rb", "lib/dao/support.rb", "lib/dao/validations.rb", "lib/dao.rb", "Rakefile", "README", "sample", "sample/rails_app", "sample/rails_app/app", "sample/rails_app/app/api.rb", "sample/rails_app/app/controllers", "sample/rails_app/app/controllers/api_controller.rb", "sample/rails_app/app/controllers/application_controller.rb", "sample/rails_app/app/helpers", "sample/rails_app/app/helpers/application_helper.rb", "sample/rails_app/app/mailers", "sample/rails_app/app/models", "sample/rails_app/app/views", "sample/rails_app/app/views/layouts", "sample/rails_app/app/views/layouts/application.html.erb", "sample/rails_app/config", "sample/rails_app/config/application.rb", "sample/rails_app/config/boot.rb", "sample/rails_app/config/database.yml", "sample/rails_app/config/environment.rb", "sample/rails_app/config/environments", "sample/rails_app/config/environments/development.rb", "sample/rails_app/config/environments/production.rb", "sample/rails_app/config/environments/test.rb", "sample/rails_app/config/initializers", "sample/rails_app/config/initializers/backtrace_silencers.rb", "sample/rails_app/config/initializers/inflections.rb", "sample/rails_app/config/initializers/mime_types.rb", "sample/rails_app/config/initializers/secret_token.rb", "sample/rails_app/config/initializers/session_store.rb", "sample/rails_app/config/locales", "sample/rails_app/config/locales/en.yml", "sample/rails_app/config/routes.rb", "sample/rails_app/config.ru", "sample/rails_app/db", "sample/rails_app/db/development.sqlite3", "sample/rails_app/db/seeds.rb", "sample/rails_app/doc", "sample/rails_app/doc/README_FOR_APP", "sample/rails_app/Gemfile", "sample/rails_app/Gemfile.lock", "sample/rails_app/lib", "sample/rails_app/lib/tasks", "sample/rails_app/log", "sample/rails_app/log/development.log", "sample/rails_app/log/production.log", "sample/rails_app/log/server.log", "sample/rails_app/log/test.log", "sample/rails_app/pubic", "sample/rails_app/pubic/javascripts", "sample/rails_app/pubic/javascripts/dao.js", "sample/rails_app/public", "sample/rails_app/public/404.html", "sample/rails_app/public/422.html", "sample/rails_app/public/500.html", "sample/rails_app/public/favicon.ico", "sample/rails_app/public/images", "sample/rails_app/public/images/rails.png", "sample/rails_app/public/index.html", "sample/rails_app/public/javascripts", "sample/rails_app/public/javascripts/application.js", "sample/rails_app/public/javascripts/controls.js", "sample/rails_app/public/javascripts/dragdrop.js", "sample/rails_app/public/javascripts/effects.js", "sample/rails_app/public/javascripts/prototype.js", "sample/rails_app/public/javascripts/rails.js", "sample/rails_app/public/robots.txt", "sample/rails_app/public/stylesheets", "sample/rails_app/Rakefile", "sample/rails_app/README", "sample/rails_app/script", "sample/rails_app/script/rails", "sample/rails_app/test", "sample/rails_app/test/fixtures", "sample/rails_app/test/functional", "sample/rails_app/test/integration", "sample/rails_app/test/performance", "sample/rails_app/test/performance/browsing_test.rb", "sample/rails_app/test/test_helper.rb", "sample/rails_app/test/unit", "sample/rails_app/tmp/cache", "sample/rails_app/tmp/pids", "sample/rails_app/tmp/sessions", "sample/rails_app/tmp/sockets", "sample/rails_app/vendor", "sample/rails_app/vendor/plugins", "test", "test/dao_test.rb", "test/helper.rb", "test/testing.rb", "test/units", "TODO"]
   spec.executables = []
   
   spec.require_path = "lib"
@@ -20,9 +20,9 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["tagz", "~> 8.2.0"])
   
-    spec.add_dependency(*["map", "~> 2.6.1"])
+    spec.add_dependency(*["map", "~> 2.7.0"])
   
-    spec.add_dependency(*["yajl-ruby", "~> 0.7.9"])
+    spec.add_dependency(*["yajl-ruby", "~> 0.8.1"])
   
 
   spec.extensions.push(*[])

data/lib/dao.rb

@@ -1,6 +1,7 @@
 # built-ins
 #
   require 'enumerator'
+  require 'set'
   #require 'fileutils'
   #require 'pathname'
   #require 'yaml'
@@ -9,7 +10,7 @@
 # dao libs
 #
   module Dao
-    Version = '2.1.0' unless defined?(Version)
+    Version = '2.2.3' unless defined?(Version)
 
     def version
       Dao::Version
@@ -17,9 +18,9 @@
 
     def dependencies
       {
-        'map' => ['map', '~> 2.6.1'],
-        'tagz' => ['tagz', '~> 8.2.0'],
-        'yajl' => ['yajl-ruby', '~> 0.7.9']
+        'map'  => ['map'       , '~> 2.7.0'],
+        'tagz' => ['tagz'      , '~> 8.2.0'],
+        'yajl' => ['yajl-ruby' , '~> 0.8.1']
       }
     end
 
@@ -60,6 +61,8 @@
     end
   end
 
+  require 'yajl/json_gem'
+
   Dao.load %w[
     blankslate.rb
     instance_exec.rb
@@ -75,6 +78,7 @@
     form.rb
     errors.rb
     validations.rb
+    presenter.rb
 
     mode.rb
     path.rb

data/lib/dao/active_record.rb

@@ -26,24 +26,66 @@ if defined?(ActiveRecord)
       end
 
       def Base.record_to_dao(record, *args)
+      # setup for eff'ing madness        
+      #
         model = record.class
         map = Dao.map
         map[:model] = model.name.underscore
         map[:id] = record.id
 
+      # yank out options if they are patently obvious...
+      #
+        if args.size == 2 and args.first.is_a?(Array) and args.last.is_a?(Hash)
+          options = Dao.map(args.last)
+          args = args.first
+        else
+          options = nil
+        end
+
+      # search for options inside args...
+      #
+        if options.nil?
+          last = args.last
+          options = Dao.map
+
+          if last.is_a?(Hash)
+            last = Dao.map(last)
+            keys = %w( include includes with )
+            if keys.any?{|key| last.has_key?(key)}
+              options.update(last)
+              args.pop
+            end
+          end
+        end
+
+      # refine the list with includes iff passed as options
+      #
+        if options.has_key?(:include) or options.has_key?(:includes) or options.has_key?(:with)
+          args.replace(model.to_dao) if args.empty?
+          args.push(options[:include]) if options[:include]
+          args.push(options[:includes]) if options[:includes]
+          args.push(options[:with]) if options[:with]
+        end
+
+      # take passed in args or model defaults
+      #
         list = args.empty? ? model.to_dao : args
 
+      # okay - go!
+      #
         list.each do |attr|
           if attr.is_a?(Array)
             related, *argv = attr
-            value = record.send(related).to_dao(*argv)
+            v = record.send(related)
+            value = v.respond_to?(:to_dao) ? v.to_dao(*argv) : v
             map[related] = value
             next
           end
 
           if attr.is_a?(Hash)
             attr.each do |related, argv|
-              value = record.send(related).to_dao(*argv)
+              v = record.send(related)
+              value = v.respond_to?(:to_dao) ? v.to_dao(*argv) : v
               map[related] = value
             end
             next
@@ -76,8 +118,8 @@ if defined?(ActiveRecord)
         model = record.class
         model.record_to_dao(record, *args)
       end
-      alias_method('to_h', 'to_dao')
-      alias_method('to_map', 'to_dao') ### HACK
+      ### alias_method('to_h', 'to_dao')
+      ### alias_method('to_map', 'to_dao') ### HACK
     end
   end
 

data/lib/dao/api/interfaces.rb

@@ -26,6 +26,8 @@ module Dao
         interfaces[path] = interface
       end
 
+      alias_method('call', 'interface')
+
       def description(string)
         doc(:description => Dao.unindent(string))
       end
@@ -55,13 +57,19 @@ module Dao
       end
     end
 
-    def call(path = '/index', params = {})
+    def call(path = '/index', params = {}, options = {})
       api = self
       path = Path.new(path)
       interface = interfaces[path]
-      raise(NameError, "NO SUCH INTERFACE: #{ path }") unless interface
 
-      params = Dao.parse(path, params)
+      unless interface
+        return index if path == '/index'
+        raise(NameError, "NO SUCH INTERFACE: #{ path }")
+      end
+
+      options = Map.options(options || {})
+
+      params = Dao.parse(path, params, options)
 
       context = Context.new(
         :api => api,
@@ -77,7 +85,9 @@ module Dao
     end
 
     def index
-      self.class.index
+      result = Result.new('/index')
+      result.data.update(self.class.index)
+      result
     end
 
     def interfaces
@@ -122,6 +132,11 @@ module Dao
       result.status(*args, &block)
     end
 
+    def status!(*args, &block)
+      status(*args, &block)
+      return!
+    end
+
     def data(*args)
       if args.empty?
         result.data

data/lib/dao/data.rb

@@ -5,61 +5,11 @@ module Dao
 
     def update(*args, &block)
       if args.size==1 and args.first.respond_to?(:to_dao)
-        update(args.first.to_dao)
+        to_dao = args.first.to_dao
+        update(to_dao)
+        return(to_dao)
       end
       super
     end
   end
 end
-
-
-=begin
-    %w( to_dao as_dao ).each do |method|
-      module_eval <<-__, __FILE__, __LINE__
-        def #{ method }(object, *args, &block)
-          case object
-            when Array
-              object.map{|element| Data.#{ method }(element)}
-
-            else
-              if object.respond_to?(:#{ method })
-                object.send(:#{ method }, *args, &block)
-              else
-                object
-              end
-          end
-        end
-      __
-    end
-=end
-
-=begin
-    IdKeys =
-      %w( id uuid guid ).map{|key| [key, key.to_sym, "_#{ key }", "_#{ key }".to_sym]}.flatten
-
-    def id
-      IdKeys.each{|key| return self[key] if has_key?(key)}
-      return nil
-    end
-
-    def has_id?
-      IdKeys.each{|key| return true if has_key?(key)}
-      return false
-    end
-
-    def new?
-      !has_id?
-    end
-
-    def new_record?
-      !has_id?
-    end
-
-    def model_name
-      path.to_s
-    end
-
-    def slug
-      Slug.for(path)
-    end
-=end

data/lib/dao/errors.rb

@@ -1,6 +1,7 @@
 module Dao
   class Errors < ::Map
     include Tagz.globally
+
     class << Errors
       include Tagz.globally
     end
@@ -21,6 +22,10 @@ module Dao
         @sticky ||= nil
         !!@sticky
       end
+
+      def to_s
+        self
+      end
     end
 
     class << Errors
@@ -67,8 +72,12 @@ module Dao
         else
           errors[keys] = Message.new(message, :sticky => sticky)
         end
+      else
+        raise(ArgumentError, 'no message!')
       end
 
+      message = Message.new(message) unless message.is_a?(Message)
+
       result = []
 
       errors.each do |keys, message|
@@ -84,7 +93,15 @@ module Dao
       
       result
     end
-    alias_method 'add_to_base', 'add'
+    alias_method('add_to_base', 'add')
+
+    def add!(*args)
+      options = Dao.map_for(args.last.is_a?(Hash) ? args.pop : {})
+      options[:sticky] = true
+      args.push(options)
+      add(*args)
+    end
+    alias_method('add_to_base!', 'add!')
 
     def clone
       clone = Errors.new
@@ -96,15 +113,6 @@ module Dao
       clone
     end
 
-    def add!(*args)
-      options = Dao.map_for(args.last.is_a?(Hash) ? args.pop : {})
-      options[:sticky] = true
-      args.push(options)
-      add(*args)
-    end
-    alias_method 'add_to_base!', 'add!'
-
-    alias_method 'clear!', 'clear' unless instance_methods.include?('clear!')
 
     def update(other, options = {})
       options = Dao.map_for(options)
@@ -121,6 +129,7 @@ module Dao
       end
     end
 
+    alias_method('clear!', 'clear') unless instance_methods.include?('clear!')
     def clear
       keep = []
       depth_first_each do |keys, message|
@@ -136,19 +145,19 @@ module Dao
     def invalid?(*keys)
       has?(keys) and !get(keys).nil?
     end
+    alias_method('on?', 'invalid?')
 
-    alias_method 'on?', 'invalid?'
-
-    alias_method 'on', 'get'
+    def on(*args, &block)
+      get(*args, &block)
+    end
 
     def size
       size = 0
       depth_first_each{ size += 1 }
       size
     end
-
-    alias_method 'count', 'size'
-    alias_method 'length', 'size'
+    alias_method('count', 'size')
+    alias_method('length', 'size')
 
     def full_messages
       global_messages = []
@@ -173,7 +182,6 @@ module Dao
       depth_first_each do |keys, message|
         index = keys.pop
         message = message.to_s.strip
-        next if message.empty?
         yield(keys, message)
       end
     end
@@ -181,8 +189,7 @@ module Dao
     def each_full_message
       full_messages.each{|msg| yield msg}
     end
-
-    alias_method 'each_full', 'each_full_message'
+    alias_method('each_full', 'each_full_message')
 
     def messages
       messages =

data/lib/dao/exceptions.rb

@@ -1,2 +1,24 @@
-class Error < ::StandardError
+module Dao
+  class Dao::Error < ::StandardError
+  end
+
+  class Dao::Error::Result < Error
+    attr_accessor :result
+
+    def self.for(result, *args, &block)
+      error = new(*args, &block)
+      error.result = result
+      error
+    end
+  end
+
+  class Dao::Error::Status < Error
+    attr_accessor :status
+
+    def self.for(status, *args, &block)
+      error = new(*args, &block)
+      error.status = status
+      error
+    end
+  end
 end