lolita 3.1.0 → 3.1.1

data/spec/navigation/tree_spec.rb

@@ -2,6 +2,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../simple_spec_helper')
 
 describe Lolita::Navigation::Tree do
 
+  let(:tree){Lolita::Navigation::Tree.new("test")}
+
   context "#new" do
     it "should create new navigation tree with name" do
       tree=Lolita::Navigation::Tree.new("Test tree")
@@ -16,7 +18,12 @@ describe Lolita::Navigation::Tree do
 
   end
 
-  let(:tree){Lolita::Navigation::Tree.new("test")}
+  describe "work with nodes" do
+    it "should have root branch with level 0" do
+      tree.root.should_not be_nil
+      tree.root.level.should == 0
+    end
+  end
 
   context "#add" do
     it "should accept object, position and options" do
@@ -26,34 +33,50 @@ describe Lolita::Navigation::Tree do
   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
-    }
+
+    let(:empty_branch){Lolita::Navigation::Branch.new(Object,:url=>"/")}
 
     it "should iterate through all branches" do
-      populated_tree.each_with_index do |branch,index|
+      0.upto(3){|i|
+        tree.add(Object,:append,:url=>"/#{i}",:name=>"branch#{i}")
+      }
+      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
+    it "should itereate in each level" do
+      parent_branch=tree.root
+      branch=empty_branch
+      0.upto(5){|i|
+        parent_branch.append(branch)
+        parent_branch=branch
+        branch=Lolita::Navigation::Branch.new(Object,:url=>"/")
+      }
+      level_counter=1
+      tree.each_level do |branches,level|
+        branches.should have(1).item
+        level.should == level_counter
+        level_counter+=1
+      end
     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")
+  it "should have callbacks" do
+    Lolita::Navigation::Tree.should respond_to(:hooks)
+    hook_names=[:before_load,:after_load,:before_branch_added,:after_branch_added]
+    (Lolita::Navigation::Tree.hooks - hook_names).should be_empty
+  end
+
+  it "should have way to add branches based on earlier added branches" do
+    tree.after_branch_added do
+      self.each do |branch|
+        if branch.resources.is_a?(Object)
+          branch.append(Object,:url=>"/")
+        end
       end
     end
+    tree.add(Object,:append,:url=>"/mypath")
     tree.should have(2).branches
   end
 end

data/spec/orm/mongoid.rb

@@ -4,12 +4,9 @@ Mongoid.configure do |config|
   config.master = Mongo::Connection.new('127.0.0.1', 27017).db("lolita3-test")
 end
 
-class ActiveSupport::TestCase
-  setup do
-    Post.delete_all
-    Comment.delete_all
-    Address.delete_all
-    Preference.delete_all
-    Profile.delete_all
+# truncate data
+Mongoid.database.collections.each do |collection|
+  unless collection.name =~ /^system\./
+    collection.remove
   end
 end

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

@@ -4,5 +4,5 @@ class Address
   field :city
   field :state
   field :post_code
-  embedded_in :person, :inverse_of => :address
+  embedded_in :person
 end

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

@@ -0,0 +1,6 @@
+class Category
+  include Mongoid::Document
+  include Lolita::Configuration
+  field :name, type: String
+  has_many :post
+end

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

@@ -1,6 +1,6 @@
 class Comment
   include Mongoid::Document
   field :body
-  referenced_in :post
-  referenced_in :profile
+  belongs_to :post
+  belongs_to :profile
 end

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

@@ -1,12 +1,16 @@
 class Post
   include Mongoid::Document
   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
+  field :title, type: String
+  field :body, type: String
+  field :is_public, type: Boolean
+  field :price, type: BigDecimal
+  field :published_at, type: DateTime, default: -> { Time.now }
+  field :expire_date, type: Date
+  belongs_to :category
+  has_and_belongs_to_many :tags
+  has_many :comments
+  belongs_to :profile
   validates_presence_of :title
   lolita
 end

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

@@ -2,5 +2,5 @@ class Preference
   include Mongoid::Document
   include Lolita::Configuration
   field :name
-  references_and_referenced_in_many :profiles, :inverse_of=>:preferences
+  has_and_belongs_to_many :profiles
 end

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

@@ -4,9 +4,9 @@ class Profile
   field :name, :type=>String
   field :age
   field :genere
-  references_many :posts
-  references_many :comments
-  references_and_referenced_in_many :preferences, :inverse_of=>:profiles
+  has_many :posts
+  has_many :comments
+  has_and_belongs_to_many :preferences
   embeds_one :address
   lolita do
 

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

@@ -0,0 +1,4 @@
+class Tag
+  include Mongoid::Document
+  field :name
+end

data/spec/support/factories/category.rb

@@ -0,0 +1,3 @@
+Factory.define(:category, :class=>Category) do |f|
+  f.name Faker::Name.name
+end

data/spec/support/factories/post.rb

@@ -1,3 +1,4 @@
 Factory.define(:post, :class=>Post) do |f|
 	f.title Faker::Lorem.sentence
+  f.association :category
 end

data/spec/support/factories/tag.rb

@@ -0,0 +1,3 @@
+Factory.define(:tag) do |f|
+  f.name Faker::Name.name
+end

metadata

@@ -2,16 +2,15 @@
 name: lolita
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors: 
-- ITHouse
-- Arturs Meisters
+- ITHouse (Latvia) and Arturs Meisters
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 +03:00
+date: 2011-04-13 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -168,7 +167,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id014
-description: Great Rails CMS that allow you to start working with models right when you add this to your project.
+description: "Great Rails CMS, that turns your business logic into good-looking, fully functional workspace. "
 email: support@ithouse.lv
 executables: []
 
@@ -179,10 +178,10 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .project
 - .rspec
-- GUIDELINE
+- GUIDELINES
 - Gemfile
+- History.rdoc
 - IDEA
 - LICENSE.txt
 - README.rdoc
@@ -195,11 +194,16 @@ files:
 - 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/filter/_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/boolean/filter/_display.html.erb
 - app/views/components/lolita/configuration/field/date/_display.html.erb
+- app/views/components/lolita/configuration/field/date_time/_display.html.erb
+- app/views/components/lolita/configuration/field/date_time/date/_display.html.erb
+- app/views/components/lolita/configuration/field/date_time/time/_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
@@ -262,6 +266,7 @@ files:
 - lib/lolita/configuration/field/big_decimal.rb
 - lib/lolita/configuration/field/boolean.rb
 - lib/lolita/configuration/field/date.rb
+- lib/lolita/configuration/field/date_time.rb
 - lib/lolita/configuration/field/integer.rb
 - lib/lolita/configuration/field/string.rb
 - lib/lolita/configuration/field/time.rb
@@ -287,14 +292,14 @@ files:
 - lib/lolita/mapping.rb
 - lib/lolita/modules.rb
 - lib/lolita/modules/rest.rb
-- lib/lolita/navigation.rb
+- lib/lolita/navigation/branch.rb
+- lib/lolita/navigation/tree.rb
 - lib/lolita/observed_array.rb
 - lib/lolita/rails.rb
 - lib/lolita/rails/all.rb
 - lib/lolita/rails/routes.rb
 - lib/lolita/ruby_ext/accessors.rb
 - lib/lolita/test/matchers.rb
-- log/development.log
 - lolita.gemspec
 - public/images/lolita/plus.png
 - public/javascripts/jquery-1.5.1.min.js
@@ -377,10 +382,12 @@ files:
 - spec/rails_app/app/controllers/application_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb
 - spec/rails_app/app/mongoid/address.rb
+- spec/rails_app/app/mongoid/category.rb
 - spec/rails_app/app/mongoid/comment.rb
 - 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/mongoid/tag.rb
 - 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
@@ -456,9 +463,9 @@ files:
 - spec/routing/routes_spec.rb
 - spec/simple_spec_helper.rb
 - spec/spec_helper.rb
+- spec/support/factories/category.rb
 - spec/support/factories/post.rb
-- test/cells/form_cell_test.rb
-- test/test_helper.rb
+- spec/support/factories/tag.rb
 has_rdoc: true
 homepage: http://github.com/ithouse/lolita
 licenses: 
@@ -473,7 +480,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -659089805
+      hash: -453610993
       segments: 
       - 0
       version: "0"
@@ -514,10 +521,12 @@ test_files:
 - spec/rails_app/app/controllers/application_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb
 - spec/rails_app/app/mongoid/address.rb
+- spec/rails_app/app/mongoid/category.rb
 - spec/rails_app/app/mongoid/comment.rb
 - 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/mongoid/tag.rb
 - spec/rails_app/config/application.rb
 - spec/rails_app/config/boot.rb
 - spec/rails_app/config/environment.rb
@@ -534,6 +543,6 @@ test_files:
 - spec/routing/routes_spec.rb
 - spec/simple_spec_helper.rb
 - spec/spec_helper.rb
+- spec/support/factories/category.rb
 - spec/support/factories/post.rb
-- test/cells/form_cell_test.rb
-- test/test_helper.rb
+- spec/support/factories/tag.rb

data/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>lolita3</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.aptana.ide.core.unifiedBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.aptana.ruby.core.rubynature</nature>
-	</natures>
-</projectDescription>

data/lib/lolita/navigation.rb

@@ -1,48 +0,0 @@
-module Lolita
-  module Navigation
-
-    class Tree
-      include Lolita::ObservedArray
-
-      def initialize
-        @branches=[]
-      end
-
-      private
-
-      def collection_variable
-        @branches
-      end
-
-      def build_element element,*args
-        if element.is_a?(Lolita::Navigation::Branch)
-          element
-        else
-          Lolita::Navigation::Branch.new(*args)
-        end
-      end
-    end #base class end
-
-    # 
-    # c_branch=Branch.new(:category)
-    # c_branch.mapping == Lolita.mappings[:category] #=>true
-    # c.branch.resource == Lolita.mappings[:category].to #=>true
-    # Branch.new(:page, :path=>{:action=>:new},:after=>Navigation.by_name(:category,:level=>1))
-    # Branch.new(:user,:prepend=>Navigation.root || {:level=>0} || 0)
-    # Branch.new(
-    #   Proc.new{|resource| resource.lolita.reports.by_name("statistic")},
-    #   :append=>Navigation.by_name(:category,:level=>1),
-    #   :path=>{:action=>:report,:plural=>true}
-    # )
-    class Branch
-      attr_reader :name
-
-      def initialize(*args)
-        options=args.extract_options!
-        @name=args.first
-
-      end
-    end #branch class end
-
-  end
-end

data/test/cells/form_cell_test.rb

@@ -1,15 +0,0 @@
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-
-$:.unshift File.join(File.dirname(__FILE__),'..','lib')
-
-require 'test/unit'
-require 'form_cell'
-
-class FormCellTest < Test::Unit::TestCase
-  def test_foo
-    #TODO: Write test
-    flunk "TODO: Write test"
-    # assert_equal("foo", bar)
-  end
-end

data/test/test_helper.rb

@@ -1,2 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-