lolita 3.1.0 → 3.1.1

data/History.rdoc

@@ -0,0 +1,70 @@
+=== Version 3.1.0 / 2011-04-12
+* Enhancements
+  * Hooks added (Arturs Meisters)
+  * Builders updated to complete received names (Arturs Meisters)
+  * Fields renamed to related Ruby or ActiveSupport classes (Gatis Tomsons)
+  * Componente default naming changed to match related model/class structure (Gatis Tomsons)
+  * No need for <em>include Lolita::Configuration</em> and #lolita call for lolita_for 
+    related class (Arturs Meisters)
+  * Automatic field type detection from ORM (Arturs Meisters) 
+  * List filter introduced (Gatis Tomsons)
+  * Response for JSON (Gatis Tomsons)
+  * Configuration has locales, and Lolita using those to seperate project translation (Arturs Meisters)
+  * DateTime field formation for display only (Valdis Pornieks)
+
+* Bug fixes
+  * Validation errors fixed (Janis Kesteris)
+  * MongoID adapter fixed to work with new mongoid (Valdis Pornieks)
+  * AR :order option fixed for find methods (Aivils Stoss)
+  * AR migration error fixed (Arturs Meisters)
+  * Redirect after destroy to index (Valdis Pornieks)
+  * Route and nested route bugs fixed (Arturs Meisters)
+  * Multiple textareas with tinyMCE (Valdis Pornieks) 
+  * Resource path methods fixed (Arturs Meisters)
+  * #url_for fixed for lolita (Arturs Meisters, Gatis Tomsons)
+  * Layout fixed (Rolands Bondars)
+
+=== Version 3.0.7 / 2011-03-29
+* Enhancements
+  * Collection field updated (Arturs Meisters)
+  * #options_for_select added for collection field (Gatis Tomsons)
+
+=== Version 3.0.6 / 2011-03-29
+* Enhancements
+  * TinyMCE updated with new buttons (Janis Kesteris)
+  * #add_module changed to support nested routes (Arturs Meisters)
+  * Routes support nested resources (Arturs Meisters)
+  * Fields splited in classes based on type (Arturs Meisters)
+  * #render_component accept :format option (Arturs Meisters)
+
+* Bug fixes
+  * Collection field collection priority fixed (Arturs Meisters)
+  * JQuery Ajax request updated, to support Rails CSRF fix. (Arturs Meisters)
+
+=== Version 3.0.5 / 2011-03-23
+* Enhacements
+  * #by_type for tabs added (Arturs Meisters)
+  * Test module invented and #be_routable matcher added (Arturs Meisters)
+  * Cucumber added for testing (Rolands Bondars)
+
+* Bug fixes
+  * Small look fixes (Rolands Bondars)
+  * #content_for removed from tab components (Rolands Bondars)
+
+=== Version 3.0.4 / 2011-03-17
+* Enhancements
+  * Save button added (Rolands Bondars)
+  * Removed unnecessery stuff from TinyMCE (Rolands Bonadars)
+  * :content used as default type for tabs. (Arturs Meisters)
+
+=== Version 3.0.3 / 2011-03-16
+* Enhancements (Arturs Meisters)
+  * First version form 3.x series of Lolita
+  * Basic configuration classes
+  * Basic views
+  * Basic controller and views mechanism
+  * New look (Rolands Bondars)
+
+=== Versions before 3.0.3
+Lolita 3.0 is completely different from previous versions and don't have any compability or architecture same as
+old versions. 

data/LICENSE.txt

@@ -1,4 +1,6 @@
-Copyright (c) 2011 Arturs Meisters
+The MIT License
+
+Copyright (c) 2011 ITHouse and Arturs Meisters
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,6 +1,6 @@
 =Lolita
 
-Content management system that works with rails.
+Great Rails CMS, that turns your business logic into good-looking, fully functional workspace.
 ==Demo
 See the demo page at Demo[http://lolita-demo.ithouse.lv]
 
@@ -48,3 +48,7 @@ to all controllers.
 If you decide to use some newer version, you most likely should copy new assets to your project. 
 This can be done with
   rails g lolita:assets
+
+==License
+
+Lolita is under MIT license. See LICENSE.txt[https://github.com/ithouse/lolita/blob/master/LICENSE.txt]

data/Rakefile

@@ -16,9 +16,9 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/ithouse/lolita"
   gem.license = "MIT"
   gem.summary = %Q{Great Rails CMS.}
-  gem.description = %Q{Great Rails CMS that allow you to start working with models right when you add this to your project.}
+  gem.description = %Q{Great Rails CMS, that turns your business logic into good-looking, fully functional workspace. }
   gem.email = "support@ithouse.lv"
-  gem.authors = ["ITHouse","Arturs Meisters"]
+  gem.authors = ["ITHouse (Latvia) and Arturs Meisters"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.1.1

data/app/controllers/lolita/rest_controller.rb

@@ -88,6 +88,6 @@ class Lolita::RestController < ApplicationController
   end
 
   def page
-    resource_class.lolita.list.paginate(params[:page])
+    resource_class.lolita.list.paginate(params[:page], :params => params)
   end
 end

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

@@ -0,0 +1 @@
+<%= select_tag filter.field_name(field), options_for_select(filter.options_for_select(field), params[filter.field_name(field)]),field.html_options || filter.html_option_for_select(field) %>

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

@@ -0,0 +1,2 @@
+<label for="<%= filter.field_name(field) %>"><%= field.title %></label>
+<%= check_box_tag filter.field_name(field), 1, params[filter.field_name(field)], field.html_options || {} %>

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

@@ -0,0 +1 @@
+<%= datetime_select resource_name, field.name %>

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

@@ -0,0 +1 @@
+<%= date_select resource_name, field.name %>

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

@@ -0,0 +1 @@
+<%= time_select resource_name, field.name %>

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

@@ -1 +1 @@
-<%= datetime_select resource_name, field.name %>
+<%= time_select resource_name, field.name %>

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

@@ -1,8 +1,8 @@
 <% if list.filter? -%>
   <form action="" action="get" class="filter">
     <% list.filter.fields.each do |field| %>
-      <%= render_component *field.build %>
+      <%= render_component *field.build(:filter, :filter=>list.filter) %>
     <% end %>
-    <button type="submit">Apply</button>
+    <button type="submit"><%= I18n.t "lolita.filter.apply_button" %></button>
   </form>
 <% end -%>

data/config/locales/en.yml

@@ -10,4 +10,7 @@ en:
       save_all: Save all
     list:
       add_new: Add new %{name}
-      confirm: Are you sure you want to delete record?
+      confirm: Are you sure you want to delete record?
+    filter:
+      apply_button: Apply
+      include_blank_by_title: " -- Filter by %{title} -- "

data/lib/lolita.rb

@@ -1,9 +1,23 @@
-main_time=Time.now
 
 $:<<File.dirname(__FILE__) unless $:.include?(File.dirname(__FILE__))
+LOLITA_VERSION=File.read(File.expand_path("../../VERSION",__FILE__)).gsub(/[^.\w]/,"")
+puts "=> Lolita #{LOLITA_VERSION} starting#{defined?(Rails) ? " with Rails" : ""}"
+
+# TODO should allow run lolita seperated
+unless (["-d","--debug"] & ARGV).empty?
+  require "ruby-debug"
+  Debugger.settings[:autoeval]=true
+else
+  unless self.respond_to?(:debugger)
+    def debugger
+      warn "Debugger called at #{caller.first} was ignored, run lolita with -d to attatch debugger."
+    end
+  end
+end
 
-require 'abstract' #FIXME remove from gem
+require 'abstract'
 require 'active_support/core_ext/numeric/time'
+require 'active_support/core_ext/date_time/conversions'
 require 'active_support/concern'
 require 'active_support/callbacks'
 require 'active_support/dependencies'
@@ -105,10 +119,9 @@ module Lolita
     autoload :ViewUserHelpers, 'lolita/controllers/view_user_helpers'
   end
 
-  autoload(:Navigation,"lolita/navigation")
   module Navigation
-    autoload :Tree, "lolita/navigation"
-    autoload :Branch, "lolita/navigation"
+    autoload :Tree, "lolita/navigation/tree"
+    autoload :Branch, "lolita/navigation/branch"
   end
 
   @@scopes={}
@@ -145,12 +158,6 @@ module Lolita
   
 end
 
-engine_time=Time.now
-
 if defined?(Rails)
   require 'lolita/rails/all'
 end
-
-puts "Lolita engine started in #{Time.at(Time.now-engine_time).strftime("%M:%S.%3N")}"
-
-puts "Lolita started in #{Time.at(Time.now-main_time).strftime("%M:%S.%3N")}"

data/lib/lolita/adapter/abstract_adapter.rb

@@ -4,7 +4,7 @@ module Lolita
 
       abstract_method '',:fields,:db, :db_name,:collection,:collection_name,:collections,:collection_names
       abstract_method '',:associations,:associations_class_names
-      abstract_method 'opt={}',:paginate
+      abstract_method 'opt={}',:paginate, :filter
       abstract_method 'name',:reflect_on_association
       abstract_method 'association',:association_macro,:association_class_name
       abstract_method 'id',:find_by_id

data/lib/lolita/adapter/active_record.rb

@@ -70,6 +70,33 @@ module Lolita
         self.klass.paginate(opt)
       end
 
+      def filter(opt={})
+        conditions = {}
+        joins = []
+        unless opt.empty?
+          opt.each_pair do |k,v|
+            field = klass.columns.detect{|f| f.name == k.to_s}
+            if field
+              conditions[k] = v
+            elsif association = associations[k.to_sym]
+              case association_macro(association)
+              when :many
+                conditions[association.name] = {:id => v}
+                joins << association.name
+              when :one
+                conditions[association.primary_key_name] = v
+              end
+            end
+          end
+          unless conditions.empty?
+            rs = self.klass.where(conditions)
+            joins.each { |join| rs = rs.joins(join) }
+            return rs
+          end
+        end
+        self
+      end
+
       def db
         self.klass.connection
       end
@@ -112,7 +139,7 @@ module Lolita
       def type_cast name
         types = {
           'decimal' => 'big_decimal',
-          'datetime' => 'time',
+          'datetime' => 'date_time',
           'text' => 'string'
         }
         types[name.to_s] || name

data/lib/lolita/adapter/mongoid.rb

@@ -30,14 +30,16 @@ module Lolita
         case macro
         when :references_many
           :many
+        when :references_and_referenced_in_many
+          :many
         when :referenced_in
           :one
+        when :references_one
+          :one
         when :embeds_one
           :one
         when :embeds_many
           :many
-        when :references_one
-          :one
         end
       end
 
@@ -64,6 +66,27 @@ module Lolita
         self.klass.paginate(options)
       end
 
+      def filter(opt={})
+        conditions = {}
+        unless opt.empty?
+          opt.each_pair do |k,v|
+            field = klass.fields.detect{|name,f| name == k.to_s}
+            if field
+              conditions[k] = v
+            elsif association = associations[k.to_s]
+              case association_macro(association)
+              when :many
+                conditions[:"#{klass.reflect_on_association(k).key}".in] = [v]
+              when :one
+                conditions[klass.reflect_on_association(k).foreign_key] = v
+              end
+            end
+          end
+          return self.klass.where(conditions)
+        end
+        self
+      end
+      
       def db
         self.klass.db
       end

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

@@ -1,6 +1,7 @@
 module Lolita
   module Configuration
     module Field
+      
       class Array < Lolita::Configuration::Field::Base
         lolita_accessor :conditions,:text_method,:value_method,:find_options,:association_type,:include_blank
 

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

@@ -1,7 +1,7 @@
 module Lolita
   module Configuration
     module Field
-      class Datetime < Lolita::Configuration::Field::Base
+      class Date < Lolita::Configuration::Field::Base
         attr_accessor :format
         def initialize *args
           @type="date"

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

@@ -0,0 +1,13 @@
+module Lolita
+  module Configuration
+    module Field
+      class DateTime < Lolita::Configuration::Field::Base
+        attr_accessor :format
+        def initialize *args
+          @type="date_time"
+          super
+        end
+      end
+    end
+  end
+end

data/lib/lolita/configuration/filter.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 module Lolita
   module Configuration
     class Filter
@@ -13,6 +14,7 @@ module Lolita
 
       def field *args, &block
         field=Lolita::Configuration::Field.add(self.dbi,*args,&block)
+        field
         @fields<<field
         field
       end
@@ -58,6 +60,28 @@ module Lolita
         end
       end
 
+      def field_name field
+        #'f_'+('a'..'z').to_a[self.fields.index(field)]
+        "f_#{field.name}"
+      end
+
+      def options_for_select field
+        if field.options_for_select
+          field.options_for_select
+        else
+          if field.association_values.respond_to?(:call)
+           field.association_values.call(self)
+          else
+            field.association_values
+          end
+        end
+      end
+
+      def html_option_for_select field
+        {
+          :include_blank => I18n.t('lolita.filter.include_blank_by_title', :title => field.title)
+        }
+      end
     end
   end
 end

data/lib/lolita/configuration/list.rb

@@ -57,7 +57,10 @@ module Lolita
         @filter.is_a?(Lolita::Configuration::Filter)
       end
 
-      # Adds filter
+      # Filter by now works only for these field types:
+      # - belongs_to
+      # - boolean
+      #
       def filter(*args,&block)
         @filter ||= Lolita::Configuration::Filter.new(self.dbi,*args,&block)
       end

data/lib/lolita/configuration/page.rb

@@ -58,18 +58,19 @@ module Lolita
       def paginate *args
         options=args ? args.extract_options! : {}
         hold=options.delete(:hold)
+        @params=options.delete(:params)
         set_values_from_options(options)
         options[:page]||=((args && args.first) || 1)
         options[:per_page]||=@per_page || 10
         @last_options=options
-        @last_options[:sort]=self.sort_columns.empty? ? nil : self.sort_columns
+        @last_options[:sort]=self.sort_columns unless self.sort_columns.empty?
         unless hold
           get_page()
         end
       end
 
       def get_page()
-        @page=@dbi.paginate((@page_options||{}).merge(@last_options))
+        @page=@dbi.filter(filter_conditions).paginate((@page_options||{}).merge(@last_options))
       end
       
       # Return last paginated page
@@ -83,6 +84,21 @@ module Lolita
 
       private
 
+      # returns filter conditions as Hash for get_page()
+      def filter_conditions
+        if @params
+          conditions = {}
+          @params.each_pair do |k,v|
+            if k.to_s =~ /^f_([a-z0-9_\-]+)$/ && !v.to_s.strip.blank?
+              conditions[$1.to_sym] = v
+            end
+          end
+          conditions
+        else
+          {}
+        end
+      end
+
       def allowed_options
         [:sort_columns,:asc,:desc]
       end