lolita 3.1.10 → 3.1.11

data/lib/lolita/observed_array.rb

@@ -1,75 +1,75 @@
-module Lolita
-  # This module overwrite Array methods that change Array to change element that is added to Array.
-# Class that include this module must have collection_variable method that return collection
-# variable that hold all records.
-# Also build_element method must have with element and &block as arguments
-# Build element method should contain actions that modify element or if you do not want to
-# change given element, than return it.
-# ====Example
-#     class MyCollection
-#      ...
-#      def build_element(element)
-#        element=element.to_s if element.is_a?(Symbol)
-#        element
-#      end
-#     end
-#
-#     my_collection=MyCollection.new
-#     my_collection.push(:element)
-#     my_collection.last #=> element
-#     my_collection.last.class #=> String
-#     
-# ====Example
-#     class MyClass
-#       include Lolita::ObservedArray
-#       private
-#         def collection_variable
-#           @collection_variable
-#         end
-#         def build_element(element,&block)
-#           ...
-#         end
-#     end
-  module ObservedArray
-
-    def method_missing(method,*args,&block)
-      collection_variable.__send__(method,*args,&block)
-    end
-    
-    def push(value)
-      value=build_element(value)
-      collection_variable.push(value)
-    end
-
-    def insert(value)
-      value=build_element(value)
-      collection_variable.insert(value)
-    end
-
-    def <<(value)
-      value=build_element(value)
-      collection_variable<<value
-    end
-
-    def []=(value,index)
-      value=build_element(value)
-      collection_variable[index]=value
-    end
-
-    #To support enumerable functions as each, collect etc.
-    def each
-      collection_variable.each{|collection_element| yield collection_element}
-    end
-
-
-    private
-
-    def collection_variable
-      raise "You should implement collection_variable method in your class. See ObservedArray for implementation."
-    end
-    
-    def build_element(element,&block)
-      raise "You should implement collection_variable method in your class.See ObsservedArray for implementation."
-    end
-  end
+module Lolita
+  # This module overwrite Array methods that change Array to change element that is added to Array.
+# Class that include this module must have collection_variable method that return collection
+# variable that hold all records.
+# Also build_element method must have with element and &block as arguments
+# Build element method should contain actions that modify element or if you do not want to
+# change given element, than return it.
+# ====Example
+#     class MyCollection
+#      ...
+#      def build_element(element)
+#        element=element.to_s if element.is_a?(Symbol)
+#        element
+#      end
+#     end
+#
+#     my_collection=MyCollection.new
+#     my_collection.push(:element)
+#     my_collection.last #=> element
+#     my_collection.last.class #=> String
+#     
+# ====Example
+#     class MyClass
+#       include Lolita::ObservedArray
+#       private
+#         def collection_variable
+#           @collection_variable
+#         end
+#         def build_element(element,&block)
+#           ...
+#         end
+#     end
+  module ObservedArray
+
+    def method_missing(method,*args,&block)
+      collection_variable.__send__(method,*args,&block)
+    end
+    
+    def push(value)
+      value=build_element(value)
+      collection_variable.push(value)
+    end
+
+    def insert(value)
+      value=build_element(value)
+      collection_variable.insert(value)
+    end
+
+    def <<(value)
+      value=build_element(value)
+      collection_variable<<value
+    end
+
+    def []=(value,index)
+      value=build_element(value)
+      collection_variable[index]=value
+    end
+
+    #To support enumerable functions as each, collect etc.
+    def each
+      collection_variable.each{|collection_element| yield collection_element}
+    end
+
+
+    private
+
+    def collection_variable
+      raise "You should implement collection_variable method in your class. See ObservedArray for implementation."
+    end
+    
+    def build_element(element,&block)
+      raise "You should implement collection_variable method in your class.See ObsservedArray for implementation."
+    end
+  end
 end

data/lib/lolita/rails.rb

@@ -1,20 +1,20 @@
-require 'lolita/rails/routes'
-
-
-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
-}
-
-module Lolita
-	class Engine < Rails::Engine
-		config.lolita=Lolita
-	  config.i18n.load_path += Dir[File.join(Lolita.root,'config', 'locales','default', '*.{yml}')]
-	end
-end
+require 'lolita/rails/routes'
+
+
+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
+}
+
+module Lolita
+	class Engine < Rails::Engine
+		config.lolita=Lolita
+	  config.i18n.load_path += Dir[File.join(Lolita.root,'config', 'locales','default', '*.{yml}')]
+	end
+end

data/lib/lolita/rails/all.rb

@@ -1,11 +1,11 @@
-unless defined?(Lolita)
-  require 'lolita'
-end
-require 'lolita/mapping'
-require 'lolita/rails'
-require 'lolita/modules'
-
-Lolita::Hooks::NamedHook.add(:components)
-Lolita::Hooks.components.class_eval{
-  add_hook :before,:after,:around
+unless defined?(Lolita)
+  require 'lolita'
+end
+require 'lolita/mapping'
+require 'lolita/rails'
+require 'lolita/modules'
+
+Lolita::Hooks::NamedHook.add(:components)
+Lolita::Hooks.components.class_eval{
+  add_hook :before,:after,:around
 }

data/lib/lolita/rails/routes.rb

@@ -1,133 +1,133 @@
-module ActionDispatch::Routing
-  
-  class RouteSet
-
-    # Each time when #draw method is called this is called as well.
-    # It creates :left_side_navigation tree and call callbacks
-    # Lolita#before_routes_loaded and Lolita#after_routes_loaded
-    def draw_with_lolita  *args,&block
-      unless Lolita::Navigation::Tree[:"left_side_navigation"]
-        tree=Lolita::Navigation::Tree.new(:"left_side_navigation")
-        Lolita::Navigation::Tree.remember(tree)
-      end
-      Lolita.run(:before_routes_loaded)
-      draw_without_lolita *args,&block
-      Lolita.run(:after_routes_loaded)
-    end
-
-    alias_method_chain :draw, :lolita
-  end
-
-  class Mapper
-
-    # Every module, that is used with lolita and has routes, need to have
-    # <code>resource method</code>, for example, lolita_rest, that should be added
-    # to ActionDispatch::Routing::Mapper class, as a *protected* method.
-    # Module can automaticliy add resource route or allow user to do it.
-    # It accepts some useful options
-    # * <tt>:module</tt>
-    # * <tt>:path</tt>
-    # * <tt>:as</tt>
-    # * <tt>:path_prefix</tt>
-    # * <tt>:controller</tt>
-    # * <tt>:class_name</tt>
-    # * <tt>:singular</tt>
-    # ====Example
-    #     Lolita.add_module Lolita::Gallery,:route=>:gallery
-    #     # in route.rb
-    #     lolita_for :galleries
-    #     # lolita_for try to call :lolita_gallery in Mapper class
-    def lolita_for *resources
-  
-      return if migrating? || generating_instalation?
-      options = resources.extract_options!
-
-      # if as = options.delete(:as)
-      #   ActiveSupport::Deprecation.warn ":as is deprecated, please use :path instead."
-      #   options[:path] ||= as
-      # end
-
-      # if scope = options.delete(:scope)
-      #   ActiveSupport::Deprecation.warn ":scope is deprecated, please use :singular instead."
-      #   options[:singular] ||= scope
-      # end
-
-      options[:as]          ||= @scope[:as]     if @scope[:as].present?
-      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
-
-        lolita_scope mapping.name do
-          yield if block_given?
-
-          with_lolita_exclusive_scope mapping.fullpath,mapping.path do
-            
-            # if not defined lolita default configuration in model, than can't use :rest
-            if !target_class.respond_to?(:lolita) && !Lolita::routes[mapping.name]
-               raise Lolita::NotFound, "Lolita not found in #{target_class}. Include Lolita::Configuration"
-            elsif target_class.respond_to?(:lolita) && target_class.instance_variable_get(:@lolita).nil?
-               raise Lolita::NotInitialized, "Call lolita method in #{target_class}."
-            else
-              route=Lolita.routes[mapping.name] || Lolita.default_route
-            end
-            unless route
-              raise Lolita::ModuleNotFound, "Module #{mapping.name.to_s.capitalize} not found!"
-            end
-            send(:"lolita_#{route}_route",mapping,mapping.controllers)
-            
-            Lolita.conditional_routes(target_class).each do |route_name|
-              send(:"lolita_#{route_name}_route",mapping,mapping.controllers)
-            end
-          end
-
-        end
-       
-        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")
-      end
-    end
-
-    protected
-    
-    def lolita_scope scope
-      constraint = lambda do |request|
-        request.env["lolita.mapping"] = Lolita.mappings[scope]
-        true
-      end
-
-      constraints(constraint) do
-        yield
-      end
-    end
-    
-    def with_lolita_exclusive_scope new_path,new_as
-      old_as, old_path, old_module = @scope[:as], @scope[:path], @scope[:module]
-      @scope[:as], @scope[:path], @scope[:module] = new_as, new_path, nil
-      yield
-    ensure
-      @scope[:as], @scope[:path], @scope[:module] = old_as, old_path, old_module
-    end
-
-    private
-
-    def migrating?
-      File.basename($0).match(/^rake/) && (ARGV.include?("db:migrate"))
-    end
-
-    def generating_instalation?
-      File.basename($0).match(/^rails/) && (ARGV.detect{|arg| arg.to_s.match(/lolita[^:]*:.*/)})
-    end
-  end
-end
+module ActionDispatch::Routing
+  
+  class RouteSet
+
+    # Each time when #draw method is called this is called as well.
+    # It creates :left_side_navigation tree and call callbacks
+    # Lolita#before_routes_loaded and Lolita#after_routes_loaded
+    def draw_with_lolita  *args,&block
+      unless Lolita::Navigation::Tree[:"left_side_navigation"]
+        tree=Lolita::Navigation::Tree.new(:"left_side_navigation")
+        Lolita::Navigation::Tree.remember(tree)
+      end
+      Lolita.run(:before_routes_loaded)
+      draw_without_lolita *args,&block
+      Lolita.run(:after_routes_loaded)
+    end
+
+    alias_method_chain :draw, :lolita
+  end
+
+  class Mapper
+
+    # Every module, that is used with lolita and has routes, need to have
+    # <code>resource method</code>, for example, lolita_rest, that should be added
+    # to ActionDispatch::Routing::Mapper class, as a *protected* method.
+    # Module can automaticliy add resource route or allow user to do it.
+    # It accepts some useful options
+    # * <tt>:module</tt>
+    # * <tt>:path</tt>
+    # * <tt>:as</tt>
+    # * <tt>:path_prefix</tt>
+    # * <tt>:controller</tt>
+    # * <tt>:class_name</tt>
+    # * <tt>:singular</tt>
+    # ====Example
+    #     Lolita.add_module Lolita::Gallery,:route=>:gallery
+    #     # in route.rb
+    #     lolita_for :galleries
+    #     # lolita_for try to call :lolita_gallery in Mapper class
+    def lolita_for *resources
+  
+      return if migrating? || generating_instalation?
+      options = resources.extract_options!
+
+      # if as = options.delete(:as)
+      #   ActiveSupport::Deprecation.warn ":as is deprecated, please use :path instead."
+      #   options[:path] ||= as
+      # end
+
+      # if scope = options.delete(:scope)
+      #   ActiveSupport::Deprecation.warn ":scope is deprecated, please use :singular instead."
+      #   options[:singular] ||= scope
+      # end
+
+      options[:as]          ||= @scope[:as]     if @scope[:as].present?
+      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
+
+        lolita_scope mapping.name do
+          yield if block_given?
+
+          with_lolita_exclusive_scope mapping.fullpath,mapping.path do
+            
+            # if not defined lolita default configuration in model, than can't use :rest
+            if !target_class.respond_to?(:lolita) && !Lolita::routes[mapping.name]
+               raise Lolita::NotFound, "Lolita not found in #{target_class}. Include Lolita::Configuration"
+            elsif target_class.respond_to?(:lolita) && target_class.instance_variable_get(:@lolita).nil?
+               raise Lolita::NotInitialized, "Call lolita method in #{target_class}."
+            else
+              route=Lolita.routes[mapping.name] || Lolita.default_route
+            end
+            unless route
+              raise Lolita::ModuleNotFound, "Module #{mapping.name.to_s.capitalize} not found!"
+            end
+            send(:"lolita_#{route}_route",mapping,mapping.controllers)
+            
+            Lolita.conditional_routes(target_class).each do |route_name|
+              send(:"lolita_#{route_name}_route",mapping,mapping.controllers)
+            end
+          end
+
+        end
+       
+        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")
+      end
+    end
+
+    protected
+    
+    def lolita_scope scope
+      constraint = lambda do |request|
+        request.env["lolita.mapping"] = Lolita.mappings[scope]
+        true
+      end
+
+      constraints(constraint) do
+        yield
+      end
+    end
+    
+    def with_lolita_exclusive_scope new_path,new_as
+      old_as, old_path, old_module = @scope[:as], @scope[:path], @scope[:module]
+      @scope[:as], @scope[:path], @scope[:module] = new_as, new_path, nil
+      yield
+    ensure
+      @scope[:as], @scope[:path], @scope[:module] = old_as, old_path, old_module
+    end
+
+    private
+
+    def migrating?
+      File.basename($0).match(/^rake/) && (ARGV.include?("db:migrate"))
+    end
+
+    def generating_instalation?
+      File.basename($0).match(/^rails/) && (ARGV.detect{|arg| arg.to_s.match(/lolita[^:]*:.*/)})
+    end
+  end
+end