lolita 3.1.3 → 3.1.4

data/History.rdoc

@@ -1,4 +1,16 @@
-=== Version 3.1.3 /
+=== Version 3.1.4 / 2011-04-19
+* Enhancements
+  * #render_component improved, to support any class with build method as first argument (Arturs Meister)
+  * list components refactore; columns and column components created (Arturs Meisters)
+  * documentation for Filters (Gatis Tomsons)
+  * sorting configuration for columns (Arturs Meisters)
+  * lolita:assets generator invoke :assets for all added modules
+
+* Bug fixes
+  * paginator updated, to use WillPaginate only when it is accessable (Arturs Meisters)
+  * resource cheching for tree (Arturs Meisters)
+
+=== Version 3.1.3 / 2011-04-15
 * Enhancements
   * Lolita::Navigation::Tree and Lolita::Navigation::Branch added (Arturs Meisters)
   * Main navigation tree generate from resources (Arturs Meisters)

data/VERSION

@@ -1 +1 @@
-3.1.3
+3.1.4

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

@@ -0,0 +1,4 @@
+<td>
+  <% value=column.formatter.with(record.send(column.name.to_sym),record) %>
+  <%= value.to_s %>
+</td>

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

@@ -0,0 +1,7 @@
+<th <%=column.currently_sorting?(params) ? "class='active'" : ""%> >
+  <% if column.sortable? %>
+    <%= render_component column, :sort %>
+  <% else %>
+    <%= column.title %>
+  <% end %>
+</th>

data/app/views/components/lolita/configuration/column/_sort.html.erb

@@ -0,0 +1,4 @@
+ <% param_options=params.reject{|k,v| [:controller,:action].include?(k)} %>
+ <% options=param_options.merge(column.sort_options(params)) %>
+ <% direction_indicator=column.currently_sorting?(params) && options[:sd].to_s=="desc" ? raw('&uArr;') : raw('&dArr;') %>
+ <%= link_to raw("#{column.title} #{direction_indicator}"), lolita_resources_path(options) %>

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

@@ -0,0 +1,5 @@
+<tbody>
+  <% page.each_with_index do |record,index| %>
+    <%= render_component columns, :row, :record=>record,:index=>index%>
+  <% end %>
+</tbody>

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

@@ -0,0 +1,2 @@
+<%= render_component columns,:header %>
+<%= render_component columns,:body,:page=>page %>

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

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

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

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

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

@@ -1,12 +1,11 @@
 <div class="box">
-  <%= render_component :"lolita/configuration/list", :title %>
-  <%= render_component :"lolita/configuration/list", :new_resource%>
-  <%= render_component :"lolita/configuration/list", :filter, :list => list %>
+  <%= render_component list, :title %>
+  <%= render_component list, :new_resource%>
+  <%= render_component list, :filter %>
   <div class="list">
     <table>
-      <%= render_component :"lolita/configuration/list", :header, :columns=>list.columns %>
-      <%= render_component :"lolita/configuration/list", :body, :page=>page,:columns=>list.columns %>
+      <%= render_component list.columns,:page=>page %>
     </table>
   </div>
-  <%= render_component :"lolita/configuration/list", :paginator,:page=>page, :columns=>list.columns %>
+  <%= render_component list,:paginator,:page=>page %>
 </div>

data/app/views/components/lolita/configuration/list/_paginator.html.erb

@@ -1,3 +1,5 @@
-<div class="paginator">
-  <%= will_paginate page %>
-</div>
+<% if page.is_a?(WillPaginate::Collection) %>
+  <div class="paginator">
+    <%= will_paginate page %>
+  </div>
+<% end %>

data/app/views/components/lolita/navigation/_tree.html.erb

@@ -1,4 +1,5 @@
-<ul>
+<ul <%=tree.parent ? "class='subtree'" : ""%> >
+  <% last_branch=tree.branches.last %>
   <%tree.branches.each do |branch| 
      if branch.object.is_a?(Lolita::Mapping) 
        branch.options[:url]||=lolita_resources_path(branch.object) 
@@ -6,7 +7,7 @@
      else   
 
        branch.options[:url]=if branch.options[:url].respond_to?(:call) 
-         self.instance_eval(&(branch.options[:url])) 
+         branch.options[:url].call(self,branch) 
        else 
          branch.options[:url] 
        end 
@@ -14,7 +15,7 @@
      end 
      
     %>
-    <li <%=active ? "class='active'" : ""%>>
+    <li class="<%=active ? "active" : ""%> <%=branch.children.branches.any? ? "with-subtree" : ""%> <%=branch==last_branch ? "last-in-subtree" : ""%>">
       <%= link_to branch.title, branch.options[:url] %>
       <% if branch.children.branches.any? %>
         <%= render_component(:"lolita/navigation",:tree,:tree=>branch.children) %>

data/lib/generators/lolita/assets_generator.rb

@@ -7,6 +7,13 @@ module Lolita
       def copy_all
         copy_dir("public")
       end      
+
+       def call_modules
+        Lolita.modules.each do |module_name|
+          command="#{module_name.to_s.underscore.gsub("/","_")}:assets" 
+          invoke command rescue nil
+        end
+      end
     end
   end
 end

data/lib/generators/lolita/install_generator.rb

@@ -19,7 +19,7 @@ module Lolita
       def install_modules
         Lolita.modules.each do |module_name|
           
-          invoke "#{module_name.to_s.underscore.gsub("/","_")}:install" 
+          invoke "#{module_name.to_s.underscore.gsub("/","_")}:install"  rescue nil
         end
       end
      

data/lib/lolita.rb

@@ -124,6 +124,13 @@ module Lolita
     autoload :Branch, "lolita/navigation/branch"
   end
 
+  module Support
+    module Formatter
+      autoload :Base, 'lolita/support/formatter/base'
+      autoload :Rails, 'lolita/support/formatter/rails'
+    end
+  end
+
   @@scopes={}
 
   def self.scope name=nil

data/lib/lolita/base_configuration.rb

@@ -134,6 +134,7 @@ module Lolita
     #        end
     #     end
     def add_module module_container, options={}
+      raise ArgumentError, "Can't add module without module container!" unless module_container
       options.assert_valid_keys(:controller,:route,:model,:path,:name,:nested)
       name=options[:name]||module_container.to_s.to_sym
       self.modules<<module_container

data/lib/lolita/configuration/column.rb

@@ -2,8 +2,10 @@ module Lolita
   module Configuration
     class Column 
 
+      include Lolita::Builder
+      
       MAX_TEXT_SIZE=20
-      lolita_accessor :name,:title,:type,:options,:format
+      lolita_accessor :name,:title,:type,:options,:sortable
       
       def initialize(*args,&block)
         self.set_attributes(*args)
@@ -11,49 +13,32 @@ module Lolita
         validate
         set_default_values
       end
-      
-      #
-      #  column do
-      #    name "UID"
-      #    format do(values)
-      #      values.first+values.last
-      #    end
-      #  end
-      # <%= column.with_format([@post.id,@post.user_id])%>
-      def with_format(value) #TODO test
-        if @format.respond_to?(:call)
-          @format.call(value)
-        elsif @format && (value.is_a?(Time) || value.is_a?(Date))
-          format_for_datetime(value)
-        else
-          format_from_type(value)
-        end
+
+      def sortable?
+        @sortable
       end
 
-      def format_from_type(value) #TODO test
-        if value
-          if value.is_a?(String)
-            value
-          elsif value.is_a?(Integer)
-            value
-          elsif value.is_a?(Date)
-            if defined?(I18n)
-              I18n.localize(value, :format => :long)
-            else
-              value.to_s
-            end
-          elsif value.is_a?(Time)
-            if defined?(I18n)
-              I18n.localize(value, :format => :long)
-            else
-              value.to_s
-            end
-          else
-            value.to_s
-          end
+      def currently_sorting?(params)
+        @sortable && params[:sc].to_s==self.name.to_s
+      end
+
+      def sort_options(params)
+        direction=if params[:sc].to_s==self.name.to_s
+          params[:sd].to_s=="asc" ? "desc" : "asc"
         else
-          ""
+          "desc"
+        end
+        {:sc=>self.name,:sd=>direction}
+      end
+      
+      # Define format, for details see Lolita::Support::Formatter::Base and Lolita::Support::Formater::Rails
+      def formatter(value=nil,&block)
+        if block_given?
+          @formatter=Lolita::Support::Formatter::Base.new(value,&block) 
+        elsif value || !@formatter
+          @formatter=Lolita::Support::Formatter::Rails.new(value)
         end
+        @formatter
       end
       
       def set_attributes(*args)
@@ -73,16 +58,10 @@ module Lolita
       private
       
       def set_default_values
+        @sortable||=true
+        @sort_direction||=:desc
         @title||=@name.to_s.humanize
       end
-      
-      def format_for_datetime value
-        if defined?(I18n)
-          I18n.localize(value, :format => @format)
-        else
-          value.to_s
-        end
-      end
 
       def validate
         raise ArgumentError.new("Column must have name.") unless self.name

data/lib/lolita/configuration/columns.rb

@@ -4,6 +4,7 @@ module Lolita
 
       include Enumerable
       include ObservedArray
+      include Lolita::Builder
       
       attr_accessor :list
       attr_reader :dbi

data/lib/lolita/configuration/filter.rb

@@ -1,6 +1,29 @@
 # coding: utf-8
 module Lolita
   module Configuration
+    # Lolita::Configuration::Filter is for filtering data in list view.
+    # By now it supports these field types:
+    # - Array
+    # - Boolean
+    #  
+    # To use it, call "filter" method in list block, filter method accepts field names
+    # as arguments. You can pass block and configure each field. Field configuration is just like in tab configuration.
+    #
+    # === Examples
+    #    
+    #    # this will build country select field and is_deleted checkbox
+    #    list do
+    #      filter :country, :is_deleted
+    #    end
+    #
+    #    # For example you have text field "status" with values opened,closed,rejected
+    #    list do
+    #      filter do
+    #        field :status, :array, :options_for_select => %w(open closed rejected)
+    #        field :is_deleted, :title => "Deleted"
+    #      end
+    #    end
+    #
     class Filter
       include Lolita::Builder
       attr_reader :dbi
@@ -61,7 +84,6 @@ module Lolita
       end
 
       def field_name field
-        #'f_'+('a'..'z').to_a[self.fields.index(field)]
         "f_#{field.name}"
       end
 

data/lib/lolita/configuration/page.rb

@@ -109,7 +109,17 @@ module Lolita
             self.send(meth,options.delete(meth))
           end
         }
+        parse_params
       end
+
+      def parse_params
+        if @params
+          if @params.has_key?(:sc)
+            self.send((@params[:sd] || :asc).to_sym,@params[:sc])
+          end
+        end
+      end
+
     end
   end
 end

data/lib/lolita/controllers/component_helpers.rb

@@ -26,19 +26,27 @@ module Lolita
       #      render_component "lolita/list", :display
       #      render_component "lolita/list/display"
       def render_component *args
-        @opts=args.extract_options!
-        name=args[0]
-        state=args[1]
-        format=@opts.delete(:format)
-    
+        name,state,options=get_render_options(*args)
+        format=options.delete(:format)
+
         raise "Can't render component without name!" unless name
         will_use_component name 
         component_name=File.join(name.to_s,state ? state.to_s : nil)
         partial_name=File.join("/components",component_name)
-        output=output_component(partial_name,component_name,:format=>format,:locals=>@opts)
+        output=output_component(partial_name,component_name,:format=>format,:locals=>options)
         self.respond_to?(:raw) ? raw(output) : output
       end
       
+      def get_render_options *args
+        options=args.extract_options!
+        if args.first.respond_to?(:build) 
+          name,state,options=args[0].build("",args[1],options)
+        else
+          name,state=args
+        end
+        return name,state,options
+      end
+
       def output_component(partial_name,name,options={})
         output=""
         if options[:format]

data/lib/lolita/controllers/url_helpers.rb

@@ -1,5 +1,21 @@
 module Lolita
   module Controllers
+    # This module is included in all controllers and views. UrlHelper provide methods to generate lolita
+    # resource paths. As all resources goes to one controller (by default), than it is very difficult to
+    # generate url with <em>:controller</em> and <em>:action</em>. 
+    # There are four methods for path:
+    # * lolita_resources_path - goes to index action
+    # * lolita_resource_path - goes to create, destroy or show, it depends what kind of method is used
+    # * new_lolita_resource_path - goes to new action
+    # * edit_lolita_resource_path - goes to edit action
+    # All of those methods accept <em>mapping</em> as a first argument and optional <em>options</em> that
+    # will be passed to path gererator. It is possible to pass only options, than current mapping will be used.
+    # ====Example
+    #     # lets say, that current mapping is for posts
+    #     edit_lolita_resource_path(:id=>4) #=> /lolita/posts/4/edit
+    #     edit_lolita_resource_path(comment_mapping,:id=>1,:parent_id=>2) #=> /lolita/comments/1/edit?parent_id=2
+    # For custom actions there are method #lolita_resource_name that make it easier to generate custom method.
+    # All other methods use that for real resource path method generation.
     module UrlHelpers
 
       def self.included(model_klass)
@@ -40,32 +56,49 @@ module Lolita
 
       protected
       
+      # Path for index.
       def lolita_resources_path(*args)
         options=args.extract_options!
         mapping=args[0]
         send(lolita_resource_name(:mapping=>mapping,:plural=>true),options)
       end
 
-      def lolita_resource_path(*args) # TODO test
+      # Path for show, create and destroy
+      def lolita_resource_path(*args) 
         options=args.extract_options!
         mapping=args[0]
         send(lolita_resource_name(:mapping=>mapping),options)
       end
 
+      # Path for new.
       def new_lolita_resource_path(*args)
         options=args.extract_options!
         mapping=args[0]
         send(lolita_resource_name(:mapping=>mapping,:action=>:new),options)
       end
 
+      # Path for edit.
       def edit_lolita_resource_path(*args)
         options=args.extract_options!
         options[:id]||=resource.id if resource
-        raise "Can edit resource without id." unless options[:id]
+        #raise "Can edit resource without id." unless options[:id]
         mapping=args[0]
         send(lolita_resource_name(:mapping=>mapping,:action=>:edit),options)
       end
 
+      # It return symbol, that represents named route method for path, like <i>lolita_posts_path</i> and so on.
+      # It accepts those options: 
+      # * <tt>:mapping</tt> - Lolita::Mapping object, that is used to detect name of named route.
+      # by default it uses Lolita::InternalHelpers#lolita_mapping.
+      # * <tt>:plural</tt> - What kind of named route should use, plural or singular.
+      # * <tt>:action</tt> - Action is used to put before named route like <i>:edit</i>.
+      # ====Example
+      #     # current mapping is for posts
+      #     lolita_resource_name(:action=>:edit) #=> :edit_lolita_post_path
+      #     lolita_resource_name(:plural=>true,:action=>:list) #=> :list_lolita_posts_path
+      #     # for different mapping 
+      #     lolita_resource_name(:mapping=>comments_mapping) #=> :lolita_comment_path
+      # This methods is very useful to create your own paths in views.
       def lolita_resource_name(options={}) #TODO test if path is right
         options.assert_valid_keys(:mapping,:plural,:action)
         mapping=(options[:mapping]||lolita_mapping)

data/lib/lolita/mapping.rb

@@ -11,14 +11,18 @@ module Lolita
   #     # add paths like this to routes
   #     # admin_posts GET /admin/posts {:controller=>"lolita/rest", :action=>:index}
   #     # edit_admin_posts GET /admin/post/1/edit {:controller=>"lolita/rest",:action=>:edit}
-  # * <tt>:module</tt> - change module for path, it changes :controller that is used for lolita, like, 
-  # :module=>"admin", change controller to "admin/posts". If this is used without :path then no named routes will be generated
+  # * <tt>:module</tt> - change module for path, it changes <i>:controller</i> that is used for lolita, like, 
+  #   <code>:module=>"admin"</code>, change controller to "admin/posts". If this is used without :path then no named routes will be generated
+  # Instances of this class is used all over the Lolita, this class itself represent what name does resource has,
+  # what controller to use, what model is related with it and so on. This is used to generate urls and paths.
+  # Also eahc request containers information with mapping related to it.
   class Mapping
     attr_reader :class_name,:path,:singular,:plural,:path_prefix,:module,:controllers,:as
     alias :name :singular
     
-    # TODO how it is when lolita plugin extend default path and there is module is this not break the logic?
+    
     def initialize(name,options={})
+      # TODO how it is when lolita plugin extend default path and there is module is this not break the logic?
       @as=options[:as]
       @plural=(options[:as] ? options[:as] : name).to_sym
       @singular=(options[:singular] || @plural.to_s.singularize).to_sym

data/lib/lolita/navigation/branch.rb

@@ -19,7 +19,11 @@ module Lolita
       end
 
       def children
-        @children||=Lolita::Navigation::Tree.new("#{name}_children_tree")
+        unless @children
+          tree=Lolita::Navigation::Tree.new("#{name}_children_tree")
+          tree.set_parent(self)
+          @children=tree
+        end
         @children
       end
 

data/lib/lolita/navigation/tree.rb

@@ -18,7 +18,7 @@ module Lolita
 
       add_hooks :before_branch_added, :after_branch_added
 
-      attr_reader :name,:root,:default_position,:branches
+      attr_reader :name,:root,:default_position,:branches,:parent
 
       def initialize(name)
         @name=name
@@ -77,6 +77,10 @@ module Lolita
         raise ArgumentError, "Branch #{given_branch.inspect} not exists in #{self.inspect}"
       end
 
+      def set_parent(new_parent)
+        @parent=new_parent
+      end
+      
       private
 
       def adding_branch *branch

data/lib/lolita/observed_array.rb

@@ -1,4 +1,5 @@
-# This module overwrite Array methods that change Array to change element that is added to Array.
+module Lolita
+  # This module overwrite Array methods that change Array to change element that is added to Array.
 # Class that include this module must have collection_variable method that return collection
 # variable that hold all records.
 # Also build_element method must have with element and &block as arguments
@@ -29,7 +30,6 @@
 #           ...
 #         end
 #     end
-module Lolita
   module ObservedArray
 
     def method_missing(method,*args,&block)

data/lib/lolita/rails/routes.rb

@@ -33,7 +33,7 @@ module ActionDispatch::Routing
     #     lolita_for :galleries
     #     # lolita_for try to call :lolita_gallery in Mapper class
     def lolita_for *resources
-      #TODO refactor
+  
       return if migrating?
       options = resources.extract_options!
 
@@ -56,22 +56,19 @@ module ActionDispatch::Routing
         mapping=Lolita.add_mapping(resource,options)
         Lolita.resources[mapping.name]=mapping
         target_class=mapping.to
-        Lolita::Navigation::Tree[:"left_side_navigation"].append(mapping,:title=>mapping.name.to_s.humanize)
+  #TODO refactor all these variables
         all_resource_classes<<target_class
 
         lolita_scope mapping.name do
           yield if block_given?
 
           with_lolita_exclusive_scope mapping.fullpath,mapping.path do
+            
             # if not defined lolita default configuration in model, than can't use :rest
             if !target_class.respond_to?(:lolita) && !Lolita::routes[mapping.name]
-               warn("Lolita not found in #{target_class}. Including Lolita::Configuration")
-               target_class.send(:include, Lolita::Configuration)
-               #raise Lolita::NotFound, "Lolita not found in #{target_class}. Include Lolita::Configuration"
+               raise Lolita::NotFound, "Lolita not found in #{target_class}. Include Lolita::Configuration"
             elsif target_class.respond_to?(:lolita) && target_class.instance_variable_get(:@lolita).nil?
-               warn "Calling #lolita on #{target_class}, because lolita not initialized yet."
-               target_class.lolita
-               #raise Lolita::NotInitialized, "Call lolita method in #{target_class}."
+               raise Lolita::NotInitialized, "Call lolita method in #{target_class}."
             else
               route=Lolita.routes[mapping.name] || Lolita.default_route
             end
@@ -86,6 +83,11 @@ module ActionDispatch::Routing
           end
 
         end
+       
+        tree=Lolita::Navigation::Tree[:"left_side_navigation"]
+        unless tree.branches.detect{|b| b.object.is_a?(Lolita::Mapping) && b.object.to==mapping.to}
+          tree.append(mapping,:title=>mapping.name.to_s.humanize)
+        end
       }
       Lolita.common_routes(all_resource_classes).each do |route_name|
         send(:"lolita_#{route_name}_route")

data/lib/lolita/support/formatter/base.rb

@@ -0,0 +1,64 @@
+module Lolita
+  module Support
+    # Containes different kind of formaters.
+    module Formatter
+       # Change output format of different input types.
+      # To define, pass block, or String.
+      # ====Exmaple
+      #     Lolita::Support::Formatter.new do |value|
+      #       value.to_i**2
+      #     end
+      #     # or as String
+      #     Lolita::Support::Formatter.new("%Y-%m")
+      # To format any value with defined formater call #with
+      # ====Example
+      #     # Previous examples may be called like this
+      #     formatter.with(1)
+      #     formatter.with(Date.today)
+      class Base
+        def initialize(format=nil,&block)
+          @format=format
+          @block=block if block_given?
+        end
+
+        def format
+          @format
+        end
+
+        def block
+          @block
+        end
+
+        def with(value,*optional_values)
+          if @block
+            @block.call(value,*optional_values)
+          elsif @format
+            use_format_for(value,*optional_values)
+          else
+            use_default_format(value,*optional_values)
+          end
+        end
+
+        private
+
+        def use_default_format(value,*optional_values)
+          value
+        end
+
+        def use_format_for(value, *optional_values)
+          if value.respond_to?(:format)
+            call_block(value,*optional_values)
+          else
+            value.to_s.unpack(@format)
+          end
+        end
+
+        def call_block(value,*optional_values)
+          value.send(:format,value,*optional_values)
+        end
+
+      end
+      
+    end
+  end
+end

data/lib/lolita/support/formatter/rails.rb

@@ -0,0 +1,57 @@
+module Lolita
+  module Support
+    module Formatter
+
+      # Formater for work with rails, it localize Date and Time.
+      # Also
+      class Rails < Lolita::Support::Formatter::Base
+
+
+        private
+
+        def use_format_for(value,*optional_values)
+          if @format && (value.is_a?(Time) || value.is_a?(Date))
+            localize_time_with_format(value,*optional_values)
+          else
+            use_default_format(value,*optional_values)
+          end
+        end
+
+        def localize_time_with_format(value,*optional_values)
+          if defined?(I18n)
+            I18n.localize(value, :format => @format)
+          else
+            use_default_format(value,*optional_values)
+          end
+        end
+
+        def use_default_format(value,*optional_values)
+          if value
+            if value.is_a?(String)
+              value
+            elsif value.is_a?(Numeric)
+              value
+            elsif value.is_a?(Date)
+              if defined?(I18n)
+                I18n.localize(value, :format => :long)
+              else
+                value.strftime("%Y/%m%/%d")
+              end
+            elsif value.is_a?(Time)
+              if defined?(I18n)
+                I18n.localize(value, :format => :long)
+              else
+                value.strftime("%Y/%m/%d %H:%M:%S")
+              end
+            else
+              value.to_s
+            end
+          else
+            ""
+          end
+        end
+      end
+
+    end
+  end
+end

data/lolita.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita}
-  s.version = "3.1.3"
+  s.version = "3.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse (Latvia) and Arturs Meisters"]
-  s.date = %q{2011-04-15}
+  s.date = %q{2011-04-19}
   s.description = %q{Great Rails CMS, that turns your business logic into good-looking, fully functional workspace. }
   s.email = %q{support@ithouse.lv}
   s.extra_rdoc_files = [
@@ -30,6 +30,17 @@ Gem::Specification.new do |s|
     "app/controllers/lolita/rest_controller.rb",
     "app/helpers/components/lolita/configuration/list_component.rb",
     "app/helpers/lolita_helper.rb",
+    "app/views/components/lolita/configuration/column/_display.html.erb",
+    "app/views/components/lolita/configuration/column/_header.html.erb",
+    "app/views/components/lolita/configuration/column/_sort.html.erb",
+    "app/views/components/lolita/configuration/columns/_body.html.erb",
+    "app/views/components/lolita/configuration/columns/_display.html.erb",
+    "app/views/components/lolita/configuration/columns/_first.html.erb",
+    "app/views/components/lolita/configuration/columns/_first_column_header.html.erb",
+    "app/views/components/lolita/configuration/columns/_header.html.erb",
+    "app/views/components/lolita/configuration/columns/_last.html.erb",
+    "app/views/components/lolita/configuration/columns/_last_column_header.html.erb",
+    "app/views/components/lolita/configuration/columns/_row.html.erb",
     "app/views/components/lolita/configuration/field/_display.html.erb",
     "app/views/components/lolita/configuration/field/_label.html.erb",
     "app/views/components/lolita/configuration/field/_object.html.erb",
@@ -52,20 +63,11 @@ Gem::Specification.new do |s|
     "app/views/components/lolita/configuration/field/string/text/_display.html.erb",
     "app/views/components/lolita/configuration/field/time/_display.html.erb",
     "app/views/components/lolita/configuration/field_set/_display.html.erb",
-    "app/views/components/lolita/configuration/list/_body.html.erb",
-    "app/views/components/lolita/configuration/list/_body_cell.html.erb",
-    "app/views/components/lolita/configuration/list/_checkbox_cell.html.erb",
-    "app/views/components/lolita/configuration/list/_checkbox_header.html.erb",
     "app/views/components/lolita/configuration/list/_display.html.erb",
     "app/views/components/lolita/configuration/list/_filter.html.erb",
-    "app/views/components/lolita/configuration/list/_header.html.erb",
-    "app/views/components/lolita/configuration/list/_header_cell.html.erb",
     "app/views/components/lolita/configuration/list/_new_resource.html.erb",
     "app/views/components/lolita/configuration/list/_paginator.html.erb",
-    "app/views/components/lolita/configuration/list/_row.html.erb",
     "app/views/components/lolita/configuration/list/_title.html.erb",
-    "app/views/components/lolita/configuration/list/_tool_cell.html.erb",
-    "app/views/components/lolita/configuration/list/_tool_header.html.erb",
     "app/views/components/lolita/configuration/tab/_display.html.erb",
     "app/views/components/lolita/configuration/tab/_fields.html.erb",
     "app/views/components/lolita/configuration/tab/content/_display.html.erb",
@@ -140,6 +142,8 @@ Gem::Specification.new do |s|
     "lib/lolita/rails/all.rb",
     "lib/lolita/rails/routes.rb",
     "lib/lolita/ruby_ext/accessors.rb",
+    "lib/lolita/support/formatter/base.rb",
+    "lib/lolita/support/formatter/rails.rb",
     "lib/lolita/test/matchers.rb",
     "lolita.gemspec",
     "public/images/lolita/plus.png",
@@ -212,6 +216,7 @@ Gem::Specification.new do |s|
     "spec/configuration/page_spec.rb",
     "spec/configuration/tab_spec.rb",
     "spec/configuration/tabs_spec.rb",
+    "spec/controllers/component_helpers_spec.rb",
     "spec/controllers/internal_helpers_spec.rb",
     "spec/controllers/lolita_rest_nested_resources_spec.rb",
     "spec/controllers/lolita_rest_spec.rb",
@@ -308,7 +313,8 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/support/factories/category.rb",
     "spec/support/factories/post.rb",
-    "spec/support/factories/tag.rb"
+    "spec/support/factories/tag.rb",
+    "spec/support/formatter/base_spec.rb"
   ]
   s.homepage = %q{http://github.com/ithouse/lolita}
   s.licenses = ["MIT"]
@@ -328,6 +334,7 @@ Gem::Specification.new do |s|
     "spec/configuration/page_spec.rb",
     "spec/configuration/tab_spec.rb",
     "spec/configuration/tabs_spec.rb",
+    "spec/controllers/component_helpers_spec.rb",
     "spec/controllers/internal_helpers_spec.rb",
     "spec/controllers/lolita_rest_nested_resources_spec.rb",
     "spec/controllers/lolita_rest_spec.rb",
@@ -365,7 +372,8 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/support/factories/category.rb",
     "spec/support/factories/post.rb",
-    "spec/support/factories/tag.rb"
+    "spec/support/factories/tag.rb",
+    "spec/support/formatter/base_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/public/stylesheets/lolita/style.css

@@ -99,6 +99,7 @@ header nav .username {margin-right: 15px;}
 /* navigation styles on left */
 #main nav {position: absolute; left: 0; min-width: 150px; margin-top: 5px;} /* width just for now */ 
 #main nav ul {margin-bottom: 50px;}
+#main nav ul.subtree{margin-bottom: 0px;}
 #main nav ul li a {display: block; padding: 10px 15px; color: #737373;}
 #main nav ul li.active a {
   background: #d9d9d9; 
@@ -110,6 +111,19 @@ header nav .username {margin-right: 15px;}
   -webkit-border-radius: 5px 0 0 5px;
   border-radius: 5px 0 0 5px;
 }
+#main nav ul li.with-subtree a{
+  border-radius: 5px 0 0 0;
+}
+#main nav ul li.active ul.subtree a{
+  background: #fff; 
+  background: -moz-linear-gradient(left, #fff, #fff);
+  background: -webkit-linear-gradient(left, #fff, #fff); 
+  border: 1px solid #f9f9f9; 
+  border-radius: 0 0 0 0;
+}
+#main nav ul li.active ul.subtree li.last-in-subtree a{
+  border-radius: 0 0 0 5px;
+}
 /* --------------------------------------------- */
 
 /* main content part */
@@ -178,6 +192,7 @@ a.create {
 .list table td input {vertical-align: middle;}
 .list table thead {background: #d5d5d5;}
 .list table thead th {text-align: left;}
+.list table thead th {font-weight:normal;}
 .list table thead th a {color: #a5a5a5;}
 .list table thead th.active a {color: #6c6c6c;} /* Style for active header */
 .list table tbody tr {border-bottom: 1px solid #e3e3e3;}

data/spec/configuration/column_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Lolita::Configuration::Column do
-
+  let(:column){Lolita::Configuration::Column.new(:col1)}
   
   it "should create new column with Hash attributes" do
     column=Lolita::Configuration::Column.new(:name=>"col1",:title=>"Col1",:type=>String)
@@ -41,5 +41,17 @@ describe Lolita::Configuration::Column do
       end
     }.should raise_error(ArgumentError, "Column must have name.")
   end
+
+  it "should allow to add formatter" do
+    column.formatter do|value|
+      "value #{value}"
+    end
+    column.formatter.with("1").should == "value 1"
+  end
+
+  it "should make default formater not defined" do
+    column.formatter.with(1).should == 1
+  end
+
 end
 

data/spec/configuration/filter_spec.rb

@@ -65,6 +65,7 @@ describe Lolita::Configuration::Filter do
   end
 
   it "should return right options_for_select" do
+    Category.delete_all
     3.times{ Factory.create(:category)}
     filter=Lolita::Configuration::Filter.new(@dbi) do
       field :category

data/spec/controllers/component_helpers_spec.rb

@@ -0,0 +1,6 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+
+describe Lolita::Controllers::ComponentHelpers do
+
+end

data/spec/controllers/lolita_rest_spec.rb

@@ -24,6 +24,7 @@ describe Lolita::RestController do
   end
 
   it "should overwrite list component body_cell" do
+    pending "Need to be seperated from whole project"
     Factory.create(:post)
     get :index
     response.body.should =~/overwritten cell/

data/spec/spec_helper.rb

@@ -30,7 +30,7 @@ require 'rspec/rails'
 require 'ffaker'
 require 'factory_girl'
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/factories/**/*.rb"].each {|f| require f}
 RSpec.configure do |config|
 # config.mock_with :mocha
 # config.mock_with :flexmock

data/spec/support/formatter/base_spec.rb

@@ -0,0 +1,42 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../simple_spec_helper')
+
+describe Lolita::Support::Formatter::Base do
+  let(:klass){Lolita::Support::Formatter::Base}
+
+  context "create new" do
+
+    it "should accept value as format" do
+      formatter=klass.new("%Y-%m")
+      formatter.format.should == "%Y-%m"
+    end
+
+    it "should accept block" do
+      formatter=klass.new do |value|
+        value**2
+      end
+      formatter.block.should_not be_nil
+    end
+  end
+
+  context "calling formatter" do
+    it "should call block" do
+      formatter=klass.new do |value|
+        value.to_i+1
+      end
+      formatter.with(2).should == 3
+    end
+
+    it "should try to call #format method on given value" do
+      formatter=klass.new("M")
+      object=mock(Object)
+      object.stub!(:format).and_return(1)
+      object.stub!(:respond_to?).with(:format).and_return(true)
+      formatter.with(object).should == 1
+    end
+
+    it "should convert received value to string and call #unpack" do
+      formatter=klass.new('C')
+      formatter.with("\100").should == [64]
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: lolita
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors: 
 - ITHouse (Latvia) and Arturs Meisters
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 +03:00
+date: 2011-04-19 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -190,6 +190,17 @@ files:
 - app/controllers/lolita/rest_controller.rb
 - app/helpers/components/lolita/configuration/list_component.rb
 - app/helpers/lolita_helper.rb
+- app/views/components/lolita/configuration/column/_display.html.erb
+- app/views/components/lolita/configuration/column/_header.html.erb
+- app/views/components/lolita/configuration/column/_sort.html.erb
+- app/views/components/lolita/configuration/columns/_body.html.erb
+- app/views/components/lolita/configuration/columns/_display.html.erb
+- app/views/components/lolita/configuration/columns/_first.html.erb
+- app/views/components/lolita/configuration/columns/_first_column_header.html.erb
+- app/views/components/lolita/configuration/columns/_header.html.erb
+- app/views/components/lolita/configuration/columns/_last.html.erb
+- app/views/components/lolita/configuration/columns/_last_column_header.html.erb
+- app/views/components/lolita/configuration/columns/_row.html.erb
 - app/views/components/lolita/configuration/field/_display.html.erb
 - app/views/components/lolita/configuration/field/_label.html.erb
 - app/views/components/lolita/configuration/field/_object.html.erb
@@ -212,20 +223,11 @@ files:
 - app/views/components/lolita/configuration/field/string/text/_display.html.erb
 - app/views/components/lolita/configuration/field/time/_display.html.erb
 - app/views/components/lolita/configuration/field_set/_display.html.erb
-- app/views/components/lolita/configuration/list/_body.html.erb
-- app/views/components/lolita/configuration/list/_body_cell.html.erb
-- app/views/components/lolita/configuration/list/_checkbox_cell.html.erb
-- app/views/components/lolita/configuration/list/_checkbox_header.html.erb
 - app/views/components/lolita/configuration/list/_display.html.erb
 - app/views/components/lolita/configuration/list/_filter.html.erb
-- app/views/components/lolita/configuration/list/_header.html.erb
-- app/views/components/lolita/configuration/list/_header_cell.html.erb
 - app/views/components/lolita/configuration/list/_new_resource.html.erb
 - app/views/components/lolita/configuration/list/_paginator.html.erb
-- app/views/components/lolita/configuration/list/_row.html.erb
 - app/views/components/lolita/configuration/list/_title.html.erb
-- app/views/components/lolita/configuration/list/_tool_cell.html.erb
-- app/views/components/lolita/configuration/list/_tool_header.html.erb
 - app/views/components/lolita/configuration/tab/_display.html.erb
 - app/views/components/lolita/configuration/tab/_fields.html.erb
 - app/views/components/lolita/configuration/tab/content/_display.html.erb
@@ -300,6 +302,8 @@ files:
 - lib/lolita/rails/all.rb
 - lib/lolita/rails/routes.rb
 - lib/lolita/ruby_ext/accessors.rb
+- lib/lolita/support/formatter/base.rb
+- lib/lolita/support/formatter/rails.rb
 - lib/lolita/test/matchers.rb
 - lolita.gemspec
 - public/images/lolita/plus.png
@@ -372,6 +376,7 @@ files:
 - spec/configuration/page_spec.rb
 - spec/configuration/tab_spec.rb
 - spec/configuration/tabs_spec.rb
+- spec/controllers/component_helpers_spec.rb
 - spec/controllers/internal_helpers_spec.rb
 - spec/controllers/lolita_rest_nested_resources_spec.rb
 - spec/controllers/lolita_rest_spec.rb
@@ -469,6 +474,7 @@ files:
 - spec/support/factories/category.rb
 - spec/support/factories/post.rb
 - spec/support/factories/tag.rb
+- spec/support/formatter/base_spec.rb
 has_rdoc: true
 homepage: http://github.com/ithouse/lolita
 licenses: 
@@ -483,7 +489,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1019725473
+      hash: 193616659
       segments: 
       - 0
       version: "0"
@@ -513,6 +519,7 @@ test_files:
 - spec/configuration/page_spec.rb
 - spec/configuration/tab_spec.rb
 - spec/configuration/tabs_spec.rb
+- spec/controllers/component_helpers_spec.rb
 - spec/controllers/internal_helpers_spec.rb
 - spec/controllers/lolita_rest_nested_resources_spec.rb
 - spec/controllers/lolita_rest_spec.rb
@@ -551,3 +558,4 @@ test_files:
 - spec/support/factories/category.rb
 - spec/support/factories/post.rb
 - spec/support/factories/tag.rb
+- spec/support/formatter/base_spec.rb

data/app/views/components/lolita/configuration/list/_body.html.erb

@@ -1,5 +0,0 @@
-<tbody>
-  <% page.each_with_index do |record,index| %>
-    <%= render_component :"lolita/configuration/list", :row, :columns=>columns,:record=>record,:index=>index %>
-  <% end %>
-</tbody>

data/app/views/components/lolita/configuration/list/_body_cell.html.erb

@@ -1,3 +0,0 @@
-<td>
-  <%= value.to_s %>
-</td>

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

@@ -1,9 +0,0 @@
-<thead>
-  <tr>
-    <%= render_component :"lolita/configuration/list",:checkbox_header %>
-    <% columns.each do |column| %>
-      <%= render_component :"lolita/configuration/list", :header_cell, :column=>column %>
-    <% end %>
-    <%= render_component :"lolita/configuration/list",:tool_header  %>
-  </tr>
-</thead>

data/app/views/components/lolita/configuration/list/_header_cell.html.erb

@@ -1,5 +0,0 @@
-<th>
-  <% if column %>
-    <%= column.title %>
-  <% end %>
-</th>

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

@@ -1,7 +0,0 @@
-<tr class="<%= @class_name %>">
-  <%= render_component :"lolita/configuration/list", :checkbox_cell, :record=>record %>
-  <% columns.each do |column| %>
-    <%= render_component :"lolita/configuration/list",:body_cell, :value=>column.with_format(record.send(column.name.to_sym)) %>
-  <% end %>
-  <%= render_component :"lolita/configuration/list", :tool_cell,:record=>record %>
-</tr>