lolita 3.1.4 → 3.1.5

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 # Thing how to seperate gems for Rails Engine from those that are only for lolita
 gem "rails", "~>3.0"
-gem "will_paginate", "~> 3.0.pre2"
+gem "kaminari", "~>0.11.0"
 gem "abstract"
 gem "builder", "~> 2.1.2" #cucumber asks for builder 3 but rails supports 2.1
 

data/History.rdoc

@@ -1,10 +1,26 @@
+=== Version 3.1.5 / 2011-04
+* Changes
+  * Moved from WillPaginate to Kaminari (Gatis Tomsons, Arturs Meisters)
+  
+* Enhancements
+  * Lolita #before_setup and #after_setup hooks added (Arturs Meisters)
+  * Lolita #before_routes_load and #after_routes_load hooks added (Arturs Meisters)
+  * added Kaminari[https://github.com/amatsuda/kaminari] support to paginator (Gatis Tomsons)
+
+* Bug fixes
+  * array field values lazy assigment removed (Arturs Meisters)
+  * tree fixed that can use mapping without InternalHelper  (Arturs Meisters)
+  * tree now can detect if parent is active, when any of children is active (Arturs Meisters)
+  * order in list view works when model has default_scope (Gatis Tomsons)
+  * rest_controller now understands Rails date/date_time generated attributes (Gatis Tomsons)
+
 === Version 3.1.4 / 2011-04-19
 * Enhancements
-  * #render_component improved, to support any class with build method as first argument (Arturs Meister)
+  * #render_component improved, to support any class with build method as first argument (Arturs Meisters)
   * 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
+  * lolita:assets generator invoke :assets for all added modules (Arturs Meisters)
 
 * Bug fixes
   * paginator updated, to use WillPaginate only when it is accessable (Arturs Meisters)

data/VERSION

@@ -1 +1 @@
-3.1.4
+3.1.5

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

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

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

@@ -1,22 +1,32 @@
-<ul <%=tree.parent ? "class='subtree'" : ""%> >
+<% if tree.root? 
+  tree.each do |branch|
+    if branch.object.is_a?(Lolita::Mapping)
+      branch.options[:url]||=lolita_resources_path(branch.object)
+    else
+      branch.options[:url]=if branch.options[:url].respond_to?(:call)
+        branch.options[:url].call(self,branch)
+      else
+        branch.options[:url]
+      end
+    end
+  end
+end %>
+<ul <%=!tree.root? ? "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) 
-       active=branch.object.to==resource_class
-     else   
-
-       branch.options[:url]=if branch.options[:url].respond_to?(:call) 
-         branch.options[:url].call(self,branch) 
-       else 
-         branch.options[:url] 
-       end 
-       active=branch.options[:url]==request.path
+       active=if self.respond_to?(:resource_class)
+          branch.object.to==resource_class
+        else
+          branch.options[:url]==request.path
+        end
+     else  
+       active=branch.self_with_children.detect{|b| b.options[:url]==request.path}
      end 
      
     %>
-    <li class="<%=active ? "active" : ""%> <%=branch.children.branches.any? ? "with-subtree" : ""%> <%=branch==last_branch ? "last-in-subtree" : ""%>">
-      <%= link_to branch.title, branch.options[:url] %>
+    <li class="<%=active ? "active" : ""%> <%=branch.children.branches.any? ? "with-subtree" : ""%> <%=!tree.root? && 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) %>
       <% end %>

data/lib/lolita.rb

@@ -22,12 +22,16 @@ require 'active_support/concern'
 require 'active_support/callbacks'
 require 'active_support/dependencies'
 require 'lolita/errors'
+require "lolita/hooks"
 # Require all ruby extensions
 Dir["#{File.dirname(__FILE__)}/lolita/ruby_ext/**/*.*"].each do |path|
   require path
 end
 
 module Lolita
+  include Lolita::Hooks
+  add_hook :before_setup, :after_setup, :after_routes_loaded,:before_routes_loaded
+  
   autoload(:LazyLoader,'lolita/lazy_loader')
   autoload(:VERSION,'lolita/version')
   autoload(:ObservedArray,'lolita/observed_array')
@@ -44,7 +48,6 @@ module Lolita
     autoload :Base, 'lolita/dbi/base'
   end
   
-  autoload :Hooks, "lolita/hooks"
   module Hooks
     autoload :NamedHook, "lolita/hooks/named_hook"
   end
@@ -125,8 +128,8 @@ module Lolita
   end
 
   module Support
-    module Formatter
-      autoload :Base, 'lolita/support/formatter/base'
+    autoload :Formatter, 'lolita/support/formatter'
+    class Formatter
       autoload :Rails, 'lolita/support/formatter/rails'
     end
   end
@@ -140,7 +143,9 @@ module Lolita
   end
 
   def self.setup
+    self.run(:before_setup)
     yield scope
+    self.run(:after_setup)
   end
 
   def self.scope_name
@@ -159,12 +164,16 @@ module Lolita
     scope.send(method_name,*args,&block)
   end
 
+  def self.rails3?
+    defined?(::Rails) && ::Rails::VERSION::MAJOR == 3
+  end
+
   module Generators
     autoload :FileHelper, File.join(Lolita.root,"lib","generators","helpers","file_helper")
   end
   
 end
 
-if defined?(Rails)
+if Lolita.rails3?
   require 'lolita/rails/all'
 end

data/lib/lolita/adapter/active_record.rb

@@ -54,20 +54,19 @@ module Lolita
       end
 
       def find_by_id(id)
-        self.klass.where(:id=>id).first
+        self.klass.unscoped.where(:id=>id).first
       end
       
       def find(*args)
-        self.klass.find(*args)
+        self.klass.unscoped.find(*args)
       end
 
       def paginate(opt={})
-        #FIXME depend on will_paginate
         if order=opt.delete(:sort)
           order=order.map{|c| c.join(" ")}.join(", ")
           opt[:order]=order
         end
-        self.klass.paginate(opt)
+        self.klass.unscoped.page(opt[:page]).per(opt[:per_page]).order(opt[:order])
       end
 
       def filter(opt={})
@@ -89,7 +88,7 @@ module Lolita
             end
           end
           unless conditions.empty?
-            rs = self.klass.where(conditions)
+            rs = self.klass.unscoped.where(conditions)
             joins.each { |join| rs = rs.joins(join) }
             return rs
           end

data/lib/lolita/adapter/mongoid.rb

@@ -55,15 +55,15 @@ module Lolita
       end
 
       def find_by_id(id)
-        self.klass.where(:_id=>id).first
+        self.klass.unscoped.where(:_id=>id).first
       end
 
       def find *args
-        self.klass.find(*args)
+        self.klass.unscoped.find(*args)
       end
 
-      def paginate(options={})
-        self.klass.paginate(options)
+      def paginate(opt={})
+        self.klass.unscoped.order_by(opt[:sort]).page(opt[:page]).per(opt[:per_page])
       end
 
       def filter(opt={})
@@ -82,7 +82,7 @@ module Lolita
               end
             end
           end
-          return self.klass.where(conditions)
+          return self.klass.unscoped.where(conditions)
         end
         self
       end

data/lib/lolita/base_configuration.rb

@@ -50,7 +50,7 @@ module Lolita
     # take first of defined #locales for Lolita, if there no defined locales for Lolita, than
     # look for I18n and take default locale from there or if there is no I18n than take :en
     def default_locale
-      @default_locale || self.locales.first || (defined?(I18n) ? I18n.default_locale : :en)
+      @default_locale || self.locales.first || (defined?(::I18n) ? ::I18n.default_locale : :en)
     end
     # Call (with #call) to route klass
     # And return all names of routes that are needed for resource.
@@ -139,7 +139,9 @@ module Lolita
       name=options[:name]||module_container.to_s.to_sym
       self.modules<<module_container
 
-      self.routes[name]=[options.has_key?(:nested) ? options[:nested] : true,options[:route]]
+      if options.has_key?(:route)
+        self.routes[name]=[options.has_key?(:nested) ? options[:nested] : true,options[:route]]
+      end
       self.controllers[name]=options[:controller] if options.has_key?(:controller)
 
       if options[:path]

data/lib/lolita/configuration/column.rb

@@ -34,7 +34,7 @@ module Lolita
       # 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) 
+          @formatter=Lolita::Support::Formatter.new(value,&block) 
         elsif value || !@formatter
           @formatter=Lolita::Support::Formatter::Rails.new(value)
         end

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

@@ -29,7 +29,7 @@ module Lolita
         # <code>find_options</code> for advanced search. When <code>find_options</code>
         # is used, than <code>conditions</code> is ignored.
         def association_values() #TODO test
-          @association_values||=if options_for_select
+          @association_values=if options_for_select
           options_for_select
         elsif @association
           klass=@dbi.association_class_name(@association).camelize.constantize

data/lib/lolita/controllers/internal_helpers.rb

@@ -43,11 +43,10 @@ module Lolita
       end
 
       def resource_attributes
-        params[resource_name] || {}
+        fix_attributes(params[resource_name] || {})
       end
 
       def resource_with_attributes(current_resource,attributes={})
-        #TODO: detect rails date_select and datetime_select special attributes
         attributes||=resource_attributes
         attributes.each{|key,value|
           current_resource.send(:"#{key}=",value)
@@ -78,12 +77,32 @@ module Lolita
 
       private
 
+      def fix_attributes attributes
+        fix_rails_date_attributes attributes
+      end
+
+      def fix_rails_date_attributes attributes
+        #{"created_at(1i)"=>"2011", "created_at(2i)"=>"4", "created_at(3i)"=>"19", "created_at(4i)"=>"16", "created_at(5i)"=>"14"}
+        date_attributes = {}
+        attributes.each_pair do |k,v|
+          if k.to_s =~ /(.+)\((\d)i\)$/
+            date_attributes[$1] = {} unless date_attributes[$1]
+            date_attributes[$1][$2.to_i] = v.to_i
+            attributes.delete(k)
+          end
+        end
+        date_attributes.each_pair do |k,v|
+          attributes[k] = v.size == 3 ? Date.new(v[1],v[2],v[3]) : Time.new(v[1],v[2],v[3],v[4],v[5])
+        end
+        attributes
+      end
+
       def switch_locale
-        old_locale=I18n.locale
+        old_locale=::I18n.locale
         Lolita.locale=params[:locale]
-        I18n.locale=Lolita.locale
+        ::I18n.locale=Lolita.locale
         yield
-        I18n.locale=old_locale
+        ::I18n.locale=old_locale
       end
     end
   end

data/lib/lolita/controllers/user_helpers.rb

@@ -7,7 +7,10 @@ module Lolita
     # or return True when no authentication is defined.
     module UserHelpers
       extend ActiveSupport::Concern
-
+      included do
+        helper LolitaHelper
+      end
+      
       private
     # FIXME what to do when block or method return false, and do not redirect
     # need some redirect, but how to detect it?

data/lib/lolita/navigation/branch.rb

@@ -27,6 +27,17 @@ module Lolita
         @children
       end
 
+      def self_with_children
+        if block_given?
+          yield self
+          @children.each do |branch|
+            yield branch
+          end
+        else
+          [self]+@children.map{|b| b}
+        end
+      end
+
       def index
         self.tree.get_branch_index(self)
       end

data/lib/lolita/navigation/tree.rb

@@ -37,6 +37,10 @@ module Lolita
         end
       end
 
+      def root?
+        !parent
+      end
+
       def method_missing method_name, *args
         @branches.send(method_name.to_sym,*args)
       end

data/lib/lolita/rails.rb

@@ -1,4 +1,5 @@
 require 'lolita/rails/routes'
+require 'kaminari'
 
 ActiveSupport.on_load(:action_controller) {
 	include Lolita::Controllers::ViewUserHelpers

data/lib/lolita/rails/routes.rb

@@ -2,12 +2,17 @@ module ActionDispatch::Routing
   
   class RouteSet
 
+    # Each time when #draw method is called this is called as well.
+    # It creates :left_side_navigation tree and call callbacks
+    # Lolita#before_routes_loaded and Lolita#after_routes_loaded
     def draw_with_lolita  *args,&block
       unless Lolita::Navigation::Tree[:"left_side_navigation"]
         tree=Lolita::Navigation::Tree.new(:"left_side_navigation")
         Lolita::Navigation::Tree.remember(tree)
       end
+      Lolita.run(:before_routes_loaded)
       draw_without_lolita *args,&block
+      Lolita.run(:after_routes_loaded)
     end
 
     alias_method_chain :draw, :lolita

data/lib/lolita/support/formatter.rb

@@ -0,0 +1,63 @@
+module Lolita
+  module Support
+    # Containes different kind of formaters.
+    # 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 Formatter
+
+      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

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

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

data/lolita.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita}
-  s.version = "3.1.4"
+  s.version = "3.1.5"
 
   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-19}
+  s.date = %q{2011-04-20}
   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 = [
@@ -19,10 +19,9 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
-    "GUIDELINES",
+    "GUIDELINES.rdoc",
     "Gemfile",
     "History.rdoc",
-    "IDEA",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -79,7 +78,6 @@ Gem::Specification.new do |s|
     "app/views/components/lolita/shared/_header.html.erb",
     "app/views/components/lolita/shared/_right_sidebar.html.erb",
     "app/views/layouts/lolita/application.html.erb",
-    "app/views/layouts/lolita/application.html.erb_spec.rb",
     "app/views/lolita/rest/form.html.erb",
     "app/views/lolita/rest/index.html.erb",
     "author",
@@ -142,7 +140,7 @@ 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.rb",
     "lib/lolita/support/formatter/rails.rb",
     "lib/lolita/test/matchers.rb",
     "lolita.gemspec",
@@ -245,7 +243,6 @@ Gem::Specification.new do |s|
     "spec/rails_app/config/environments/test.rb",
     "spec/rails_app/config/initializers/backtrace_silencers.rb",
     "spec/rails_app/config/initializers/inflections.rb",
-    "spec/rails_app/config/initializers/load_my_cells.rb",
     "spec/rails_app/config/initializers/secret_token.rb",
     "spec/rails_app/config/routes.rb",
     "spec/rails_app/db/schema.rb",
@@ -314,7 +311,7 @@ Gem::Specification.new do |s|
     "spec/support/factories/category.rb",
     "spec/support/factories/post.rb",
     "spec/support/factories/tag.rb",
-    "spec/support/formatter/base_spec.rb"
+    "spec/support/formatter_spec.rb"
   ]
   s.homepage = %q{http://github.com/ithouse/lolita}
   s.licenses = ["MIT"]
@@ -362,7 +359,6 @@ Gem::Specification.new do |s|
     "spec/rails_app/config/environments/test.rb",
     "spec/rails_app/config/initializers/backtrace_silencers.rb",
     "spec/rails_app/config/initializers/inflections.rb",
-    "spec/rails_app/config/initializers/load_my_cells.rb",
     "spec/rails_app/config/initializers/secret_token.rb",
     "spec/rails_app/config/routes.rb",
     "spec/rails_app/db/schema.rb",
@@ -373,7 +369,7 @@ Gem::Specification.new do |s|
     "spec/support/factories/category.rb",
     "spec/support/factories/post.rb",
     "spec/support/factories/tag.rb",
-    "spec/support/formatter/base_spec.rb"
+    "spec/support/formatter_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -381,7 +377,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["~> 3.0"])
-      s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
+      s.add_runtime_dependency(%q<kaminari>, ["~> 0.11.0"])
       s.add_runtime_dependency(%q<abstract>, [">= 0"])
       s.add_runtime_dependency(%q<builder>, ["~> 2.1.2"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -396,7 +392,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<akephalos>, [">= 0"])
     else
       s.add_dependency(%q<rails>, ["~> 3.0"])
-      s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
+      s.add_dependency(%q<kaminari>, ["~> 0.11.0"])
       s.add_dependency(%q<abstract>, [">= 0"])
       s.add_dependency(%q<builder>, ["~> 2.1.2"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -412,7 +408,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rails>, ["~> 3.0"])
-    s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
+    s.add_dependency(%q<kaminari>, ["~> 0.11.0"])
     s.add_dependency(%q<abstract>, [">= 0"])
     s.add_dependency(%q<builder>, ["~> 2.1.2"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/spec/controllers/internal_helpers_spec.rb

@@ -59,5 +59,18 @@ describe MyController do
     attributes={:published_at => {}}
     @controller.send(:resource_with_attributes,resource,attributes)
   end
+
+  it "should fix rails date attributes" do
+    params = {"date_till(1i)"=>"2011", "date_till(2i)"=>"4", "date_till(3i)"=>"19", "description"=>"", "created_at(1i)"=>"2011", "created_at(2i)"=>"4", "created_at(3i)"=>"19", "created_at(4i)"=>"16", "created_at(5i)"=>"14"}
+    attributes = @controller.send(:fix_attributes,params)
+    attributes['date_till'].should == Date.new(2011,4,19)
+  end
+
+  it "should fix rails date_time attributes" do
+    params = {"created_at(1i)"=>"2011", "created_at(2i)"=>"4", "created_at(3i)"=>"19", "created_at(4i)"=>"16", "created_at(5i)"=>"14"}
+    attributes = @controller.send(:fix_attributes,params)
+    attributes['created_at'].should == Time.new(2011,4,19,16,14)
+  end
+
 end
 

data/spec/dbi/base_spec.rb

@@ -30,5 +30,15 @@ describe Lolita::DBI::Base do
   it "should display all adapter available" do
     Lolita::DBI::Base.adapters.size.should > 0
   end
+
+  it "should order with paginate" do
+    Post.destroy_all
+    Factory.create(:post, :title => "Apple")
+    Factory.create(:post, :title => "Banana")
+    Factory.create(:post, :title => "Cucumber")
+    dbi=Lolita::DBI::Base.new(Post)
+    dbi.paginate(:per_page => 3, :page => 1, :sort => [[:title,:desc]]).map(&:title).should == %w(Cucumber Banana Apple)
+    dbi.paginate(:per_page => 3, :page => 1, :sort => [[:title,:asc]]).map(&:title).should == %w(Apple Banana Cucumber)
+  end
 end
 

data/spec/rails_app/app/mongoid/post.rb

@@ -12,7 +12,7 @@ class Post
   has_many :comments
   belongs_to :profile
   validates_presence_of :title
-
+  default_scope order_by([:title, :asc])
   accepts_nested_attributes_for :comments, :reject_if => :all_blank
 
   lolita

data/spec/rails_app/config/application.rb

@@ -8,7 +8,7 @@ Bundler.require(:default, LOLITA_ORM, Rails.env) if defined?(Bundler)
 #require 'cells'
 require 'lolita'
 require "lolita/rails/all"
-require 'will_paginate'
+require 'kaminari'
 
 module RailsApp
 	class Application < Rails::Application

data/spec/support/{formatter/base_spec.rb → formatter_spec.rb}

@@ -1,7 +1,7 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../simple_spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../simple_spec_helper')
 
-describe Lolita::Support::Formatter::Base do
-  let(:klass){Lolita::Support::Formatter::Base}
+describe Lolita::Support::Formatter do
+  let(:klass){Lolita::Support::Formatter}
 
   context "create new" do
 

metadata

@@ -2,7 +2,7 @@
 name: lolita
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors: 
 - ITHouse (Latvia) and Arturs Meisters
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 +03:00
+date: 2011-04-20 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,13 +25,13 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: will_paginate
+  name: kaminari
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.pre2
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -179,10 +179,9 @@ extra_rdoc_files:
 files: 
 - .document
 - .rspec
-- GUIDELINES
+- GUIDELINES.rdoc
 - Gemfile
 - History.rdoc
-- IDEA
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -239,7 +238,6 @@ files:
 - app/views/components/lolita/shared/_header.html.erb
 - app/views/components/lolita/shared/_right_sidebar.html.erb
 - app/views/layouts/lolita/application.html.erb
-- app/views/layouts/lolita/application.html.erb_spec.rb
 - app/views/lolita/rest/form.html.erb
 - app/views/lolita/rest/index.html.erb
 - author
@@ -302,7 +300,7 @@ 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.rb
 - lib/lolita/support/formatter/rails.rb
 - lib/lolita/test/matchers.rb
 - lolita.gemspec
@@ -405,7 +403,6 @@ files:
 - spec/rails_app/config/environments/test.rb
 - spec/rails_app/config/initializers/backtrace_silencers.rb
 - spec/rails_app/config/initializers/inflections.rb
-- spec/rails_app/config/initializers/load_my_cells.rb
 - spec/rails_app/config/initializers/secret_token.rb
 - spec/rails_app/config/routes.rb
 - spec/rails_app/db/schema.rb
@@ -474,7 +471,7 @@ files:
 - spec/support/factories/category.rb
 - spec/support/factories/post.rb
 - spec/support/factories/tag.rb
-- spec/support/formatter/base_spec.rb
+- spec/support/formatter_spec.rb
 has_rdoc: true
 homepage: http://github.com/ithouse/lolita
 licenses: 
@@ -489,7 +486,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 193616659
+      hash: 884824061
       segments: 
       - 0
       version: "0"
@@ -547,7 +544,6 @@ test_files:
 - spec/rails_app/config/environments/test.rb
 - spec/rails_app/config/initializers/backtrace_silencers.rb
 - spec/rails_app/config/initializers/inflections.rb
-- spec/rails_app/config/initializers/load_my_cells.rb
 - spec/rails_app/config/initializers/secret_token.rb
 - spec/rails_app/config/routes.rb
 - spec/rails_app/db/schema.rb
@@ -558,4 +554,4 @@ test_files:
 - spec/support/factories/category.rb
 - spec/support/factories/post.rb
 - spec/support/factories/tag.rb
-- spec/support/formatter/base_spec.rb
+- spec/support/formatter_spec.rb

data/IDEA

@@ -1 +0,0 @@
-Put your ideas about lolita here --->

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

@@ -1,64 +0,0 @@
-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/spec/rails_app/config/initializers/load_my_cells.rb

@@ -1,7 +0,0 @@
-#dir_path="#{Rails.root}/app/cells/lolita"
-#Dir.new(dir_path).each {|f|
-#  if f.to_s.match(/\.rb$/)
-#    puts "-#{f}"
-#    require("#{dir_path}/#{f}")
-#  end
-# }