lolita 3.0.5 → 3.0.6

data/lib/lolita/configuration/factory.rb

@@ -0,0 +1,46 @@
+module Lolita
+  module Configuration
+    module Factory
+      
+      def temp_object?
+        @create_temp_object||=false
+        @create_temp_object
+      end
+
+      def add(dbi,*args,&block)
+        @create_temp_object=true
+        begin
+          temp_object=self.new(dbi,*args,&block)
+        rescue Exception => e
+          raise e
+        ensure
+          @create_temp_object=false
+        end
+        factory(temp_object.type).new(dbi,*args,&block)
+      end
+
+
+      protected
+
+      def factory(name)
+        begin
+          Lolita::Configuration.const_get(:"#{to_class(name)}#{factory_name}")
+        rescue
+          error_class=Lolita.const_get(:"#{factory_name}NotFoundError")
+          raise error_class, "Can't find field Lolita::Configuration::#{to_class(name)}#{factory_name}. Add in /configuration/#{factory_name.downcase}/#{name.to_s.downcase}.rb"
+        end
+      end
+
+      def to_class(name)
+        name.to_s.downcase.gsub(/_\w/) do |m|
+          m.gsub("_","").upcase
+        end.humanize
+      end
+
+      def factory_name
+        @factory_name||=self.to_s.split("::").last
+        @factory_name
+      end
+    end
+  end
+end

data/lib/lolita/configuration/field.rb

@@ -24,27 +24,24 @@ module Lolita
     #       end
     #     end
     class Field
+      extend Lolita::Configuration::Factory
 
-      lolita_accessor :name,:title,:field_set,:nested_for,:options, :html_options,:record
-      attr_reader :dbi,:nested_in,:association_type
+      @@default_type="string"
+      lolita_accessor :name,:title,:type,:field_set,:nested_for,:options, :html_options,:record,:association
+      attr_reader :dbi,:nested_in
       
       def initialize dbi, *args, &block
         @dbi=dbi
-        self.set_attributes(*args)
-        self.instance_eval(&block) if block_given?
-        set_default_values
-        validate
-      end
-
-      def type(value=nil)
-        @type=value if value
-        add_extension unless @extension_added
-        @type
-      end
-
-      def type=(value)
-        @type=value
-        add_extension unless @extension_added
+        begin
+          self.set_attributes(*args)
+          self.instance_eval(&block) if block_given?
+          set_default_values
+          validate
+        rescue Exception=>e
+          unless self.class.temp_object?
+            raise e
+          end
+        end
       end
       
       def value value=nil, &block
@@ -100,6 +97,7 @@ module Lolita
         if args
           attributes=args.extract_options!
           self.name=args.first if args.first
+          self.type=args[1] if args[1]
           attributes.each{|attr,value|
             self.send(:"#{attr}=",value)
           }
@@ -116,42 +114,30 @@ module Lolita
       end
 
       private
+     
 
-      def add_extension #TODO test
-        @extension_added=true
+      def set_default_values
         set_association
-        refactor_type
-        set_association_type
-        self.extend("Lolita::Configuration::FieldExtensions::#{@type.camelize}".constantize) rescue nil
-      end
-
-      
-      def set_association #TODO test
-        assoc_name=@name.to_s.gsub(/_id$/,"")
-        @association=@dbi.reflect_on_association(assoc_name.to_sym) ||
-          @dbi.reflect_on_association(assoc_name.pluralize.to_sym)
-      end
-      
-      def refactor_type #TODO test
-        @type=if @association
-          "collection"
-        elsif [:created_at,:updated_at,:type].include?(@name)
-          "disabled"
-        else
-          @type
-        end
+        set_type
+        self.title||=self.name.to_s.capitalize
+        self.options||={}
       end
 
-      def set_association_type #TODO test
+      def set_type
+        @type=@type.to_s.downcase if @type
         if @association
-          @association_type=@dbi.association_macro(@association)
+          @type="collection"
+        elsif @type.nil? || @type.to_s=="object"
+          @type=@@default_type
         end
       end
 
-      def set_default_values
-        self.title||=self.name.to_s.capitalize
-        self.type||="string"
-        self.options||={}
+      # Need here because this don't know how to recognize association.
+      # TODO maybe need move to adapter, and it is converted there
+      def set_association #TODO test
+        assoc_name=@name.to_s.gsub(/_id$/,"") 
+        @association||=@dbi.reflect_on_association(assoc_name.to_sym) ||
+          @dbi.reflect_on_association(assoc_name.pluralize.to_sym)
       end
 
       def validate

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

@@ -0,0 +1,10 @@
+module Lolita
+  module Configuration
+    class BooleanField < Lolita::Configuration::Field
+      def initialize *args
+        @type="boolean"
+        super
+      end
+    end
+  end
+end

data/lib/lolita/configuration/{field_extensions → field}/collection.rb

@@ -1,18 +1,19 @@
 module Lolita
   module Configuration
-    # Field Extensions is used to extend Field instances. FieldExtensions allow
-    # different field types have same property with different functionality. For
-    # example, <code>:find_options</code>, it is possible to avoid <code>order</code>
-    # and <code>group</code> usage when it is not neccessary and allow when you
-    # need it.
-    # It depends on field
-    # _type_. Each different field type, can have one extension module. Instance
-    # will be automaticly extended when type is assigned, therefor type should
-    # be called before any type-specific method is called.
-    module FieldExtensions
-      module Collection
+    class CollectionField < Lolita::Configuration::Field
+       lolita_accessor :conditions,:text_method,:value_method,:find_options,:association_type
+      
 
-        lolita_accessor :conditions,:text_method,:value_method,:find_options
+        def initialize *args,&block
+          @type="collection"
+          super
+          set_association_type
+        end
+
+        def options_for_select &block
+          @options_for_select=block if block_given?
+          @options_for_select
+        end
 
         # Collect values for collection type field.
         # Uses <code>text_method</code> for content. By default it search for
@@ -21,7 +22,9 @@ 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
-          if @association
+          @association_values||=if options_for_select
+            options_for_select
+          elsif @association
             klass=@dbi.association_class_name(@association).camelize.constantize
             current_text_method=@text_method || default_text_method(klass)
             current_value_method=@value_method || :id
@@ -34,10 +37,17 @@ module Lolita
           else
             []
           end
+          @association_values
         end
 
         private
 
+        def set_association_type #TODO test
+          if @association
+            @association_type||=@dbi.association_macro(@association)
+          end
+        end
+
         def default_text_method(klass)
           assoc_dbi=Lolita::DBI::Base.new(klass)
           field=assoc_dbi.fields.detect{|f| f[:type].downcase=="string"}
@@ -45,13 +55,11 @@ module Lolita
             field[:name]
           else
             raise Lolita::FieldTypeError, %^
-            	Can't find any content field in #{assoc_dbi.klass}. 
-            	Use text_method in #{klass} to set one.
+              Can't find any content field in #{assoc_dbi.klass}. 
+              Use text_method in #{klass} to set one.
            ^
           end
         end
-        # MODULE end
-      end
     end
   end
 end

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

@@ -0,0 +1,10 @@
+module Lolita
+  module Configuration
+    class DatetimeField < Lolita::Configuration::Field
+      def initialize *args
+        @type="datetime"
+        super
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module Lolita
+  module Configuration
+    class DisabledField < Lolita::Configuration::Field
+      def initialize *args
+        @type="disabled"
+        super
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module Lolita
+  module Configuration
+    class IntegerField < Lolita::Configuration::Field
+      def initialize *args
+        @type="integer"
+        super
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module Lolita
+  module Configuration
+    class PasswordField < Lolita::Configuration::Field
+      def initialize *args
+        @type="password"
+        super
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Lolita
+  module Configuration
+    class StringField < Lolita::Configuration::Field
+
+      def initialize *args, &block
+        @type="string"
+        super
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module Lolita
+  module Configuration
+    class TextField < Lolita::Configuration::Field
+      def initialize *args
+        @type="text"
+        super
+      end
+    end
+  end
+end

data/lib/lolita/configuration/tab.rb

@@ -18,27 +18,10 @@ module Lolita
     #       tab(:files)
     #     end
     class Tab
+      extend Lolita::Configuration::Factory
 
-      class << self
-      
-        def add(dbi,*args,&block)
-          type=args.first if args
-          if !type || type==:default
-            temp_tab=self.new(dbi,*args,&block)
-            type=temp_tab.type
-          end
-          unless type==:default
-            begin
-              "Lolita::Configuration::#{type.to_s.camelize}Tab".constantize.new(dbi,*args,&block)
-            rescue NameError
-              raise Lolita::TabNotFoundError, "Lolita::Configuration::#{type.to_s.camelize}Tab not found. Add it in /lolita/configuration/tab/#{type}.rb"
-            end
-          else
-            temp_tab
-          end
-        end
-      end
       # For different types there are different builders(cells)
+      @@default_tab_type=:default
       @@available_types=[:content]
    
       lolita_accessor :title,:name,:type
@@ -64,7 +47,7 @@ module Lolita
       # For details how to pass args and block see Lolita::Configuration::Field.
       # Return field itself.
       def field *args, &block
-        field=Lolita::Configuration::Field.new(self.current_dbi,*args,&block)
+        field=Lolita::Configuration::Field.add(self.current_dbi,*args,&block)
         field.field_set=current_fieldset
         if self.current_dbi!=self.dbi
           field.nested_in=self.dbi
@@ -171,11 +154,11 @@ module Lolita
       private
 
       def set_default_fields
-        default_fields if @type!=:default && @fields.empty?
+        default_fields if @fields.empty? 
       end
 
       def set_default_attributes
-        @type=:default unless @type
+        @type=@@default_tab_type unless @type
         @name="tab_#{self.__id__}" unless @name
         @title=@type.to_s.humanize unless @title
       end
@@ -186,9 +169,6 @@ module Lolita
       
       def validate
         set_default_attributes
-        if type==:default && fields.empty?
-          raise Lolita::NoFieldsGivenError, "At least one field must be specified for default tab."
-        end
       end
       
       class << self

data/lib/lolita/configuration/tab/default.rb

@@ -0,0 +1,24 @@
+module Lolita
+  module Configuration
+    class DefaultTab < Lolita::Configuration::Tab
+
+      def initialize *args,&block
+        self.type=:default
+        super
+      end
+
+      private
+
+      def set_default_fields
+        warn("Default fields are not set for DefaultTab.")
+      end
+
+      def validate
+        super
+        if fields.empty?
+          raise Lolita::NoFieldsGivenError, "At least one field must be specified for default tab."
+        end
+      end
+    end
+  end
+end

data/lib/lolita/configuration/tabs.rb

@@ -28,13 +28,17 @@ module Lolita
         }
       end
 
+      def clear
+        @tabs=[]
+      end
+      
       def tabs=(values)
-        if values.is_a?(Array)
+        if values.respond_to?(:each)
           values.each{|tab|
             self<<tab
           }
         else
-          raise ArgumentError, "Tabs must be specified as Array."
+          raise ArgumentError, "#{values.class} did not responded to :each."
         end
       end
 
@@ -61,7 +65,7 @@ module Lolita
           default_tab_types
         end
         tab_types.each{|type|
-          self<<Lolita::Configuration::Tab.new(@dbi,type.to_sym)
+          self<<Lolita::Configuration::Tab.add(@dbi,type.to_sym)
         }
       end
 

data/lib/lolita/controllers/component_helpers.rb

@@ -29,11 +29,26 @@ module Lolita
         @opts=args.extract_options!
         name=args[0]
         state=args[1]
+        format=@opts.delete(:format)
         raise "Can't render component without name!" unless name
         will_use_component name 
-        return render(:partial=>"/components/#{name}#{state ? "/#{state}" : nil}",:locals=>@opts)
+        if format
+          with_format(format) do
+            render(:partial=>"/components/#{name}#{state ? "/#{state}" : nil}",:locals=>@opts)
+          end
+        else
+          render(:partial=>"/components/#{name}#{state ? "/#{state}" : nil}",:locals=>@opts)
+        end
       end
       
+      def with_format(format, &block)
+        old_formats = formats
+        self.formats = [format]
+        result=block.call
+        self.formats = old_formats
+        result
+      end
+
       # Require component helper file and extend current instance with component helper module.
       # ====Example
       #     will_use_component :"lolita/list"