puffer 0.0.32 → 0.1.0

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

@@ -20,15 +20,15 @@ a:hover
 	text-decoration: none;
 }
 
-h1
+h1, h1 *
 {
-    font-size: 21px;
+    font-size: 21px !important;
     margin-bottom: 10px;
 }
 
-h2
+h2, h2 *
 {
-    font-size: 17px;
+    font-size: 17px !important;
     margin-bottom: 10px;
 }
 
@@ -168,6 +168,11 @@ h2
     margin-bottom: 8px;
 }
 
+.sidebar .navigation > li .additional dd.date_range input[type=text]
+{
+    width: 48%;
+}
+
 .sidebar .navigation > li .additional, .dashboard .navigation > li ul.additional
 {
     padding: 10px 12px;
@@ -273,6 +278,8 @@ h2
 .list_table *
 {
     font-size: 8pt;
+    margin: 0;
+    padding: 0;
 }
 
 .list_table tr
@@ -412,6 +419,13 @@ select
     height: 60px;
 }
 
+.nested_attributes li
+{
+    border-left: 1px solid #ccc;
+    padding-left: 20px;
+    margin-bottom: 15px;
+}
+
 .field_error
 {
     color: #C83E3E;
@@ -464,3 +478,14 @@ select
 {
     display: block;
 }
+
+.show_entry
+{
+    min-width: 900px;
+}
+
+.show_entry li
+{
+    list-style: none;
+    margin-bottom: 10px;
+}

data/app/components/base/form.html.erb

@@ -1,15 +1,9 @@
-<% content_for :label do %>
-  <%= opts[:form].label field %>
-<% end unless content_for? :label %>
-
-<% content_for :error do %>
-  <%= opts[:form].object.errors[field.name.to_sym].first %>
-<% end unless content_for? :error %>
-
-<div class="label">
-  <%= yield :label %>
-  <div class="field_error">
-    <%= yield :error %>
+<%= component_fields_for @record do |f| %>
+  <div class="label">
+    <%= f.label field %>
+    <div class="field_error">
+      <%= f.object.errors[field.name.to_sym].first %>
+    </div>
   </div>
-</div>
-<%= yield :input %>
+  <%= f.text_field field, field.input_options %>
+<% end %>

data/app/components/base_component.rb

@@ -1,7 +1,7 @@
 class BaseComponent < Puffer::Component::Base
 
   def index
-    opts[:record].call_chain(field.to_s)
+    @record.call_chain(field.to_s)
   end
 
   def form

data/app/components/boolean/form.html.erb

@@ -1,3 +1,5 @@
-<%= opts[:form].check_box field, field.input_options %>
-<%= opts[:form].label field %>
-<%= opts[:form].object.errors[field.name.to_sym].first %>
+<%= component_fields_for @record do |f| %>
+  <%= f.check_box field, field.input_options %>
+  <%= f.label field %>
+  <%= @record.errors[field.name.to_sym].first %>
+<% end %>

data/app/components/boolean/index.html.erb

@@ -1,3 +1,7 @@
-<%= component_wrap do %>
-  <%= link_to opts[:record].call_chain(field.to_s) ? 'True' : 'False', event_path(:change, :id => opts[:record].to_param), :remote => true %>
+<% if field.options[:editable] && field.column %>
+  <%= component_wrap do %>
+    <%= link_to @record.call_chain(field.to_s) ? 'True' : 'False', event_path(:change, :id => @record.to_param), :remote => true %>
+  <% end %>
+<% else %>
+  <%= check_box_tag '', '', @record.call_chain(field.to_s), :disabled => true %>
 <% end %>

data/app/components/boolean_component.rb

@@ -5,8 +5,8 @@ class BooleanComponent < BaseComponent
   end
 
   def change
-    opts[:record] = resource.member
-    opts[:record].update_attributes field.to_s => !opts[:record].call_chain(field.to_s)
+    @record = resource.member
+    @record.update_attributes field.to_s => !@record.call_chain(field.to_s)
     replace :index
   end
 

data/app/components/date_time/filter.html.erb

@@ -0,0 +1,9 @@
+<%= component_fields_for @record do |f| %>
+  <dt><%= f.label field.field_name %></dt>
+  <dd class="date_range">
+    <%= f.fields_for field.to_s do |fields| %>
+      <%= fields.text_field :from, field.input_options.merge("data-calendar" => "{showButtons: true, listYears: true, format: '#{@format}'}", :autocomplete => :off) %>
+      <%= fields.text_field :till, field.input_options.merge("data-calendar" => "{showButtons: true, listYears: true, format: '#{@format}'}", :autocomplete => :off) %>
+    <% end %>
+  </dd>
+<% end %>

data/app/components/date_time/form.html.erb

@@ -1,5 +1,9 @@
-<% content_for :input do %>
-  <%= opts[:form].text_field field, field.input_options.merge("data-calendar" => "{showButtons: true, listYears: true, format: '#{@format}'}", :autocomplete => :off) %>
+<%= component_fields_for @record do |f| %>
+  <div class="label">
+    <%= f.label field %>
+    <div class="field_error">
+      <%= @record.errors[field.name.to_sym].first %>
+    </div>
+  </div>
+  <%= f.text_field field, field.input_options.merge("data-calendar" => "{showButtons: true, listYears: true, format: '#{@format}'}", :autocomplete => :off) %>
 <% end %>
-
-<%= render :file => 'base/form' %>

data/app/components/date_time_component.rb

@@ -1,12 +1,28 @@
 class DateTimeComponent < BaseComponent
 
+  def index
+    date = super
+    date.to_s(field.options[:format].presence || :db) if date.present?
+  end
+
   def form
-    @format = case field.type
-      when :date                    then '%Y-%m-%d'
-      when :time                    then '%H:%M:%S'
-      when :datetime, :timestamp    then '%Y-%m-%d %H:%M:%S'
+    @format = time_format
+    render
+  end
+
+  def filter
+    @format = time_format
+    render
+  end
+
+private
+
+  def time_format
+    @format ||= case field.type
+      when :date                                then '%Y-%m-%d'
+      when :time                                then '%H:%M:%S'
+      when :datetime, :date_time, :timestamp    then '%Y-%m-%d %H:%M:%S'
     end
-    super
   end
 
 end

data/app/components/file/form.html.erb

@@ -1,5 +1,9 @@
-<% content_for :input do %>
-  <%= opts[:form].file_field field, field.input_options %>
+<%= component_fields_for @record do |f| %>
+  <div class="label">
+    <%= f.label field %>
+    <div class="field_error">
+      <%= @record.errors[field.name.to_sym].first %>
+    </div>
+  </div>
+  <%= f.file_field field, field.input_options %>
 <% end %>
-
-<%= render :file => 'base/form' %>

data/app/components/hidden/form.html.erb

@@ -1 +1,3 @@
-<%= opts[:form].hidden_field field, field.input_options %>
+<%= component_fields_for @record do |f| %>
+  <%= f.hidden_field field, field.input_options %>
+<% end %>

data/app/components/nested_attributes_many/form.html.erb

@@ -0,0 +1,47 @@
+<%= component_fields_for @record do |f| %>
+  <h2><%= f.label field %></h2>
+
+  <ul class="nested_attributes" id="<%= "#{field.name}_nested_attributes" %>">
+    <% f.object.send(field.name).each_with_index do |nested_record, index| -%>
+      <%= f.fields_for field.name, nested_record, :child_index => index do |nested_builder| %>
+        <li id="<%= "#{field.name}_#{index}_attributes" %>">
+          <% field.children.each do |field| %>
+            <%= field.render :form, parent_controller, nested_builder.object, :builder => nested_builder %>
+          <% end %>
+          <%= nested_builder.hidden_field :id if nested_builder.object.persisted? %>
+
+          <% destroy_nested_record = capture do %>
+            <%= nested_builder.hidden_field :_destroy, :value => true %>
+            <%= nested_builder.hidden_field :id %>
+          <% end.to_s.strip.gsub("\n", ' ') %>
+
+          <%= link_to t('.destroy'), '#',
+            :data => {:insert => {
+              :content => destroy_nested_record,
+              :element => "#{field.name}_marked_for_destroy",
+              :remove => "#{field.name}_#{index}_attributes"
+            }} %>
+        </li>
+      <% end %>
+    <% end -%>
+  </ul>
+
+  <div id="<%= field.name %>_marked_for_destroy" style="display: none">
+  </div>
+  
+  <% new_nested_record = capture do %>
+    <%= f.fields_for field.name, field.reflection.klass.new, :child_index => "new_nested_index" do |nested_builder| %>
+      <li id="<%= "#{field.name}_new_nested_index_attributes" %>">
+        <% field.children.each do |field| %>
+          <%= field.render :form, parent_controller, nested_builder.object, :builder => nested_builder %>
+        <% end %>
+
+        <%= link_to t('.destroy'), '#',
+          :data => {:insert => {:remove => "#{field.name}_new_nested_index_attributes"}} %>
+      </li>
+    <% end %>
+  <% end.to_s.strip.gsub("\n", ' ') %>
+
+  <%= link_to t('.add'), '#',
+    :data => {:insert => {:content => new_nested_record, :element => "#{field.name}_nested_attributes"}} %>
+<% end %>

data/app/components/nested_attributes_many_component.rb

@@ -0,0 +1,7 @@
+class NestedAttributesManyComponent < BaseComponent
+
+  def form
+    render
+  end
+
+end

data/app/components/nested_attributes_one/form.html.erb

@@ -0,0 +1,48 @@
+<%= component_fields_for @record do |f| %>
+  <h2><%= f.label field %></h2>
+
+  <ul class="nested_attributes" id="<%= "#{field.name}_nested_attributes" %>">
+    <% if f.object.send(field.name) -%>
+      <%= f.fields_for field.name do |nested_builder| %>
+        <li id="<%= "#{field.name}_attributes" %>">
+          <% field.children.each do |field| %>
+            <%= field.render :form, parent_controller, nested_builder.object, :builder => nested_builder %>
+          <% end %>
+
+          <% destroy_nested_record = capture do %>
+            <%= nested_builder.hidden_field :_destroy, :value => true %>
+            <%= nested_builder.hidden_field :id %>
+          <% end.to_s.strip.gsub("\n", ' ') %>
+
+          <%= link_to t('.destroy'), '#',
+            :data => {:insert => {
+              :content => destroy_nested_record,
+              :element => "#{field.name}_marked_for_destroy",
+              :remove => "#{field.name}_attributes",
+              :show => "#{field.name}_attributes_add"
+            }} %>
+        </li>
+      <% end %>
+    <% end -%>
+  </ul>
+
+  <div id="<%= field.name %>_marked_for_destroy" style="display: none">
+  </div>
+
+  <% new_nested_record = capture do %>
+    <%= f.fields_for field.name, field.reflection.klass.new do |nested_builder| %>
+      <li id="<%= "#{field.name}_attributes" %>">
+        <% field.children.each do |field| %>
+          <%= field.render :form, parent_controller, nested_builder.object, :builder => nested_builder %>
+        <% end %>
+
+        <%= link_to t('.destroy'), '#',
+          :data => {:insert => {:remove => "#{field.name}_attributes", :show => "#{field.name}_attributes_add"}} %>
+      </li>
+    <% end %>
+  <% end.to_s.strip.gsub("\n", ' ') %>
+
+  <%= link_to t('.add'), '#',
+    :style => ('display: none' if f.object.send(field.name)), :id => "#{field.name}_attributes_add",
+    :data => {:insert => {:content => new_nested_record, :element => "#{field.name}_nested_attributes", :hide => "#{field.name}_attributes_add"}} %>
+<% end %>

data/app/components/nested_attributes_one_component.rb

@@ -0,0 +1,7 @@
+class NestedAttributesOneComponent < BaseComponent
+
+  def form
+    render
+  end
+
+end

data/app/components/password/form.html.erb

@@ -1,5 +1,9 @@
-<% content_for :input do %>
-  <%= opts[:form].password_field field, field.input_options %>
+<%= component_fields_for @record do |f| %>
+  <div class="label">
+    <%= f.label field %>
+    <div class="field_error">
+      <%= @record.errors[field.name.to_sym].first %>
+    </div>
+  </div>
+  <%= f.password_field field, field.input_options %>
 <% end %>
-
-<%= render :file => 'base/form' %>

data/app/components/password_component.rb

@@ -1,7 +1,7 @@
 class PasswordComponent < BaseComponent
 
   def index
-    '*' * opts[:record].call_chain(field.to_s).mb_chars.length
+    '*' * @record.call_chain(field.to_s).mb_chars.length
   end
 
 end

data/app/components/references_many/index.html.erb

@@ -1 +1 @@
-<%= link_to field.human, resource.children_hash[field.name].collection_path %>
+<%= link_to "#{field.human} (#{@record.send(field.to_s).size})", resource.children_hash[field.name].collection_path %>

data/app/components/references_one/choose.html.erb

@@ -5,5 +5,5 @@
 <div id="paginator"></div>
 
 <%= javascript_tag do %>
-  new Paginator({total: <%= records.num_pages %>, current: <%= params[:page] || 1 %>, link: {'data-dialog-uri': '<%= event_path(:choose, :page => '%{page}') %>'}}).insertTo('paginator', 'instead');
+  new Paginator({total: <%= @records.num_pages %>, current: <%= params[:page] || 1 %>, link: {'data-dialog-uri': '<%= event_path(:choose, :page => '%{page}') %>'}}).insertTo('paginator', 'instead');
 <% end %>

data/app/components/references_one/form.html.erb

@@ -1,10 +1,11 @@
-<% content_for :input do %>
-  <% link_to "Choose", '#', :"data-dialog-uri" => event_path(:choose) %>
+<%= component_fields_for @record do |f| %>
+  <div class="label">
+    <%= f.label field %>
+    <div class="field_error">
+      <%= @record.errors[field.reflection.foreign_key.to_sym].first ||
+        @record.errors[field.name.to_sym].first.presence %>
+    </div>
+  </div>
+  <%#= f.hidden_field field, field.input_options %>
+  <%= link_to "Choose", '#', :data => {"new-dialog-uri" => event_path(:choose)} %>
 <% end %>
-
-<% content_for :error do %>
-  <%= opts[:form].object.errors[field.reflection.foreign_key.to_sym].first ||
-    opts[:form].object.errors[field.name.to_sym].first.presence %>
-<% end %>
-
-<%= render :file => 'base/form' %>

data/app/components/references_one_component.rb

@@ -5,7 +5,6 @@ class ReferencesOneComponent < Puffer::Component::Base
   end
 
   def choose
-    #@records = field.reflection.klass.includes(field.children.includes).where(field.children.searches(params[:search])).page(params[:page])
     @records = field.reflection.klass.to_adapter.filter(field.reflection.klass, field.children, :search => params[:puffer_search]).page(params[:page])
     render
   end

data/app/components/render_component.rb

@@ -0,0 +1,13 @@
+class RenderComponent < Puffer::Component::Base
+
+  def action_missing name
+    case field.options[:render]
+    when Symbol then
+      view_context.send(field.options[:render])
+    when Proc then
+      field.options[:render].bind(view_context).call
+    else ''
+    end
+  end
+
+end

data/app/components/select/filter.html.erb

@@ -1,2 +1,4 @@
-<dt><%= opts[:form].label field.field_name %></dt>
-<dd><%= opts[:form].select field.field_name, @options, :include_blank => true %></dd>
+<%= component_fields_for @record do |f| %>
+  <dt><%= f.label field.field_name %></dt>
+  <dd><%= f.select field.field_name, @options, :include_blank => true %></dd>
+<% end %>

data/app/components/select/form.html.erb

@@ -1,5 +1,9 @@
-<% content_for :input do %>
-  <%= opts[:form].select field, @options, {:include_blank => field.options.key?(:include_blank) ? field.options[:include_blank] : true }, field.input_options %>
+<%= component_fields_for @record do |f| %>
+  <div class="label">
+    <%= f.label field %>
+    <div class="field_error">
+      <%= @record.errors[field.name.to_sym].first %>
+    </div>
+  </div>
+  <%= f.select field, @options, {:include_blank => field.options.key?(:include_blank) ? field.options[:include_blank] : true }, field.input_options %>
 <% end %>
-
-<%= render :file => 'base/form' %>

data/app/components/text/form.html.erb

@@ -1,5 +1,9 @@
-<% content_for :input do %>
-  <%= opts[:form].text_area field, field.input_options %>
+<%= component_fields_for @record do |f| %>
+  <div class="label">
+    <%= f.label field %>
+    <div class="field_error">
+      <%= @record.errors[field.name.to_sym].first %>
+    </div>
+  </div>
+  <%= f.text_area field, field.input_options %>
 <% end %>
-
-<%= render :file => 'base/form' %>

data/app/controllers/admin/sessions_controller.rb

@@ -1,26 +1,6 @@
 # Implemented basic rails auth with custom PufferUser model.
 # Admin::SessionsController could be redefined in application.
 # See Puffer::SessionsBase docs for additional info.
-class Admin::SessionsController < Puffer::SessionsBase
-
-  def new
-    @record = PufferUser.new
-  end
-
-  def create
-    @record = PufferUser.to_adapter.find_first(:conditions => {:email => params[:puffer_user][:email]})
-    if @record && @record.authenticate(params[:puffer_user][:password])
-      session[:puffer_user_id] = @record.id
-      redirect_to admin_root_url
-    else
-      @record = PufferUser.new :email => params[:puffer_user][:email]
-      render 'new'
-    end
-  end
-
-  def destroy
-    session.delete(:puffer_user_id)
-    redirect_to new_admin_session_url
-  end
+class Admin::SessionsController < Puffer::Sessions::Simple
 
 end

data/app/controllers/puffer/base.rb

@@ -8,23 +8,30 @@ module Puffer
     define_fieldset :index, :form
     define_fieldset :show, :fallbacks => :index
     define_fieldset :create, :update, :fallbacks => :form
+    define_fieldset :filter, :fallbacks => :index
+
+    layout 'puffer'
 
     respond_to :html, :js
 
     def index
       @records = resource.collection.page(params[:page])
+      respond_with @records
     end
 
     def show
       @record = resource.member
+      respond_with @record
     end
 
     def new
       @record = resource.new_member
+      respond_with @record
     end
 
     def edit
       @record = resource.member
+      respond_with @record
     end
 
     def create
@@ -42,17 +49,17 @@ module Puffer
     def destroy
       @record = resource.member
       @record.destroy
-      redirect_to (request.referrer || resource.collection_path)
+      respond_with @records, :location => (request.referrer || resource.collection_path)
     end
 
     def event
-      render :text => fields(params[:fieldset])[params[:field]].render(self, params[:event])
+      render :text => fields(params[:fieldset])[params[:field]].render(params[:event], self)
     end
 
   private
 
     def puffer_saving_location
-      params[:commit] == t('puffer.save') ? resource.edit_path(record) : resource.collection_path
+      @record.persisted? && params[:commit] == t('puffer.save') ? resource.edit_path(record) : resource.collection_path
     end
 
   end

data/app/controllers/puffer/dashboard_base.rb

@@ -6,8 +6,14 @@ class Puffer::DashboardBase < ApplicationController
 
   layout 'puffer_dashboard'
 
-  def index
+  respond_to :html
+
+  setup do
+    group nil
+  end
 
+  def index
+    
   end
 
 end

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

@@ -1,31 +1,35 @@
 # Puffer::SessionsBase is a base class for any Admin::SessionsController
 # implementation by default implemented basic auth through PufferUser.
 # See Puffer::SessionsDeviseBase for alternative implementation example.
-class Puffer::SessionsBase < ApplicationController
+class Puffer::Sessions::Base < ApplicationController
   unloadable
   pufferize!
 
   before_filter :require_puffer_user, :only => :destroy
 
-  define_fieldset :create
+  define_fieldset :create, :fallbacks => :form
 
   layout 'puffer_sessions'
 
   respond_to :html
 
+  setup do
+    group nil
+  end
+
   create do
     field :email, :type => :string
     field :password, :type => :password
   end
 
   def new
-    # @record = UserSession.new
+    # @record = resource.new_member
   end
 
   def create
-    # @record = UserSession.new params[:user_session]
+    # @record = resource.new_member
     # if @record.save
-    #   redirect_back_or_default puffer_root_url
+    #   redirect_back_or admin_root_url
     # else
     #   render 'new'
     # end
@@ -33,7 +37,6 @@ class Puffer::SessionsBase < ApplicationController
 
   def destroy
     # current_user_session.destroy
-    # redirect_to new_puffer_session_url
+    # redirect_to new_admin_session_url
   end
-
 end

data/app/controllers/puffer/sessions/clearance.rb

@@ -0,0 +1,29 @@
+# Puffer::Sessions::Clearance integrates Puffer admin interface
+# builder with the Clearance authentication & authorization solution.
+class Puffer::Sessions::Clearance < Puffer::Sessions::Base
+
+  setup do
+    model_name :user
+  end
+
+  def new
+    @record = resource.new_member
+  end
+
+  def create
+    # I used to follow the Clearance conventions
+    params[:session] = params.delete resource.attributes_key
+    
+    if @record = authenticate(params) and sign_in(@record)
+      redirect_back_or admin_root_url
+    else
+      @record = resource.new_member :email => params[:session][:email]
+      render 'new'
+    end
+  end
+
+  def destroy
+    sign_out
+    redirect_to new_admin_session_url
+  end
+end

data/app/controllers/puffer/{sessions_devise_base.rb → sessions/devise.rb}

@@ -1,4 +1,4 @@
-class Puffer::SessionsDeviseBase < Puffer::SessionsBase
+class Puffer::Sessions::Devise < Puffer::Sessions::Base
   # include Devise::Controllers::InternalHelpers
 
   # GET /resource/sign_in