dao 3.3.0 → 4.2.1

data/README

@@ -114,3 +114,10 @@ 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
+
+HISTORY
+  4.0.0
+    - dao depends has tied itself to rails, for better or worse...
+    - drop custom form encoding.  just use a rack-like approach.
+    - dao form parameter encoding has changed slightly to 'dao[/api/path][x,y,z]=42'
+    - dao form paramters are now preparsed in a before filter

data/Rakefile

@@ -60,7 +60,7 @@ end
 task :gemspec do
   ignore_extensions = ['git', 'svn', 'tmp', /sw./, 'bak', 'gem']
   ignore_directories = ['pkg']
-  ignore_files = ['test/log']
+  ignore_files = ['test/log', 'a.rb'] + Dir['db/*'] + %w'db'
 
   shiteless = 
     lambda do |list|
@@ -87,7 +87,7 @@ task :gemspec do
   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")
+  test_files  = test(?e, "test/#{ lib }.rb") ? "test/#{ lib }.rb" : nil
   summary     = object.respond_to?(:summary) ? object.summary : "summary: #{ lib } kicks the ass"
   description = object.respond_to?(:description) ? object.description : "description: #{ lib } kicks the ass"
 
@@ -100,38 +100,51 @@ task :gemspec do
   end
   extensions = [extensions].flatten.compact
 
+# TODO
+  if This.dependencies.nil?
+    dependencies = []
+  else
+    case This.dependencies
+      when Hash
+        dependencies = This.dependencies.values
+      when Array
+        dependencies = This.dependencies
+    end
+  end
+
   template = 
     if test(?e, 'gemspec.erb')
       Template{ IO.read('gemspec.erb') }
     else
       Template {
         <<-__
-          ## #{ lib }.gemspec
+          ## <%= lib %>.gemspec
           #
 
           Gem::Specification::new do |spec|
-            spec.name = #{ lib.inspect }
-            spec.version = #{ version.inspect }
+            spec.name = <%= lib.inspect %>
+            spec.version = <%= version.inspect %>
             spec.platform = Gem::Platform::RUBY
-            spec.summary = #{ lib.inspect }
-            spec.description = #{ description.inspect }
+            spec.summary = <%= lib.inspect %>
+            spec.description = <%= description.inspect %>
 
-            spec.files =\n#{ files.sort.pretty_inspect }
-            spec.executables = #{ executables.inspect }
+            spec.files =\n<%= files.sort.pretty_inspect %>
+            spec.executables = <%= executables.inspect %>
             
             spec.require_path = "lib"
 
-            spec.test_files = #{ test_files.inspect }
+            spec.test_files = <%= test_files.inspect %>
 
-          ### spec.add_dependency 'lib', '>= version'
-          #### spec.add_dependency 'map'
+            <% dependencies.each do |lib_version| %>
+              spec.add_dependency(*<%= Array(lib_version).flatten.inspect %>)
+            <% end %>
 
-            spec.extensions.push(*#{ extensions.inspect })
+            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 }
+            spec.rubyforge_project = <%= This.rubyforge_project.inspect %>
+            spec.author = <%= This.author.inspect %>
+            spec.email = <%= This.email.inspect %>
+            spec.homepage = <%= This.homepage.inspect %>
           end
         __
       }
@@ -267,6 +280,12 @@ BEGIN {
   end
   This.version = version
 
+# see if dependencies are export by the module
+#
+  if This.object.respond_to?(:dependencies)
+    This.dependencies = This.object.dependencies
+  end
+
 # we need to know the name of the lib an it's version
 #
   abort('no lib') unless This.lib

data/b.rb

@@ -0,0 +1,38 @@
+
+require 'dao'
+
+
+
+class C < ::Map
+  include Dao::Validations
+  validates_presence_of :foo
+end
+
+c = C.new
+
+p c.valid?
+p c.errors
+
+c.update(:foo => 42)
+
+p c.valid?
+p c.errors
+
+#p 'c.validator.attributes' => c.validator.attributes
+#p 'c' => c
+
+__END__
+
+p c.valid?
+
+
+p c
+
+p c.valid?
+
+#c.validator
+#p c.validator.object
+#p c.valid?
+#p c.errors
+#p c.status
+

data/dao.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "dao"
-  spec.version = "3.3.0"
+  spec.version = "4.2.1"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "dao"
   spec.description = "description: dao kicks the ass"
@@ -11,11 +11,9 @@ Gem::Specification::new do |spec|
   spec.files =
 ["README",
  "Rakefile",
- "TODO",
- "a.rb",
+ "b.rb",
  "dao.gemspec",
  "db",
- "db/dao.yml",
  "lib",
  "lib/dao",
  "lib/dao.rb",
@@ -26,35 +24,46 @@ Gem::Specification::new do |spec|
  "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/conducer",
+ "lib/dao/conducer.rb",
+ "lib/dao/conducer/attributes.rb",
+ "lib/dao/conducer/crud.rb",
+ "lib/dao/current.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/extractor.rb",
  "lib/dao/form.rb",
+ "lib/dao/image_cache.rb",
  "lib/dao/instance_exec.rb",
- "lib/dao/interface.rb",
  "lib/dao/mode.rb",
  "lib/dao/mongo_mapper.rb",
+ "lib/dao/name.rb",
  "lib/dao/params.rb",
  "lib/dao/path.rb",
- "lib/dao/presenter.rb",
+ "lib/dao/rack",
+ "lib/dao/rack.rb",
+ "lib/dao/rack/middleware",
+ "lib/dao/rack/middleware.rb",
+ "lib/dao/rack/middleware/params_parser.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/conducer.rb",
+ "lib/dao/rails/lib/generators/dao/templates/conducer_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",
@@ -66,14 +75,20 @@ Gem::Specification::new do |spec|
  "lib/dao/support.rb",
  "lib/dao/validations",
  "lib/dao/validations.rb",
- "lib/dao/validations/base.rb",
+ "lib/dao/validations/callback.rb",
  "lib/dao/validations/common.rb",
+ "lib/dao/validations/validator.rb",
  "test",
- "test/dao_test.rb",
+ "test/active_model_conducer_lint_test.rb",
+ "test/api_test.rb",
+ "test/conducer_test.rb",
+ "test/db.yml",
+ "test/form_test.rb",
  "test/helper.rb",
  "test/leak.rb",
+ "test/support_test.rb",
  "test/testing.rb",
- "test/units"]
+ "test/validations_test.rb"]
 
   spec.executables = []
   
@@ -81,8 +96,21 @@ Gem::Specification::new do |spec|
 
   spec.test_files = nil
 
-### spec.add_dependency 'lib', '>= version'
-#### spec.add_dependency 'map'
+  
+    spec.add_dependency(*["rails", "~> 3.0"])
+  
+    spec.add_dependency(*["uuidtools", "~> 2.1"])
+  
+    spec.add_dependency(*["tagz", "~> 9.0"])
+  
+    spec.add_dependency(*["fattr", "~> 2.2"])
+  
+    spec.add_dependency(*["map", "~> 4.4"])
+  
+    spec.add_dependency(*["unidecode", "~> 1.0"])
+  
+    spec.add_dependency(*["yajl-ruby", "~> 0.8"])
+  
 
   spec.extensions.push(*[])
 

data/lib/dao.rb

@@ -2,15 +2,11 @@
 #
   require 'enumerator'
   require 'set'
-  #require 'fileutils'
-  #require 'pathname'
-  #require 'yaml'
-  #require 'yaml/store'
 
 # dao libs
 #
   module Dao
-    Version = '3.3.0' unless defined?(Version)
+    Version = '4.2.1' unless defined?(Version)
 
     def version
       Dao::Version
@@ -18,9 +14,13 @@
 
     def dependencies
       {
-        'map'  => ['map'       , '~> 4.2.0'],
-        'tagz' => ['tagz'      , '~> 9.0.0'],
-        'yajl' => ['yajl-ruby' , '~> 0.8.1']
+        'rails'       =>  [ 'rails'       , '~> 3.0' ],
+        'map'         =>  [ 'map'         , '~> 4.4' ],
+        'fattr'       =>  [ 'fattr'       , '~> 2.2' ],
+        'tagz'        =>  [ 'tagz'        , '~> 9.0' ],
+        'yajl'        =>  [ 'yajl-ruby'   , '~> 0.8' ],
+        'unidecode'   =>  [ 'unidecode'   , '~> 1.0' ],
+        'uuidtools'   =>  [ 'uuidtools'   , '~> 2.1' ]
       }
     end
 
@@ -61,16 +61,34 @@
     end
   end
 
+  #active_record
+  #action_mailer
+  #rails/test_unit
+  %w[
+    action_controller
+    active_resource
+    active_support
+  ].each do |framework|
+    begin
+      require "#{ framework }/railtie"
+    rescue LoadError
+    end
+  end
+#require 'rails/all'
+
+
   require 'yajl/json_gem'
 
   Dao.load %w[
     blankslate.rb
     instance_exec.rb
+    extractor.rb
     exceptions.rb
     support.rb
     slug.rb
     stdext.rb
 
+    name.rb
     status.rb
     errors.rb
     form.rb
@@ -79,20 +97,33 @@
     result.rb
     params.rb
 
+    current.rb
+
     mode.rb
     route.rb
     path.rb
-    interface.rb
+    endpoint.rb
     api.rb
 
+    db.rb
 
     rails.rb
     active_record.rb
     mongo_mapper.rb
-  ]
 
-  Dao.autoload(:Db, Dao.libdir('db.rb'))
+    conducer.rb
+    image_cache.rb
+  ]
 
-  unless defined?(D)
-    D = Dao
+# protect against rails' too clever reloading
+#
+=begin
+  if defined?(Rails)
+    unless defined?(unloadable)
+      require 'active_support'
+      require 'active_support/dependencies'
+    end
+    unloadable(Dao)
   end
+  BEGIN{ Object.send(:remove_const, :Dao) if defined?(Dao) }
+=end

data/lib/dao/api.rb

@@ -4,7 +4,7 @@ module Dao
     Dao.load 'api/modes.rb'
     Dao.load 'api/routes.rb'
     Dao.load 'api/context.rb'
-    Dao.load 'api/interfaces.rb'
+    Dao.load 'api/endpoints.rb'
     Dao.load 'api/dsl.rb'
   end
 end

data/lib/dao/api/context.rb

@@ -1,6 +1,12 @@
 module Dao
   class Context
-    Attrs = %w( api route path interface args status errors params result data form validations )
+    Attrs = %w(
+      api path route endpoint
+      params validator errors status form
+      result
+      data
+      args
+    )
 
     Attrs.each{|a| attr_accessor(a)}
 
@@ -8,61 +14,45 @@ module Dao
       Attrs
     end
 
-    def Context.for(api, route, path, interface, params, *args)
-    # setup
-    #
-      options = Dao.options_for!(args)
-
-      parsed_params = Dao.parse(path, params, options)
+    def Context.for(*args, &block)
+      new(*args, &block)
+    end
 
-      result = Result.new(:mode => api.mode)
-      params = result.params
-      params.update(parsed_params)
+    def initialize(api, path, route, endpoint, params, *args)
+      @api = api
+      @path = path
+      @route = route
+      @endpoint = endpoint
 
-      args =
-        if interface.arity < 1
-          [params, result]
-        else
-          [params, result].slice(0, interface.arity)
-        end
+      @params = Params.new
+      @params.update(params)
+      @params.path = @path
+      @params.route = @route
+      @form = @params.form
 
-    # build the context
-    #
-      context = new
-      context.api = api
-      context.interface = interface
-      context.route = route
-      context.path = path
-      context.args = args
-      context.status = Status.default
-      context.errors = Errors.new
+      @validator = Validator.new(@params)
+      @validator.validations_search_path.unshift(@api.class)
 
-      context.result = result
-      context.data = result.data
+      @validations = @validator.validations
 
-      context.params = params
-      context.form = params.form
-      context.validations = params.validations
+      @params.validator = @validator
+      @errors = @validator.errors
+      @status = @validator.status
 
-    # wire up shared state
-    #
-      result.route = context.route
-      result.path = context.path
-      result.status = context.status
-      result.errors = context.errors
+      @result = Result.new
+      @result.path = @path
+      @result.route = @route
+      @result.mode = @api.mode
+      @result.params = @params
+      @result.errors = @params.errors
 
-      params.route = context.route
-      params.path = context.path
-      params.status = context.status
-      params.errors = context.errors
+      @data = @result.data
 
-      context
+      @args = @endpoint.arity < 1 ? [@params, @result] : [@params, @result].slice(0, @endpoint.arity)
     end
 
-    include InstanceExec
-
     def call
-      api.instance_exec(*args, &interface)
+      @api.instance_exec(*@args, &@endpoint)
     end
   end
 end