puffer 0.0.29 → 0.0.30

data/app/components/references_one_component.rb

@@ -5,8 +5,13 @@ 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.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
 
+  def filter
+
+  end
+
 end

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

@@ -0,0 +1,2 @@
+<dt><%= opts[:form].label field.field_name %></dt>
+<dd><%= opts[:form].select field.field_name, @options, :include_blank => true %></dd>

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

@@ -1,5 +1,5 @@
 <% content_for :input do %>
-  <%= opts[:form].select field, @options, {:include_blank => field.options[:include_blank]}, field.input_options %>
+  <%= opts[:form].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/select_component.rb

@@ -1,7 +1,19 @@
 class SelectComponent < BaseComponent
 
   def form
-    @options = case field.options[:select]
+    @options = select_options
+    super
+  end
+
+  def filter
+    @options = select_options
+    render
+  end
+
+private
+
+  def select_options
+    case field.options[:select]
       when Symbol then
         parent_controller.view_context.send field.options[:select]
       when Proc then
@@ -9,7 +21,6 @@ class SelectComponent < BaseComponent
       else
         field.options[:select]
     end
-    super
   end
 
 end

data/app/controllers/admin/puffer_users_controller.rb

@@ -1,3 +1,7 @@
-class Admin::PufferUsersController < Puffer::PufferUsersBase
+require 'puffer_user'
 
+if defined?(PufferUser)
+  class Admin::PufferUsersController < Puffer::PufferUsersBase
+    
+  end
 end

data/app/controllers/admin/sessions_controller.rb

@@ -1,3 +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
@@ -5,7 +8,7 @@ class Admin::SessionsController < Puffer::SessionsBase
   end
 
   def create
-    @record = PufferUser.find_by_email(params[:puffer_user][:email])
+    @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

data/app/controllers/puffer/base.rb

@@ -12,7 +12,7 @@ module Puffer
     respond_to :html, :js
 
     def index
-      @records = resource.collection
+      @records = resource.collection.page(params[:page])
     end
 
     def show

data/app/controllers/puffer/sessions_base.rb

@@ -1,3 +1,6 @@
+# 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
   unloadable
   pufferize!

data/app/controllers/puffer/tree_base.rb

@@ -7,8 +7,8 @@ module Puffer
     define_fieldset :tree, :fallbacks => :index
 
     def index
-      return super if params[:search]
-      @records = resource.collection_scope.includes(resource.includes)
+      return super if puffer_filters.any?
+      @records = resource.collection_scope
       if session[:expanded].present?
         @records = @records.where(["depth in (0, 1) or parent_id in (#{session[:expanded].join(', ')})"]).arrange
       else
@@ -34,7 +34,7 @@ module Puffer
       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
+      @records = resource.model.to_adapter.filter(@parent.self_and_descendants.where(:parent_id => [@parent.parent_id] + session[:expanded]), tree_fields).arrange
       render 'toggle'
     end
 
@@ -42,7 +42,7 @@ module Puffer
       @parent = resource.member
       session[:expanded] ||= []
       session[:expanded].delete params[:id]
-      @records = resource.collection_scope.where(:id => [@parent.id]).includes(resource.includes).arrange
+      @records = resource.model.to_adapter.filter(resource.collection_scope.where(:id => [@parent.id]), tree_fields).arrange
       render 'toggle'
     end
 

data/app/helpers/puffer_helper.rb

@@ -1,25 +1,26 @@
 module PufferHelper
 
-  def puffer_namespaces
-    Rails.application.routes.puffer.keys.each do |prefix|
-      yield prefix.to_s.humanize, send("#{prefix}_root_path"), prefix == namespace
+  def puffer_scopes_navigation
+    Rails.application.routes.resources_tree.map(&:scope).uniq.each do |scope|
+      yield scope, send("#{scope}_root_path"), scope == puffer_namespace
     end
   end
 
-  def puffer_navigation
-    Rails.application.routes.puffer[namespace].values.map(&:first).each do |controller|
-      title = controller.configuration.group.to_s.humanize
-      path = polymorphic_url [namespace, controller.model]
-      current = configuration.group && resource.root.controller.configuration.group == controller.configuration.group
-      yield title, path, current
+  def puffer_groups_navigation namespace = puffer_namespace
+    Rails.application.routes.resources_tree.roots.select {|node| node.controller.model && node.scope == namespace}.uniq_by(&:group).each do |resource_node|
+      path = send("#{resource_node.url_string}_path")
+      current = resource.resource_node ? resource.root.resource_node.group == resource_node.group : false
+
+      yield resource_node.group, path, current
     end
   end
 
-  def sidebar_puffer_navigation
-    (Rails.application.routes.puffer[namespace][configuration.group] || []).each do |controller|
-      title = controller.model.model_name.human
-      path = polymorphic_url [namespace, controller.model]
-      current = controller.controller_name == resource.root.controller_name
+  def puffer_resources_navigation namespace = puffer_namespace, group = configuration.group
+    Rails.application.routes.resources_tree.roots.select {|node| node.controller.model && node.scope == namespace && node.group == group}.each do |resource_node|
+      title = resource_node.controller.model.model_name.human
+      path = send("#{resource_node.url_string}_path")
+      current = resource.resource_node ? resource.root.resource_node == resource_node : false
+
       yield title, path, current
     end
   end
@@ -41,7 +42,7 @@ module PufferHelper
       res = record.call_chain(field.to_s)
     end
     unless field.native?
-      url = edit_polymorphic_path [resource.namespace, record.call_chain(field.path)] rescue nil
+      url = edit_polymorphic_path [resource.scope, record.call_chain(field.path)] rescue nil
       res = link_to res, url if url
     end
     res

data/app/models/puffer/puffer_user.rb

@@ -1,24 +1,25 @@
-class Puffer::PufferUser < ActiveRecord::Base
-  self.abstract_class = true
+module Puffer::PufferUser
+  extend ActiveSupport::Concern
+  include ActiveModel::SecurePassword
 
-  attr_protected :password_digest
-  
-  has_secure_password
+  included do
+    attr_protected :password_digest
+    has_secure_password
 
-  validates :email, :uniqueness => true, :presence => true
-  validates :password, :presence => true, :length => {:minimum => 6}, :on => :create
+    validates :email, :uniqueness => true, :presence => true
+    validates :password, :presence => true, :length => { :minimum => 6 }, :on => :create
+  end
 
-  def roles= value
+  def roles= value = []
     value = value.split(',').map(&:strip).map(&:presence) if value.is_a?(String)
     write_attribute(:roles, value.join(', '))
   end
 
   def roles_array
-    roles.split(',').map(&:strip).map(&:presence)
+    roles.to_s.split(',').map(&:strip).map(&:presence)
   end
 
   def has_role? role
     roles_array.include?(role.to_s)
   end
-
 end

data/app/models/puffer_user.rb

@@ -1,3 +1,15 @@
-class PufferUser < Puffer::PufferUser
+if defined?(Mongoid::Document)
+  class PufferUser
+    include Mongoid::Document
 
-end
+    field :email, :type => String
+    field :password_digest, :type => String
+    field :roles, :type => String
+
+    include Puffer::PufferUser
+  end
+elsif defined?(ActiveRecord::Base) && ActiveRecord::Base.connection.table_exists?('puffer_users')
+  class PufferUser < ActiveRecord::Base
+    include Puffer::PufferUser
+  end
+end

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

@@ -1,12 +1,12 @@
 <% content_for :header do %>
   <ul class="namespaces">
-    <% puffer_namespaces do |title, path, current| %>
-      <li<%= raw(current ? ' class="selected"' : '') %>><%= link_to title, path %></li>
+    <% puffer_scopes_navigation do |title, path, current| %>
+      <li<%= raw(current ? ' class="selected"' : '') %>><%= link_to title.to_s.humanize, path %></li>
     <% end %>
   </ul>
   <ul class="navigation">
-    <% puffer_navigation do |title, path, current| %>
-      <li<%= raw(current ? ' class="selected"' : '') %>><%= link_to title, path %></li>
+    <% puffer_groups_navigation do |title, path, current| %>
+      <li<%= raw(current ? ' class="selected"' : '') %>><%= link_to title.to_s.humanize, path %></li>
     <% end %>
   </ul>
 <% end %>
@@ -15,8 +15,8 @@
   <div class="columns">
     <div class="column sidebar">
       <div class="padder">
-        <ul class="navigation">
-          <% sidebar_puffer_navigation do |title, path, current| %>
+        <ul class="navigation"> 
+          <% puffer_resources_navigation do |title, path, current| %>
             <li<%= raw(current ? ' class="selected"' : '') %>>
               <%= link_to title, path %>
               <% if current %>
@@ -34,19 +34,18 @@
                         <% end %>
                       </p>
                     </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 %>
-                        <% end %>
-                        <% end %>
+                    <%= form_for puffer_filters, :url => resource.collection_path, :method => :get do |f| %>
+                      <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 %>
                       <% end %>
-                    </dd>
+
+                      <dd><%= submit_tag 'Search', :name => nil %></dd>
+                    <% end %>
+
                   </dl>
                 </div>
               <% end %>

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

@@ -6,8 +6,7 @@
     <%= csrf_meta_tag %>
     <%= stylesheet_link_tag    "puffer/application" %>
     <%= javascript_include_tag "puffer/application" %>
-    <%= yield :stylesheets %>
-    <%= yield :javascripts %>
+    <%= yield :assets %>
   </head>
   <body>
     <div class="body">

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

@@ -1,7 +1,7 @@
 <% content_for :header do %>
   <ul class="namespaces">
-    <% puffer_namespaces do |title, path, current| %>
-      <li<%= raw(current ? ' class="selected"' : '') %>><%= link_to title, path %></li>
+    <% puffer_scopes_navigation do |title, path, current| %>
+      <li<%= raw(current ? ' class="selected"' : '') %>><%= link_to title.to_s.humanize, path %></li>
     <% end %>
   </ul>
 <% end %>

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

@@ -1,6 +1,15 @@
 <% @title = "Edit #{resource.human}" %>
 <h1><%= @title %></h1>
-<%= form_for record, :url => resource.member_path, :html => {:multipart => true} do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f, :action => 'edit' } %>
-<% end %>
+<%= 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 %>

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

@@ -1,6 +1,15 @@
 <% @title = "New #{resource.human}" %>
 <h1><%= @title %></h1>
-<%= form_for record, :url => resource.collection_path, :html => {:multipart => true} do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f, :action => 'new' } %>
-<% end %>
+<%= 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>
+  <% 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/dashboard_base/index.html.erb

@@ -1,13 +1,13 @@
-<% Rails.application.routes.puffer.each do |(namespace, groups)| %>
-  <h2><%= namespace.to_s.humanize %></h2>
+<% puffer_scopes_navigation do |scope| %>
+  <h2><%= scope.to_s.humanize %></h2>
   <ul class="navigation">
-    <% groups.each do |(group, controllers)| %>
+    <% puffer_groups_navigation scope do |group| %>
       <li>
         <span><%= group.to_s.humanize %></span>
         <ul class="additional">
-          <% controllers.each do |controller| %>
+          <% puffer_resources_navigation scope, group do |resource, url| %>
             <li>
-              <%= link_to controller.model.model_name.human, polymorphic_url([namespace, controller.model]) %>
+              <%= link_to resource, url %>
             </li>
           <% end %>
         </ul>

data/lib/generators/puffer/component/component_generator.rb

@@ -5,7 +5,6 @@ class Puffer::ComponentGenerator < Rails::Generators::NamedBase
     @name = name.underscore
 
     template 'component.rb', "app/components/#{@name}_component.rb"
-    template 'component_spec.rb', "spec/app/components/#{@name}_component_spec.rb"
   end
 
   def generate_views

data/lib/generators/puffer/controller/controller_generator.rb

@@ -15,7 +15,7 @@ private
   end
 
   def attributes
-    @model_name.constantize.columns.map(&:name)
+    @model_name.constantize.to_adapter.column_names
   end
 
 end

data/lib/generators/puffer/controller/templates/controller.rb

@@ -6,13 +6,21 @@ class <%= controller_name %>Controller < Puffer::Base
 
   index do
 <% attributes.each do |attribute| -%>
+<% if %w(_id id _type type created_at updated_at).include?(attribute.to_s) -%>
+    # field :<%= attribute %>
+<% else -%>
     field :<%= attribute %>
+<% end -%>
 <% end -%>
   end
 
   form do
 <% attributes.each do |attribute| -%>
+<% if %w(_id id _type type created_at updated_at).include?(attribute.to_s) -%>
+    # field :<%= attribute %>
+<% else -%>
     field :<%= attribute %>
+<% end -%>
 <% end -%>
   end
 

data/lib/puffer.rb

@@ -11,11 +11,18 @@ require 'puffer/extensions/controller'
 require 'puffer/extensions/core'
 require 'puffer/extensions/mapper'
 require 'puffer/extensions/form'
+require 'puffer/extensions/directive_processor'
 require 'puffer/extensions/engine'
 require 'puffer/engine'
 
 module Puffer
 
+  class PufferError < StandardError
+  end
+
+  class ComponentMissing < PufferError
+  end
+
   module Controller
     autoload :Action, 'puffer/controller/actions'
     autoload :MemberAction, 'puffer/controller/actions'
@@ -24,24 +31,81 @@ module Puffer
   
   module Component
     autoload :Base, 'puffer/component'
+  end
 
-    mattr_accessor :_mappings
-    self._mappings = {}
+  # Puffer has two types of mappings. If maps <tt>field.type</tt> to component
+  # class and also maps field attributes to <tt>field.type</tt>
+  mattr_accessor :_component_mappings
+  self._component_mappings = {}
+
+  # Maps <tt>field.type</tt> to component class
+  #
+  # ex:
+  #
+  #   Puffer.map_component :ckeditor, :rich, :text, :to => CkeditorComponent
+  #
+  # this declaration maps even text fields to use <tt>CkeditorComponent</tt> for
+  # rendering
+  def self.map_component *args
+    to = args.extract_options![:to]
+    args.each { |type| _component_mappings[type.to_sym] = to }
+  end
+
+  def self.component_for field
+    type = field
+    type = field.type if field.respond_to? :type
+    (_component_mappings[type.to_sym] || "#{type}_component").to_s.camelize.constantize
+  rescue NameError
+    raise ComponentMissing, "Missing `#{type}` component for `#{field}` field. Please use Puffer.map_component binding or specify field type manually"
+  end
+
+  map_component :belongs_to, :has_one, :to => :ReferencesOneComponent
+  map_component :has_many, :has_and_belongs_to_many, :to => :ReferencesManyComponent
+  map_component :date, :time, :datetime, :date_time, :timestamp, :to => :DateTimeComponent
+  map_component :integer, :float, :decimal, :big_decimal, :to => :StringComponent
+  map_component :"mongoid/fields/serializable/object", :"bson/object_id", :symbol, :array, :hash, :set, :range, :to => :StringComponent
 
-    def self.map_component *args
-      to = args.extract_options![:to]
-      args.each { |type| _mappings[type.to_sym] = to }
-    end
 
-    def self.component_for type
-      (_mappings[type.to_sym] || "#{type}_component").to_s.camelize.constantize
+
+
+  mattr_accessor :_field_type_customs
+  self._field_type_customs = []
+
+
+  # Appends or prepends custom type.
+  #
+  # ex:
+  #
+  #   Puffer.append_custom_field_type :paperclip do |field|
+  #     field.model.respond_to?(:attachment_definitions)
+  #       && field.model.attachment_definitions.key?(:field.field_name.to_sym)
+  #   end
+  def self.prepend_custom_field_type custom_type, &block
+    _field_type_customs.shift [custom_type, block]
+  end
+
+  def self.append_custom_field_type custom_type, &block
+    _field_type_customs.push [custom_type, block]
+  end
+
+  def self.field_type_for field
+    custom_type = swallow_nil{_field_type_customs.detect {|(type, block)| block.call(field) }.first}
+    case custom_type
+    when Proc then
+      custom_type.call(field)
+    else
+      custom_type
     end
+  end
 
-    map_component :belongs_to, :has_one, :to => :ReferencesOneComponent
-    map_component :has_many, :has_and_belongs_to_many, :to => :ReferencesManyComponent
-    map_component :date, :time, :datetime, :timestamp, :to => :DateTimeComponent
-    map_component :integer, :decimal, :to => :StringComponent
-    map_component :array, :decimal, :to => :StringComponent
+  append_custom_field_type :select do |field|
+    field.options.key? :select
+  end
+  append_custom_field_type :password do |field|
+    field.name =~ /password/
+  end
+  append_custom_field_type(proc {|type| type.reflection.macro}) do |field|
+    field.reflection
   end
 
 end