dao 4.2.1 → 4.4.2

data/lib/dao/rails/lib/generators/dao/USAGE

@@ -1,5 +1,5 @@
 Description:
-  rails generate dao system
+  rails generate dao system|conducer
 
 Example:
-  rails generate dao system
+  rails generate dao system|conducer

data/lib/dao/rails/lib/generators/dao/dao_generator.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class DaoGenerator < Rails::Generators::NamedBase
   source_root(File.expand_path('../templates', __FILE__))
 
@@ -5,9 +6,6 @@ class DaoGenerator < Rails::Generators::NamedBase
     ARGV.shift if ARGV.first == name
 
     case name
-      when /conducer_controller/
-        generate_conducer_controller!
-
       when /conducer/
         generate_conducer!
       
@@ -17,9 +15,6 @@ class DaoGenerator < Rails::Generators::NamedBase
       when /api/
         generate_system!
 
-      when /conducers/
-        generate_system!
-
       when /assets/
         generate_system!
 
@@ -29,13 +24,6 @@ class DaoGenerator < Rails::Generators::NamedBase
   end
 
 protected
-  def generate_conducer_controller!
-    @conducer_name = ARGV.shift.sub(/_?conducer$/i, '') + '_conducer'
-    @controller_name = @conducer_name.sub(/_conducer/, '_controller')
-
-    template "conducer_controller.rb", "app/controllers/#{ @conducer_name.underscore }.rb"
-    #template "conducer.rb", "app/conducers/#{ @conducer_name.underscore }.rb"
-  end
 
   def generate_conducer!
     @conducer_name = ARGV.shift.sub(/_?conducer$/i, '') + '_conducer'
@@ -43,34 +31,27 @@ protected
   end
 
   def generate_system!
-    dao_dir = File.join(Rails.root, 'app/dao')
+    FileUtils.mkdir_p(File.join(Rails.root, 'app/conducers'))
 
-    FileUtils.mkdir_p(dao_dir)
-    FileUtils.mkdir_p(File.join(dao_dir, 'apis'))
-    FileUtils.mkdir_p(File.join(dao_dir, 'conducers'))
-
-    copy_file("api.rb", "app/dao/api.rb")
+    copy_file("api.rb", "lib/api.rb")
 
     copy_file("api_controller.rb", "app/controllers/api_controller.rb")
+
     copy_file("dao_helper.rb", "app/helpers/dao_helper.rb")
 
-    copy_file("dao.js", "public/javascripts/dao.js")
-    copy_file("dao.css", "public/stylesheets/dao.css")
+    copy_file("dao.js", "app/assets/javascripts/dao.js")
 
-    route("match 'api(/*path)' => 'api#index', :as => 'api'")
+    copy_file("dao.css", "app/assets/stylesheets/dao.css")
 
-    gem("yajl-ruby")
+    route("match 'api(/*path)' => 'api#index', :as => 'api'")
 
     application(
       <<-__
 
         config.after_initialize do
-          require 'app/dao/api.rb'
-          require 'yajl/json_gem'
+          require File.join(Rails.root, 'lib/api.rb')
         end
 
-        config.autoload_paths += %w( app/models app/dao app/dao/apis app/dao/conducers )
-
         ### config.action_view.javascript_expansions[:defaults] ||= []
         ### config.action_view.javascript_expansions[:defaults] += %( dao )
 

data/lib/dao/rails/lib/generators/dao/templates/api.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 Api = 
   Dao.api do
   ##
@@ -21,7 +22,7 @@ Api =
     call('/pong'){
       require_current_user!
       data.update :time => Time.now
-      data.update :current_user => current_user.id
+      data.update :current_user => current_user
     }
 
   ## this is simply a suggested way to model your api.  it is not required.

data/lib/dao/rails/lib/generators/dao/templates/api_controller.rb

@@ -1,4 +1,9 @@
+# -*- encoding : utf-8 -*-
+
+Kernel.load(File.join(Rails.root, 'lib/api.rb'))
+
 class APIController < ApplicationController
+
   layout false
 
   skip_before_filter :verify_authenticity_token
@@ -22,38 +27,35 @@ protected
   end
 
   def respond_with(object, options = {})
-    json = json_for(object)
+    json = Dao.json_for(object)
 
     status = object.status rescue (options[:status] || 200)
     status = status.code if status.respond_to?(:code)
 
-    respond_to do |wants|
-      wants.json{ render :json => json, :status => status }
-      wants.html{ render :text => json, :status => status, :content_type => 'text/plain' }
-      wants.xml{ render :text => 'no soup for you!', :status => 403 }
-    end
-  end
-
-  def json_for(object)
-    begin
-      if Rails.env.production?
-        ::JSON.generate(object)
-      else
-        ::JSON.pretty_generate(object, :max_nesting => 0)
+    if @format == 'json'
+      render(:json => json, :status => status)
+    else
+      respond_to do |wants|
+        wants.json{ render :json => json, :status => status }
+        wants.html{ render :text => json, :status => status, :content_type => 'text/plain' }
+        wants.xml{ render :text => 'no soup for you!', :status => 403 }
       end
-    rescue Object => e
-      Rails.logger.error(e)
-      YAML.load( object.to_yaml ).to_json
     end
   end
 
   def setup_path
     @path = params[:path] || params[:action] || 'index'
-    unless api.route?(@path) or @path=='index'
+    @path, @format = @path.split(/\./, 2)
+    unless @format.blank?
+      params[:format] = @format
+      params[:path] = @path
+    end
+    unless api.route?(@path) or @path == 'index'
       render :nothing => true, :status => 404
     end
   end
 
+
   def setup_mode
     @mode = params['mode'] || (request.get? ? 'read' : 'write')
   end
@@ -87,13 +89,13 @@ protected
         return
       end
     else
-      if defined?(current_user)
+      begin
         if current_user
           @api = Api.new(current_user)
         else
           render(:nothing => true, :status => :unauthorized)
         end
-      else
+      rescue NameError
         @api = Api.new
       end
     end

data/lib/dao/rails/lib/generators/dao/templates/conducer.rb

@@ -1,64 +1,70 @@
+# -*- encoding : utf-8 -*-
 <%
 
   class_name = @conducer_name.camelize
   model_name = class_name.sub(/Conducer/, '') 
 
 -%>
+
 class <%= class_name %> < Dao::Conducer
-## class_methods
-#
-  class << <%= class_name %>
-    def all(params = {})
-      records = <%= model_name %>.paginate(params)
-
-      records.map! do |record|
-        new(record.attributes)
-      end
-    end
+  def initialize(user, model, params = {})
+    @user = user
+    @model = model
 
-    def find(id)
-      raise NotImplementedError, <<-__
-        this needs to return an instance based on the id
-      __
-    end
-  end
+    update_attributes(
+      :user  => @user.attributes,
+      :model => @model.attributes,
+
+      :foo  => 'bar'
+    )
+
+    id!(@model.id) unless @model.new_record?
+
+    mount(Dao::Upload, :logo, :placeholder => (@model.logo.try(:url) || 'http://placeholder.com/image.png'))
+
+    case action
+      when 'new', 'create'
+        @attributes.email = @user.email
+        @model.field = @page.field
+
+        update_attributes(params)
+
+      when 'edit', 'update', 'show'
+        @attributes.email = @user.email
+        @model.field = @page.field
 
-## instance_methods
-#
-  def initialize
-    run_callbacks :initialize do
+        update_attributes(params)
     end
   end
 
+
+  validates_presence_of :something
+
   def save
-    run_callbacks :save do
-      return(false) unless valid?
+    return(false) unless valid?
 
-      raise NotImplementedError, <<-__
-        this needs to
-          - persist data to the db and get a new id
-          - set the id on the object : @attributes.set(:id => id)
-          - return true or false
-      __
+    raise NotImplementedError, <<-__
+      this needs to
+        - persist data to the db and get a new id
+        - set the id on the object : @attributes.set(:id => id)
+        - return true or false
+    __
 
-      true
-    end
+    true
   end
 
   def destroy
-    run_callbacks :destroy do
-      id = self.id
-      if id
-
-        raise NotImplementedError, <<-__
-          this needs to
-            - un-persist data from the db
-            - set the id on the object to nil : @attributes.rm(:id)
-            - return this id of the destroyed object 
-        __
-
-      end
-      id
+    id = self.id
+    if id
+
+      raise NotImplementedError, <<-__
+        this needs to
+          - un-persist data from the db
+          - set the id on the object to nil : @attributes.rm(:id)
+          - return this id of the destroyed object 
+      __
+
     end
+    id
   end
 end

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

@@ -1,27 +1,28 @@
 /* dao errors */
-table.dao.errors {
-  font-weight: normal;
-  width: 100%;
-  border-bottom: 1px solid #ccc;
-}
-table.dao.errors caption {
-  font-weight: bold;
-  color: #333;
-  font-style: italic;
-  text-align: left;
-  margin-bottom: 0.5em;
-}
-table.dao.errors td.key {
-  padding-left: 1em;
-  color: #666;
-}
-table.dao.errors td.separator {
-  color: #666;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-}
-table.dao.errors td.message {
-  font-style: italic;
-  width: 100%;
-}
 
+  .dao.errors {
+    font-weight: normal;
+    width: 100%;
+    border-bottom: 1px solid #ccc;
+    background-color: #ffe;
+    padding: 0.5em;
+  }
+
+  .dao.errors .caption {
+    font-weight: bold;
+    color: #333;
+    font-style: italic;
+    text-align: left;
+    margin-bottom: 0.5em;
+  }
+
+  .dao.errors .title {
+    padding-left: 1em;
+    color: #666;
+  }
+
+  .dao.errors .message {
+    font-style: italic;
+    font-weight: bold;
+    width: 100%;
+  }

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

@@ -109,6 +109,9 @@ if(!window.Dao){
         };
       })();
     }
+
+  // short-cuts for read and write
+  // 
     Dao.Api.prototype['read'] = Dao.Api.prototype['get'];
     Dao.Api.prototype['write'] = Dao.Api.prototype['post'];
 

data/lib/dao/rails/lib/generators/dao/templates/dao_helper.rb

@@ -1,65 +1,40 @@
+# -*- encoding : utf-8 -*-
 module DaoHelper
-  def render_dao(result, *args, &block)
-    if result.status =~ 200 or result.status == 420
-      @result = result unless defined?(@result)
-      render(*args, &block)
-    else
-      result.error!
-    end
-  end
-
-  def dao(path, *args, &block)
-    options = args.extract_options!.to_options!
-
-    mode = options[:mode]
-
-    if mode.blank?
-      mode =
-        case request.method
-          when "GET"
-            :read
-          when "PUT", "POST", "DELETE"
-            :write
-          else
-            :read
-        end
-    end
-
-    @dao = api.send(mode, path, params)
-    @dao.route = request.fullpath
-    #@dao.mode = mode
-
-    #unless options[:error!] == false
-      @dao.error! unless @dao.status.ok?
-    #end
-
-    block ? block.call(@dao) : @dao
-  end
-
   def dao_form_for(*args, &block)
     options = args.extract_options!.to_options!
 
-    model = args.flatten.select{|arg| arg.respond_to?(:new_record?)}.last
+    model = args.flatten.detect{|arg| arg.respond_to?(:persisted?)}
 
     if model
-      first = args.first
-      url = options.delete(:url)
+      first = args.shift
+      url = args.shift || options.delete(:url)
+
       method = options.delete(:method)
       html = dao_form_attrs(options)
 
       options.clear
 
-      if model.new_record?
-        url ||= url_for(first)
-        method ||= :post
-      else
-        url ||= url_for(first)
+      if model.persisted?
         method ||= :put
+      else
+        method ||= :post
       end
 
+      url =
+        case method
+          when :put
+            url_for(:action => :update)
+          when :post
+            url_for(:action => :create)
+          else
+            './'
+        end
+
       options[:url] = url
       options[:html] = html.dup.merge(:method => method)
+      #options[:builder] = Dao::Form::Builder
 
+      args.push(model)
       args.push(options)
       
       form_for(*args) do
@@ -72,6 +47,8 @@ module DaoHelper
     end
   end
 
+  alias_method(:dao_form, :dao_form_for)
+
   def dao_form_attrs(*args)
     args.flatten!
     options = args.extract_options!.to_options!.dup
@@ -87,5 +64,41 @@ module DaoHelper
     options
   end
 
+  def render_dao(result, *args, &block)
+    if result.status =~ 200 or result.status == 420
+      @result = result unless defined?(@result)
+      render(*args, &block)
+    else
+      result.error!
+    end
+  end
+
+  def dao(path, *args, &block)
+    options = args.extract_options!.to_options!
+
+    mode = options[:mode]
+
+    if mode.blank?
+      mode =
+        case request.method
+          when "GET"
+            :read
+          when "PUT", "POST", "DELETE"
+            :write
+          else
+            :read
+        end
+    end
+
+    @dao = api.send(mode, path, params)
+    @dao.route = request.fullpath
+    #@dao.mode = mode
+
+    #unless options[:error!] == false
+      @dao.error! unless @dao.status.ok?
+    #end
+
+    block ? block.call(@dao) : @dao
+  end
 end
 ApplicationController.send(:include, DaoHelper)