puffer 0.0.32 → 0.1.0

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

@@ -0,0 +1,28 @@
+class Puffer::Sessions::Simple < Puffer::Sessions::Base
+
+  setup do
+    model_name :puffer_user
+  end
+
+  def new
+    @record = resource.new_member
+  end
+
+  def create
+    p resource.attributes_key
+    @record = resource.adapter.find_first(:conditions => {:email => resource.attributes[:email]})
+    if @record && @record.authenticate(resource.attributes[:password])
+      session[:puffer_user_id] = @record.id
+      redirect_back_or admin_root_url
+    else
+      @record = resource.new_member :email => resource.attributes[:email]
+      render 'new'
+    end
+  end
+
+  def destroy
+    session.delete(:puffer_user_id)
+    redirect_to new_admin_session_url
+  end
+
+end

data/app/controllers/puffer/tree_base.rb

@@ -2,7 +2,7 @@ module Puffer
   class TreeBase < Puffer::Base
     unloadable
 
-    helper :puffer_tree
+    helper 'puffer/helpers/puffer_tree'
 
     define_fieldset :tree, :fallbacks => :index
 

data/app/models/puffer_user.rb

@@ -12,4 +12,7 @@ elsif defined?(ActiveRecord::Base) && ActiveRecord::Base.connection.table_exists
   class PufferUser < ActiveRecord::Base
     include Puffer::PufferUser
   end
+else
+  class PufferUser
+  end
 end

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

@@ -39,8 +39,8 @@
                       <dt><%= f.label :puffer_search %></dt>
                       <dd><%= f.text_field :puffer_search %></dd>
 
-                      <% index_fields.columns.each do |field| %>
-                        <%= field.render controller, :filter, :form => f %>
+                      <% filter_fields.columns.each do |field| %>
+                        <%= field.render :filter, controller, puffer_filters %>
                       <% end %>
 
                       <dd><%= submit_tag 'Search', :name => nil %></dd>
@@ -56,7 +56,7 @@
       </div>
     </div>
     <div class="column">
-      <div class="content">
+      <div class="content" id="content">
         <%= yield %>
       </div>
     </div>

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

@@ -0,0 +1,15 @@
+<% @title = "Edit #{resource.human}" %>
+<h1><%= @title %></h1>
+<%= form_for record, :url => resource.member_path do |f| %>
+  <ul class="form">
+  <% update_fields.each do |field| -%>
+    <li><%= field.render :update, controller, record %></li>
+  <% end -%>
+  </ul>
+
+  <div class="buttons">
+    <%= f.submit t('puffer.save') %>
+    <%= f.submit t('puffer.save_and_exit') %>
+    <%= link_to 'cancel', (request.referer || resource.collectin_path) %>
+  </div>
+<% end %>

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

@@ -0,0 +1,26 @@
+<% @title = resource.human %>
+<h1><%= @title %></h1>
+
+
+<% if records.present? %>
+  <div class="paginator"></div>
+
+  <%= render :layout => 'table', :locals => {:table_fields => index_fields} do |record| %>
+    <%= link_to 'show', resource.member_path(record), :data => {'new-dialog-uri' => resource.member_path(record)} if configuration.show %>
+    <%= link_to 'edit', resource.edit_path(record) if update_fields.present? %>
+    <% _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 %>
+  <% end %>
+
+  <div class="paginator"></div>
+
+  <%= javascript_tag do %>
+    $$('.paginator').each(function(element) {
+      new Paginator({total: <%= records.num_pages %>, current: <%= params[:page] || 1 %>, link: {'href': '<%= resource.collection_path(:page => '%{page}', Puffer::Filters.model_name.param_key => puffer_filters.query).html_safe %>'}}).insertTo(element, 'instead');
+    });
+  <% end %>
+<% else %>
+  <p>Sorry, but there is no records in <%= resource.human %></p>
+<% end %>

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

@@ -0,0 +1,13 @@
+<% @title = "Show #{resource.human}" %>
+<h1><%= @title %></h1>
+
+<ul class="show_entry">
+<% show_fields.each do |field| -%>
+  <li>
+    <h2><%= field.human %></h2>
+    <div>
+      <%= field.render :show, controller, record %>
+    </div>
+  </li>
+<% end if show_fields && record -%>
+</ul>

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

@@ -13,7 +13,7 @@
   <% records.each do |record| -%>
     <tr>
     <% table_fields.each do |field| -%>
-      <td><%= field.render controller, :index, :record => record %></td>
+      <td><%= field.render :index, controller, record %></td>
     <% end -%>
       <td class="actions">
         <%= yield record %>

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

@@ -1,15 +1 @@
-<% @title = "Edit #{resource.human}" %>
-<h1><%= @title %></h1>
-<%= form_for record, :url => resource.member_path do |f| %>
-  <ul class="form">
-  <% update_fields.each do |field| -%>
-    <li><%= field.render controller, :update, :form => f, :record => f.object %></li>
-  <% end -%>
-  </ul>
-
-  <div class="buttons">
-    <%= f.submit t('puffer.save') %>
-    <%= f.submit t('puffer.save_and_exit') %>
-    <%= link_to 'cancel', (request.referer || resource.collectin_path) %>
-  </div>
-<% end %>
+<%= render 'edit' %>

data/app/views/puffer/base/edit.js.erb

@@ -0,0 +1 @@
+<%= render 'edit' %>

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

@@ -1,20 +1 @@
-<% @title = resource.human %>
-<h1><%= @title %></h1>
-
-
-<% if records.present? %>
-  <div class="rui-paginator" data-paginator="{total: <%= records.num_pages %>, current: <%= params[:page] || 1 %>, link: {href: '<%= resource.collection_path(:page => '%{page}') %>'}}"></div>
-
-  <%= render :layout => 'table', :locals => {:table_fields => index_fields} do |record| %>
-    <%= link_to 'edit', resource.edit_path(record) if update_fields.present? %>
-    <% _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 %>
-  <% end %>
-
-  <div class="rui-paginator" data-paginator="{total: <%= records.num_pages %>, current: <%= params[:page] || 1 %>, link: {href: '<%= resource.collection_path(:page => '%{page}') %>'}}"></div>
-<% else %>
-  <p>Sorry, but there is no records in <%= resource.human %></p>
-<% end %>
-
+<%= render 'index' %>

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

@@ -0,0 +1 @@
+$('content').update('<%= j render 'index' %>');

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

@@ -3,7 +3,7 @@
 <%= form_for record, :url => resource.collection_path do |f| %>
   <ul class="form">
   <% create_fields.each do |field| -%>
-    <li><%= field.render controller, :create, :form => f, :record => f.object %></li>
+    <li><%= field.render :create, controller, record %></li>
   <% end -%>
   </ul>
 

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

@@ -1,22 +1 @@
-<% @title = "Show #{resource.human}" %>
-<h1><%= @title %></h1>
-<ul class="show_entry">
-  <% if resource.children.present? %>
-    <li>
-      <h2>Associations</h2>
-      <% resource.children.each do |child| %>
-        <%= link_to child.human, child.collection_path %>
-      <% end %>
-    </li>
-  <% end %>
-
-<% show_fields.each do |field| -%>
-  <li>
-    <h2><%= field.human %></h2>
-    <div>
-      <%= render_field field, record %>
-    </div>
-  </li>
-<% end if show_fields && record -%>
-</ul>
-
+<%= render 'show' %>

data/app/views/puffer/base/show.js.erb

@@ -0,0 +1 @@
+<%= render 'show' %>

data/app/views/puffer/base/update.js.erb

@@ -0,0 +1 @@
+<%= render 'edit' %>

data/app/views/puffer/sessions/base/new.html.erb

@@ -0,0 +1,11 @@
+<%= form_for record, :url => admin_session_path(:return_to => params[:return_to]), :method => :post do |f| %>
+  <ul class="form">
+  <% create_fields.each do |field| -%>
+    <li><%= field.render :create, controller, record %></li>
+  <% end -%>
+  </ul>
+
+  <div class="buttons">
+    <%= f.submit 'Login' %>
+  </div>
+<% end %>

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

@@ -12,7 +12,7 @@
       <% end %>
       <span class="handle">⇅</span>
       <% tree_fields.each do |field| -%>
-        <span><%= field.render controller, :tree, :record => record %></span>
+        <span><%= field.render :tree, controller, record %></span>
       <% end -%>
     </dt>
     <dd class="column">

data/lib/puffer/component.rb

@@ -14,29 +14,7 @@ module Puffer
 
       abstract!
 
-      module ComponentHelper
-        def component_wrap name = :span, options = {}, &block
-          content_tag name, options.merge(:id => component_id), &block
-        end
-
-        def clean_content_for name, *args, &block
-          @view_flow.set name, ''
-          content_for name, *args, &block
-        end
-
-        def paginate(scope, options = {}, &block)
-          paginator = Kaminari::Helpers::Paginator.new parent_controller.view_context, options.reverse_merge(:current_page => scope.current_page, :num_pages => scope.num_pages, :per_page => scope.limit_value, :param_name => Kaminari.config.param_name, :remote => false)
-          paginator.to_s
-        end
-      end
-
       module ClassMethods
-        def render_component parent_controller, field, context, *args
-          klass = "#{field.type}_component".camelize.constantize rescue StringComponent
-          component = klass.new field
-          component.process parent_controller, context, *args
-        end
-
         def controller_path
           @controller_path ||= name.sub(/Component$/, '').underscore unless anonymous?
         end
@@ -45,40 +23,37 @@ module Puffer
       extend ClassMethods
 
       include AbstractController::Rendering
-      include AbstractController::Helpers
       include AbstractController::Translation
       include AbstractController::Logger
       include AbstractController::Layouts
+      include ActionController::Helpers
 
       include ActionController::RequestForgeryProtection
       include ActionController::UrlFor
       include Rails.application.routes.url_helpers
 
-      helper ComponentHelper, PufferHelper
+      helper 'puffer/helpers/component', 'puffer/helpers/puffer'
 
-      attr_accessor :parent_controller, :field, :opts, :identifer, :resource
+      attr_reader :parent_controller, :field, :identifer, :record, :records, :resource, :opts
       delegate :env, :request, :params, :session, :_members, :_collections, :to => :parent_controller
-      helper_method :params, :session, :resource, :_members, :_collections, :parent_controller, :field, :opts, :identifer, :component_id, :event_url, :event_path, :record, :records
+      helper_method :params, :session, :_members, :_collections, :parent_controller, :field, :identifer, :component_id, :event_url, :event_path, :record, :records, :resource, :opts
 
       def initialize field
         super()
         @field = field
       end
 
-      def process parent_controller, context, *args
+      def process context, parent_controller, record, options = {}
         @parent_controller = parent_controller
-        super context, *args
-      end
-
-      def send_action method_name, *args
-        @opts = args.extract_options!
-        if @opts[:record]
-          @resource = Puffer::Resource.new(params.merge(:member => @opts[:record]), parent_controller)
-        else
-          @resource = parent_controller.resource
-        end
+        @record = record
+        @opts = options
         @identifer = params[:identifer] || generate_identifer
-        send method_name, *args
+
+        resource_params = params
+        resource_params.merge!(:id => record.id) if record && record.respond_to?(:id)
+        @resource = Puffer::Resource.new(resource_params, parent_controller)
+
+        super context
       end
 
       def render *args, &block
@@ -101,7 +76,7 @@ module Puffer
       end
 
       def method_for_action action_name
-        fallback_action(action_name) || super
+        super fallback_action(action_name)
       end
 
       def fallback_action action_name
@@ -120,14 +95,6 @@ module Puffer
         {:action => :event, :event => name, :field => field.to_s, :fieldset => field.field_set.name, :identifer => identifer}
       end
 
-      def record
-        @record || instance_variable_get("@#{resource.name.singularize}")
-      end
-
-      def records
-        @records || instance_variable_get("@#{resource.name.pluralize}")
-      end
-
       def component_id
         "component_#{identifer}"
       end

data/lib/puffer/controller/auth.rb

@@ -35,15 +35,7 @@ module Puffer
         # method, or you should properly redefine +has_puffer_access?+ See
         # +has_puffer_access?+ source and docs.
         def current_puffer_user
-          @current_puffer_user ||= super rescue (PufferUser.find(session[:puffer_user_id]) if session[:puffer_user_id])
-        end
-
-        # Used in before_filter to prevent unauthorized access
-        def require_puffer_user
-          unless has_puffer_access?(puffer_namespace)
-            redirect_to new_admin_session_url(:return_to => request.fullpath)
-            return false
-          end
+          @current_puffer_user ||= super rescue (::Admin::SessionsController.model.to_adapter.find_first(:conditions => {:_id => session[:puffer_user_id]}) if session[:puffer_user_id])
         end
 
         # This method is also part of auth system and it can be redefined at the
@@ -63,6 +55,18 @@ module Puffer
           super rescue (current_puffer_user && current_puffer_user.has_role?(namespace))
         end
 
+        # Used in before_filter to prevent unauthorized access
+        def require_puffer_user
+          unless has_puffer_access?(puffer_namespace)
+            redirect_to new_admin_session_url(:return_to => request.fullpath)
+            return false
+          end
+        end
+
+        def redirect_back_or default
+          redirect_to(params[:return_to].presence || default)
+        end
+
       end
 
     end

data/lib/puffer/controller/config.rb

@@ -1,12 +1,30 @@
+# Every puffer controller can be configured
+# Something like:
+#
+#   setup do
+#     group :posting
+#     model_name 'article'
+#   end
+#
 module Puffer
   module Controller
     module Config
       extend ActiveSupport::Concern
 
       included do
+        # Configuration options with default values:
+        #  group - interface group name, displays as tab in interface header
         puffer_class_attribute :group, :default
+        #  model_name - obviosly - model name for controller
         puffer_class_attribute :model_name
+        #  destroy - records destruction allowed?
         puffer_class_attribute :destroy, true
+        #  destroy - records show method allowed?
+        puffer_class_attribute :show, false
+        #  scope - default scope name for all queries
+        puffer_class_attribute :scope
+        #  order - default order option. Is a string with field name and direction. Ex: 'email', 'first_name asc', 'title desc'
+        puffer_class_attribute :order
 
         helper_method :configuration
       end

data/lib/puffer/controller/mutate.rb

@@ -4,9 +4,9 @@ module Puffer
       extend ActiveSupport::Concern
 
       included do
-        layout 'puffer'
-        helper :puffer
-        delegate :puffer_filters_class, :model, :model_name, :to => 'self.class'
+        helper 'puffer/helpers/puffer'
+        
+        delegate :model, :model_name, :to => 'self.class'
         helper_method :puffer_filters, :puffer_namespace, :resource, :record, :records
       end
 
@@ -18,7 +18,11 @@ module Puffer
         end
 
         def puffer_filters
-          @puffer_filters ||= puffer_filters_class.new params[puffer_filters_class.model_name.param_key]
+          @puffer_filters ||= begin
+            filters = params[Puffer::Filters.model_name.param_key] || {}
+            filters = {:puffer_order => configuration.order}.merge(filters) if configuration.order.present?
+            Puffer::Filters.new filter_fields, filters
+          end
         end
 
         def puffer_namespace
@@ -45,10 +49,6 @@ module Puffer
           true
         end
 
-        def puffer_filters_class
-          @puffer_filters_class ||= Puffer::Filters.controller_filters(self)
-        end
-
         def model_name
           @model_name ||= (configuration.model_name || controller_name.singularize).to_s
         end

data/lib/puffer/engine.rb

@@ -1,5 +1,10 @@
 module Puffer
   class Engine < Rails::Engine
     config.autoload_paths << File.join(root, 'lib')
+
+    initializer 'puffer_components.set_configs', :after => 'action_controller.set_configs' do |app|
+      Puffer::Component::Base.helpers_path = app.config.helpers_paths
+      Puffer::Component::Base.helper :all
+    end
   end
 end

data/lib/puffer/field.rb

@@ -36,10 +36,6 @@ module Puffer
       @human ||= model && model.human_attribute_name(name)
     end
 
-    def order
-      @order ||= options[:order] || query_column
-    end
-
     def type
       @type ||= options[:type] || custom_type || column_type || :string
     end
@@ -49,7 +45,7 @@ module Puffer
     end
 
     def reflection
-      @reflection ||= model && model.reflect_on_association(name.to_sym)
+      @reflection ||= model && model.to_adapter.reflection(name)
     end
 
     def input_options
@@ -64,8 +60,9 @@ module Puffer
       @component ||= component_class.new self
     end
 
-    def render controller, context, *args
-      component.process controller, context, *args
+    def render context, controller, *record_and_options
+      options = record_and_options.extract_options!
+      component.process context, controller, record_and_options.first, options
     end
 
     def model
@@ -85,12 +82,9 @@ module Puffer
     end
 
     def column_type
+      reflection.macro if reflection
       column[:type] if column
     end
 
-    def query_column
-      "#{model.table_name}.#{name}" if column
-    end
-
   end
 end