dao 2.2.3 → 3.1.0

data/Rakefile

@@ -1,7 +1,7 @@
 This.rubyforge_project = 'codeforpeople'
 This.author = "Ara T. Howard"
 This.email = "ara.t.howard@gmail.com"
-This.homepage = "http://github.com/ahoward/#{ This.lib }"
+This.homepage = "https://github.com/ahoward/#{ This.lib }"
 
 
 task :default do
@@ -26,11 +26,10 @@ def run_tests!(which = nil)
         
   div = ('=' * 119)
   line = ('-' * 119)
-  helper = nil #"-r ./test/helper.rb" if test(?e, "./test/helper.rb")
 
   test_rbs.each_with_index do |test_rb, index|
     testno = index + 1
-    command = "#{ This.ruby } -I ./lib -I ./test/lib #{ helper } #{ test_rb }"
+    command = "#{ This.ruby } -I ./lib -I ./test/lib #{ test_rb }"
 
     puts
     say(div, :color => :cyan, :bold => true)
@@ -59,9 +58,9 @@ end
 
 
 task :gemspec do
-  ignore_extensions = 'git', 'svn', 'tmp', /sw./, 'bak', 'gem'
-  ignore_directories = %w[ pkg ]
-  ignore_files = %w[ test/log ]
+  ignore_extensions = ['git', 'svn', 'tmp', /sw./, 'bak', 'gem']
+  ignore_directories = ['pkg']
+  ignore_files = ['test/log']
 
   shiteless = 
     lambda do |list|
@@ -83,16 +82,14 @@ task :gemspec do
     end
 
   lib         = This.lib
-  namespace   = This.namespace
+  object      = This.object
   version     = This.version
   files       = shiteless[Dir::glob("**/**")]
   executables = shiteless[Dir::glob("bin/*")].map{|exe| File.basename(exe)}
-  has_rdoc    = true #File.exist?('doc')
+  #has_rdoc    = true #File.exist?('doc')
   test_files  = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
-
-  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 : []
+  summary     = object.respond_to?(:summary) ? object.summary : "summary: #{ lib } kicks the ass"
+  description = object.respond_to?(:description) ? object.description : "description: #{ lib } kicks the ass"
 
   if This.extensions.nil?
     This.extensions = []
@@ -105,51 +102,45 @@ task :gemspec do
 
   template = 
     if test(?e, 'gemspec.erb')
-      IO.read('gemspec.erb')
+      Template{ IO.read('gemspec.erb') }
     else
-      <<-__
-        ## <%= 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 {
+        <<-__
+          ## #{ 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 =\n#{ files.sort.pretty_inspect }
+            spec.executables = #{ executables.inspect }
+            
+            spec.require_path = "lib"
+
+            spec.test_files = #{ test_files.inspect }
+
+          ### spec.add_dependency 'lib', '>= version'
+          #### spec.add_dependency 'map'
 
-  template = Template{ template }
+            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
 
   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)}
+  gemspec = "#{ lib }.gemspec"
+  open(gemspec, "w"){|fd| fd.puts(template)}
+  This.gemspec = gemspec
 end
 
 task :gem => [:clean, :gemspec] do
@@ -159,8 +150,8 @@ task :gem => [:clean, :gemspec] do
   `#{ cmd }`
   after = Dir['*.gem']
   gem = ((after - before).first || after.first) or abort('no gem!')
-  Fu.mv gem, This.pkgdir
-  This.gem = File.basename(gem)
+  Fu.mv(gem, This.pkgdir)
+  This.gem = File.join(This.pkgdir, File.basename(gem))
 end
 
 task :readme do
@@ -216,12 +207,18 @@ task :release => [:clean, :gemspec, :gem] do
   gems = Dir[File.join(This.pkgdir, '*.gem')].flatten
   raise "which one? : #{ gems.inspect }" if gems.size > 1
   raise "no gems?" if gems.size < 1
-  cmd = "rubyforge login && rubyforge add_release #{ This.rubyforge_project } #{ This.lib } #{ This.version } #{ This.pkgdir }/#{ This.gem }"
+
+  cmd = "gem push #{ This.gem }"
   puts cmd
-  system cmd
-  cmd = "gem push #{ This.pkgdir }/#{ This.gem }"
+  puts
+  system(cmd)
+  abort("cmd(#{ cmd }) failed with (#{ $?.inspect })") unless $?.exitstatus.zero?
+
+  cmd = "rubyforge login && rubyforge add_release #{ This.rubyforge_project } #{ This.lib } #{ This.version } #{ This.gem }"
   puts cmd
-  system cmd
+  puts
+  system(cmd)
+  abort("cmd(#{ cmd }) failed with (#{ $?.inspect })") unless $?.exitstatus.zero?
 end
 
 
@@ -237,7 +234,7 @@ BEGIN {
   require 'erb'
   require 'fileutils'
   require 'rbconfig'
-  require 'yaml'
+  require 'pp'
 
 # fu shortcut
 #
@@ -251,70 +248,28 @@ 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(This.dir).sub(/[-].*$/, '')
+    lib = File.basename(Dir.pwd).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
-    version = This.namespace.send(:version)
+    require "./lib/#{ This.lib }"
+    This.name = lib.capitalize
+    This.object = eval(This.name)
+    version = This.object.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
@@ -338,11 +293,11 @@ BEGIN {
     def unindent(s)
       indent = nil
       s.each_line do |line|
-        next if line =~ %r/^\s*$/
-        indent = line[%r/^\s*/] and break
-      end
-      indent ? s.gsub(%r/^#{ indent }/, "") : s
+      next if line =~ %r/^\s*$/
+      indent = line[%r/^\s*/] and break
     end
+    indent ? s.gsub(%r/^#{ indent }/, "") : s
+  end
     extend self
   end
 
@@ -350,11 +305,11 @@ BEGIN {
 #
   class Template
     def initialize(&block)
-      @block = block.binding
+      @block = block
       @template = block.call.to_s
     end
     def expand(b=nil)
-      ERB.new(Util.unindent(@template)).result(b||@block)
+      ERB.new(Util.unindent(@template)).result((b||@block).binding)
     end
     alias_method 'to_s', 'expand'
   end

data/TODO

@@ -1,16 +1,10 @@
 todo:
-
-- auto apply?
-
-- pre-condition and parameter code
-
-
-- class level nested AR conversions
+  - class level nested AR conversions
     to_dao(:a, :b => [:foo, :bar])
 
-
-
 done:
+  - auto apply?
+  - pre-condition and parameter code
     - engine-ify the rails stuff?  or what
       - generator api
       - controller

data/a.rb

@@ -0,0 +1,25 @@
+Api =
+  Dao.api do
+    call('/users/:user_id/comments/:comment_id') do
+      p route
+      p path
+      p params
+    end
+  end
+
+api = Api.new
+
+result = api.call('/users/1/comments/2')
+puts result.form.input(:user_id)
+puts result.form.input(:comment_id)
+puts
+
+result = api.call('/users/comments', :user_id => 1, :comment_id => 2)
+puts result.form.input(:user_id)
+puts result.form.input(:comment_id)
+puts
+
+result = api.call('/users/:user_id/comments/:comment_id', :user_id => 1, :comment_id => 2)
+puts result.form.input(:user_id)
+puts result.form.input(:comment_id)
+puts

data/dao.gemspec

@@ -2,33 +2,89 @@
 #
 
 Gem::Specification::new do |spec|
-  spec.name = "dao" 
-  spec.version = "2.2.3"
+  spec.name = "dao"
+  spec.version = "3.1.0"
   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/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.files =
+["README",
+ "Rakefile",
+ "TODO",
+ "a.rb",
+ "dao.gemspec",
+ "lib",
+ "lib/dao",
+ "lib/dao.rb",
+ "lib/dao/active_record.rb",
+ "lib/dao/api",
+ "lib/dao/api.rb",
+ "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/routes.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.rb",
+ "lib/dao/rails/lib",
+ "lib/dao/rails/lib/generators",
+ "lib/dao/rails/lib/generators/dao",
+ "lib/dao/rails/lib/generators/dao/USAGE",
+ "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/result.rb",
+ "lib/dao/route.rb",
+ "lib/dao/slug.rb",
+ "lib/dao/status.rb",
+ "lib/dao/stdext.rb",
+ "lib/dao/support.rb",
+ "lib/dao/validations",
+ "lib/dao/validations.rb",
+ "lib/dao/validations/base.rb",
+ "lib/dao/validations/common.rb",
+ "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(*["tagz", "~> 8.2.0"])
-  
-    spec.add_dependency(*["map", "~> 2.7.0"])
-  
-    spec.add_dependency(*["yajl-ruby", "~> 0.8.1"])
-  
+### spec.add_dependency 'lib', '>= version'
+#### spec.add_dependency 'map'
 
   spec.extensions.push(*[])
 
   spec.rubyforge_project = "codeforpeople"
   spec.author = "Ara T. Howard"
   spec.email = "ara.t.howard@gmail.com"
-  spec.homepage = "http://github.com/ahoward/dao"
+  spec.homepage = "https://github.com/ahoward/dao"
 end

data/lib/dao.rb

@@ -10,7 +10,7 @@
 # dao libs
 #
   module Dao
-    Version = '2.2.3' unless defined?(Version)
+    Version = '3.1.0' unless defined?(Version)
 
     def version
       Dao::Version
@@ -18,8 +18,8 @@
 
     def dependencies
       {
-        'map'  => ['map'       , '~> 2.7.0'],
-        'tagz' => ['tagz'      , '~> 8.2.0'],
+        'map'  => ['map'       , '~> 4.0.0'],
+        'tagz' => ['tagz'      , '~> 9.0.0'],
         'yajl' => ['yajl-ruby' , '~> 0.8.1']
       }
     end
@@ -71,16 +71,16 @@
     slug.rb
     stdext.rb
 
-    result.rb
-    params.rb
     status.rb
-    data.rb
-    form.rb
     errors.rb
+    form.rb
     validations.rb
-    presenter.rb
+    data.rb
+    result.rb
+    params.rb
 
     mode.rb
+    route.rb
     path.rb
     interface.rb
     api.rb