lolita 3.0.7 → 3.1.0

data/spec/lolita_spec.rb

@@ -1,10 +1,12 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/simple_spec_helper')
 
 describe Lolita do
 
-  it "should yield itself" do
-    Lolita.setup do |config|
-      config.class.should == Lolita::BaseConfiguration
+  context "#setup" do
+    it "should yield Lolita::BaseConfiguration instance" do
+      Lolita.setup do |config|
+        config.class.should == Lolita::BaseConfiguration
+      end
     end
   end
 end

data/spec/navigation/tree_spec.rb

@@ -0,0 +1,59 @@
+require File.expand_path(File.dirname(__FILE__) + '/../simple_spec_helper')
+
+describe Lolita::Navigation::Tree do
+
+  context "#new" do
+    it "should create new navigation tree with name" do
+      tree=Lolita::Navigation::Tree.new("Test tree")
+      tree.name.should == "Test tree"
+    end
+
+    it "should raise error when name is not specified" do
+      lambda{
+        Lolita::Navigation::Tree.new
+      }.should raise_error(ArgumentError)
+    end
+
+  end
+
+  let(:tree){Lolita::Navigation::Tree.new("test")}
+
+  context "#add" do
+    it "should accept object, position and options" do
+      tree.add(Object,:append,:url=>"/mypath")
+      tree.should have(1).branch
+    end
+  end
+
+  context "#each" do
+    let(:populated_tree){
+      p_tree=Lolita::Navigation::Tre.new("populated tree")
+      0.upto(3){|i|
+        p_tree.add(Object,:append,:url=>"/#{i}",:name=>"branch#{i}")
+      }
+      p_tree
+    }
+
+    it "should iterate through all branches" do
+      populated_tree.each_with_index do |branch,index|
+        branch.name.should == "branch#{index}"
+      end
+    end
+  end
+
+  context "callbacks" do
+    it "should respond to callback #before_load" do
+      Lolita::Hooks.tree("test").before_load
+    end
+  end
+
+  it "should add new branch when other branches meet some criteria " do
+    tree.add(Object,:append,:url=>"/mypath")
+    tree.each_branch do |branch|
+      if branch.resource.is_a?(Object) 
+        tree.append(Object,:url=>"/mypath2")
+      end
+    end
+    tree.should have(2).branches
+  end
+end

data/spec/rails_app/app/mongoid/post.rb

@@ -3,6 +3,8 @@ class Post
   include Lolita::Configuration
   field :title, :type => String
   field :body, :type => String
+  field :is_public, :type => Boolean
+  field :price, :type => BigDecimal
   references_many :comments,:class_name=>"Comment"
   referenced_in :profile
   validates_presence_of :title

data/spec/rails_app/config/application.rb

@@ -7,6 +7,7 @@ require "rails/test_unit/railtie"
 Bundler.require(:default, LOLITA_ORM, Rails.env) if defined?(Bundler)
 #require 'cells'
 require 'lolita'
+require "lolita/rails/all"
 require 'will_paginate'
 
 module RailsApp

data/spec/rails_app/lib/lolita/configuration/field/my_custom_collection.rb

@@ -0,0 +1,14 @@
+module Lolita
+  module Configuration
+    module Field
+      class MyCustomCollection < Lolita::Configuration::Field::Array
+        
+          def initialize *args,&block
+            super
+            @type="my_custom_collection"
+          end
+
+      end
+    end
+  end
+end

data/spec/simple_spec_helper.rb

@@ -0,0 +1 @@
+require File.expand_path("../../lib/lolita",__FILE__)

data/spec/spec_helper.rb

@@ -24,9 +24,8 @@ require 'rubygems'
 #require 'ruby-debug'
 LOLITA_ORM=:mongoid
 require "orm/#{LOLITA_ORM}"
-
+require "rails"
 require "rails_app/config/environment"
-
 require 'rspec/rails'
 require 'ffaker'
 require 'factory_girl'

metadata

@@ -2,7 +2,7 @@
 name: lolita
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.7
+  version: 3.1.0
 platform: ruby
 authors: 
 - ITHouse
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +03:00
+date: 2011-04-12 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -176,7 +176,7 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE.txt
-- README.md
+- README.rdoc
 files: 
 - .document
 - .project
@@ -185,50 +185,54 @@ files:
 - Gemfile
 - IDEA
 - LICENSE.txt
-- README.md
+- README.rdoc
 - Rakefile
 - VERSION
 - app/controllers/lolita/rest_controller.rb
-- app/helpers/components/lolita/list_component.rb
+- app/helpers/components/lolita/configuration/list_component.rb
 - app/helpers/lolita_helper.rb
-- app/views/components/lolita/field/_boolean.html.erb
-- app/views/components/lolita/field/_collection.html.erb
-- app/views/components/lolita/field/_date.html.erb
-- app/views/components/lolita/field/_datetime.html.erb
-- app/views/components/lolita/field/_disabled.html.erb
-- app/views/components/lolita/field/_display.html.erb
-- app/views/components/lolita/field/_integer.html.erb
-- app/views/components/lolita/field/_label.html.erb
-- app/views/components/lolita/field/_object.html.erb
-- app/views/components/lolita/field/_password.html.erb
-- app/views/components/lolita/field/_select.html.erb
-- app/views/components/lolita/field/_string.html.erb
-- app/views/components/lolita/field/_text.html.erb
-- app/views/components/lolita/field_set/_display.html.erb
-- app/views/components/lolita/list/_body.html.erb
-- app/views/components/lolita/list/_body_cell.html.erb
-- app/views/components/lolita/list/_checkbox_cell.html.erb
-- app/views/components/lolita/list/_checkbox_header.html.erb
-- app/views/components/lolita/list/_display.html.erb
-- app/views/components/lolita/list/_header.html.erb
-- app/views/components/lolita/list/_header_cell.html.erb
-- app/views/components/lolita/list/_new_resource.html.erb
-- app/views/components/lolita/list/_paginator.html.erb
-- app/views/components/lolita/list/_row.html.erb
-- app/views/components/lolita/list/_title.html.erb
-- app/views/components/lolita/list/_tool_cell.html.erb
-- app/views/components/lolita/list/_tool_header.html.erb
+- app/views/components/lolita/configuration/field/_display.html.erb
+- 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/habtm/_display.html.erb
+- 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
+- app/views/components/lolita/configuration/field/date/_display.html.erb
+- app/views/components/lolita/configuration/field/float/_display.html.erb
+- app/views/components/lolita/configuration/field/integer/_display.html.erb
+- app/views/components/lolita/configuration/field/string/_display.html.erb
+- app/views/components/lolita/configuration/field/string/disabled/_display.html.erb
+- app/views/components/lolita/configuration/field/string/password/_display.html.erb
+- app/views/components/lolita/configuration/field/string/text/_display.html.erb
+- app/views/components/lolita/configuration/field/time/_display.html.erb
+- app/views/components/lolita/configuration/field_set/_display.html.erb
+- app/views/components/lolita/configuration/list/_body.html.erb
+- app/views/components/lolita/configuration/list/_body_cell.html.erb
+- app/views/components/lolita/configuration/list/_checkbox_cell.html.erb
+- app/views/components/lolita/configuration/list/_checkbox_header.html.erb
+- app/views/components/lolita/configuration/list/_display.html.erb
+- app/views/components/lolita/configuration/list/_filter.html.erb
+- app/views/components/lolita/configuration/list/_header.html.erb
+- app/views/components/lolita/configuration/list/_header_cell.html.erb
+- app/views/components/lolita/configuration/list/_new_resource.html.erb
+- app/views/components/lolita/configuration/list/_paginator.html.erb
+- app/views/components/lolita/configuration/list/_row.html.erb
+- app/views/components/lolita/configuration/list/_title.html.erb
+- app/views/components/lolita/configuration/list/_tool_cell.html.erb
+- app/views/components/lolita/configuration/list/_tool_header.html.erb
+- app/views/components/lolita/configuration/tab/_display.html.erb
+- app/views/components/lolita/configuration/tab/_fields.html.erb
+- app/views/components/lolita/configuration/tab/content/_display.html.erb
+- app/views/components/lolita/configuration/tab/default/_display.html.erb
+- app/views/components/lolita/configuration/tabs/_display.html.erb
 - app/views/components/lolita/navigation/_display.html.erb
 - 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/tab/_content.html.erb
-- app/views/components/lolita/tab/_default.html.erb
-- app/views/components/lolita/tab/_display.html.erb
-- app/views/components/lolita/tab/_fields.html.erb
-- app/views/components/lolita/tabs/_display.html.erb
-- app/views/lolita/layouts/application.html.erb
-- app/views/lolita/layouts/application.html.erb_spec.rb
+- app/views/layouts/lolita/application.html.erb
+- app/views/layouts/lolita/application.html.erb_spec.rb
 - app/views/lolita/rest/form.html.erb
 - app/views/lolita/rest/index.html.erb
 - author
@@ -254,15 +258,16 @@ files:
 - lib/lolita/configuration/columns.rb
 - lib/lolita/configuration/factory.rb
 - lib/lolita/configuration/field.rb
+- lib/lolita/configuration/field/array.rb
+- lib/lolita/configuration/field/big_decimal.rb
 - lib/lolita/configuration/field/boolean.rb
-- lib/lolita/configuration/field/collection.rb
-- lib/lolita/configuration/field/datetime.rb
-- lib/lolita/configuration/field/disabled.rb
+- lib/lolita/configuration/field/date.rb
 - lib/lolita/configuration/field/integer.rb
-- lib/lolita/configuration/field/password.rb
 - lib/lolita/configuration/field/string.rb
-- lib/lolita/configuration/field/text.rb
+- lib/lolita/configuration/field/time.rb
 - lib/lolita/configuration/field_set.rb
+- lib/lolita/configuration/fields.rb
+- lib/lolita/configuration/filter.rb
 - lib/lolita/configuration/list.rb
 - lib/lolita/configuration/page.rb
 - lib/lolita/configuration/tab.rb
@@ -276,13 +281,13 @@ files:
 - lib/lolita/controllers/view_user_helpers.rb
 - lib/lolita/dbi/base.rb
 - lib/lolita/errors.rb
-- lib/lolita/hooks/base.rb
-- lib/lolita/hooks/component.rb
-- lib/lolita/hooks/hooks.rb
+- lib/lolita/hooks.rb
+- lib/lolita/hooks/named_hook.rb
 - lib/lolita/lazy_loader.rb
 - lib/lolita/mapping.rb
 - lib/lolita/modules.rb
 - lib/lolita/modules/rest.rb
+- lib/lolita/navigation.rb
 - lib/lolita/observed_array.rb
 - lib/lolita/rails.rb
 - lib/lolita/rails/all.rb
@@ -350,11 +355,13 @@ files:
 - public/stylesheets/lolita/default.css
 - public/stylesheets/lolita/style.css
 - spec/adapter_helper.rb
+- spec/builder_spec.rb
 - spec/configuration/base_spec.rb
 - spec/configuration/column_spec.rb
 - spec/configuration/columns_spec.rb
 - spec/configuration/field_set_spec.rb
 - spec/configuration/field_spec.rb
+- spec/configuration/filter_spec.rb
 - spec/configuration/list_spec.rb
 - spec/configuration/page_spec.rb
 - spec/configuration/tab_spec.rb
@@ -362,8 +369,10 @@ files:
 - spec/controllers/internal_helpers_spec.rb
 - spec/controllers/lolita_rest_spec.rb
 - spec/dbi/base_spec.rb
+- spec/hooks_spec.rb
 - spec/lolita_spec.rb
 - spec/mapping_spec.rb
+- spec/navigation/tree_spec.rb
 - spec/orm/mongoid.rb
 - spec/rails_app/app/controllers/application_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb
@@ -372,7 +381,7 @@ files:
 - spec/rails_app/app/mongoid/post.rb
 - spec/rails_app/app/mongoid/preference.rb
 - spec/rails_app/app/mongoid/profile.rb
-- spec/rails_app/app/views/components/lolita/list/_body_cell.html.erb
+- spec/rails_app/app/views/components/lolita/configuration/list/_body_cell.html.erb
 - spec/rails_app/config/application.rb
 - spec/rails_app/config/boot.rb
 - spec/rails_app/config/environment.rb
@@ -385,6 +394,7 @@ files:
 - spec/rails_app/config/initializers/secret_token.rb
 - spec/rails_app/config/routes.rb
 - spec/rails_app/db/schema.rb
+- spec/rails_app/lib/lolita/configuration/field/my_custom_collection.rb
 - spec/rails_app/public/images/lolita/plus.png
 - spec/rails_app/public/javascripts/jquery-1.5.1.min.js
 - spec/rails_app/public/javascripts/lolita/main.js
@@ -444,6 +454,7 @@ files:
 - spec/rails_app/public/stylesheets/lolita/default.css
 - spec/rails_app/public/stylesheets/lolita/style.css
 - spec/routing/routes_spec.rb
+- spec/simple_spec_helper.rb
 - spec/spec_helper.rb
 - spec/support/factories/post.rb
 - test/cells/form_cell_test.rb
@@ -462,7 +473,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 85335663
+      hash: -659089805
       segments: 
       - 0
       version: "0"
@@ -481,11 +492,13 @@ specification_version: 3
 summary: Great Rails CMS.
 test_files: 
 - spec/adapter_helper.rb
+- spec/builder_spec.rb
 - spec/configuration/base_spec.rb
 - spec/configuration/column_spec.rb
 - spec/configuration/columns_spec.rb
 - spec/configuration/field_set_spec.rb
 - spec/configuration/field_spec.rb
+- spec/configuration/filter_spec.rb
 - spec/configuration/list_spec.rb
 - spec/configuration/page_spec.rb
 - spec/configuration/tab_spec.rb
@@ -493,8 +506,10 @@ test_files:
 - spec/controllers/internal_helpers_spec.rb
 - spec/controllers/lolita_rest_spec.rb
 - spec/dbi/base_spec.rb
+- spec/hooks_spec.rb
 - spec/lolita_spec.rb
 - spec/mapping_spec.rb
+- spec/navigation/tree_spec.rb
 - spec/orm/mongoid.rb
 - spec/rails_app/app/controllers/application_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb
@@ -515,7 +530,9 @@ test_files:
 - spec/rails_app/config/initializers/secret_token.rb
 - spec/rails_app/config/routes.rb
 - spec/rails_app/db/schema.rb
+- spec/rails_app/lib/lolita/configuration/field/my_custom_collection.rb
 - spec/routing/routes_spec.rb
+- spec/simple_spec_helper.rb
 - spec/spec_helper.rb
 - spec/support/factories/post.rb
 - test/cells/form_cell_test.rb

data/README.md

@@ -1,5 +0,0 @@
-# Lolita 3
-
-Lolita is a Ruby On Rails based CMS with ActiveRecord and Mongoid support
-
-#### ALPHA STAGE, PLEASE USE branch **[2-3-stable](https://github.com/ithouse/lolita/tree/2-3-stable)**

data/app/helpers/components/lolita/list_component.rb

@@ -1,9 +0,0 @@
-module Components
-  module Lolita
-    module ListComponent
-      def sort_options
-        params[:sort]
-      end
-    end
-  end
-end

data/app/views/components/lolita/field/_collection.html.erb

@@ -1,5 +0,0 @@
-<% if field.association_type==:one %>
-  <%= render_component :"lolita/field", :select,:field=>field %>
-<% else %>
-
-<% end %>

data/app/views/components/lolita/field/_date.html.erb

@@ -1 +0,0 @@
-<%= render_component :"lolita/field", :string,:field=>field %>

data/app/views/components/lolita/field/_datetime.html.erb

@@ -1 +0,0 @@
-<%= render_component :"lolita/field", :string,:field=>field %>

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

@@ -1,6 +0,0 @@
-<div class="field" id="field_<%=field.__id__%>">
-  <%= render_component :"lolita/field", :label, :field=>field %>
-  <div class="field-value" id="field_<%=field.__id__%>_value">
-    <%= render_component :"lolita/field", field.type_name.to_sym,:field=>field %>
-  </div>
-</div>

data/app/views/components/lolita/field/_integer.html.erb

@@ -1 +0,0 @@
-<%= render_component :"lolita/field", :string,:field=>field %>

data/app/views/components/lolita/field/_label.html.erb

@@ -1 +0,0 @@
-<%= label resource_name,field.name, :id=>"field_#{field.__id__}_label" %>

data/app/views/components/lolita/field/_select.html.erb

@@ -1 +0,0 @@
-<%= select resource_name, field.name, field.association_values.respond_to?(:call) ? field.association_values.call(self) : field.association_values, {:include_blank => field.include_blank} %>

data/app/views/components/lolita/field/_text.html.erb

@@ -1,27 +0,0 @@
-<% content_for :script do %>
-  <%= javascript_include_tag "tinymce/jquery.tinymce" %>
-  <script>
-    function load_tinymce(){
-      $("textarea").tinymce({
-        script_url: "/javascripts/tinymce/tiny_mce.js",
-        theme: "advanced",
-        skin: "cirkuit",
-        mode: "textareas",
-        theme_advanced_buttons1 : "bold,italic,underline,|,justifyleft,justifycenter,justifyright,|,formatselect,|,link,unlink,image,code",
-        theme_advanced_buttons2 : "",
-        theme_advanced_buttons3 : "",
-        theme_advanced_toolbar_location: "top",
-        theme_advanced_toolbar_align: "left",
-        // theme_advanced_statusbar_location : "bottom",
-        theme_advanced_resizing: true
-      });
-    }
-  </script>
-<% end %>
-
-<%= text_area resource_name, field.name %>
-<script type="text/javascript">
-   $(function(){
-      load_tinymce(); 
-    })
-</script>