databrowser 0.8 → 0.9

data/lib/data_browser/data_browser.rb

@@ -4,6 +4,7 @@ require 'digest/sha1'
 module DataBrowser
   @@user_digest = nil
   @@models = []
+  @@tables = []
 
   class << self
     def should_auth
@@ -36,5 +37,13 @@ module DataBrowser
     def models=(models)
       @@models = models if models.is_a?(Array)
     end
+
+    def tables
+      @@tables
+    end
+
+    def tables=(tables)
+      @@tables = tables if tables.is_a?(Array)
+    end
   end
 end

data/lib/data_browser/data_browser_controller.rb

@@ -3,16 +3,15 @@ module DataBrowser
     layout "data_browser"
     protect_from_forgery :secret => Time.now.to_i.to_s
     before_filter :load_models, :authenticate
-    before_filter :load_current_model, :except => [:index]
 
-    @@models = nil
-    
+    helper_method :current_model, :current_model_id
+
     # all the work here is being done by :load_models
     def index; end
 
     def browse
-      params[:select] ||= @model.column_names
-      @objects = @model.find(:all,
+      params[:select] ||= current_model.column_names
+      @objects = current_model.find(:all,
         :conditions => params[:conditions],
         :select => params[:select] ? params[:select].join(", ") : nil
       )
@@ -24,64 +23,55 @@ module DataBrowser
     end
 
     def empty
-      @model.delete_all
-      flash[:notice] = "#{@model.to_s} model was emptied"
+      current_model.delete_all
+      flash[:notice] = "#{current_model.table_name} model was emptied"
       redirect_to :action => "index"
     end
 
     def new
-      @obj = @model.new
+      @obj = current_model.new
     end
 
     def edit
-      @obj = @model.find(params[:id])
+      @obj = current_model.find(params[:id])
     end
 
     def destroy
-      @obj = @model.find(params[:id])
+      @obj = current_model.find(params[:id])
       @obj.destroy()
-      flash[:notice] = "#{@model.to_s} #{@obj.to_param} successfuly deleted!"
-      redirect_to :action => "browse", :model => @model.to_s
+      flash[:notice] = "#{current_model.table_name} #{@obj.to_param} successfuly deleted!"
+      redirect_to :action => "browse", :model => current_model_id
     end
 
     def update
-      @obj = @model.find(params[:id])
-      @obj.attributes = params[@model.to_s.underscore]
+      @obj = current_model.find(params[:id])
+      @obj.update_attributes(params[current_model.to_s.underscore])
 
-      @obj.save(false)
-      flash[:notice] = "#{@model.to_s} #{@obj.to_param} successfuly saved!"
-      redirect_to :action => "browse", :model => @model.to_s
+      flash[:notice] = "#{current_model.table_name} #{@obj.to_param} successfuly saved!"
+      redirect_to :action => "browse", :model => current_model_id
     end
 
     def create
-      @obj = @model.new(params[@model.to_s.underscore])
+      @obj = current_model.new(params[current_model.to_s.underscore])
     
       @obj.save(false)
-      flash[:notice] = "#{@model.to_s} #{@obj.to_param} successfuly saved!"
-      redirect_to :action => "browse", :model => @model.to_s
+      flash[:notice] = "#{current_model.table_name} #{@obj.to_param} successfuly saved!"
+      redirect_to :action => "browse", :model => current_model_id
     end
 
     protected
 
     def load_models
-      # this will make that the models won't be fetched in every request
       if DataBrowser.models.size == 0
-        models_root = File.join(RAILS_ROOT, "app", "models", "*.rb")
-        models = Dir.glob(models_root).collect do |c|
-          c = File.basename(c).gsub(/\.rb/, "").classify
-          c = Kernel.const_get(c)
-          c if c < ActiveRecord::Base
+        (DataBrowser.tables.empty?? ActiveRecord::Base.connection.tables : DataBrowser.tables).each do |table|
+          model_name = "DataBrowser::#{table.classify}"
+          eval("#{model_name} = Class.new(ActiveRecord::Base); DataBrowser.models.push(#{model_name})")
         end
-        DataBrowser.models = models.compact.sort { |a, b| a.to_s <=> b.to_s }
       end
 
       @models = DataBrowser.models
     end
 
-    def load_current_model
-      @model = Kernel.const_get(params[:model]) if params[:model]
-    end
-
     def authenticate
       if DataBrowser::should_auth && !DataBrowser::check_digest(session[:databrowser])
         authenticate_or_request_with_http_basic("DataBrowser") do |user, pass|
@@ -89,5 +79,13 @@ module DataBrowser
         end
       end
     end
+
+    def current_model
+      @model ||= DataBrowser.models[current_model_id] if current_model_id
+    end
+
+    def current_model_id
+      params[:model].to_i if params[:model]
+    end
   end
 end

data/lib/data_browser/routing.rb

@@ -3,11 +3,21 @@ module DataBrowser
     def databrowser(opts={})
       root = opts[:root] || "databrowser"
       with_options :controller => "data_browser/data_browser" do |db|
-        db.connect "/#{root}"
-        db.connect "/#{root}/about", :action => "about"
-        db.connect "/#{root}/:model", :action => "browse"
-        db.connect "/#{root}/:model/:action"
-        db.connect "/#{root}/:model/:id/:action"
+        # 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.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
   end

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

@@ -1,6 +1,6 @@
 <ul>
   <%
-    @model.columns_hash.each do |name, column|
+    current_model.columns_hash.each do |name, column|
       next if name.eql?("id")
   %>
   <li>

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

@@ -1,6 +1,6 @@
     <tr class="<%= cycle("odd", "") %>">
-      <td><%= link_to("Edit", :action => "edit", :id => obj.to_param, :model => @model.to_s) %></td>
-      <td><%= link_to("Delete", :action => "destroy", :id => obj.to_param, :model => @model.to_s) %></td>
+      <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>
       <% for column in params[:select] %>
       <td><%= obj.attributes[column] %></td>
       <% end %>

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

@@ -2,6 +2,6 @@
 
 <p>Rails DataBrowser is a data browser based on the idea of <a href="http://www.djangoproject.com/documentation/databrowse/">Django's Databrowser</a>.</p>
 <p>Using Rails DataBrowser you can browse, view, edit, crate and delete data through your model classes. It's not a replacement to your DBMS or to your CMS, it's just a helper for developers and WebMasters to manage data without.</p>
-<p>If you find a bug, please report it <a href="http://trac.milk-it.net/open/newticket">here</a></p>
+<p>If you find a bug, please report it <a href="http://redmine.milk-it.net/projects/databrowser/issues/new">here</a></p>
 <p />
-<p>Rails DataBrowser plugin is sponsored by <a href="http://milk-it.net">Milk-it Brasil Software House</a> and maintained by <%= mail_to "carlos@milk-it.net", "Carlos Júnior", :encode => "hex", :replace_at => " at ", :replace_dot => "dot" %>.</p>
+<p>Rails DataBrowser plugin is sponsored by <a href="http://milk-it.net">Milk-it Software House</a> and maintained by <%= mail_to "carlos@milk-it.net", "Carlos Júnior", :encode => "hex", :replace_at => " at ", :replace_dot => "dot" %>.</p>

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

@@ -1,8 +1,8 @@
-<% form_tag({:model => @model.to_s}, {:id => "search_form"}) do %>
+<% form_tag(data_browser_model_path(:model => current_model_id), {:id => "search_form"}) do %>
 <div id="search-box" style="display:none">
 <p>
     <label>Select</label><br />
-    <% for column in @model.column_names %>
+    <% for column in current_model.column_names %>
     <label><%= check_box_tag("select[]", column, params[:select].include?(column)) %><%= column %></label>
     <% end %>
 </p>

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

@@ -1,8 +1,8 @@
 <ul>
-  <% @models.each do |model| %>
+  <% @models.each_with_index do |model, i| %>
   <li>
-    <%= link_to(model.to_s, :action => "browse", :model => model.to_s) %> (<%=model.count%> records)
-    <%= link_to("empty", {:action => "empty", :model => model.to_s}, :confirm => "Are you sure?") %>
+    <%= link_to(model.table_name, data_browser_model_path(:model => i)) %> (<%= model.count %> records)
+    <%= link_to("empty", data_browser_model_path(:model => i), :confirm => "Are you sure?", :method => :delete) %>
   </li>
   <% end %>
 </ul>

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

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

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

@@ -209,15 +209,15 @@ document.getElementById("show-search").style.display = "none";
 </script>
 </head>
 <body id="home">
-    <h1><%= link_to("<b>Rails</b>DataBrowser", :action => "index") %></h1>
+    <h1><%= link_to("<b>Rails</b>DataBrowser", data_browser_home_path()) %></h1>
     <ul id="models">
-	<% for model in @models %>
-        <li><%= link_to(model.to_s, :action => "browse", :model => model.to_s) %></li>
+	<% @models.each_with_index do |model, i| %>
+        <li><%= link_to(model.table_name, data_browser_model_path(:model => i)) %></li>
 	<% end %>
     </ul>
     <div id="content">
-        <% if @model %>
-        <h2><%= @model.to_s %> (<%=@model.table_name%> table) <%= link_to("new", :action => "new", :model => @model.to_s) %></h2>
+        <% if current_model %>
+        <h2><%= current_model.table_name %> <%= link_to("new", data_browser_new_path(:model => current_model_id)) %></h2>
         <% end %>
         <%= content_tag(:h3, flash[:notice], :class => "notice") if flash[:notice] %>
         <%= yield %>
@@ -225,12 +225,12 @@ document.getElementById("show-search").style.display = "none";
     <div style="clear:both">&nbsp;</div>
     <div id="footer">
         <p class="left">
-        Powered by <%= link_to "DataBrowser", :action => "about" %><br />
+        Powered by <%= link_to("DataBrowser", data_browser_about_path()) %><br />
         by <a href="http://milk-it.net">Milk-it</a>
         </p>
         <p class="right">
             Visit Rails DataBrowser Official WebSite.<br />
-            <a href="http://trac.milk-it.net/open/wiki/DataBrowser">trac.milk-it.net/open</a>
+            <a href="http://redmine.milk-it.net/projects/show/databrowser">redmine.milk-it.net/projects</a>
         </p>
     </div>
 </body>

metadata

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