dao 2.0.0 → 2.1.0

data/README

@@ -2,29 +2,109 @@ NAME
   dao
 
 SYNOPSIS
-  a library for structuring rails applications using the 'data access object' pattern
+  a sa-weet-ass library for structuring rails applications using the 'data
+  access object' design pattern.
 
 DESCRITPION
-  stay tuned...
-
-ISSUES ADRESSED
-  . testability
-  . documentability
-  . being able to reason about code
-  . reasoning about caching
-  . avoiding duplicating logic in html/api
-  . avoid N+1 in view
-  . avoid design issues with REST (delete(1,2,3))
-  . nested attributes trivally
-  . lack of domain (current_user)
-  . easily optimize queries later
-  . magic
+  applications that are written on dao look like this in ruby
+
+    result = api.call('/posts/new', params)
+
+  and like this in javascript
+
+    result = api.call('/posts/new', params)
+
+  in command-line applications they look like this
+
+    result = api.call('/posts/new', params)
+
+  and in tests this syntax is used
+
+    result = api.call('/posts/new', params)
+
+  when a developer wants to understand the interface of a dao application she
+  does this
+
+    vi app/api.rb
+
+  when a developer of a dao application wants to play with a dao application
+  interactively she does
+
+    (rails console)
+
+    > api = Api.new
+    > result = api.call('/posts/new', params)
+
+  when a remote client wants to understand the api of a dao application she
+  does
+
+    curl --silent http://dao.app.com/api | less
+
+
+
+  this kind of brutally consistent interface is made possible by structuring
+  access to data around the finest data structure of all time - the hash.  in
+  the case of dao the hash is a well structured and slightly clever hash, but
+  a simple hash interface is the basis of every bit of goodness dao has to
+  offer.
+
+  in dao, application developers do not bring models into controllers and,
+  especially not into views.  instead, a unified interface to application
+  logic and data is used everywhere: in tests, in controllers, from the
+  command-line, and also from javascript.
+
+  this speration of concerns brings with it many, many desirable qualities:
+
+    - total seperation of concerns between the front and back end of a web
+      application.  when developers are using dao changes to the data model
+      have zero effect on controllers and views.
+
+    - issues related to having models in controllers and views such as
+      difficulty reasoning about caching and n+1 queries in views killing the
+      db simply disappear.
+
+    - bad programming practices like using quasi-global variables
+      (current_user) or decorating models with view specific attributes
+      (password_verification) are no longer needed.
+
+    - developers are able to reason over the abilities of an application by
+      reading only a few source files.
+
+    - databases can be swapped, mixed, or alternate storage/caching mechanisms
+      added at any time without affecting the application's controllers or
+      views.
+
+    - transition from form based views to semi-ajax ones to fully-ajax ones is
+      direct.
+
+    - forms and interfaces that involve dozens of models are as easy to deal
+      with as simple ones.
+
+    - code can be optimized at the interface
+
+
+  wikipedia has this to say about dao in general
+
+    "
+
+      In computer software, a data access object (DAO) is an object that
+      provides an abstract interface to some type of database or persistence
+      mechanism, providing some specific operations without exposing details
+      of the database.  It provides a mapping from application calls to the
+      persistence layer. This isolation separates the concerns of what data
+      accesses the application needs, in terms of domain-specific objects and
+      data types (the public interface of the DAO), and how these needs can be
+      satisfied with a specific DBMS, database schema, etc. (the
+      implementation of the DAO).
+
+    " 
+      - http://en.wikipedia.org/wiki/Data_access_object
 
 READING
-  http://www.paperplanes.de/2010/5/7/activerecord_callbacks_ruined_my_life.html
   http://best-practice-software-engineering.ifs.tuwien.ac.at/patterns/dao.html
   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
 
 INSTALL
   gem 'dao', :path => File.expand_path('..') ### Gemfile
@@ -32,4 +112,3 @@ INSTALL
   vim -o app/api.rb app/controllers/api_controller.rb
   curl --silent http://0.0.0.0:3000/api
   curl --silent http://0.0.0.0:3000/api/ping
-    

data/Rakefile

@@ -83,14 +83,16 @@ task :gemspec do
     end
 
   lib         = This.lib
-  object      = This.object
+  namespace   = This.namespace
   version     = This.version
   files       = shiteless[Dir::glob("**/**")]
   executables = shiteless[Dir::glob("bin/*")].map{|exe| File.basename(exe)}
   has_rdoc    = true #File.exist?('doc')
   test_files  = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
-  summary     = object.respond_to?(:summary) ? object.summary : "summary: #{ lib } kicks the ass"
-  description = object.respond_to?(:description) ? object.description : "description: #{ lib } kicks the ass"
+
+  summary     = namespace.respond_to?(:summary) ? namespace.summary : "summary: #{ lib } kicks the ass"
+  description = namespace.respond_to?(:description) ? namespace.description : "description: #{ lib } kicks the ass"
+  dependencies =  namespace.respond_to?(:dependencies) ? namespace.dependencies : []
 
   if This.extensions.nil?
     This.extensions = []
@@ -103,44 +105,48 @@ task :gemspec do
 
   template = 
     if test(?e, 'gemspec.erb')
-      Template{ IO.read('gemspec.erb') }
+      IO.read('gemspec.erb')
     else
-      Template {
-        <<-__
-          ## #{ lib }.gemspec
-          #
-
-          Gem::Specification::new do |spec|
-            spec.name = #{ lib.inspect }
-            spec.version = #{ version.inspect }
-            spec.platform = Gem::Platform::RUBY
-            spec.summary = #{ lib.inspect }
-            spec.description = #{ description.inspect }
-
-            spec.files = #{ files.inspect }
-            spec.executables = #{ executables.inspect }
-            
-            spec.require_path = "lib"
-
-            spec.has_rdoc = #{ has_rdoc.inspect }
-            spec.test_files = #{ test_files.inspect }
-
-          # spec.add_dependency 'lib', '>= version'
-            spec.add_dependency 'map'
-            spec.add_dependency 'tagz'
-            spec.add_dependency 'yajl-ruby'
-
-            spec.extensions.push(*#{ extensions.inspect })
-
-            spec.rubyforge_project = #{ This.rubyforge_project.inspect }
-            spec.author = #{ This.author.inspect }
-            spec.email = #{ This.email.inspect }
-            spec.homepage = #{ This.homepage.inspect }
-          end
-        __
-      }
+      <<-__
+        ## <%= lib %>.gemspec
+        #
+
+        Gem::Specification::new do |spec|
+          spec.name = <%= lib.inspect %> 
+          spec.version = <%= version.inspect %>
+          spec.platform = Gem::Platform::RUBY
+          spec.summary = <%= lib.inspect %>
+          spec.description = <%= description.inspect %>
+
+          spec.files = <%= files.inspect %>
+          spec.executables = <%= executables.inspect %>
+          
+          spec.require_path = "lib"
+
+          spec.has_rdoc = <%= has_rdoc.inspect %>
+
+          <% if defined?(test_files) %>
+            spec.test_files = <%= test_files.inspect %>
+          <% end %>
+
+          <% dependencies.each do |dependency| 
+               lib, spec = dependency
+          %>
+            spec.add_dependency(*<%= spec.inspect %>)
+          <% end %>
+
+          spec.extensions.push(*<%= extensions.inspect %>)
+
+          spec.rubyforge_project = <%= This.rubyforge_project.inspect %>
+          spec.author = <%= This.author.inspect %>
+          spec.email = <%= This.email.inspect %>
+          spec.homepage = <%= This.homepage.inspect %>
+        end
+      __
     end
 
+  template = Template{ template }
+
   Fu.mkdir_p(This.pkgdir)
   This.gemspec = File.join(This.dir, "#{ This.lib }.gemspec") #File.join(This.pkgdir, "gemspec.rb")
   open("#{ This.gemspec }", "w"){|fd| fd.puts(template)}
@@ -231,6 +237,7 @@ BEGIN {
   require 'erb'
   require 'fileutils'
   require 'rbconfig'
+  require 'yaml'
 
 # fu shortcut
 #
@@ -244,28 +251,70 @@ BEGIN {
   This.dir = File.dirname(This.file)
   This.pkgdir = File.join(This.dir, 'pkg')
 
+# use pkg.yml iff present
+#
+  pkg_config_yml = File.join(This.dir, 'pkg/config.yml')
+  if test(?e, pkg_config_yml)
+    pkg_config = YAML::load(ERB.new(IO.read(pkg_config_yml)).result)
+
+    if pkg_config.is_a?(Hash)
+      ENV['LIB'] ||= pkg_config['lib']
+      ENV['AUTOREQUIRE'] ||= pkg_config['autorequire']
+      ENV['VERSION'] ||= pkg_config['version']
+      ENV['NAME'] ||= pkg_config['name']
+      ENV['NAMESPACE'] ||= pkg_config['namespace']
+    end
+  end
+
 # grok lib
 #
   lib = ENV['LIB']
   unless lib
-    lib = File.basename(Dir.pwd).sub(/[-].*$/, '')
+    lib = File.basename(This.dir).sub(/[-].*$/, '')
   end
   This.lib = lib
 
+# grok autorequire
+#
+  autorequire = ENV['AUTOREQUIRE']
+  unless autorequire
+    autorequire = File.join(This.dir, 'lib', This.lib)
+  end
+  This.autorequire = autorequire
+
+# load the package
+#
+  require This.autorequire
+
+# grok name
+#
+  name = ENV['NAME']
+  unless name
+    name = This.lib.capitalize
+  end
+  This.name = name
+
+# grok namespace
+#
+  namespace = ENV['NAMESPACE']
+  unless namespace
+    namespace = This.name
+  end
+  This.namespace = eval(namespace)
+
 # grok version
 #
   version = ENV['VERSION']
   unless version
-    require "./lib/#{ This.lib }"
-    This.name = lib.capitalize
-    This.object = eval(This.name)
-    version = This.object.send(:version)
+    version = This.namespace.send(:version)
   end
   This.version = version
 
 # we need to know the name of the lib an it's version
 #
   abort('no lib') unless This.lib
+  abort('no name') unless This.name
+  abort('no namespace') unless This.namespace
   abort('no version') unless This.version
 
 # discover full path to this ruby executable

data/dao.gemspec

@@ -2,24 +2,28 @@
 #
 
 Gem::Specification::new do |spec|
-  spec.name = "dao"
-  spec.version = "2.0.0"
+  spec.name = "dao" 
+  spec.version = "2.1.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "dao"
   spec.description = "description: dao kicks the ass"
 
-  spec.files = ["dao.gemspec", "db", "db/dao.yml", "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/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/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/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/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.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.executables = []
   
   spec.require_path = "lib"
 
   spec.has_rdoc = true
-  spec.test_files = nil
 
-# spec.add_dependency 'lib', '>= version'
-  spec.add_dependency 'map'
-  spec.add_dependency 'tagz'
-  spec.add_dependency 'yajl-ruby'
+  
+
+  
+    spec.add_dependency(*["tagz", "~> 8.2.0"])
+  
+    spec.add_dependency(*["map", "~> 2.6.1"])
+  
+    spec.add_dependency(*["yajl-ruby", "~> 0.7.9"])
+  
 
   spec.extensions.push(*[])
 

data/lib/dao.rb

@@ -6,33 +6,23 @@
   #require 'yaml'
   #require 'yaml/store'
 
-# gems
-#
-  begin
-    require 'rubygems'
-  rescue LoadError
-    nil
-  end
-
-  if defined?(gem)
-    gem('map', '~> 2.2.2')
-    gem('tagz', '~> 8.0')
-    gem('yajl-ruby', '~> 0.7.9')
-  end
-
-  require 'map'
-  require 'tagz'
-  require 'yajl'
-
 # dao libs
 #
   module Dao
-    Version = '2.0.0' unless defined?(Version)
+    Version = '2.1.0' unless defined?(Version)
 
     def version
       Dao::Version
     end
 
+    def dependencies
+      {
+        'map' => ['map', '~> 2.6.1'],
+        'tagz' => ['tagz', '~> 8.2.0'],
+        'yajl' => ['yajl-ruby', '~> 0.7.9']
+      }
+    end
+
     def libdir(*args, &block)
       @libdir ||= File.expand_path(__FILE__).sub(/\.rb$/,'')
       args.empty? ? @libdir : File.join(@libdir, *args)
@@ -55,8 +45,24 @@
     extend(Dao)
   end
 
+# gems
+#
+  begin
+    require 'rubygems'
+  rescue LoadError
+    nil
+  end
+
+  if defined?(gem)
+    Dao.dependencies.each do |lib, dependency|
+      gem(*dependency)
+      require(lib)
+    end
+  end
+
   Dao.load %w[
     blankslate.rb
+    instance_exec.rb
     exceptions.rb
     support.rb
     slug.rb
@@ -72,7 +78,7 @@
 
     mode.rb
     path.rb
-    endpoint.rb
+    interface.rb
     api.rb
 
 
@@ -86,3 +92,10 @@
   unless defined?(D)
     D = Dao
   end
+
+  if defined?(Rails.env)
+    unless Rails.env.production?
+      unloadable(Dao)
+      unloadable(D)
+    end
+  end

data/lib/dao/active_record.rb

@@ -8,68 +8,76 @@ end
 if defined?(ActiveRecord)
 
   module ActiveRecord
-    module ToDao
-      module ClassMethods
-        def to_dao(*args)
-
+    class Base
+      def Base.to_dao(*args)
+        if args.first.is_a?(Base)
+          record_to_dao(record = args.shift, *args)
+        else
           @to_dao ||= (
-            column_names # + reflect_on_all_associations.map(&:name)
-          ).map{|name| name.to_s}
-
-          unless args.empty?
-            @to_dao.clear
-            args.flatten.compact.each do |arg|
-              @to_dao.push(arg.to_s)
-            end
-            @to_dao.uniq!
-            @to_dao.map!{|name| name.to_s}
-          end
-
+            names = column_names ### + reflect_on_all_associations.map(&:name)
+          )
+          @to_dao = Array(args) unless args.empty?
           @to_dao
         end
+      end
 
-        def to_dao=(*args)
-          to_dao(*args)
-        end
+      def Base.to_dao=(*args)
+        to_dao(*args)
       end
 
-      module InstanceMethods
-        def to_dao(*args)
-          hash = Dao.hash
-          model = self.class
+      def Base.record_to_dao(record, *args)
+        model = record.class
+        map = Dao.map
+        map[:model] = model.name.underscore
+        map[:id] = record.id
 
-          attrs = args.empty? ? model.to_dao : args
+        list = args.empty? ? model.to_dao : args
 
-          attrs.each do |attr|
-            value = send(attr)
+        list.each do |attr|
+          if attr.is_a?(Array)
+            related, *argv = attr
+            value = record.send(related).to_dao(*argv)
+            map[related] = value
+            next
+          end
 
-            if value.respond_to?(:to_dao)
-              hash[attr] = value.to_dao
-              next
+          if attr.is_a?(Hash)
+            attr.each do |related, argv|
+              value = record.send(related).to_dao(*argv)
+              map[related] = value
             end
+            next
+          end
 
-            if value.is_a?(Array)
-              hash[attr] = value.map{|val| val.respond_to?(:to_dao) ? val.to_dao : val}
-              next
-            end
+          value = record.send(attr)
 
-            hash[attr] = value
+          if value.respond_to?(:to_dao)
+            map[attr] = value.to_dao
+            next
           end
 
-          if hash.has_key?(:_id) and not hash.has_key?(:id)
-            hash[:id] = hash[:_id]
+          if value.is_a?(Array)
+            map[attr] = value.map{|val| val.respond_to?(:to_dao) ? val.to_dao : val}
+            next
           end
 
-          hash
+          map[attr] = value
+        end
+
+        if map.has_key?(:_id) and not map.has_key?(:id)
+          map[:id] = map[:_id]
         end
-        alias_method 'to_h', 'to_dao'
-        #alias_method 'to_map', 'to_dao' ### HACK
+
+        map
       end
-    end
 
-    if defined?(ActiveRecord::Base)
-      ActiveRecord::Base.send(:extend, ToDao::ClassMethods)
-      ActiveRecord::Base.send(:include, ToDao::InstanceMethods)
+      def to_dao(*args)
+        record = self
+        model = record.class
+        model.record_to_dao(record, *args)
+      end
+      alias_method('to_h', 'to_dao')
+      alias_method('to_map', 'to_dao') ### HACK
     end
   end