lolita 3.1.14 → 3.1.15

data/History.rdoc

@@ -1,3 +1,20 @@
+=== Version 3.1.15 / 2011-08-29
+* Enhancements
+  * By default content tab excludes technical columns, like created_at, updated_at etc.
+  * It's possible to define and lolita uses nested fields in each tab through nested_fields_for.
+  * All fields (except array/habtm) uses #tab_form for field generation, that is current tab form.
+  * Lolita know how to vizualize habtm relation
+  * Added #component_locals method for views, so it is possible to access next component locals.
+  * Hidden field type added
+  * Nested forms updated to be more flexible
+  
+* Changes
+  * For unknown period field_sets are removed from use, it is possible to define them and use in your own views.
+
+* Bug fixes
+  * /lolita now redirects to first existing mapping if any defined (Issue #14)
+  * component hooks fixed to use right local variable and detect right name of current component
+
 === Version 3.1.14 / 2011-08-24
 * Enhancements
   * request notifications moved to related methods in ::Controllers::InternalHelpers

data/README.rdoc

@@ -31,6 +31,7 @@ This will make routes like
   /lolita/posts
   /lolita/posts/1/edit
   /lolita/posts/new
+Or open /lolita and it will redirect to first available resource list view.
 
 For more detailed usage read Usage[https://github.com/ithouse/lolita/wiki/Usage] at wiki.
 

data/VERSION

@@ -1 +1 @@
-3.1.14
+3.1.15

data/app/controllers/lolita/info_controller.rb

@@ -2,6 +2,9 @@ class Lolita::InfoController < ApplicationController
   @@properties = []
 
   def index
+    if Lolita.mappings.any?
+      return redirect_to(lolita_resources_path(Lolita.mappings.values.first))
+    end
     render :layout => false
   end
 

data/app/helpers/components/lolita/configuration_component.rb

@@ -0,0 +1,21 @@
+module Components
+  module Lolita
+    module ConfigurationComponent
+      def link_to_remove_fields(name, f)
+        f.hidden_field(:_destroy) + link_to_function(name, "remove_fields(this)")
+      end
+      
+      def link_to_add_fields(name, f, nested_form)
+        new_object = nested_form.klass.new
+        fields_content = ""
+        fields = f.fields_for(nested_form.name, new_object, :child_index => "new_#{nested_form.name}") do |builder|
+          self.tab_form(builder) do
+            fields_content = render_component(nested_form, :"fields")
+          end
+        end
+        link_to_function(name, "add_fields(this, \"#{nested_form.name}\", \"#{escape_javascript(fields_content)}\")")
+      end
+
+    end
+  end
+end

data/app/views/components/lolita/configuration/columns/_header.html.erb

@@ -1,9 +1,9 @@
 <thead>
   <tr>
-    <%= render_component columns,:first_column_header %>
+    <%#= render_component columns,:first_column_header %>
     <% columns.each do |column| %>
       <%= render_component column,:header %>
     <% end %>
     <%= render_component columns,:last_column_header  %>
   </tr>
-</thead>
+</thead>

data/app/views/components/lolita/configuration/columns/_row.html.erb

@@ -1,5 +1,5 @@
 <tr class="<%= index%2==0 ? "even" : "odd" %>">
-  <%= render_component columns,:first,:record=>record %>
+  <%#= render_component columns,:first,:record=>record %>
   <% columns.each do |column| %>
     <%= render_component column, :record=>record %>
   <% end %>

data/app/views/components/lolita/configuration/field/_display.html.erb

@@ -1,5 +1,7 @@
 <div class="field" id="field_<%=field.__id__%>">
-  <%= render_component *field.build(:name=>"/lolita/configuration/field", :state => :"label") %>
+  <% unless field.type == "hidden" %>
+    <%= render_component *field.build(:name=>"/lolita/configuration/field", :state => :"label") %>
+  <% end %>
   <div class="field-value" id="field_<%=field.__id__%>_value">
     <%= render_component *field.build %>
   </div>

data/app/views/components/lolita/configuration/field/boolean/_display.html.erb

@@ -1 +1 @@
-<%= check_box resource_name, field.name, field.html_options %>
+<%= tab_form.check_box field.name, field.html_options %>

data/app/views/components/lolita/configuration/field/date/_display.html.erb

@@ -1 +1 @@
-<%= date_select resource_name, field.name, field.options, field.html_options %>
+<%= tab_form.date_select field.name, field.options, field.html_options %>

data/app/views/components/lolita/configuration/field/date_time/_display.html.erb

@@ -1 +1 @@
-<%= datetime_select resource_name, field.name,field.options,field.html_options %>
+<%= tab_form.datetime_select field.name,field.options,field.html_options %>

data/app/views/components/lolita/configuration/field/date_time/date/_display.html.erb

@@ -1 +1 @@
-<%= date_select resource_name, field.name,field.options,field.html_options %>
+<%= tab_form.date_select field.name,field.options,field.html_options %>

data/app/views/components/lolita/configuration/field/date_time/time/_display.html.erb

@@ -1 +1 @@
-<%= time_select resource_name, field.name,field.options,field.html_options %>
+<%= tab.form.time_select field.name,field.options,field.html_options %>

data/app/views/components/lolita/configuration/field/float/_display.html.erb

@@ -1 +1 @@
-<%= text_field resource_name, field.name,field.html_options %>
+<%= tab_form.text_field field.name,field.html_options %>

data/app/views/components/lolita/configuration/field/hidden/_display.html.erb

@@ -0,0 +1 @@
+<%=tab_form.hidden_field field.name, field.html_options%>

data/app/views/components/lolita/configuration/field/string/_display.html.erb

@@ -1,5 +1,5 @@
 <% if field.options[:native_type] == "text" %>
  <%= render_component :"lolita/configuration/field/string/text", :display, :field=>field %>
 <% else %>
-  <%= text_field resource_name, field.name, field.html_options %>
+  <%= tab_form.text_field field.name, field.html_options %>
 <% end %>

data/app/views/components/lolita/configuration/field/string/password/_display.html.erb

@@ -1,3 +1,3 @@
 <div class="field-value" id="field_<%=field.__id__%>_value">
-  <%= password_field resource_name, field.name,field.html_options %>
+  <%= tab_form.password_field field.name,field.html_options %>
 </div>

data/app/views/components/lolita/configuration/field/string/text/_display.html.erb

@@ -5,7 +5,7 @@
   <% end %>
 <% end %>
 
-<%= text_area resource_name, field.name, :rows=>(field.rows || 20), :"data-simple"=>field.simple %>
+<%= tab_form.text_area field.name, :rows=>(field.rows || 20), :"data-simple"=>field.simple %>
 <% if @textarea_component_include_tinymce_once.nil? %>
   <script type="text/javascript">
     $(document).ready(

data/app/views/components/lolita/configuration/field/time/_display.html.erb

@@ -1 +1 @@
-<%= time_select resource_name, field.name %>
+<%= tab_form.time_select field.name,field.options, field.html_options %>

data/app/views/components/lolita/configuration/nested_form/_display.html.erb

@@ -0,0 +1,13 @@
+<div class="nested_form" id=<%= "nested_form_#{nested_form.__id__}" %>>
+  <% unless nested_form.field_style == :normal %>
+	 <%= label_tag nested_form.name %>
+  <% end %>
+	<%= tab_form.fields_for nested_form.name do |form| %>
+		<% tab_form(form) do %>
+				<%= render_component nested_form, :fields %>
+		<% end %>
+	<% end %>
+  <% if nested_form.expandable? %>
+	 <p><%= link_to_add_fields ::I18n.t("lolita.nested_form.add", :resource_name => nested_form.klass.model_name.human.downcase), tab_form, nested_form %> </p>
+  <% end %>
+</div>

data/app/views/components/lolita/configuration/nested_form/_fields.html.erb

@@ -0,0 +1,13 @@
+<div class = "fields" >
+  <% nested_form.fields.each do |field| %>
+    <% if nested_form.field_style == :normal %>
+      <%= render_component "lolita/configuration/field", :display, :field => field %>
+    <% else %>
+      <%= render_component field %>
+    <% end %>
+  <% end %>
+  <% if nested_form.expandable? %>
+    <%= link_to_remove_fields I18n.t("lolita.shared.delete").downcase, tab_form %>
+  <% end %>
+</div>
+  

data/app/views/components/lolita/configuration/tab/_display.html.erb

@@ -13,5 +13,5 @@
       }.compact.join("<br>") %>
     </p>
   <% end %>
-  <%= render_component *tab.build %>
+  <%= render_component "lolita/configuration/tab", :form, :tab => tab %>
 </div>

data/app/views/components/lolita/configuration/tab/_fields.html.erb

@@ -1,7 +1,9 @@
-<% tab.fields_with_field_set do |fields_or_field,field_set| %>
-  <% if field_set %>
-    <%= render_component :"lolita/configuration/field_set", :display, :fields=>fields_or_field,:field_set=>field_set %>
- <% else %>
-    <%= render_component :"lolita/configuration/field", :display,:field=>fields_or_field %>
-   <% end %>
- <% end %>
+<% tab.fields_in_groups do |group| %>
+  <% if group.first.nested_form %>
+    <%= render_component group.first.nested_form %>
+  <% else %>
+    <% group.each do |field| %>
+      <%= render_component "lolita/configuration/field", :display, :field => field %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/components/lolita/configuration/tab/_form.html.erb

@@ -0,0 +1,8 @@
+<%
+  #This partial is useful for hooks. You don't need to hook in each tab, but you can hook here, that is common to all tabs
+%>
+<%= form_for resource, :url => "#",:html => {:multipart=>true, :id=>"tab-form-#{tab.__id__}",:method => resource.new_record? ? :post : :put} do |form| %>
+  <% self.tab_form = form %>
+  <%= render_component *tab.build %>
+<% end %>
+<% self.tab_form = nil %>

data/app/views/components/lolita/configuration/tab/default/_display.html.erb

@@ -1,11 +1,3 @@
-<%  #
-# FIXME: move to /tab_types/
-#
-%>
-<%= form_for resource, :url => "#",:html => {:multipart=>true, :id=>"tab-form-#{tab.__id__}",:method => resource.new_record? ? :post : :put} do |form| %>
-  <% self.tab_form = form %>
-  <div class="tab-content">
-    <%= render_component :"lolita/configuration/tab", :fields, :tab=>tab, %>
-  </div>
-<% end %>
-<% self.tab_form = nil %>
+<div class="tab-content">
+  <%= render_component :"lolita/configuration/tab", :fields, :tab=>tab %>
+</div>

data/config/locales/en.yml

@@ -6,6 +6,8 @@ en:
       log_out: Log out
       edit: Edit
       delete: Delete
+    nested_form:
+      add: "Add %{resource_name}"
     tabs:
       last_save: Last saved
       save: Save

data/config/locales/lv.yml

@@ -4,8 +4,10 @@ lv:
       save_notice: Veiksmīgi saglabāts.
       save_alert: Saglabāšana neizdevās.
       log_out: Atteikties
-      edit: Edit
-      delete: Delete
+      edit: Labot
+      delete: Dzēst
+    nested_form:
+      add: "Pievienot %{resource_name}"
     tabs:
       last_save: Pēdējā saglabāšana
       save: Saglabāt

data/lib/generators/templates/lolita.rb

@@ -3,6 +3,7 @@ Lolita.setup do |config|
   # ==> User and authentication configuration
   # Add one or more of your user classes to Lolita
   # config.user_classes << MyUser
+  # config.authentication = :authenticate_user!
   
   # Define authentication for Lolita controllers.
   # Call some of your own methods
@@ -11,9 +12,10 @@ Lolita.setup do |config|
   # config.authentication={
   #  current_user.is_a?(Admin) || current_user.has_role?(:admin)
   # }
-  
+
   <% if defined?(Devise) %>
-    config.user_classes << User
-    config.authentication=:authenticate_user!
+    <% default_user_class = Devise.mappings.keys.first %>
+    config.user_classes << <%= default_user.to_s.camelize %>
+    config.authentication=:authenticate_<%= default_user_class %>!
   <% end %>
 end

data/lib/lolita.rb

@@ -60,6 +60,7 @@ module Lolita
  
 
   module Configuration
+    autoload :Helper, 'lolita/configuration/helper'
     autoload :Factory, 'lolita/configuration/factory'
     autoload :Base, 'lolita/configuration/base'
     autoload :Column, 'lolita/configuration/column'

data/lib/lolita/adapter/active_record.rb

@@ -23,6 +23,8 @@ module Lolita
       end
 
       def reflect_on_association(name)
+        # TODO create association proxy for different dbi, so use of attributes will go through them
+        # like #klass, it's same for mongoid ar AR but it may change for others
         klass.reflect_on_association(name)
       end
 

data/lib/lolita/configuration/columns.rb

@@ -28,7 +28,9 @@ module Lolita
       def generate!
         @columns.clear
         @dbi.fields.each_with_index{|field,index|
-          @columns[index]=Lolita::Configuration::Column.new(@dbi,field)
+          unless Lolita::Configuration::Helper.tehnical_field?(field,@dbi)
+            @columns << Lolita::Configuration::Column.new(@dbi,field)
+          end
         }
       end
 

data/lib/lolita/configuration/field/hidden.rb

@@ -0,0 +1,12 @@
+module Lolita
+  module Configuration
+    module Field
+      class Hidden < Lolita::Configuration::Field::Base
+        def initialize *args
+          @type="hidden"
+          super
+        end
+      end
+    end
+  end
+end

data/lib/lolita/configuration/helper.rb

@@ -0,0 +1,24 @@
+module Lolita
+  module Configuration
+    module Helper
+      class << self
+        # Return true if field name matches one of these:
+        # * created_at, updated_at, type
+        # * ends with _id, but there is no association that uses that field as foreign_key
+        # * there are uploader with that name
+        def tehnical_field?(db_field,dbi)
+          name = db_field[:name].to_s
+          if name.match(/^created_at|updated_at|type$/)
+            true
+          elsif name.match(/_id$/)
+            # FIXME move this to dbi association proxy
+            key_method = dbi.adapter_name == :active_record ? :association_foreign_key : :key
+            !dbi.associations.values.detect{|assoc| assoc.send(key_method) == name}
+          elsif dbi.klass.respond_to?(:uploaders)
+            dbi_klass.uploaders.keys.include?(name.to_sym)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/lolita/configuration/nested_form.rb

@@ -1,10 +1,24 @@
 module Lolita
   module Configuration
+    # Accept those attributes
+    # * <tt>:name</tt> - Name of nested relation, like :comments.
+    # * <tt>:field_style</tt> - Is fields rendered with as normal (with lable and staff) or like in table (:simple). Default :simple
+    # * <tt>:expandable</tt> - Show or not "Add new" and "Delete" links in form,
+    # by default, it is expandable if association macro is :many
+    # * <tt>:field_rejection_proc</tt> - Proc, that contains condition of how to reject field. 
+    # By default form rejects all fields from parent tab that doesn't have current form as field nested_form
+    # ====Example
+    #    form = Lolita::Configuration::NestedForm.new(Lolita::Configuration::Tab::Content.new,:comments)
+    #    form.field_rejection_proc = Proc.new{|field|
+    #       field.name.to_s.match(/_id$/)
+    #    }
+    #    # form exclude all fields that ends with _id
     class NestedForm
-       @@last_nested_form=0
+      include Lolita::Builder
+      @@last_nested_form=0
       
-      attr_reader :parent, :options
-      attr_accessor :name
+      attr_reader :parent, :options, :field_style
+      attr_accessor :name, :expandable, :field_rejection_proc
 
       def initialize parent,name=nil, options ={}
         @parent=parent
@@ -12,8 +26,40 @@ module Lolita
         self.name=name || "nested_form_#{next_nested_form}"
       end
 
+      def field_style=(value)
+        allowed_values = [:normal,:simple]
+        raise ArgumentError, "Only #{allowed_values.inspect} are allowed" unless allowed_values.include?(value)
+        @field_style = value
+      end
+
+      def expandable?
+        @expandable == true || (@expandable == nil && macro == :many)
+      end
+
+      def dbi
+        @parent.dbi
+      end
+
+      def fields=(new_fields)
+        @fields = new_fields
+      end
+
       def fields
-        self.parent.fields.reject{|f| f.nested_form!=self}
+        if @fields
+          @fields
+        elsif field_rejection_proc
+          self.parent.fields.reject(&field_rejection_proc)
+        else
+          self.parent.fields.reject{|f| f.nested_form!=self}
+        end
+      end
+
+      def klass
+        dbi.reflect_on_association(name).klass
+      end
+
+      def macro
+        dbi.association_macro(dbi.reflect_on_association(name))
       end
 
       private

data/lib/lolita/configuration/tab.rb

@@ -84,20 +84,20 @@ module Lolita
         # See Lolita::Adapter classes for use of DB field method.
         def default_fields
           self.current_dbi.fields.each{|db_field|
-            self.field(db_field)
+            self.field(db_field) unless Lolita::Configuration::Helper.tehnical_field?(db_field,self.current_dbi)
           }
         end
 
         # Add tab nested fields for <em>class_or_name</em> and <em>&block</em>
         # that will be evaluted in current tab instance.
         def nested_fields_for class_or_name, options ={},&block
-          current_class=get_class(class_or_name)
-          nested_form = Lolita::Configuration::NestedForm.new(self,current_class.to_s.downcase, options)
+          current_class = get_class(class_or_name)
+          nested_form = Lolita::Configuration::NestedForm.new(self,class_or_name, options)
           self.current_nested_form = nested_form
           @nested_forms << nested_form
-          self.current_dbi=Lolita::DBI::Base.new(current_class)
+          self.current_dbi = Lolita::DBI::Base.new(current_class)
           self.instance_eval(&block)
-          self.current_dbi=self.dbi
+          self.current_dbi = self.dbi
           self.current_nested_form = nil
         end
 
@@ -133,31 +133,25 @@ module Lolita
           }
         end
 
-        # tab.field do
-        #  tab.fields_with_fieldset do |field,fieldset|
-        #    =field
-        #  end
-
-        def fields_by_forms
-          forms = []
-          current_form = nil
-          content = forms
-          self.fields.each do |field|
-            if field.nested_form 
-              if current_form != field.nested_form
-                form_fields = []
-                forms << form_fields
-                content = form_fields
-              end
-              content << field
+        # Return fields in groups where in one group are fields for same model.
+        # It return all groups as array or yield each group when block is given.
+        def fields_in_groups()
+          groups = []
+          current_class = nil
+          self.fields.each do |group_field|
+
+            klass = group_field.dbi.klass
+            if current_class == klass
+              groups.last << group_field
+            else
+              groups << [group_field]
             end
+            current_class = klass
           end
           if block_given?
-            forms.each do |form_or_field|
-              yield form_or_field
-            end
+            groups.each{|group| yield group }
           else
-            forms
+            groups
           end
         end
 
@@ -194,8 +188,12 @@ module Lolita
           end
         end
 
-        def get_class(str_or_sym_or_class)
-          str_or_sym_or_class.is_a?(Class) ? str_or_sym_or_class : str_or_sym_or_class.to_s.camelize.constantize
+        def get_class(association_name)
+          if association_name.is_a?(Symbol) && assoc = self.current_dbi.reflect_on_association(association_name)
+            assoc.klass
+          else
+            raise ArgumentError, "Association named `#{association_name}` not found for #{self.current_dbi.klass}."
+          end
         end
         
         def validate