lolita 3.2.0.rc.6 → 3.2.0.rc.7

data/lib/lolita/configuration/column.rb

@@ -39,8 +39,31 @@ module Lolita
         @sortable
       end
 
-      def currently_sorting?(params)
-        @sortable && params[:sc].to_s==self.name.to_s
+      def current_sort_state(params)
+        @sortable && sort_pairs(params).detect{|pair| pair[0]==self.name.to_s} || []
+      end
+
+      def sort_params params
+        if @sortable
+          pairs = sort_pairs(params)
+          found_pair = false
+          pairs.each_with_index{|pair,index|
+            if pair[0] == self.name.to_s
+              pairs[index][1] = pair[1] == "asc" ? "desc" : "asc"
+              found_pair = true
+            end
+          }
+          unless found_pair
+            pairs << [self.name.to_s,"asc"]
+          end
+          (pairs.map{|pair| pair.join(",")}).join("|")
+        else
+          ""
+        end
+      end
+
+      def sort_pairs params
+        (params[:s] || "").split("|").map{|pair| pair.split(",")}
       end
 
       # Define format, for details see Lolita::Support::Formatter and Lolita::Support::Formater::Rails

data/lib/lolita/configuration/field.rb

@@ -4,6 +4,7 @@ module Lolita
     # To change behaviour of field you can use these attributes
     # * <tt>name</tt> - field name, used to set or get value from related ORM object
     # * <tt>type</tt> - can change the way field is shown and how data is formated
+    # * <tt>on</tt> - when to show field on hide, accepts array or symbol. Possible states are :create, :update or proc
     # * <tt>field_set</tt> - define field set that field belongs to. See Lolita::Configuration::FieldSet
     # * <tt>nested_in</tt> - define field for different Lolita::DBI instance, than given. This is used
     #   to create nested fields in one form for related models. Like user and profile, where in user
@@ -29,7 +30,7 @@ module Lolita
         include Lolita::Builder
 
         @@default_type = :string
-        lolita_accessor :name,:title,:field_set, :nested_form,:nested_for,:options, :html_options
+        lolita_accessor :name,:title,:on,:field_set, :nested_form,:nested_for,:options, :html_options
         attr_reader :dbi,:nested_in
         attr_accessor :dbi_field
         
@@ -68,6 +69,28 @@ module Lolita
           @name= value ? value.to_sym : nil
         end
 
+        def match_state_of?(record)
+          if @on
+            if @on.respond_to?(:call)
+              @on.call(record)
+            elsif @on.respond_to?(:detect)
+              !!@on.detect{|state| record_state_matches_with(record,state)}
+            else
+              record_state_matches_with(record,@on)
+            end
+          else
+            true
+          end
+        end
+
+        def record_state_matches_with(record,state)
+          if record.new_record?
+            state == :create
+          else
+            state == :update
+          end
+        end
+
         def nested_in=(dbi)
           unless self.dbi.associations_class_names.include?(dbi.klass.to_s)
             raise Lolita::ReferenceError, "There is no association between #{self.dbi.klass} and #{dbi.klass}"

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

@@ -11,6 +11,9 @@ module Lolita
       # select with visible values by default it calles <em>text_method</em>. It will fallback first content column. Class should respond to one
       # of these. 
       class Array < Lolita::Configuration::Field::Base
+        include Lolita::Hooks
+        add_hook :after_association_loaded
+
         lolita_accessor :conditions,:text_method,:value_method,:find_options,:association,:include_blank
         lolita_accessor :related_classes
 
@@ -20,17 +23,33 @@ module Lolita
           self.find_dbi_field unless self.dbi_field
           
           @association ||= self.dbi_field ? self.dbi_field.association : detect_association
+          self.run(:after_association_loaded)
           self.builder = detect_builder unless @builder
           self.name = recognize_real_name
         end
 
-        def options_for_select=(value=nil)
-          @options_for_select=value
+        # For details see Lolita::Configuration::Search
+        def search *args, &block
+          if (args && args.any?) || block_given?
+            self.after_association_loaded do
+              @search = create_search(*args,&block)
+            end
+          end
+          @search
+        end
+
+        def create_search *args, &block
+          Lolita::Configuration::Search.new(Lolita::DBI::Base.create(@association.klass),*args,&block)
+        end
+
+        def values=(value=nil)
+          @values=value
         end
 
-        def options_for_select value=nil, &block
-          @options_for_select=value || block if value || block_given?
-          @options_for_select
+        # Use this with block if values are dynamicly collected.
+        def values value=nil, &block
+          @values=value || block if value || block_given?
+          @values
         end
 
         # Collect values for array type field.
@@ -40,8 +59,10 @@ 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(record = nil) #TODO test
-          @association_values=if options_for_select
-            options_for_select
+          @association_values=if values
+            values
+          elsif search
+            search.run("")
           elsif @association && @association.polymorphic?
             polymorphic_association_values(record)
           elsif @association
@@ -99,7 +120,7 @@ module Lolita
             if @association.polymorphic?
               "polymorphic"
             elsif @association.macro == :many_to_many
-              "habtm"
+              "autocomplete"
             else
               "select"
             end
@@ -126,6 +147,7 @@ module Lolita
 
         def recognize_real_name
           if @association && !@association.polymorphic? && @association.macro == :one
+            @real_name = self.name
             self.name = @association.key
           else
             @name
@@ -137,7 +159,9 @@ module Lolita
         def default_text_method(klass)
           assoc_dbi=Lolita::DBI::Base.create(klass) rescue nil
           if assoc_dbi
-            field=assoc_dbi.fields.detect{|f| f.type.to_s=="string"}
+            field = assoc_dbi.fields.detect{|f| f.name.to_s == "title"}
+            field ||= assoc_dbi.fields.detect{|f| f.name.to_s == "name"}
+            field ||= assoc_dbi.fields.detect{|f| f.type.to_s=="string"}
             if field
               field.name
             else

data/lib/lolita/configuration/search.rb

@@ -49,6 +49,7 @@ module Lolita
         @dbi = dbi
         set_attributes(args ? args.extract_options! : {})
         instance_eval(&block) if block_given?
+        @with ||= args[0]!=true && args[0] ? args[0] : nil 
       end
 
       def with(value = nil)

data/lib/lolita/controllers/authorization_helpers.rb

@@ -15,7 +15,7 @@ module Lolita
       # Proxy method for current_abi, it gives control back to superclass when method is called in
       # other controller than Lolita's (it responds to #lolita_mapping) otherwise it creates or return existing ability with #lolita_current_user.
       def current_ability
-        if self.respond_to?(:lolita_mapping) && lolita_current_user
+        if self.respond_to?(:is_lolita_resource?) && self.is_lolita_resource? && lolita_current_user
           if defined?(::CanCan)
             @current_ability||= ::Ability.new(lolita_current_user)
           else

data/lib/lolita/controllers/internal_helpers.rb

@@ -5,7 +5,7 @@ module Lolita
       included do
         helper LolitaHelper
         #TODO pārnest helperus uz lolitu vai arī uz lolita app nevis likt iekš controllers iekš lolitas
-        helpers = %w(resource resource_name 
+        helpers = %w(resource resource_name use_mapping 
                      resource_class lolita_mapping show_response tab_form tab_form=)
         hide_action *helpers
        
@@ -21,14 +21,14 @@ module Lolita
       end
       
       def resource_name
-        lolita_mapping.name
+        lolita_mapping.class_name.underscore.to_sym
       end
       
       def resource_class
         lolita_mapping.to
       end
       
-      def lolita_mapping
+      def lolita_mapping(new_mapping = nil)
         @lolita_mapping||=request.env["lolita.mapping"]
       end
 
@@ -45,6 +45,19 @@ module Lolita
         end
         @tab_form
       end
+
+      def use_mapping(new_mapping)
+        if block_given? 
+          begin
+            @old_mapping = lolita_mapping
+            @lolita_mapping = new_mapping
+            yield
+          ensure
+            @lolita_mapping = @old_mapping
+            @old_mapping = nil
+          end
+        end
+      end
       
       protected
 
@@ -62,6 +75,7 @@ module Lolita
 
       def is_lolita_resource?
         raise ActionController::UnknownAction unless lolita_mapping
+        true
       end
 
       def resource=(new_resource)

data/lib/lolita/hooks.rb

@@ -60,6 +60,30 @@ module Lolita
   # See Lolita::Hooks::NamedHook for details.
   module Hooks
     class Runner
+
+      class << self
+        def singleton_hook(hook_object,hook_name)
+          class << hook_object
+            def hooks_runned(name=nil)
+              @hooks_runned ||=[]
+              @hooks_runned << name if name
+              @hooks_runned
+            end
+          end
+
+          hook_object.hooks_runned(hook_name)
+        end
+
+        def runned?(hook_object,hook_name)
+          if hook_object.respond_to?(:hooks_runned)
+            hook_object.hooks_runned.include?(hook_name)
+          end
+        end
+
+        def singleton_hooks
+          @singleton_hooks || {}
+        end
+      end
      
       attr_accessor :hooks_run_scope, :given_callback_content
       attr_writer :hooks_scope
@@ -68,6 +92,7 @@ module Lolita
         @hook_class = hook_class
         @hook_name = hook_name
         @options = options
+        @options[:once] = @options[:once] == true ? @hook_class : @options[:once]
       end
 
       # Hooks scope is used to execute callbacks. By default it is class itself.
@@ -76,12 +101,15 @@ module Lolita
       end
 
       def run(&block)
-        result = nil
-        in_hooks_scope(@options[:scope],@options[:run_scope]) do 
-          callback = get_callback(@hook_name)
-          result = run_callback(callback,&block)
+        if !@options[:once] || (@options[:once] && !self.class.runned?(@options[:once],@hook_name))
+          self.class.singleton_hook(@options[:once],@hook_name)
+          result = nil
+          in_hooks_scope(@options[:scope],@options[:run_scope]) do 
+            callback = get_callback(@hook_name)
+            result = run_callback(callback,&block)
+          end
+          result
         end
-        result
       end
 
       # Call callback block inside of run block.

data/lib/lolita/lazy_loader.rb

@@ -36,6 +36,9 @@ module Lolita
           @class_instance=@lazy_class.new(&@eval_block)
         end
       end
+      if @class_instance.respond_to?(:after_initialize,true)
+        @class_instance.send(:after_initialize)
+      end
       @class_instance.__send__(method_name,*args,&block)
     end
 

data/lib/lolita/mapping.rb

@@ -18,7 +18,7 @@ module Lolita
   # Also eahc request containers information with mapping related to it.
   class Mapping
     attr_reader :class_name,:path,:singular,:plural,:path_prefix,:module,:controllers,:as
-    attr_reader :visible, :only
+    attr_reader :visible, :only, :append_to
     alias :name :singular
     
     
@@ -26,6 +26,7 @@ module Lolita
       # TODO how it is when lolita plugin extend default path and there is module is this not break the logic?
       @as=options[:as]
       @visible = options.keys.include?(:visible) ? options[:visible] : true
+      @append_to = options[:append_to]
       @only = options[:only] || nil
       @plural=(options[:as] ? options[:as] : name).to_sym
       @singular=(options[:singular] || @plural.to_s.singularize).to_sym
@@ -55,8 +56,18 @@ module Lolita
     end
 
     def add_to_navigation_tree
+      tree = Lolita::Navigation::Tree[:"left_side_navigation"]
       if self.visible
-        tree = Lolita::Navigation::Tree[:"left_side_navigation"]
+        if self.append_to
+          parent_branch = tree.branches.detect{|b| b.options[:system_name] == self.append_to}
+          unless parent_branch
+            parent_branch = tree.append(nil,:title => lambda{|branch| 
+              return ::I18n.t("lolita.navigation." + branch.options[:system_name])
+              }, :system_name => self.append_to
+            )
+          end
+          tree = parent_branch.children
+        end
         unless tree.branches.detect{|b| b.object.is_a?(Lolita::Mapping) && b.object.to==self.to}
           tree.append(self)
         end

data/lib/lolita/navigation/branch.rb

@@ -23,7 +23,11 @@ module Lolita
       end
 
       def title
-        @title || self.object.to.model_name.human(:count=>2)
+        if @title && @title.respond_to?(:call)
+          @title.call(self)
+        else
+          @title || self.object.to.model_name.human(:count=>2)
+        end
       end
 
       def tree=(new_tree)
@@ -86,21 +90,18 @@ module Lolita
       def active?(view)
         resource = view.respond_to?(:resource_class) ? view.send(:resource_class) : nil rescue nil
         request = view.send(:request)
-        if self.object.is_a?(Lolita::Mapping) && self.object && self.object.to == resource
+        self_active = if self.object.is_a?(Lolita::Mapping) && self.object && self.object.to == resource
           true
-        else
-          self.self_with_children.detect{|branch|
-            if branch.options[:active].respond_to?(:call)
-              branch.options[:active].call(view,self,branch)
-            else
-              branch.options[:url] == request.path
-            end
-          }
+        elsif self.options[:active].respond_to?(:call)
+          self.options[:active].call(view,self)
+        elsif self.options[:url]
+          self.options[:url] == request.path
         end
+        self_active || (self.children.any? && self.children.branches.detect{|c_branch| c_branch.active?(view)})
       end
 
       def visible?(view)
-        if self.object && self.object.respond_to?(:to)
+        self_visible = if self.object && self.object.respond_to?(:to)
           view.send(:can?,:read,self.object.to)
         elsif self.options[:visible]
           if self.options[:visible].respond_to?(:call)
@@ -111,6 +112,7 @@ module Lolita
         else
           true
         end
+        self_visible && (self.children.any? && self.children.visible?(view) || self.children.empty?)
       end
 
       def self.get_or_create(*args)

data/lib/lolita/rails.rb

@@ -1,3 +1,4 @@
+require 'action_controller/railtie'
 require 'lolita/rails/routes'
 require 'haml'
 

data/lib/lolita/rails/routes.rb

@@ -56,11 +56,13 @@ module ActionDispatch::Routing
       options[:module]      ||= @scope[:module] if @scope[:module].present?
       options[:path_prefix] ||= @scope[:path]   if @scope[:path].present?
       resources.map!(&:to_sym)
+
       all_resource_classes=[]
       resources.each{|resource|
         mapping=Lolita.add_mapping(resource,options)
         Lolita.resources[mapping.name]=mapping
         target_class=mapping.to
+        
   #TODO refactor all these variables
         all_resource_classes<<target_class
 
@@ -120,7 +122,7 @@ module ActionDispatch::Routing
     private
 
     def migrating?
-      File.basename($0).match(/^rake/) && (ARGV.include?("db:migrate"))
+      File.basename($0).match(/^rake/) && (ARGV.detect{|arg| arg.to_s.match(/migrate/)})
     end
 
     def generating_instalation?

data/lib/lolita/search/simple.rb

@@ -64,7 +64,6 @@ module Lolita
           arity_limit = search_method_arity > args.size ? args.size : search_method_arity
           @dbi.klass.send(self.search_method.to_sym,*(args.slice(0..(arity_limit-1))))
         end
-        @dbi.klass.send(self.search_method.to_sym,@query,@request)
       end
 
       def run_default_search
@@ -73,4 +72,4 @@ module Lolita
     end
 
   end
-end
+end

data/lolita.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lolita"
-  s.version = "3.2.0.rc.6"
+  s.version = "3.2.0.rc.7"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse (Latvia) and Arturs Meisters"]
-  s.date = "2011-11-15"
+  s.date = "2011-12-20"
   s.description = "Great Rails CMS, that turns your business logic into good-looking, fully functional workspace. "
   s.email = "support@ithouse.lv"
   s.extra_rdoc_files = [
@@ -27,8 +27,23 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/assets/images/lolita/favicon.ico",
+    "app/assets/images/lolita/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png",
+    "app/assets/images/lolita/jquery-ui/images/ui-bg_flat_55_fbec88_40x100.png",
+    "app/assets/images/lolita/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png",
+    "app/assets/images/lolita/jquery-ui/images/ui-bg_highlight-soft_45_676767_1x100.png",
+    "app/assets/images/lolita/jquery-ui/images/ui-bg_highlight-soft_75_e3e3e3_1x100.png",
+    "app/assets/images/lolita/jquery-ui/images/ui-bg_highlight-soft_85_f3f3f3_1x100.png",
+    "app/assets/images/lolita/jquery-ui/images/ui-bg_inset-hard_100_d7d7d7_1x100.png",
+    "app/assets/images/lolita/jquery-ui/images/ui-bg_inset-hard_100_fcfdfd_1x100.png",
+    "app/assets/images/lolita/jquery-ui/images/ui-icons_7ac1ed_256x240.png",
+    "app/assets/images/lolita/jquery-ui/images/ui-icons_a1a1a1_256x240.png",
+    "app/assets/images/lolita/jquery-ui/images/ui-icons_cd0a0a_256x240.png",
+    "app/assets/images/lolita/jquery-ui/images/ui-icons_d8e7f3_256x240.png",
+    "app/assets/images/lolita/large-ajax-loader.gif",
     "app/assets/images/lolita/plus.png",
     "app/assets/images/lolita/search_icon.png",
+    "app/assets/images/lolita/small-ajax-loader.gif",
+    "app/assets/images/lolita/trash-small.png",
     "app/assets/javascripts/lolita/application.js",
     "app/assets/javascripts/lolita/base64.js",
     "app/assets/javascripts/lolita/main.js",
@@ -37,6 +52,7 @@ Gem::Specification.new do |s|
     "app/assets/stylesheets/lolita/PIE.htc",
     "app/assets/stylesheets/lolita/application.css",
     "app/assets/stylesheets/lolita/default.css.erb",
+    "app/assets/stylesheets/lolita/jquery-ui-1.8.16.lolita.css.erb",
     "app/assets/stylesheets/lolita/style.css.erb",
     "app/controllers/lolita/field_data_controller.rb",
     "app/controllers/lolita/info_controller.rb",
@@ -59,9 +75,10 @@ Gem::Specification.new do |s|
     "app/views/components/lolita/configuration/field/_label.html.erb",
     "app/views/components/lolita/configuration/field/_object.html.erb",
     "app/views/components/lolita/configuration/field/array/_display.html.erb",
+    "app/views/components/lolita/configuration/field/array/autocomplete/_display.html.haml",
+    "app/views/components/lolita/configuration/field/array/autocomplete/_input.html.haml",
+    "app/views/components/lolita/configuration/field/array/checkbox/_display.html.haml",
     "app/views/components/lolita/configuration/field/array/filter/_display.html.erb",
-    "app/views/components/lolita/configuration/field/array/habtm/_display.html.haml",
-    "app/views/components/lolita/configuration/field/array/habtm_autocomplete/_display.html.haml",
     "app/views/components/lolita/configuration/field/array/polymorphic/_display.html.haml",
     "app/views/components/lolita/configuration/field/array/polymorphic/_options_for_select.html.haml",
     "app/views/components/lolita/configuration/field/array/select/_display.html.erb",
@@ -101,6 +118,7 @@ Gem::Specification.new do |s|
     "app/views/components/lolita/shared/_flash.html.erb",
     "app/views/components/lolita/shared/_header.html.erb",
     "app/views/components/lolita/shared/_right_sidebar.html.erb",
+    "app/views/components/lolita/shared/_save_button.html.erb",
     "app/views/kaminari/lolita/_first_page.html.erb",
     "app/views/kaminari/lolita/_gap.html.erb",
     "app/views/kaminari/lolita/_last_page.html.erb",
@@ -188,7 +206,6 @@ Gem::Specification.new do |s|
     "lib/lolita/system_configuration/base.rb",
     "lib/lolita/test/matchers.rb",
     "lolita.gemspec",
-    "lolita.gemspec.orig",
     "spec/adapter_helper.rb",
     "spec/builder_spec.rb",
     "spec/configuration/base_spec.rb",
@@ -301,7 +318,7 @@ Gem::Specification.new do |s|
     "spec/support/factories/tag.rb",
     "spec/support/formatter_spec.rb",
     "vendor/assets/javascripts/application_vendor_lolita.js",
-    "vendor/assets/javascripts/jquery-ui-1.8.13.min.js",
+    "vendor/assets/javascripts/jquery-numeric.js",
     "vendor/assets/javascripts/modernizr_1_7_min.js",
     "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/content.css",
     "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/dialog.css",