lolita 3.1.18 → 3.2.0.rc1

data/lib/lolita/navigation/tree.rb

@@ -41,16 +41,6 @@ module Lolita
         !parent
       end
 
-      def visible?(view)
-        self.branches.inject([]){|result,branch| 
-          if branch.visible?(view)
-            result << true
-          else
-            result
-          end
-        }.any?
-      end
-
       def method_missing method_name, *args
         @branches.send(method_name.to_sym,*args)
       end

data/lib/lolita/rails.rb

@@ -1,12 +1,13 @@
-require 'action_controller/railtie'
 require 'lolita/rails/routes'
 require 'haml'
 
 ActiveSupport.on_load(:action_controller) {
+	include Lolita::Controllers::ViewUserHelpers
 	include Lolita::Controllers::UrlHelpers
 	include Lolita::Controllers::ComponentHelpers
 }
 ActiveSupport.on_load(:action_view) {
+	include Lolita::Controllers::ViewUserHelpers
 	include Lolita::Controllers::UrlHelpers
 	include Lolita::Controllers::ComponentHelpers
 }

data/lib/lolita/rails/routes.rb

@@ -56,13 +56,11 @@ 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
 
@@ -91,7 +89,10 @@ module ActionDispatch::Routing
 
         end
        
-        mapping.add_to_navigation_tree
+        tree=Lolita::Navigation::Tree[:"left_side_navigation"]
+        unless tree.branches.detect{|b| b.object.is_a?(Lolita::Mapping) && b.object.to==mapping.to}
+          tree.append(mapping,:title=>mapping.to.model_name.human(:count=>2))
+        end
       }
       Lolita.common_routes(all_resource_classes).each do |route_name|
         send(:"lolita_#{route_name}_route")
@@ -122,7 +123,7 @@ module ActionDispatch::Routing
     private
 
     def migrating?
-      File.basename($0).match(/^rake/) && (ARGV.detect{|arg| arg.to_s.match(/migrate/)})
+      File.basename($0).match(/^rake/) && (ARGV.include?("db:migrate"))
     end
 
     def generating_instalation?

data/lib/lolita/system_configuration/application.rb

@@ -1,19 +1,13 @@
 module Lolita
   module SystemConfiguration
-    # This configuration is used in application lolita initializer
-    # For detailed documentation see initializer.
     class Application
 
-      attr_writer :name, :assets
+      attr_writer :name
 
       def name
         @name || default_name
       end
 
-      def assets
-         @assets ||= []
-      end
-
       def default_name
         if defined?(Rails)
            Rails::Application.subclasses.first.to_s.split("::").first

data/lolita.gemspec

@@ -5,16 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = "lolita"
-  s.version = "3.1.18"
+  s.version = "3.2.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  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-12-07"
+  s.date = "2011-09-05"
   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 = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
@@ -23,10 +23,18 @@ Gem::Specification.new do |s|
     "Gemfile",
     "History.rdoc",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
-    "app/controllers/lolita/field_data_controller.rb",
+    "app/assets/images/lolita/plus.png",
+    "app/assets/javascripts/lolita/application.js",
+    "app/assets/javascripts/lolita/base64.js",
+    "app/assets/javascripts/lolita/main.js",
+    "app/assets/javascripts/lolita/tab.js",
+    "app/assets/stylesheets/lolita/PIE-custom.htc",
+    "app/assets/stylesheets/lolita/PIE.htc",
+    "app/assets/stylesheets/lolita/default.css",
+    "app/assets/stylesheets/lolita/style.css",
     "app/controllers/lolita/info_controller.rb",
     "app/controllers/lolita/rest_controller.rb",
     "app/helpers/components/lolita/configuration/list_component.rb",
@@ -47,12 +55,8 @@ 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/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/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",
     "app/views/components/lolita/configuration/field/big_decimal/_display.html.erb",
     "app/views/components/lolita/configuration/field/boolean/_display.html.erb",
@@ -77,7 +81,6 @@ Gem::Specification.new do |s|
     "app/views/components/lolita/configuration/list/_title.html.erb",
     "app/views/components/lolita/configuration/nested_form/_display.html.erb",
     "app/views/components/lolita/configuration/nested_form/_fields.html.erb",
-    "app/views/components/lolita/configuration/search/_display.html.haml",
     "app/views/components/lolita/configuration/tab/_display.html.erb",
     "app/views/components/lolita/configuration/tab/_error_msg.html.erb",
     "app/views/components/lolita/configuration/tab/_fields.html.erb",
@@ -90,7 +93,6 @@ 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",
@@ -114,7 +116,6 @@ Gem::Specification.new do |s|
     "features/support/env.rb",
     "features/support/paths.rb",
     "lib/generators/helpers/file_helper.rb",
-    "lib/generators/lolita/assets_generator.rb",
     "lib/generators/lolita/install_generator.rb",
     "lib/generators/templates/lolita.rb",
     "lib/lolita.rb",
@@ -126,7 +127,6 @@ Gem::Specification.new do |s|
     "lib/lolita/configuration/base.rb",
     "lib/lolita/configuration/column.rb",
     "lib/lolita/configuration/columns.rb",
-    "lib/lolita/configuration/factory.rb",
     "lib/lolita/configuration/factory/field.rb",
     "lib/lolita/configuration/factory/tab.rb",
     "lib/lolita/configuration/field.rb",
@@ -146,17 +146,12 @@ Gem::Specification.new do |s|
     "lib/lolita/configuration/field_set.rb",
     "lib/lolita/configuration/fields.rb",
     "lib/lolita/configuration/filter.rb",
-    "lib/lolita/configuration/helper.rb",
     "lib/lolita/configuration/list.rb",
     "lib/lolita/configuration/nested_form.rb",
-    "lib/lolita/configuration/page.rb",
-    "lib/lolita/configuration/search.rb",
     "lib/lolita/configuration/tab.rb",
     "lib/lolita/configuration/tab/content.rb",
     "lib/lolita/configuration/tab/default.rb",
     "lib/lolita/configuration/tabs.rb",
-    "lib/lolita/controller_additions.rb",
-    "lib/lolita/controllers/authorization_helpers.rb",
     "lib/lolita/controllers/component_helpers.rb",
     "lib/lolita/controllers/internal_helpers.rb",
     "lib/lolita/controllers/url_helpers.rb",
@@ -177,81 +172,12 @@ Gem::Specification.new do |s|
     "lib/lolita/rails/all.rb",
     "lib/lolita/rails/routes.rb",
     "lib/lolita/ruby_ext/accessors.rb",
-    "lib/lolita/search/simple.rb",
     "lib/lolita/support/formatter.rb",
     "lib/lolita/support/formatter/rails.rb",
     "lib/lolita/system_configuration/application.rb",
     "lib/lolita/system_configuration/base.rb",
     "lib/lolita/test/matchers.rb",
     "lolita.gemspec",
-    "public/images/lolita/plus.png",
-    "public/javascripts/jquery-1.6.min.js",
-    "public/javascripts/jquery-ui-1.8.13.min.js",
-    "public/javascripts/lolita/application.js",
-    "public/javascripts/lolita/base64.js",
-    "public/javascripts/lolita/main.js",
-    "public/javascripts/lolita/tab.js",
-    "public/javascripts/modernizr-1.7.min.js",
-    "public/javascripts/rails.js",
-    "public/javascripts/tinymce/jquery.tinymce.js",
-    "public/javascripts/tinymce/langs/en.js",
-    "public/javascripts/tinymce/license.txt",
-    "public/javascripts/tinymce/themes/advanced/about.htm",
-    "public/javascripts/tinymce/themes/advanced/anchor.htm",
-    "public/javascripts/tinymce/themes/advanced/charmap.htm",
-    "public/javascripts/tinymce/themes/advanced/color_picker.htm",
-    "public/javascripts/tinymce/themes/advanced/editor_template.js",
-    "public/javascripts/tinymce/themes/advanced/editor_template_src.js",
-    "public/javascripts/tinymce/themes/advanced/image.htm",
-    "public/javascripts/tinymce/themes/advanced/img/colorpicker.jpg",
-    "public/javascripts/tinymce/themes/advanced/img/flash.gif",
-    "public/javascripts/tinymce/themes/advanced/img/icons.gif",
-    "public/javascripts/tinymce/themes/advanced/img/iframe.gif",
-    "public/javascripts/tinymce/themes/advanced/img/pagebreak.gif",
-    "public/javascripts/tinymce/themes/advanced/img/quicktime.gif",
-    "public/javascripts/tinymce/themes/advanced/img/realmedia.gif",
-    "public/javascripts/tinymce/themes/advanced/img/shockwave.gif",
-    "public/javascripts/tinymce/themes/advanced/img/trans.gif",
-    "public/javascripts/tinymce/themes/advanced/img/video.gif",
-    "public/javascripts/tinymce/themes/advanced/img/windowsmedia.gif",
-    "public/javascripts/tinymce/themes/advanced/js/about.js",
-    "public/javascripts/tinymce/themes/advanced/js/anchor.js",
-    "public/javascripts/tinymce/themes/advanced/js/charmap.js",
-    "public/javascripts/tinymce/themes/advanced/js/color_picker.js",
-    "public/javascripts/tinymce/themes/advanced/js/image.js",
-    "public/javascripts/tinymce/themes/advanced/js/link.js",
-    "public/javascripts/tinymce/themes/advanced/js/source_editor.js",
-    "public/javascripts/tinymce/themes/advanced/langs/en.js",
-    "public/javascripts/tinymce/themes/advanced/langs/en_dlg.js",
-    "public/javascripts/tinymce/themes/advanced/link.htm",
-    "public/javascripts/tinymce/themes/advanced/shortcuts.htm",
-    "public/javascripts/tinymce/themes/advanced/skins/cirkuit/content.css",
-    "public/javascripts/tinymce/themes/advanced/skins/cirkuit/dialog.css",
-    "public/javascripts/tinymce/themes/advanced/skins/cirkuit/img/butt2.png",
-    "public/javascripts/tinymce/themes/advanced/skins/cirkuit/img/button-bg.png",
-    "public/javascripts/tinymce/themes/advanced/skins/cirkuit/img/buttons.png",
-    "public/javascripts/tinymce/themes/advanced/skins/cirkuit/img/down_arrow.gif",
-    "public/javascripts/tinymce/themes/advanced/skins/cirkuit/img/fade-butt.png",
-    "public/javascripts/tinymce/themes/advanced/skins/cirkuit/img/icons.png",
-    "public/javascripts/tinymce/themes/advanced/skins/cirkuit/img/items.gif",
-    "public/javascripts/tinymce/themes/advanced/skins/cirkuit/img/menu-arrow.png",
-    "public/javascripts/tinymce/themes/advanced/skins/cirkuit/img/menu-check.png",
-    "public/javascripts/tinymce/themes/advanced/skins/cirkuit/img/progress.gif",
-    "public/javascripts/tinymce/themes/advanced/skins/cirkuit/img/tabs.gif",
-    "public/javascripts/tinymce/themes/advanced/skins/cirkuit/img/toolbarbg.png",
-    "public/javascripts/tinymce/themes/advanced/skins/cirkuit/ui.css",
-    "public/javascripts/tinymce/themes/advanced/source_editor.htm",
-    "public/javascripts/tinymce/tiny_mce.js",
-    "public/javascripts/tinymce/tiny_mce_popup.js",
-    "public/javascripts/tinymce/utils/editable_selects.js",
-    "public/javascripts/tinymce/utils/form_utils.js",
-    "public/javascripts/tinymce/utils/mctabs.js",
-    "public/javascripts/tinymce/utils/validate.js",
-    "public/javascripts/tinymce_config.js",
-    "public/stylesheets/lolita/PIE-custom.htc",
-    "public/stylesheets/lolita/PIE.htc",
-    "public/stylesheets/lolita/default.css",
-    "public/stylesheets/lolita/style.css",
     "spec/adapter_helper.rb",
     "spec/builder_spec.rb",
     "spec/configuration/base_spec.rb",
@@ -261,7 +187,6 @@ Gem::Specification.new do |s|
     "spec/configuration/field_spec.rb",
     "spec/configuration/filter_spec.rb",
     "spec/configuration/list_spec.rb",
-    "spec/configuration/search_spec.rb",
     "spec/configuration/tab_spec.rb",
     "spec/configuration/tabs_spec.rb",
     "spec/controllers/component_helpers_spec.rb",
@@ -356,18 +281,75 @@ Gem::Specification.new do |s|
     "spec/rails_app/public/stylesheets/lolita/default.css",
     "spec/rails_app/public/stylesheets/lolita/style.css",
     "spec/routing/routes_spec.rb",
-    "spec/search/simple_spec.rb",
     "spec/simple_spec_helper.rb",
     "spec/spec_helper.rb",
     "spec/support/factories/category.rb",
     "spec/support/factories/post.rb",
     "spec/support/factories/tag.rb",
-    "spec/support/formatter_spec.rb"
+    "spec/support/formatter_spec.rb",
+    "vendor/assets/javascripts/jquery-1.6.2.min.js",
+    "vendor/assets/javascripts/jquery-ui-1.8.13.min.js",
+    "vendor/assets/javascripts/modernizr-1.7.min.js",
+    "vendor/assets/javascripts/tinymce/jquery.tinymce.js",
+    "vendor/assets/javascripts/tinymce/langs/en.js",
+    "vendor/assets/javascripts/tinymce/license.txt",
+    "vendor/assets/javascripts/tinymce/themes/advanced/about.htm",
+    "vendor/assets/javascripts/tinymce/themes/advanced/anchor.htm",
+    "vendor/assets/javascripts/tinymce/themes/advanced/charmap.htm",
+    "vendor/assets/javascripts/tinymce/themes/advanced/color_picker.htm",
+    "vendor/assets/javascripts/tinymce/themes/advanced/editor_template.js",
+    "vendor/assets/javascripts/tinymce/themes/advanced/editor_template_src.js",
+    "vendor/assets/javascripts/tinymce/themes/advanced/image.htm",
+    "vendor/assets/javascripts/tinymce/themes/advanced/img/colorpicker.jpg",
+    "vendor/assets/javascripts/tinymce/themes/advanced/img/flash.gif",
+    "vendor/assets/javascripts/tinymce/themes/advanced/img/icons.gif",
+    "vendor/assets/javascripts/tinymce/themes/advanced/img/iframe.gif",
+    "vendor/assets/javascripts/tinymce/themes/advanced/img/pagebreak.gif",
+    "vendor/assets/javascripts/tinymce/themes/advanced/img/quicktime.gif",
+    "vendor/assets/javascripts/tinymce/themes/advanced/img/realmedia.gif",
+    "vendor/assets/javascripts/tinymce/themes/advanced/img/shockwave.gif",
+    "vendor/assets/javascripts/tinymce/themes/advanced/img/trans.gif",
+    "vendor/assets/javascripts/tinymce/themes/advanced/img/video.gif",
+    "vendor/assets/javascripts/tinymce/themes/advanced/img/windowsmedia.gif",
+    "vendor/assets/javascripts/tinymce/themes/advanced/js/about.js",
+    "vendor/assets/javascripts/tinymce/themes/advanced/js/anchor.js",
+    "vendor/assets/javascripts/tinymce/themes/advanced/js/charmap.js",
+    "vendor/assets/javascripts/tinymce/themes/advanced/js/color_picker.js",
+    "vendor/assets/javascripts/tinymce/themes/advanced/js/image.js",
+    "vendor/assets/javascripts/tinymce/themes/advanced/js/link.js",
+    "vendor/assets/javascripts/tinymce/themes/advanced/js/source_editor.js",
+    "vendor/assets/javascripts/tinymce/themes/advanced/langs/en.js",
+    "vendor/assets/javascripts/tinymce/themes/advanced/langs/en_dlg.js",
+    "vendor/assets/javascripts/tinymce/themes/advanced/link.htm",
+    "vendor/assets/javascripts/tinymce/themes/advanced/shortcuts.htm",
+    "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/content.css",
+    "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/dialog.css",
+    "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/butt2.png",
+    "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/button-bg.png",
+    "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/buttons.png",
+    "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/down_arrow.gif",
+    "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/fade-butt.png",
+    "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/icons.png",
+    "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/items.gif",
+    "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/menu-arrow.png",
+    "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/menu-check.png",
+    "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/progress.gif",
+    "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/tabs.gif",
+    "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/img/toolbarbg.png",
+    "vendor/assets/javascripts/tinymce/themes/advanced/skins/cirkuit/ui.css",
+    "vendor/assets/javascripts/tinymce/themes/advanced/source_editor.htm",
+    "vendor/assets/javascripts/tinymce/tiny_mce.js",
+    "vendor/assets/javascripts/tinymce/tiny_mce_popup.js",
+    "vendor/assets/javascripts/tinymce/utils/editable_selects.js",
+    "vendor/assets/javascripts/tinymce/utils/form_utils.js",
+    "vendor/assets/javascripts/tinymce/utils/mctabs.js",
+    "vendor/assets/javascripts/tinymce/utils/validate.js",
+    "vendor/assets/javascripts/tinymce_config.js"
   ]
   s.homepage = "http://github.com/ithouse/lolita"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.10"
   s.summary = "Great Rails CMS."
   s.test_files = [
     "spec/adapter_helper.rb",
@@ -379,7 +361,6 @@ Gem::Specification.new do |s|
     "spec/configuration/field_spec.rb",
     "spec/configuration/filter_spec.rb",
     "spec/configuration/list_spec.rb",
-    "spec/configuration/search_spec.rb",
     "spec/configuration/tab_spec.rb",
     "spec/configuration/tabs_spec.rb",
     "spec/controllers/component_helpers_spec.rb",
@@ -415,7 +396,6 @@ Gem::Specification.new do |s|
     "spec/rails_app/db/schema.rb",
     "spec/rails_app/lib/lolita/configuration/field/my_custom_collection.rb",
     "spec/routing/routes_spec.rb",
-    "spec/search/simple_spec.rb",
     "spec/simple_spec_helper.rb",
     "spec/spec_helper.rb",
     "spec/support/factories/category.rb",
@@ -428,11 +408,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["~> 3.0.10"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.1.0"])
       s.add_runtime_dependency(%q<kaminari>, ["~> 0.12.4"])
       s.add_runtime_dependency(%q<abstract>, [">= 0"])
-      s.add_runtime_dependency(%q<builder>, ["~> 2.1.2"])
+      s.add_runtime_dependency(%q<builder>, ["~> 3.0"])
       s.add_runtime_dependency(%q<haml>, ["~> 3.1.2"])
+      s.add_runtime_dependency(%q<jquery-rails>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.6.0"])
@@ -444,11 +425,12 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
       s.add_development_dependency(%q<akephalos>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, ["~> 3.0.10"])
+      s.add_dependency(%q<rails>, ["~> 3.1.0"])
       s.add_dependency(%q<kaminari>, ["~> 0.12.4"])
       s.add_dependency(%q<abstract>, [">= 0"])
-      s.add_dependency(%q<builder>, ["~> 2.1.2"])
+      s.add_dependency(%q<builder>, ["~> 3.0"])
       s.add_dependency(%q<haml>, ["~> 3.1.2"])
+      s.add_dependency(%q<jquery-rails>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.6.0"])
@@ -461,11 +443,12 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<akephalos>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 3.0.10"])
+    s.add_dependency(%q<rails>, ["~> 3.1.0"])
     s.add_dependency(%q<kaminari>, ["~> 0.12.4"])
     s.add_dependency(%q<abstract>, [">= 0"])
-    s.add_dependency(%q<builder>, ["~> 2.1.2"])
+    s.add_dependency(%q<builder>, ["~> 3.0"])
     s.add_dependency(%q<haml>, ["~> 3.1.2"])
+    s.add_dependency(%q<jquery-rails>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rspec>, ["~> 2.6.0"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.6.0"])

data/spec/configuration/field_spec.rb

@@ -81,7 +81,7 @@ describe Lolita::Configuration::Field do
 
   it "should allow set field that references to (has_many or has_one) any class" do
     field=Lolita::Configuration::Factory::Field.add(@dbi,:comments,:array)
-    field.type.to_s.should == "array"
+    field.type.should == "array"
     field.association.macro.should == :many
   end
 

data/spec/configuration/list_spec.rb

@@ -1,10 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-class SearchEngine
-  def run(*args)
-  end
-end
-
 describe Lolita::Configuration::List do
 
   before(:each) do
@@ -60,20 +55,20 @@ describe Lolita::Configuration::List do
     list.columns.size.should == 3
   end
 
-  describe "search" do
-    let(:list){ Lolita::Configuration::List.new(@dbi,:per => 10) }
-
-    it "should define default search by passing true" do
-      list.search true
-      list.search.class.to_s.should match(/Lolita::Configuration::Search/)
-    end
-
-    it "should define search with block" do
-      list.search do 
-        with SearchEngine.new
-      end
-      list.search.class.to_s.should match(/Lolita::Configuration::Search/)
-    end
+  
+  it "should move columns to right or left" do
+    pending
+#    list = Lolita::Configuration::List.new do
+#      column :name=>"col1"
+#      column :name=>"col2"
+#      column :name=>"col3"
+#    end
+#    list.columns.first.name.should == "col1"
+#    list.move(:col2).before(:col1)
+#    list.columns[:col_index].move_after(:col1)
+#    list.columns.first.name.should == "col2"
+#    list.move(:col2).after(:col1)
+#    list.columns.first.name.should == "col1"
   end
 
 end