lolita 3.2.0.rc.3 → 3.2.0.rc.4

data/History.rdoc

@@ -15,6 +15,7 @@
   * All fields must have name as well as tabs must have type
   
 * Bug fixes
+  * Each hook call runs as new instance of Hooks::Runner 
   * All classes fixed to work with both mongoid and AR
    
 

data/VERSION

@@ -1 +1 @@
-3.2.0.rc.3
+3.2.0.rc.4

data/app/assets/javascripts/lolita/tab.js

@@ -32,7 +32,7 @@ $(function(){
   })
   // All tabs are closable when clicked on tab title.
   $(".tab .tab-title.grey").live('click',function(){
-		$(this).parent().toggleClass("minimized")
+		$(this).parent().toggleClass("minimized").trigger("tab.toggle")
 	})
   // Integer field validator
   $(".integer").live("keydown",function(event){

data/app/views/layouts/lolita/application.html.erb

@@ -10,7 +10,7 @@
     <meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <title>Lolita</title><meta name="description" content=""><meta name="author" content="">
-    <link rel="shortcut icon" href="/favicon.ico">
+    <link rel="shortcut icon" href="/lolita/favicon.ico">
 
     <%= stylesheet_link_tag "lolita/application.css" %>
     <%= yield :style %>

data/lib/lolita/controllers/component_helpers.rb

@@ -70,7 +70,7 @@ module Lolita
       def output_with_callbacks(partial_name,name,locals)
         @component_locals ||={}
         @component_locals[name] = locals
-        
+ 
         output = Lolita::Hooks.component(name).run(:before,:run_scope => self).to_s
         block_output = Lolita::Hooks.component(name).run(:around, :run_scope => self) do
           render(:partial => partial_name,:locals=>locals)

data/lib/lolita/hooks.rb

@@ -59,6 +59,126 @@ module Lolita
   # ==Named hooks
   # See Lolita::Hooks::NamedHook for details.
   module Hooks
+    class Runner
+     
+      attr_accessor :hooks_run_scope, :given_callback_content
+      attr_writer :hooks_scope
+
+      def initialize(hook_class,hook_name, options)
+        @hook_class = hook_class
+        @hook_name = hook_name
+        @options = options
+      end
+
+      # Hooks scope is used to execute callbacks. By default it is class itself.
+      def hooks_scope
+        @hooks_scope || @hook_class
+      end
+
+      def run(&block)
+        result = nil
+        in_hooks_scope(@options[:scope],@options[:run_scope]) do 
+          callback = get_callback(@hook_name)
+          result = run_callback(callback,&block)
+        end
+        result
+      end
+
+      # Call callback block inside of run block.
+      # ====Example
+      #     MyClass.run(:before_save) do 
+      #        do_stuff
+      #        let_content # execute callback block(-s) in same scope as run is executed.
+      #     end
+      def let_content
+        if self.given_callback_content.respond_to?(:call)
+          run_block(self.given_callback_content)
+        elsif self.given_callback_content
+          self.given_callback_content
+        end
+      end
+
+      protected
+
+       # Switch between self and given <em>scope</em>. Block will be executed with <em>scope</em>.
+      # And after that it will switch back to self.
+      def in_hooks_scope(scope,run_scope=nil)
+        begin
+          this = self
+          self.hooks_scope=scope || @hook_class
+          self.hooks_scope.define_singleton_method(:let_content) do
+            this.let_content
+          end
+          if run_scope
+            run_scope.define_singleton_method(:let_content) do
+              this.let_content
+            end
+          end
+          self.hooks_run_scope = run_scope || self.hooks_scope
+          yield
+        ensure
+          self.hooks_scope = @hook_class
+          self.hooks_run_scope = self.hooks_scope
+        end
+      end
+
+      # Return all callbacks
+      # If scope is not class then it merge class callbacks with scope callbacks. That means that
+      # class callbacks always will be called before scope callbacks.
+      def get_callback(name)
+        scope_callbacks = hooks_scope.callbacks[name.to_sym] || {}
+  
+        @hook_class.superclasses.each do |const_name|
+          scope_callbacks = @hook_class.collect_callbacks_from(name,const_name,scope_callbacks)
+        end
+        scope_callbacks
+      end
+
+      # Run callback. Each callback is Hash with <i>:methods</i> Array and </i>:blocks</i> Array
+      def run_callback(callback,&block)
+        method_results=run_methods(callback[:methods],&block)
+        block_results=run_blocks(callback[:blocks],&block)
+        method_results+block_results
+      end
+
+      # Run methods from <em>methods</em> Array
+      def run_methods methods, &block
+        result = ""
+        (methods||[]).each do |method_name|
+          result << (hooks_run_scope.__send__(method_name,&block)).to_s
+        end
+        result
+      end
+
+      # Run blocks from <em>blocks</em> Array. Also it set #given_callback_content if block is given, this
+      # will allow to call #let_content. Each block is runned with #run_block.
+      # After first run result of first block become #given_callback_content, and when next block
+      # call #let_content, this string will be returned for that block
+      def run_blocks blocks,&given_block
+        result=""
+
+        self.given_callback_content=block_given? ? given_block : nil
+
+        if blocks && !blocks.empty?
+          blocks.each do |block|
+            result << (run_block(block,&given_block)).to_s
+            self.given_callback_content=result
+          end
+        elsif block_given?
+          self.given_callback_content=nil
+          result << run_block(given_block).to_s
+        end
+        result
+      end
+
+      # Run block in scope. 
+      def run_block block, &given_block
+        hooks_run_scope.instance_eval(&block)
+      end
+
+
+    end # end of Runner
+
     def self.included(base)
       base.extend(ClassMethods)
       base.extend(CommonMethods)
@@ -92,28 +212,14 @@ module Lolita
     end
 
     module ClassMethods
-      attr_accessor :hooks_run_scope
-
-      # Setter for #hook_scope.
-      def hooks_scope=(object)
-        @hooks_scope=object
-      end
 
-      # Hooks scope is used to execute callbacks. By default it is class itself.
-      def hooks_scope
-        @hooks_scope||self
+      def hooks_scope=(value)
+        @hooks_scope = value
       end
 
-      # Setter for #callback_content
-      def given_callback_content=(content)
-        @given_callback_content=content
+      def hooks_scope 
+        @hooks_scope || self
       end
-
-      # Callback content is used to let callback content executed insede of run block.
-      def given_callback_content
-        @given_callback_content
-      end
-
       # All hooks for class. This is Array of hook names.
       def hooks
         @hooks||=[]
@@ -163,6 +269,15 @@ module Lolita
         }
       end
 
+      def in_hooks_scope(scope)
+        begin
+          self.hooks_scope = scope
+          yield
+        ensure
+          self.hooks_scope = self
+        end
+      end
+
       # 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.
@@ -171,16 +286,10 @@ module Lolita
       #     # this will call callbacks in MyClass instance scope, that means that self will be MyClass instance.
       def run(hook_name,*args,&block)
 
-        result=nil
         options=args ? args.extract_options! : {}
-
         raise Lolita::HookNotFound, "Hook #{hook_name} is not defined for #{self}." unless self.has_hook?(hook_name)
-        in_hooks_scope(options[:scope],options[:run_scope]) do
-          callback=get_callback(hook_name)
-          result=run_callback(callback,&block)
-        end
-
-        result
+        runner = Lolita::Hooks::Runner.new(self,hook_name,options)
+        runner.run(&block)
       end
 
       # Is hook with <em>name</em> is defined for class.
@@ -196,20 +305,6 @@ module Lolita
         end
       end
 
-      # Call callback block inside of run block.
-      # ====Example
-      #     MyClass.run(:before_save) do 
-      #        do_stuff
-      #        let_content # execute callback block(-s) in same scope as run is executed.
-      #     end
-      def let_content
-        if self.given_callback_content.respond_to?(:call)
-          run_block(self.given_callback_content)
-        elsif self.given_callback_content
-          self.given_callback_content
-        end
-      end
-
       # Set #method_missing
       def recognize_hook_methods method_name, *args, &block
         if method_name.to_s.match(/^run_(\w+)/)
@@ -218,81 +313,6 @@ module Lolita
         end
       end
 
-      protected
-
-      # Switch between self and given <em>scope</em>. Block will be executed with <em>scope</em>.
-      # And after that it will switch back to self.
-      def in_hooks_scope(scope,run_scope=nil)
-        begin
-          self.hooks_scope=scope||self
-          if run_scope
-            run_scope.define_singleton_method(:let_content) do
-              scope.let_content
-            end
-          end
-          self.hooks_run_scope=run_scope || self.hooks_scope
-          yield
-        ensure
-          self.hooks_scope=self
-          self.hooks_run_scope=self.hooks_scope
-        end
-      end
-
-      # Run callback. Each callback is Hash with <i>:methods</i> Array and </i>:blocks</i> Array
-      def run_callback(callback,&block)
-        method_results=run_methods(callback[:methods],&block)
-        block_results=run_blocks(callback[:blocks],&block)
-        method_results+block_results
-      end
-
-      # Run methods from <em>methods</em> Array
-      def run_methods methods, &block
-        result=""
-        (methods||[]).each do |method_name|
-          result << (hooks_run_scope.__send__(method_name,&block)).to_s
-        end
-        result
-      end
-
-      # Run blocks from <em>blocks</em> Array. Also it set #given_callback_content if block is given, this
-      # will allow to call #let_content. Each block is runned with #run_block.
-      # After first run result of first block become #given_callback_content, and when next block
-      # call #let_content, this string will be returned for that block
-      def run_blocks blocks,&given_block
-        result=""
-
-        self.given_callback_content=block_given? ? given_block : nil
-
-        if blocks && !blocks.empty?
-          blocks.each do |block|
-            result << (run_block(block,&given_block)).to_s
-            self.given_callback_content=result
-          end
-        elsif block_given?
-          self.given_callback_content=nil
-          result << run_block(given_block).to_s
-        end
-        result
-      end
-
-      # Run block in scope. 
-      def run_block block, &given_block
-        hooks_run_scope.instance_eval(&block)
-      end
-
-      # Return all callbacks
-      # If scope is not class then it merge class callbacks with scope callbacks. That means that
-      # class callbacks always will be called before scope callbacks.
-      def get_callback(name)
-        scope_callbacks=hooks_scope.callbacks[name.to_sym] || {}
-  
-        superclasses.each do |const_name|
-          scope_callbacks=collect_callbacks_from(name,const_name,scope_callbacks)
-        end
-        scope_callbacks
-      end
-
-
       def collect_callbacks_from(name,const_name,scope_callbacks)
           class_callbacks=const_name.callbacks[name.to_sym] || {}
           [:methods,:blocks].each do |attr|
@@ -339,11 +359,6 @@ module Lolita
         self.class.run(*hook_names,options,&block)
       end
 
-      # See Lolita::Hooks::ClassMethods#let_content
-      def let_content
-        self.class.let_content
-      end
-
       # See Lolita::Hooks::ClassMethods#method_missing
       def method_missing(*args,&block)
         unless self.class.recognize_hook_methods(*args,:scope=>self,&block)

data/lolita.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lolita"
-  s.version = "3.2.0.rc.3"
+  s.version = "3.2.0.rc.4"
 
   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-09-09"
+  s.date = "2011-10-04"
   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 = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
+    "app/assets/images/lolita/favicon.ico",
     "app/assets/images/lolita/plus.png",
     "app/assets/javascripts/lolita/application.js",
     "app/assets/javascripts/lolita/base64.js",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc.3
+  version: 3.2.0.rc.4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-09 00:00:00.000000000Z
+date: 2011-10-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &85967590 !ruby/object:Gem::Requirement
+  requirement: &76601680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *85967590
+  version_requirements: *76601680
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &85963300 !ruby/object:Gem::Requirement
+  requirement: &76600440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *85963300
+  version_requirements: *76600440
 - !ruby/object:Gem::Dependency
   name: abstract
-  requirement: &85962920 !ruby/object:Gem::Requirement
+  requirement: &76599760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85962920
+  version_requirements: *76599760
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &85962540 !ruby/object:Gem::Requirement
+  requirement: &76599090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *85962540
+  version_requirements: *76599090
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &85962140 !ruby/object:Gem::Requirement
+  requirement: &76598340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 3.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *85962140
+  version_requirements: *76598340
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &85961800 !ruby/object:Gem::Requirement
+  requirement: &76597790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85961800
+  version_requirements: *76597790
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
-  requirement: &85961450 !ruby/object:Gem::Requirement
+  requirement: &76597200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85961450
+  version_requirements: *76597200
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &85961080 !ruby/object:Gem::Requirement
+  requirement: &76596670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *85961080
+  version_requirements: *76596670
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &85960610 !ruby/object:Gem::Requirement
+  requirement: &76596160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *85960610
+  version_requirements: *76596160
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &85959250 !ruby/object:Gem::Requirement
+  requirement: &76595590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *85959250
+  version_requirements: *76595590
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &85958850 !ruby/object:Gem::Requirement
+  requirement: &76533130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85958850
+  version_requirements: *76533130
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &85957860 !ruby/object:Gem::Requirement
+  requirement: &76532330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85957860
+  version_requirements: *76532330
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &85956980 !ruby/object:Gem::Requirement
+  requirement: &76531520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85956980
+  version_requirements: *76531520
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &85956420 !ruby/object:Gem::Requirement
+  requirement: &76530500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85956420
+  version_requirements: *76530500
 description: ! 'Great Rails CMS, that turns your business logic into good-looking,
   fully functional workspace. '
 email: support@ithouse.lv
@@ -183,6 +183,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- app/assets/images/lolita/favicon.ico
 - app/assets/images/lolita/plus.png
 - app/assets/javascripts/lolita/application.js
 - app/assets/javascripts/lolita/base64.js
@@ -482,7 +483,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 675447699
+      hash: -235037699
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: