puffer 0.0.20 → 0.0.21

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'rails', '>= 3.1.0.rc4'
+gem 'rails', '>= 3.1.0.rc5'
 gem 'kaminari'
 gem 'apotomo'
 
@@ -18,4 +18,6 @@ group :development, :test do
   gem 'forgery'
   gem 'fabrication'
   gem "jeweler"
+
+  gem 'nested_set'
 end

data/Gemfile.lock

@@ -1,41 +1,40 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0.rc4)
-      actionpack (= 3.1.0.rc4)
+    actionmailer (3.1.0.rc5)
+      actionpack (= 3.1.0.rc5)
       mail (~> 2.3.0)
-    actionpack (3.1.0.rc4)
-      activemodel (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+    actionpack (3.1.0.rc5)
+      activemodel (= 3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.0)
-      rack-cache (~> 1.0.1)
+      rack (~> 1.3.1)
+      rack-cache (~> 1.0.2)
       rack-mount (~> 0.8.1)
       rack-test (~> 0.6.0)
-      sprockets (~> 2.0.0.beta.10)
-      tzinfo (~> 0.3.27)
-    activemodel (3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+      sprockets (~> 2.0.0.beta.12)
+    activemodel (3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
       bcrypt-ruby (~> 2.1.4)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.0.rc4)
-      activemodel (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
-      arel (~> 2.1.1)
-      tzinfo (~> 0.3.27)
-    activeresource (3.1.0.rc4)
-      activemodel (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
-    activesupport (3.1.0.rc4)
+    activerecord (3.1.0.rc5)
+      activemodel (= 3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
+      arel (~> 2.1.4)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0.rc5)
+      activemodel (= 3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
+    activesupport (3.1.0.rc5)
       multi_json (~> 1.0)
     apotomo (1.1.2)
       cells (>= 3.5.6)
       hooks (~> 0.1.3)
       onfire (~> 0.2.0)
-    arel (2.1.3)
+    arel (2.1.4)
     bcrypt-ruby (2.1.4)
     builder (3.0.0)
     capybara (1.0.0)
@@ -79,35 +78,38 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.16)
     multi_json (1.0.3)
+    nested_set (1.6.7)
+      activerecord (>= 3.0.0)
+      railties (>= 3.0.0)
     nokogiri (1.5.0)
     onfire (0.2.0)
-    polyglot (0.3.1)
-    rack (1.3.1)
+    polyglot (0.3.2)
+    rack (1.3.2)
     rack-cache (1.0.2)
       rack (>= 0.4)
     rack-mount (0.8.1)
       rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.0)
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0.rc4)
-      actionmailer (= 3.1.0.rc4)
-      actionpack (= 3.1.0.rc4)
-      activerecord (= 3.1.0.rc4)
-      activeresource (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+    rails (3.1.0.rc5)
+      actionmailer (= 3.1.0.rc5)
+      actionpack (= 3.1.0.rc5)
+      activerecord (= 3.1.0.rc5)
+      activeresource (= 3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
       bundler (~> 1.0)
-      railties (= 3.1.0.rc4)
-    railties (3.1.0.rc4)
-      actionpack (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+      railties (= 3.1.0.rc5)
+    railties (3.1.0.rc5)
+      actionpack (= 3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2)
-    rdoc (3.8)
+    rdoc (3.9)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -127,14 +129,15 @@ GEM
       ffi (>= 1.0.7)
       json_pure
       rubyzip
-    sprockets (2.0.0.beta.10)
-      hike (~> 1.0)
+    sprockets (2.0.0.beta.12)
+      hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
-    sqlite3 (1.3.3)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.4)
     thor (0.14.6)
     tilt (1.3.2)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.29)
     xpath (0.1.4)
@@ -154,6 +157,7 @@ DEPENDENCIES
   jeweler
   kaminari
   libnotify
-  rails (>= 3.1.0.rc4)
+  nested_set
+  rails (>= 3.1.0.rc5)
   rspec-rails
   sqlite3

data/README.md

@@ -1,6 +1,6 @@
-# Puffer - YARAI (Yet Another Rails Admin Interface). Rails 3 only.
+# Puffer - YARAI (Yet Another Rails Admin Interface). Rails 3.1 only.
 
-Puffer was created to help project owner or moderators view and edit all the project`s data models. It is rails 3 only
+Puffer was created to help project owner or moderators view and edit all the project`s data models. It is rails 3.1 only
 
 ## Keyfeatures
 
@@ -15,9 +15,6 @@ You can instal puffer as a gem:
 <pre>gem install puffer</pre>
 Or in Gemfile:
 <pre>gem "puffer"</pre>
-Next step is:
-<pre>rails g puffer:install</pre>
-This will install main puffer config file in your initializers and some css/js.
 
 ## Introduction.
 

data/VERSION

@@ -1 +1 @@
-0.0.20
+0.0.21

data/app/assets/stylesheets/puffer/application.css

@@ -1,4 +1,5 @@
 /*
  *= require puffer/reset
  *= require puffer/puffer
+ *= require puffer/puffer_tree
  */

data/app/assets/stylesheets/puffer/puffer_tree.css

@@ -0,0 +1,65 @@
+.puffer_tree *
+{
+    font-size: 8pt;
+}
+
+.puffer_tree li
+{
+    list-style: none;
+    position: relative;
+}
+
+.puffer_tree li ul
+{
+    margin-left: 20px;
+}
+
+.puffer_tree li .record
+{
+    margin-bottom: 5px;
+    border: 1px solid #ddd;
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
+
+.puffer_tree li .record dt
+{
+    white-space: nowrap;
+}
+
+.puffer_tree li .record dd
+{
+    width: 50px;
+    white-space: nowrap;
+    padding: 5px;
+    padding-left: 20px;
+}
+
+.puffer_tree li .record dt > span
+{
+    display: table-cell;
+    *display: inline;
+    zoom: 1;
+    padding: 5px;
+    white-space: normal;
+    vertical-align: top;
+}
+
+.puffer_tree li .record dt > span.handle
+{
+    padding-right: 10px;
+    color: #999;
+}
+
+.puffer_tree li .record .toggle
+{
+    position: absolute;
+    left: -20px;
+}
+
+.puffer_tree li .record .toggle a
+{
+    color: #999;
+    text-decoration: none;
+}

data/{lib → app/controllers}/puffer/base.rb

@@ -3,7 +3,9 @@ module Puffer
     unloadable
 
     pufferize!
-    define_fields :index, :show, :form, :create, :update
+    define_fieldset :index, :form
+    define_fieldset :show, :fallbacks => :index
+    define_fieldset :create, :update, :fallbacks => :form
 
     respond_to :html, :js
 

data/app/controllers/puffer/{dashboard.rb → dashboard_base.rb}

@@ -1,4 +1,4 @@
-class Puffer::Dashboard < ApplicationController
+class Puffer::DashboardBase < ApplicationController
   unloadable
 
   pufferize!

data/app/controllers/puffer/dashboard_controller.rb

@@ -0,0 +1,4 @@
+class Puffer::DashboardController < Puffer::DashboardBase
+  unloadable
+
+end

data/app/controllers/puffer/{sessions.rb → sessions_base.rb}

@@ -1,8 +1,8 @@
-class Puffer::Sessions < ApplicationController
+class Puffer::SessionsBase < ApplicationController
   unloadable
 
   pufferize!
-  define_fields :create
+  define_fieldset :create
 
   layout 'puffer_sessions'
 

data/{lib/generators/puffer/install/templates → app/controllers/puffer}/sessions_controller.rb

@@ -1,4 +1,5 @@
-class Puffer::SessionsController < Puffer::Sessions
+class Puffer::SessionsController < Puffer::SessionsBase
+  unloadable
   # This is example session controller for puffer authentication.
   # You can define your own actions.
   # Also, you can redefine <tt>new<tt> action view as you wish,

data/app/controllers/puffer/tree_base.rb

@@ -0,0 +1,50 @@
+module Puffer
+  class TreeBase < Puffer::Base
+    unloadable
+
+    helper :puffer_tree
+
+    define_fieldset :tree, :fallbacks => :index
+
+    def index
+      return super if params[:search]
+      @records = resource.collection_scope.includes(resource.includes)
+      if session[:expanded].present?
+        @records = @records.where(["depth in (0, 1) or parent_id in (#{session[:expanded].join(', ')})"]).arrange
+      else
+        @records = @records.with_depth([0, 1]).arrange
+      end
+      render 'tree'
+    end
+
+    member do
+      get :inherit, :label => 'inherit'
+      get :expand, :display => false
+      get :collapse, :display => false
+    end
+
+    def inherit
+      @parent = resource.member
+      @record = @parent.children.new
+      render 'new'
+    end
+
+    def expand
+      @parent = resource.member
+      session[:expanded] ||= []
+      session[:expanded].push params[:id] if @parent
+      session[:expanded].uniq!
+      @records = @parent.self_and_descendants.where(:parent_id => [@parent.parent_id] + session[:expanded]).includes(resource.includes).arrange
+      render 'toggle'
+    end
+
+    def collapse
+      @parent = resource.member
+      session[:expanded] ||= []
+      session[:expanded].delete params[:id]
+      @records = resource.collection_scope.where(:id => [@parent.id]).includes(resource.includes).arrange
+      render 'toggle'
+    end
+
+  end
+end

data/app/helpers/puffer_helper.rb

@@ -1,12 +1,8 @@
 module PufferHelper
 
   def puffer_namespaces
-    Rails.application.routes.puffer.each do |(prefix, groups)|
-      controller = groups.values.first.first
-      title = prefix.to_s.humanize
-      path = send("#{prefix}_#{controller.controller_name}_path")
-      current = controller.namespace == namespace
-      yield title, path, current
+    Rails.application.routes.puffer.keys.each do |prefix|
+      yield prefix.to_s.humanize, send("#{prefix}_root_path"), prefix == namespace
     end
   end
 

data/app/helpers/puffer_tree_helper.rb

@@ -0,0 +1,15 @@
+module PufferTreeHelper
+
+  def puffer_tree hash, options = {}, &block
+    content_tag :ul, options do
+      puffer_tree_node hash, &block
+    end if hash.present?
+  end
+
+  def puffer_tree_node hash, &block
+    hash.keys.each do |node|
+      block.call node, render_tree(hash[node], &block)
+    end if hash.present?
+  end
+
+end

data/app/views/layouts/puffer.html.erb

@@ -1,77 +1,60 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title><%= [@title, 'Puffer'].compact.join(' - ') %></title>
-    <meta http-equiv="content-type" content="text/html;charset=utf-8" />
-    <%= csrf_meta_tag %>
-    <%= stylesheet_link_tag    "puffer/application" %>
-    <%= javascript_include_tag "puffer/application" %>
-    <%= yield :stylesheets %>
-    <%= yield :javascripts %>
-  </head>
-  <body>
-    <div class="body">
-      <div class="header">
-        <div class="logo">
-          <%= link_to t('puffer.logo'), puffer_root_path %>
-        </div>
-        <ul class="namespaces">
-          <% puffer_namespaces do |title, path, current| %>
-            <li<%= raw(current ? ' class="selected"' : '') %>><%= link_to title, path %></li>
-          <% end %>
-        </ul>
+<% content_for :header do %>
+  <ul class="namespaces">
+    <% puffer_namespaces do |title, path, current| %>
+      <li<%= raw(current ? ' class="selected"' : '') %>><%= link_to title, path %></li>
+    <% end %>
+  </ul>
+  <ul class="navigation">
+    <% puffer_navigation do |title, path, current| %>
+      <li<%= raw(current ? ' class="selected"' : '') %>><%= link_to title, path %></li>
+    <% end %>
+  </ul>
+<% end %>
+
+<% content_for :content do %>
+  <div class="columns">
+    <div class="column sidebar">
+      <div class="padder">
         <ul class="navigation">
-          <% puffer_navigation do |title, path, current| %>
-            <li<%= raw(current ? ' class="selected"' : '') %>><%= link_to title, path %></li>
+          <% sidebar_puffer_navigation do |title, path, current| %>
+            <li<%= raw(current ? ' class="selected"' : '') %>>
+              <%= link_to title, path %>
+              <% if current %>
+                <div class="additional">
+                  <dl>
+                    <dt>Links</dt>
+                    <dd>
+                      <%= link_to t(:list, :target => resource.human), resource.collection_path %>
+                      <%= link_to t(:add, :target => resource.human), resource.new_path %>
+                    </dd>
+                    <dt>Search</dt>
+                    <dd>
+                      <%= form_tag resource.collection_path, {:method => :get} do %>
+                        <%= text_field_tag :search, params[:search] %>
+                        <%= submit_tag 'Search' %>
+
+                        <% if false %>
+                        <% if resource_session[:search].present? %>
+                          <%= link_to 'clear', resource.collection_path(:search => '') %>
+                        <% end %>
+                        <% end %>
+                      <% end %>
+                    </dd>
+                  </dl>
+                </div>
+              <% end %>
+            </li>
           <% end %>
         </ul>
-        <div class="logout">
-          <%= link_to t('puffer.logout'), puffer_session_url, :method => :delete %>
-        </div>
+        <%= yield :sidebar %>
       </div>
-      <div class="columns">
-        <div class="column sidebar">
-          <div class="padder">
-            <ul class="navigation">
-              <% sidebar_puffer_navigation do |title, path, current| %>
-                <li<%= raw(current ? ' class="selected"' : '') %>>
-                  <%= link_to title, path %>
-                  <% if current %>
-                    <div class="additional">
-                      <dl>
-                        <dt>Links</dt>
-                        <dd>
-                          <%= link_to t(:list, :target => resource.human), resource.collection_path %>
-                          <%= link_to t(:add, :target => resource.human), resource.new_path %>
-                        </dd>
-                        <dt>Search</dt>
-                        <dd>
-                          <%= form_tag resource.collection_path, {:method => :get} do %>
-                            <%= text_field_tag :search, params[:search] %>
-                            <%= submit_tag 'Search' %>
-
-                            <% if false %>
-                            <% if resource_session[:search].present? %>
-                              <%= link_to 'clear', resource.collection_path(:search => '') %>
-                            <% end %>
-                            <% end %>
-                          <% end %>
-                        </dd>
-                      </dl>
-                    </div>
-                  <% end %>
-                </li>
-              <% end %>
-            </ul>
-            <%= yield :sidebar %>
-          </div>
-        </div>
-        <div class="column">
-          <div class="content">
-            <%= yield %>
-          </div>
-        </div>
+    </div>
+    <div class="column">
+      <div class="content">
+        <%= yield %>
       </div>
     </div>
-  </body>
-</html>
+  </div>
+<% end %>
+
+<%= render :file => 'layouts/puffer_base' %>

data/app/views/layouts/puffer_base.html.erb

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title><%= [@title, 'Puffer'].compact.join(' - ') %></title>
+    <meta http-equiv="content-type" content="text/html;charset=utf-8" />
+    <%= csrf_meta_tag %>
+    <%= stylesheet_link_tag    "puffer/application" %>
+    <%= javascript_include_tag "puffer/application" %>
+    <%= yield :stylesheets %>
+    <%= yield :javascripts %>
+  </head>
+  <body>
+    <div class="body">
+      <div class="header">
+        <div class="logo">
+          <%= link_to t('puffer.logo'), puffer_root_path %>
+        </div>
+        <%= yield :header %>
+        <% if respond_to?(:current_user) && !current_user %>
+          <div class="logout">
+            <%= link_to t('puffer.logout'), puffer_session_url, :method => :delete %>
+          </div>
+        <% end %>
+      </div>
+      <%= yield :content %>
+    </div>
+  </body>
+</html>

data/app/views/layouts/puffer_dashboard.html.erb

@@ -1,32 +1,15 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title><%= [@title, 'Puffer'].compact.join(' - ') %></title>
-    <meta http-equiv="content-type" content="text/html;charset=utf-8" />
-    <%= csrf_meta_tag %>
-    <%= stylesheet_link_tag    "puffer/application" %>
-    <%= javascript_include_tag "puffer/application" %>
-    <%= yield :stylesheets %>
-    <%= yield :javascripts %>
-  </head>
-  <body>
-    <div class="body">
-      <div class="header">
-        <div class="logo">
-          <%= link_to t('puffer.logo'), puffer_root_path %>
-        </div>
-        <ul class="namespaces">
-          <% puffer_namespaces do |title, path, current| %>
-            <li<%= raw(current ? ' class="selected"' : '') %>><%= link_to title, path %></li>
-          <% end %>
-        </ul>
-        <div class="logout">
-          <%= link_to t('puffer.logout'), puffer_session_url, :method => :delete %>
-        </div>
-      </div>
-      <div class="content dashboard">
-        <%= yield %>
-      </div>
-    </div>
-  </body>
-</html>
+<% content_for :header do %>
+  <ul class="namespaces">
+    <% puffer_namespaces do |title, path, current| %>
+      <li<%= raw(current ? ' class="selected"' : '') %>><%= link_to title, path %></li>
+    <% end %>
+  </ul>
+<% end %>
+
+<% content_for :content do %>
+  <div class="content dashboard">
+    <%= yield %>
+  </div>
+<% end %>
+
+<%= render :file => 'layouts/puffer_base' %>

data/app/views/layouts/puffer_sessions.html.erb

@@ -1,24 +1,7 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title><%= [@title, 'Puffer'].compact.join(' - ') %></title>
-    <meta http-equiv="content-type" content="text/html;charset=utf-8" />
-    <%= csrf_meta_tag %>
-    <%= stylesheet_link_tag    "puffer/application" %>
-    <%= javascript_include_tag "puffer/application" %>
-    <%= yield :stylesheets %>
-    <%= yield :javascripts %>
-  </head>
-  <body>
-    <div class="body">
-      <div class="header">
-        <div class="logo">
-          <span><%= t('puffer.logo') %></span>
-        </div>
-      </div>
-      <div class="content sessions">
-        <%= yield %>
-      </div>
-    </div>
-  </body>
-</html>
+<% content_for :content do %>
+  <div class="content sessions">
+    <%= yield %>
+  </div>
+<% end %>
+
+<%= render :file => 'layouts/puffer_base' %>

data/app/views/puffer/base/index.html.erb

@@ -32,4 +32,3 @@
   <p>Sorry, but there is no records in <%= resource.human %></p>
 <% end %>
 <%= paginate records, :url => resource.collection_path(:page => '') %>
-

data/app/views/puffer/tree_base/_record.html.erb

@@ -0,0 +1,27 @@
+<li id="<%= dom_id record %>">
+  <dl class="record columns">
+    <dt class="column">
+      <% unless record.leaf? || record.root? %>
+        <span class="toggle">
+        <% if children.blank? %>
+          <%= link_to '+', resource.member_path(record, :action => :expand), :remote => true %>
+        <% else %>
+          <%= link_to '–', resource.member_path(record, :action => :collapse), :remote => true %>
+        <% end %>
+        </span>
+      <% end %>
+      <span class="handle">⇅</span>
+      <% tree_fields.each do |field| -%>
+        <span><%= render_field field, record %></span>
+      <% end -%>
+    </dt>
+    <dd class="column">
+      <%= link_to 'edit', resource.edit_path(record) if update_fields.present? %>
+      <% controller._members.each do |member| %>
+        <%= link_to member.label, resource.member_path(record, :action => member.action) if member.display? %>
+      <% end %>
+      <%= link_to 'destroy', resource.member_path(record), :confirm => "Are you sure?", :method => :delete if configuration.destroy %>
+    </dd>
+  </dl>
+  <%= children %>
+</li>