databrowser 0.9 → 1.0

data/lib/data_browser/data_browser_controller.rb

@@ -4,10 +4,12 @@ module DataBrowser
     protect_from_forgery :secret => Time.now.to_i.to_s
     before_filter :load_models, :authenticate
 
-    helper_method :current_model, :current_model_id
+    include DataBrowser::Helpers
 
     # all the work here is being done by :load_models
     def index; end
+    def new; end
+    def edit; end
 
     def browse
       params[:select] ||= current_model.column_names
@@ -25,38 +27,25 @@ module DataBrowser
     def empty
       current_model.delete_all
       flash[:notice] = "#{current_model.table_name} model was emptied"
-      redirect_to :action => "index"
-    end
-
-    def new
-      @obj = current_model.new
-    end
-
-    def edit
-      @obj = current_model.find(params[:id])
+      redirect_to data_browser_home_url()
     end
 
     def destroy
-      @obj = current_model.find(params[:id])
-      @obj.destroy()
+      current_object.delete_all(current_object.attributes)
       flash[:notice] = "#{current_model.table_name} #{@obj.to_param} successfuly deleted!"
-      redirect_to :action => "browse", :model => current_model_id
+      redirect_to data_browser_model_url(:model => current_model_id)
     end
 
     def update
-      @obj = current_model.find(params[:id])
-      @obj.update_attributes(params[current_model.to_s.underscore])
-
+      current_model.update_all(data_from_params, current_object.attributes)
       flash[:notice] = "#{current_model.table_name} #{@obj.to_param} successfuly saved!"
-      redirect_to :action => "browse", :model => current_model_id
+      redirect_to data_browser_model_url(:model => current_model_id)
     end
 
     def create
-      @obj = current_model.new(params[current_model.to_s.underscore])
-    
-      @obj.save(false)
-      flash[:notice] = "#{current_model.table_name} #{@obj.to_param} successfuly saved!"
-      redirect_to :action => "browse", :model => current_model_id
+      current_model.create(data_from_params)
+      flash[:notice] = "#{current_model.table_name} #{current_object.to_param || "record"} successfuly saved!"
+      redirect_to data_browser_model_url(:model => current_model_id)
     end
 
     protected
@@ -80,12 +69,11 @@ module DataBrowser
       end
     end
 
-    def current_model
-      @model ||= DataBrowser.models[current_model_id] if current_model_id
-    end
+    private
 
-    def current_model_id
-      params[:model].to_i if params[:model]
+    def data_from_params
+      pos = ActionController::RecordIdentifier.singular_class_name(current_model)
+              current_model.new(params[pos]).attributes # Hum... well, you know..
     end
   end
 end

data/lib/data_browser/routing.rb

@@ -1,22 +1,24 @@
 module DataBrowser
   module Routing
-    def databrowser(opts={})
-      root = opts[:root] || "databrowser"
+    def databrowser(root="databrowser")
       with_options :controller => "data_browser/data_browser" do |db|
         # Databrowser pages
         db.data_browser_home    "/#{root}",       :action => "index"
         db.data_browser_about   "/#{root}/about", :action => "about"
         # Model manipulation
         db.with_options :model => /\d+/ do |model|
-          model.data_browser_model  "/#{root}/:model",          :action => "browse", :conditions => {:method => :get}
-          model.data_browser_new    "/#{root}/:model/new",      :action => "new",    :conditions => {:method => :get}
-          model.data_browser_object "/#{root}/:model/:id",      :action => "show",   :conditions => {:method => :get}
-          model.data_browser_edit   "/#{root}/:model/:id/edit", :action => "edit",   :conditions => {:method => :get}
+          model.data_browser_model  "/#{root}/:model",     :action => "browse", :conditions => {:method => :get}
+          model.data_browser_new    "/#{root}/:model/new", :action => "new",    :conditions => {:method => :get}
+
+          model.connect "/#{root}/:model", :action => "empty",  :conditions => {:method => :delete}
+          model.connect "/#{root}/:model", :action => "create", :conditions => {:method => :post}
+
+          # Object manipulation
+          model.data_browser_object "/#{root}/:model/:id/",     :action => "show", :conditions => {:method => :get}
+          model.data_browser_edit   "/#{root}/:model/:id/edit", :action => "edit", :conditions => {:method => :get}
 
-          model.connect "/#{root}/:model",     :action => "empty",   :conditions => {:method => :delete}
           model.connect "/#{root}/:model/:id", :action => "update",  :conditions => {:method => :put}
           model.connect "/#{root}/:model/:id", :action => "destroy", :conditions => {:method => :delete}
-          model.connect "/#{root}/:model",     :action => "create",  :conditions => {:method => :post}
         end
       end
     end

data/lib/data_browser/views/data_browser/data_browser/_obj.rhtml

@@ -1,6 +1,6 @@
     <tr class="<%= cycle("odd", "") %>">
-      <td><%= link_to("Edit", data_browser_edit_path(:id => obj.to_param, :model => current_model_id)) unless obj.to_param.nil? %></td>
-      <td><%= link_to("Delete", data_browser_object_path(:id => obj.to_param, :model => current_model_id), :method => :delete, :confirm => "Are you sure?") unless obj.to_param.nil? %></td>
+      <td><%= link_to("Edit", data_browser_edit_path(object_params(obj))) %></td>
+      <td><%= link_to("Delete", data_browser_object_path(object_params(obj)), :method => :delete, :confirm => "Are you sure?") %></td>
       <% for column in params[:select] %>
       <td><%= obj.attributes[column] %></td>
       <% end %>

data/lib/data_browser/views/data_browser/data_browser/edit.html.erb

@@ -1,5 +1,5 @@
-<% form_for(@obj, :url => {:action => "update", :id => @obj.id, :model => @model.to_s}) do |f| %>
-  <%= render :partial => "form", :locals => {:form => f} %>
+<% form_for(current_object, :url => data_browser_object_path(object_params(current_object)), :method => :put) do |f| %>
+  <%= render :partial => "form", :object => f %>
   <div class="button">
       <%= submit_tag("Save") %> or <%= link_to("cancel", :action => "browse", :model => @model.to_s) %>
   </div>

data/lib/data_browser/views/data_browser/data_browser/new.html.erb

@@ -1,5 +1,5 @@
-<% form_for(@obj, :url => data_browser_model_path(:model => current_model_id), :method => :post) do |f| %>
-  <%= render :partial => "form", :locals => {:form => f} %>
+<% form_for(current_object, :url => data_browser_model_path(:model => current_model_id), :method => :post) do |f| %>
+  <%= render :partial => "form", :object => f %>
   <div class="button">
       <%= submit_tag("Create") %> or <%= link_to("cancel", :action => "browse", :model => @model.to_s) %>
   </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: databrowser
 version: !ruby/object:Gem::Version 
-  version: "0.9"
+  version: "1.0"
 platform: ruby
 authors: 
 - Carlos Junior
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-05 00:00:00 -03:00
+date: 2008-08-06 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency