lolita 3.1.0 → 3.1.1

data/lib/lolita/controllers/internal_helpers.rb

@@ -47,6 +47,7 @@ module Lolita
       end
 
       def resource_with_attributes(current_resource,attributes={})
+        #TODO: detect rails date_select and datetime_select special attributes
         attributes||=resource_attributes
         attributes.each{|key,value|
           current_resource.send(:"#{key}=",value)

data/lib/lolita/hooks.rb

@@ -4,7 +4,7 @@ module Lolita
   # Hooks are stored in class <i>@hooks</i> variable, that is Hash and each key is hook name
   # and each hook also is Hash that have <em>:methods</em> and <em>:blocks</em>
   # keys. Both of those are Array, and each time you call callback method, like <i>before_save</i> and so on, block 
-  # and/or methods is stored. <b>Each time</b> #fire is called all blocks and methods will be executed.
+  # and/or methods is stored. <b>Each time</b> #run is called all blocks and methods will be executed.
   # It may look like this.
   #    class MyClass
   #      include Lolita::Hooks
@@ -19,7 +19,7 @@ module Lolita
   # ==Scopes
   # Most times hook callbacks are defined for class like in previous example, but also it's possible to do it
   # on class instances. Difference between calling it on class or on instance is that instance callbacks will
-  # be called only when event is fired on instance. Class callbacks will be called on class and also on instance
+  # be called only when event is runned on instance. Class callbacks will be called on class and also on instance
   # callbacks.
   #    my_object=MyClass.new
   #    MyClass.before_save do
@@ -29,25 +29,25 @@ module Lolita
   #      puts "instance callback"
   #    end
   #    
-  #    MyClass.fire(:before_save) #=> 
+  #    MyClass.run(:before_save) #=> 
   #      class_callback
   #    
-  #    my_object.fire(:before_save) #=>
+  #    my_object.run(:before_save) #=>
   #      class_callback
   #      instance_callback
   #   # As you can see, first class callbacks is called and after that instance callbacks.
   #
   # ==Firing events
-  # To execute callbacks, events should be called on object. Event names is same hooks names. #fire can be called
-  # on class or on instance. Also it is possible to pass block to fire event, that will replace callback block
+  # To execute callbacks, events should be called on object. Event names is same hooks names. #run can be called
+  # on class or on instance. Also it is possible to pass block to run event, that will replace callback block
   # or if #let_content is called than it will work like wrapper, like this
   #    # this is continuation of previous code
-  #    MyClass.fire(:before_save) do
+  #    MyClass.run(:before_save) do
   #      puts "replaced text"
   #    end
   #    # will produce #=> replaced text
   #    
-  #    MyClass.fire(:before_save) do
+  #    MyClass.run(:before_save) do
   #      puts "before callback"
   #      let_content
   #      puts "after callback"
@@ -108,7 +108,7 @@ module Lolita
         @given_callback_content=content
       end
 
-      # Callback content is used to let callback content executed insede of fire block.
+      # Callback content is used to let callback content executed insede of run block.
       def given_callback_content
         @given_callback_content
       end
@@ -147,13 +147,13 @@ module Lolita
         }
       end
 
-      # Fire is used to execute callback. Method accept one or more <i>hook_names</i> and optional block.
+      # run is used to execute callback. Method accept one or more <i>hook_names</i> and optional block.
       # It will raise error if hook don't exist for this class. Also it accept <em>:scope</em> options, that
       # is used to #get_callbacks and #run_callbacks.
       # ====Example
-      #     MyClass.fire(:before_save,:after_save,:scope=>MyClass.new)
+      #     MyClass.run(:before_save,:after_save,:scope=>MyClass.new)
       #     # this will call callbacks in MyClass instance scope, that means that self will be MyClass instance.
-      def fire(*hook_names,&block)
+      def run(*hook_names,&block)
         options=hook_names.extract_options!
         (hook_names || []).each do |hook_name|
           raise Lolita::HookNotFound, "Hook #{hook_name} is not defined for #{self}." unless self.has_hook?(hook_name)
@@ -169,19 +169,19 @@ module Lolita
         self.hooks.include?(name.to_sym)
       end
 
-      # Try to recognize named fire methods like 
-      #    MyClass.fire_after_save # will call MyClass.fire(:after_save) 
+      # Try to recognize named run methods like 
+      #    MyClass.run_after_save # will call MyClass.run(:after_save) 
       def method_missing(*args, &block)
         unless self.recognize_hook_methods(*args,&block)
           super
         end
       end
 
-      # Call callback block inside of fire block.
+      # Call callback block inside of run block.
       # ====Example
-      #     MyClass.fire(:before_save) do 
+      #     MyClass.run(:before_save) do 
       #        do_stuff
-      #        let_content # execute callback block(-s) in same scope as fire is executed.
+      #        let_content # execute callback block(-s) in same scope as run is executed.
       #     end
       def let_content
         if content=self.given_callback_content
@@ -191,8 +191,8 @@ module Lolita
 
       # Set #method_missing
       def recognize_hook_methods method_name, *args, &block
-        if method_name.to_s.match(/^fire_(\w+)/)
-          self.fire($1,&block)
+        if method_name.to_s.match(/^run_(\w+)/)
+          self.run($1,&block)
           true
         end
       end
@@ -276,9 +276,9 @@ module Lolita
     # Methods for instance.
     module InstanceMethods
 
-      # See Lolita::Hooks::ClassMethods#fire
-      def fire(*hook_names)
-        self.class.fire(*hook_names,:scope=>self)
+      # See Lolita::Hooks::ClassMethods#run
+      def run(*hook_names)
+        self.class.run(*hook_names,:scope=>self)
       end
 
       # See Lolita::Hooks::ClassMethods#let_content

data/lib/lolita/hooks/named_hook.rb

@@ -11,7 +11,7 @@ module Lolita
     #      go_to_honeymoon
     #    end
     #    john=Person.new("John")
-    #    john.fire(:get_merried) # and now john will go to honeymoon
+    #    john.run(:get_merried) # and now john will go to honeymoon
     # Hooks are added for pluralized hook name, even if you pass like #add(:person), it will create named hook
     # with <i>people</i> name. This will be class, and when you call #person it will create instance for that class.
     class NamedHook
@@ -30,6 +30,7 @@ module Lolita
           named_hooks.keys
         end
 
+        # Detect that named hook exist with given name.
         def exist?(name)
           self.names.include?(name)
         end
@@ -44,6 +45,9 @@ module Lolita
           end
         end
 
+        # Find named hook filter.
+        # ====Example
+        #     Lolita::Hooks::NamedHook.find(:components,:"list")
         def find(hook_name,filter_name)
           if named_hook=self.by_name(hook_name)
             named_hook[filter_name.to_sym]
@@ -99,14 +103,14 @@ module Lolita
               @hook_name
             end
 
-            # def self.fire(*hook_names,&block)
+            # def self.run(*hook_names,&block)
             #   hook_names||=[]
             #   hook_names.extract_options!
             #   super(*hook_names,&block)
             #   if named_hook=self.by_name(self.hook_name)
             #     named_hook.each{|filter_name, filter|
             #       unless filter_name.to_sym==:"_class"
-            #         self.fire(*(hook_names + [{:scope=>filter}]),&block)
+            #         self.run(*(hook_names + [{:scope=>filter}]),&block)
             #       end
             #     }
             #   end

data/lib/lolita/navigation/branch.rb

@@ -0,0 +1,7 @@
+module Lolita
+  module Navigation
+    class Branch
+
+    end
+  end
+end

data/lib/lolita/navigation/tree.rb

@@ -0,0 +1,7 @@
+module Lolita
+  module Navigation
+    class Tree
+
+    end
+  end
+end

data/lolita.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita}
-  s.version = "3.1.0"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["ITHouse", "Arturs Meisters"]
-  s.date = %q{2011-04-12}
-  s.description = %q{Great Rails CMS that allow you to start working with models right when you add this to your project.}
+  s.authors = ["ITHouse (Latvia) and Arturs Meisters"]
+  s.date = %q{2011-04-13}
+  s.description = %q{Great Rails CMS, that turns your business logic into good-looking, fully functional workspace. }
   s.email = %q{support@ithouse.lv}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -18,10 +18,10 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-    ".project",
     ".rspec",
-    "GUIDELINE",
+    "GUIDELINES",
     "Gemfile",
+    "History.rdoc",
     "IDEA",
     "LICENSE.txt",
     "README.rdoc",
@@ -34,11 +34,16 @@ 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/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",
@@ -101,6 +106,7 @@ Gem::Specification.new do |s|
     "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",
@@ -126,14 +132,14 @@ Gem::Specification.new do |s|
     "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",
@@ -216,10 +222,12 @@ Gem::Specification.new do |s|
     "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",
@@ -295,9 +303,9 @@ Gem::Specification.new do |s|
     "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"
   ]
   s.homepage = %q{http://github.com/ithouse/lolita}
   s.licenses = ["MIT"]
@@ -328,10 +336,12 @@ Gem::Specification.new do |s|
     "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",
@@ -348,9 +358,9 @@ Gem::Specification.new do |s|
     "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"
   ]
 
   if s.respond_to? :specification_version then

data/public/stylesheets/lolita/style.css

@@ -189,6 +189,22 @@ a.create {
   box-shadow: inset 0px 1px 1px #ddd;
 } 
 
+/* filter */
+#main form.filter {
+  background: #F3F3F3;
+  padding: 10px;
+}
+#main form.filter select {
+  margin-right: 15px;
+  margin-bottom: 3px;
+}
+#main form.filter input {
+  vertical-align: middle;
+  margin: 0 10px 2px 3px;
+}
+#main form.filter label {
+  color: #666;
+}
 /* --------------------------------------------- */
 
 /* TinyMCE advanced theme's skin "Cirkuit" overrides */

data/spec/adapter_helper.rb

@@ -28,13 +28,13 @@ else
   class Comment < ActiveRecord::Base
     belongs_to :test_class1, :class_name=>"Post"
   end
+
   class Post < ActiveRecord::Base
     has_many :pages
     include Lolita::Configuration
     lolita 
   end
 
-
   class Profile < ActiveRecord::Base
     include Lolita::Configuration
     lolita do

data/spec/configuration/filter_spec.rb

@@ -8,7 +8,6 @@ describe Lolita::Configuration::Filter do
 
   it "should create new filter with block" do
     Lolita::Configuration::Filter.new(@dbi) do
-
     end
   end
 
@@ -57,4 +56,67 @@ describe Lolita::Configuration::Filter do
     filter.fields[1].type.should == "integer"
     filter.fields[2].type.should == "time"
   end
+
+  it "should generate correct field_name" do
+    filter=Lolita::Configuration::Filter.new(@dbi)
+    filter.fields :name, :not_public
+    filter.field_name(filter.fields.first).should == "f_name"
+    filter.field_name(filter.fields.last).should == "f_not_public"
+  end
+
+  it "should return right options_for_select" do
+    3.times{ Factory.create(:category)}
+    filter=Lolita::Configuration::Filter.new(@dbi) do
+      field :category
+      field :some_type, :array, :options_for_select => %w(a b c)
+    end
+    options = filter.options_for_select(filter.fields.first)
+    options.size.should == 3
+    options.first.first.should be_an(String)
+    options.first.last.should be_an(BSON::ObjectId)
+    options = filter.options_for_select(filter.fields.last)
+    options.size.should == 3
+    options.should == %w(a b c)
+  end
+
+  it "should filter results for boolean" do
+    Factory.create(:post, :is_public => true)
+    Factory.create(:post, :is_public => true)
+    Factory.create(:post, :is_public => false)
+
+    filter=Lolita::Configuration::Filter.new(@dbi) do
+      field :is_public
+    end
+
+    @dbi.filter(:is_public => 1).size.should == 2
+    @dbi.filter(:is_public => 0).size.should == 1
+  end
+
+  it "should filter results for belongs_to" do
+    c1 = Factory.create(:category, :name => "Linux")
+    c2 = Factory.create(:category, :name => "Android")
+    p1=Factory.create(:post, :category => c1)
+    p2=Factory.create(:post, :category => c1)
+    p3=Factory.create(:post, :category => c2)
+
+    filter=Lolita::Configuration::Filter.new(@dbi) do
+      field :tags
+    end
+    @dbi.filter(:category => c1.id).size.should == 2
+    @dbi.filter(:category => c2.id).size.should == 1
+  end
+
+  it "should filter results for has_and_belongs_to_many" do
+    tag1 = Factory.create(:tag, :name => "Linux")
+    tag2 = Factory.create(:tag, :name => "Android")
+    p1=Factory.create(:post, :tags => [tag1,tag2])
+    p2=Factory.create(:post, :tags => [tag1,tag2])
+    p3=Factory.create(:post, :tags => [tag1])
+
+    filter=Lolita::Configuration::Filter.new(@dbi) do
+      field :tags
+    end
+    @dbi.filter(:tags => tag1.id).size.should == 3
+    @dbi.filter(:tags => tag2.id).size.should == 2
+  end
 end

data/spec/controllers/internal_helpers_spec.rb

@@ -32,5 +32,12 @@ describe MyController do
     @controller.send(:resource=,nil)
     @controller.resource.should be_nil
   end
+
+  it "should convert rails date_select and datetime_select values" do
+    resource=Post.new
+    sample_date = Date.civil(2011,1,1)
+    attributes={:published_at => {}}
+    @controller.send(:resource_with_attributes,resource,attributes)
+  end
 end
 

data/spec/controllers/lolita_rest_spec.rb

@@ -13,6 +13,7 @@ describe Lolita::RestController do
   end
 
   it "should overwrite list component body_cell" do
+    Factory.create(:post)
     get :index
     response.body.should =~/overwritten cell/
   end

data/spec/hooks_spec.rb

@@ -9,11 +9,11 @@ class MyClass
 
   attr_accessor :name
   def initialize
-    self.fire(:after_init)
+    self.run(:after_init)
   end
 
   def save
-    self.fire(:before_save)
+    self.run(:before_save)
   end
 end
 
@@ -91,17 +91,17 @@ describe Lolita::Hooks do
       MyClass.after_load do
         value(true)
       end
-      MyClass.fire(:after_load)
+      MyClass.run(:after_load)
       MyClass.value.should be_true
     end
 
-    it "should have named fire method" do
+    it "should have named run method" do
       MyClass.after_load {
         MyClass.value(MyClass.value()+1)
       }
       object=MyClass.new
-      MyClass.fire_after_load
-      object.fire_after_load
+      MyClass.run_after_load
+      object.run_after_load
       MyClass.value.should == 2
     end
 
@@ -110,22 +110,22 @@ describe Lolita::Hooks do
       MyClass.after_load do
         value(value()+1)
       end
-      MyClass.fire(:after_load)
-      MyClass.fire(:after_load)
+      MyClass.run(:after_load)
+      MyClass.run(:after_load)
       MyClass.value.should == 2
     end
 
 
     context "wrap around" do
 
-      it "should allow to wrap around when #fire receive block" do
+      it "should allow to wrap around when #run receive block" do
         MyClass.after_load do 
           value("first")
           let_content()
           value("second")
         end
 
-        MyClass.fire(:after_load) do
+        MyClass.run(:after_load) do
           value().should=="first"
         end
         MyClass.value.should == "second"
@@ -159,7 +159,7 @@ describe Lolita::Hooks do
         Counter.set(Counter.get+1)
       end
 
-      Lolita::Hooks.component(:"list").fire(:before) 
+      Lolita::Hooks.component(:"list").run(:before) 
       Counter.get.should == 1
     end
 
@@ -169,12 +169,13 @@ describe Lolita::Hooks do
       Lolita::Hooks.components.after do
         Counter.set(Counter.get+1)
       end
-      Lolita::Hooks.component(:"list").fire(:after)
-      Lolita::Hooks.component(:"tab").fire(:after)
+      Lolita::Hooks.component(:"list").run(:after)
+      Lolita::Hooks.component(:"tab").run(:after)
       Counter.get.should == 2
     end
 
-    it "should run all named hook callbacks when fired on named collection" do
+    it "should run all named hook callbacks when runned on named collection" do
+      pending "Need to update functionality to work."
       Lolita::Hooks.components.add_hook(:after)
       Counter.set(0)
       Lolita::Hooks.component(:"list").after do
@@ -183,7 +184,7 @@ describe Lolita::Hooks do
       Lolita::Hooks.component(:"tab").after do
         Counter.set(Counter.get+1)
       end
-      Lolita::Hooks.components.fire(:after)
+      Lolita::Hooks.components.run(:after)
       Counter.get.should == 2
     end