lolita 3.3.4 → 3.3.5

data/lib/lolita/adapter/field_helper.rb

@@ -1,19 +1,19 @@
-module Lolita
-  module Adapter
-    module FieldHelper
-      def technical?
-        if self.name.to_s.match(/^created_at|updated_at|type$/)
-          true
-        elsif self.primary?
-          true
-        elsif adapter.klass.respond_to?(:uploaders)
-          adapter.klass.uploaders.keys.include?(name.to_sym)
-        end
-      end
-
-      def content?
-        !technical?
-      end
-    end
-  end
+module Lolita
+  module Adapter
+    module FieldHelper
+      def technical?
+        if self.name.to_s.match(/^created_at|updated_at|type$/)
+          true
+        elsif self.primary?
+          true
+        elsif adapter.klass.respond_to?(:uploaders)
+          adapter.klass.uploaders.keys.include?(name.to_sym)
+        end
+      end
+
+      def content?
+        !technical?
+      end
+    end
+  end
 end

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

@@ -1,12 +1,12 @@
-module Lolita
-  module Configuration
-    module Field
-      class BigDecimal < Lolita::Configuration::Field::Base
-        def initialize dbi,name,*args, &block
-          
-          super
-        end
-      end
-    end
-  end
-end
+module Lolita
+  module Configuration
+    module Field
+      class BigDecimal < Lolita::Configuration::Field::Base
+        def initialize dbi,name,*args, &block
+          
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -1,12 +1,12 @@
-module Lolita
-  module Configuration
-    module Field
-      class Boolean < Lolita::Configuration::Field::Base
-        def initialize dbi,name,*args, &block
-          
-          super
-        end
-      end
-    end
-  end
-end
+module Lolita
+  module Configuration
+    module Field
+      class Boolean < Lolita::Configuration::Field::Base
+        def initialize dbi,name,*args, &block
+          
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -1,13 +1,13 @@
-module Lolita
-  module Configuration
-    module Field
-      class Date < Lolita::Configuration::Field::Base
-        attr_accessor :format
-        def initialize dbi,name,*args, &block
-          
-          super
-        end
-      end
-    end
-  end
+module Lolita
+  module Configuration
+    module Field
+      class Date < Lolita::Configuration::Field::Base
+        attr_accessor :format
+        def initialize dbi,name,*args, &block
+          
+          super
+        end
+      end
+    end
+  end
 end

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

@@ -1,12 +1,12 @@
-module Lolita
-  module Configuration
-    module Field
-      class Hidden < Lolita::Configuration::Field::Base
-        def initialize dbi,name,type,options, &block
-          
-          super
-        end
-      end
-    end
-  end
-end
+module Lolita
+  module Configuration
+    module Field
+      class Hidden < Lolita::Configuration::Field::Base
+        def initialize dbi,name,type,options, &block
+          
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -1,11 +1,11 @@
-module Lolita
-  module Configuration
-    module Field
-      class Integer< Lolita::Configuration::Field::Base
-        def initialize dbi,name,*args, &block
-          super
-        end
-      end
-    end
-  end
-end
+module Lolita
+  module Configuration
+    module Field
+      class Integer< Lolita::Configuration::Field::Base
+        def initialize dbi,name,*args, &block
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -1,16 +1,16 @@
-module Lolita
-  module Configuration
-    module Field
-      class String < Lolita::Configuration::Field::Base
-        lolita_accessor :simple, :rows
-        def initialize dbi,name,*args, &block
-          super
-          if self.dbi_field && self.dbi_field.options[:native_type] == "text"
-            self.builder = :text unless @builder
-          end
-        end
-
-      end
-    end
-  end
-end
+module Lolita
+  module Configuration
+    module Field
+      class String < Lolita::Configuration::Field::Base
+        lolita_accessor :simple, :rows
+        def initialize dbi,name,*args, &block
+          super
+          if self.dbi_field && self.dbi_field.options[:native_type] == "text"
+            self.builder = :text unless @builder
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,13 +1,13 @@
-module Lolita
-  module Configuration
-    module Field
-      class Time < Lolita::Configuration::Field::Base
-        attr_accessor :format
-        def initialize dbi,name,*args, &block
-         
-          super
-        end
-      end
-    end
-  end
-end
+module Lolita
+  module Configuration
+    module Field
+      class Time < Lolita::Configuration::Field::Base
+        attr_accessor :format
+        def initialize dbi,name,*args, &block
+         
+          super
+        end
+      end
+    end
+  end
+end

data/lib/lolita/configuration/field_set.rb

@@ -1,26 +1,26 @@
-module Lolita
-  module Configuration
-    class FieldSet
-
-      @@last_fieldset=0
-      
-      attr_reader :parent
-      attr_accessor :name
-
-      def initialize parent,name=nil
-        @parent=parent
-        self.name=name || "fieldset_#{next_fieldset}"
-      end
-
-      def fields
-        self.parent.fields.reject{|f| f.field_set!=self}
-      end
-
-      private
-
-      def next_fieldset
-        @@last_fieldset+=1
-      end
-    end
-  end
+module Lolita
+  module Configuration
+    class FieldSet
+
+      @@last_fieldset=0
+      
+      attr_reader :parent
+      attr_accessor :name
+
+      def initialize parent,name=nil
+        @parent=parent
+        self.name=name || "fieldset_#{next_fieldset}"
+      end
+
+      def fields
+        self.parent.fields.reject{|f| f.field_set!=self}
+      end
+
+      private
+
+      def next_fieldset
+        @@last_fieldset+=1
+      end
+    end
+  end
 end

data/lib/lolita/configuration/filter.rb

@@ -111,12 +111,6 @@ module Lolita
         end
       end
 
-      def resource(params)
-	if klass = fields.any? ? fields.first.dbi.klass : nil
-	  klass.new(params[klass.to_s.underscore.to_sym]).extend(Module.new{def persisted?; true; end})
-	end
-      end
-      
     end
   end
-end
+end

data/lib/lolita/configuration/filter.rb~

@@ -0,0 +1,122 @@
+# 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, :values=> %w(open closed rejected)
+    #        field :is_deleted, :title => "Deleted"
+    #      end
+    #    end
+    #
+    class Filter
+      include Lolita::Builder
+      attr_reader :dbi
+
+      def initialize(dbi,*args,&block)
+        @dbi = dbi
+        @fields=Lolita::Configuration::Fields.new
+        set_attributes(*args)
+        self.instance_eval(&block) if block_given?
+      end
+
+      def field *args, &block
+        field=Lolita::Configuration::Factory::Field.create(self.dbi,*args,&block)
+        field
+        @fields<<field
+        field
+      end
+
+      # Set all fields in tab. Accept <code>fields</code> as Array.
+      # Each array element can be Lolita::Configuration::Field object or
+      # Hash, that will be passed to #field method.
+      def fields=(fields)
+        if fields.is_a?(Array)
+          fields.each{|field_attr|
+            if field_attr.is_a?(Lolita::Configuration::Field)
+              @fields<<field_attr
+            else
+              self.field(field_attr)
+            end
+          }
+        end
+      end
+
+      def fields(*args, &block)
+        if args && args.any? || block_given?
+          args.each do |field_name|
+            f = field(field_name)
+            f.instance_eval(&block) if block_given?
+          end
+        end
+        @fields
+      end
+
+      # Used to set attributes if block not given.
+      def set_attributes(*args)
+        if args && args[0]
+          if args[0].is_a?(Hash)
+            args[0].each{|m,value|
+              self.send("#{m}=".to_sym,value)
+            }
+          else
+            fields *args            
+          end
+        end
+      end
+
+      def html_option_for_select field
+        {
+          :include_blank => ::I18n.t('lolita.filter.include_blank_by_title', :title => field.title)
+        }
+      end
+
+      def update method_name, list, request
+        filter_params = request && request.params && request.params[:filter]
+        page_criteria = if method_name == :paginate && self.search && filter_params
+          search_criteria = self.search.run(nil,request)
+          page_criteria = if search_criteria.respond_to?(:where)
+            list.page_criteria.merge(search_criteria)
+          elsif search_criteria.nil?
+            list.page_criteria
+          else
+            search_criteria
+          end
+        else
+          list.page_criteria.merge(self.dbi.filter(filter_params || {}))
+        end
+        list.instance_variable_set(:@page_criteria,page_criteria)
+      end
+
+      def search *args, &block
+        if args && args.any? || block_given?
+          @search = Lolita::Configuration::Search.new(self.dbi,*args, &block)
+        else
+          @search
+        end
+      end
+
+      def resource(params)
+	if klass = fields.any? ? fields.first.dbi.klass : nil
+	  klass.new(params[klass.to_s.underscore.to_sym]).extend(Module.new{def persisted?; true; end})
+	end
+      end
+      
+    end
+  end
+end

data/lib/lolita/configuration/nested_form.rb

@@ -1,105 +1,105 @@
-module Lolita
-  module Configuration
-    # Accept those attributes
-    # * <tt>:name</tt> - Name of nested relation, like :comments.
-    # * <tt>:field_style</tt> - Is fields rendered with as normal (with lable and staff) or like in table (:simple). Default :simple
-    # * <tt>:expandable</tt> - Show or not "Add new" and "Delete" links in form,
-    # by default, it is expandable if association macro is :many
-    # * <tt>:field_rejection_proc</tt> - Proc, that contains condition of how to reject field. 
-    # By default form rejects all fields from parent tab that doesn't have current form as field nested_form
-    # ====Example
-    #    form = Lolita::Configuration::NestedForm.new(Lolita::Configuration::Tab::Content.new,:comments)
-    #    form.field_rejection_proc = Proc.new{|field|
-    #       field.name.to_s.match(/_id$/)
-    #    }
-    #    # form exclude all fields that ends with _id
-    class NestedForm
-      include Lolita::Builder
-      @@last_nested_form=0
-      
-      attr_reader :parent, :options, :field_style
-      attr_accessor :name, :expandable, :field_rejection_proc
-      attr_writer :build_method
-
-      def initialize parent,name=nil, options ={}
-        @parent=parent
-        @options = options
-        self.name=name || "nested_form_#{next_nested_form}"
-        set_attributes_from(options)
-      end
-
-      def allow_destroy?
-        dbi.klass.nested_attributes_options[name][:allow_destroy]
-      end
-
-      def update_only?
-        dbi.klass.nested_attributes_options[name][:update_only]
-      end
-
-      def build_method
-        @build_method || self.name
-      end
-      # Set field style - normal or simple. Default - normal.      
-      def field_style=(value)
-        allowed_values = [:normal,:simple]
-        raise ArgumentError, "Only #{allowed_values.inspect} are allowed" unless allowed_values.include?(value)
-        @field_style = value
-      end
-
-      # Detect if it's possible to add more than one field group, like if model has many other objects.
-      def expandable?
-        @expandable == true || (@expandable == nil && macro == :many)
-      end
-
-      # Create field, that is not real field, but represents nested attributes as one.
-      # It is used to create label.
-      def as_field
-        Lolita::Configuration::Factory::Field.add(dbi,self.name, :string)
-      end
-
-      # Parent (a.k.a tab) dbi
-      def dbi
-        @parent.dbi
-      end
-
-      # Fields setter. Fields should be array and each element should be Lolita::Configuration::Field object.
-      def fields=(new_fields)
-        @fields = new_fields
-      end
-
-      # Return all fields. Each time fields ar returned from @fields if its defined or calculated by using #field_rejection_proc
-      # or collected from parent (tab) where fields nested form is same with self.
-      def fields
-        if @fields
-          @fields
-        elsif field_rejection_proc
-          self.parent.fields.reject(&field_rejection_proc)
-        else
-          self.parent.fields.reject{|f| f.nested_form!=self}
-        end
-      end
-
-      # Parent (tab) dbi klass
-      def klass
-        dbi.reflect_on_association(name).klass
-      end
-
-      # Parent (tab) dbi klass reflection with #name and macros of that.
-      def macro
-        dbi.reflect_on_association(name).macro
-      end
-
-      private
-
-      def next_nested_form
-        @@last_nested_form+=1
-      end
-
-      def set_attributes_from(options)
-        options.each{|key,value|
-          instance_variable_set(:"@#{key}",value)
-        }
-      end
-    end
-  end
+module Lolita
+  module Configuration
+    # Accept those attributes
+    # * <tt>:name</tt> - Name of nested relation, like :comments.
+    # * <tt>:field_style</tt> - Is fields rendered with as normal (with lable and staff) or like in table (:simple). Default :simple
+    # * <tt>:expandable</tt> - Show or not "Add new" and "Delete" links in form,
+    # by default, it is expandable if association macro is :many
+    # * <tt>:field_rejection_proc</tt> - Proc, that contains condition of how to reject field. 
+    # By default form rejects all fields from parent tab that doesn't have current form as field nested_form
+    # ====Example
+    #    form = Lolita::Configuration::NestedForm.new(Lolita::Configuration::Tab::Content.new,:comments)
+    #    form.field_rejection_proc = Proc.new{|field|
+    #       field.name.to_s.match(/_id$/)
+    #    }
+    #    # form exclude all fields that ends with _id
+    class NestedForm
+      include Lolita::Builder
+      @@last_nested_form=0
+      
+      attr_reader :parent, :options, :field_style
+      attr_accessor :name, :expandable, :field_rejection_proc
+      attr_writer :build_method
+
+      def initialize parent,name=nil, options ={}
+        @parent=parent
+        @options = options
+        self.name=name || "nested_form_#{next_nested_form}"
+        set_attributes_from(options)
+      end
+
+      def allow_destroy?
+        dbi.klass.nested_attributes_options[name][:allow_destroy]
+      end
+
+      def update_only?
+        dbi.klass.nested_attributes_options[name][:update_only]
+      end
+
+      def build_method
+        @build_method || self.name
+      end
+      # Set field style - normal or simple. Default - normal.      
+      def field_style=(value)
+        allowed_values = [:normal,:simple]
+        raise ArgumentError, "Only #{allowed_values.inspect} are allowed" unless allowed_values.include?(value)
+        @field_style = value
+      end
+
+      # Detect if it's possible to add more than one field group, like if model has many other objects.
+      def expandable?
+        @expandable == true || (@expandable == nil && macro == :many)
+      end
+
+      # Create field, that is not real field, but represents nested attributes as one.
+      # It is used to create label.
+      def as_field
+        Lolita::Configuration::Factory::Field.add(dbi,self.name, :string)
+      end
+
+      # Parent (a.k.a tab) dbi
+      def dbi
+        @parent.dbi
+      end
+
+      # Fields setter. Fields should be array and each element should be Lolita::Configuration::Field object.
+      def fields=(new_fields)
+        @fields = new_fields
+      end
+
+      # Return all fields. Each time fields ar returned from @fields if its defined or calculated by using #field_rejection_proc
+      # or collected from parent (tab) where fields nested form is same with self.
+      def fields
+        if @fields
+          @fields
+        elsif field_rejection_proc
+          self.parent.fields.reject(&field_rejection_proc)
+        else
+          self.parent.fields.reject{|f| f.nested_form!=self}
+        end
+      end
+
+      # Parent (tab) dbi klass
+      def klass
+        dbi.reflect_on_association(name).klass
+      end
+
+      # Parent (tab) dbi klass reflection with #name and macros of that.
+      def macro
+        dbi.reflect_on_association(name).macro
+      end
+
+      private
+
+      def next_nested_form
+        @@last_nested_form+=1
+      end
+
+      def set_attributes_from(options)
+        options.each{|key,value|
+          instance_variable_set(:"@#{key}",value)
+        }
+      end
+    end
+  end
 end