lolita 3.1.9 → 3.1.10

data/lib/lolita/modules.rb

@@ -1,6 +1,6 @@
-require "lolita/modules/rest"
-
-Lolita.default_route = :rest
-
-
-
+require "lolita/modules/rest"
+
+Lolita.default_route = :rest
+
+
+

data/lib/lolita/modules/rest.rb

@@ -1,10 +1,10 @@
-module ActionDispatch::Routing
-  class Mapper
-    protected
-    def lolita_rest_route mapping, controllers
-      resources mapping.plural,:only=>[:index,:new,:create,:edit,:update,:destroy],
-        :controller=>controllers[:rest],:module=>mapping.module
-    end
-  end
-end
-
+module ActionDispatch::Routing
+  class Mapper
+    protected
+    def lolita_rest_route mapping, controllers
+      resources mapping.plural,:only=>[:index,:new,:create,:edit,:update,:destroy],
+        :controller=>controllers[:rest],:module=>mapping.module
+    end
+  end
+end
+

data/lib/lolita/navigation/branch.rb

@@ -1,133 +1,133 @@
-module Lolita
-  module Navigation
-    class Branch
-
-      attr_accessor :title,:name,:object
-      attr_reader :level,:options,:tree,:parent
-
-      def initialize(*args)
-        
-        @options=args ? args.extract_options! : {}
-        set_object(args||[])
-        set_default_values
-        assign_attributes_from_options
-      end
-
-      def tree=(new_tree)
-        raise ArgumentError, "Tree already assigned" if self.tree || !new_tree.is_a?(Lolita::Navigation::Tree)
-        @tree=new_tree
-      end
-
-      def children
-        unless @children
-          tree=Lolita::Navigation::Tree.new("#{name}_children_tree")
-          tree.set_parent(self)
-          @children=tree
-        end
-        @children
-      end
-
-      def self_with_children
-        if block_given?
-          yield self
-          @children.each do |branch|
-            yield branch
-          end
-        else
-          [self]+@children.map{|b| b}
-        end
-      end
-
-      def index
-        self.tree.get_branch_index(self)
-      end
-
-      def siblings
-        index=self.index
-        {
-          :before=>self.tree.branches[index-1],
-          :after=>self.tree.branches[index+1]
-        }
-      end
-
-      def append(*args)
-        move_to(:append,*args)
-      end
-
-      def after(*args)
-        move_to(:after,*args)
-      end
-
-      def before(*args)
-        move_to(:before,*args)
-      end
-
-      def prepend(*args)
-        move_to(:prepend,*args)
-      end
-
-      def self.get_or_create(*args)
-        options=args ? args.extract_options! : {}
-        args||=[]
-        possible_object=args[0]
-
-        if possible_object.is_a?(String)
-          self.new(possible_object,options.merge(:title=>possible_object))
-        elsif possible_object.is_a?(self)
-          possible_object
-        else
-          self.new(possible_object,options)
-        end
-      end
-
-      def get_or_create(*args)
-        self.class.get_or_create(*args)
-      end
-
-      private
-
-      def move_to(position,*args)
-        branch=get_or_create(*args)
-        raise ArgumentError("Can't #{position} without branch.") unless branch
-        if [:before,:after].include?(position) && !branch.tree
-          raise ArgumentError, "Can't move in not-existing tree!"
-        end
-        new_branch=case position
-        when :append
-          self.children.append(branch)
-        when :prepend
-          self.children.prepend(branch)
-        when :after
-          branch.tree.before(branch,self)
-        when :before
-          branch.tree.after(branch,self)
-        end
-        new_branch.instance_variable_set(:"@level",new_branch.level+([:append,:prepend].include?(position) ? 1 : 0))
-        new_branch
-      end
-
-
-      def set_object(args)
-        @object=if args[0].is_a?(Lolita::Navigation::Tree)
-          @level=0
-          args[0]
-        else
-          args[0]
-        end
-      end
-
-      def set_default_values
-        @name||="branch_#{self.__id__}"
-        @level||=0
-      end
-
-      def assign_attributes_from_options
-        @options.each{|key,value|
-          if self.respond_to?(:"#{key}=")
-            self.send(:"#{key}=",@options.delete(key))
-          end
-        }
-      end
-    end
-  end
+module Lolita
+  module Navigation
+    class Branch
+
+      attr_accessor :title,:name,:object
+      attr_reader :level,:options,:tree,:parent
+
+      def initialize(*args)
+        
+        @options=args ? args.extract_options! : {}
+        set_object(args||[])
+        set_default_values
+        assign_attributes_from_options
+      end
+
+      def tree=(new_tree)
+        raise ArgumentError, "Tree already assigned" if self.tree || !new_tree.is_a?(Lolita::Navigation::Tree)
+        @tree=new_tree
+      end
+
+      def children
+        unless @children
+          tree=Lolita::Navigation::Tree.new("#{name}_children_tree")
+          tree.set_parent(self)
+          @children=tree
+        end
+        @children
+      end
+
+      def self_with_children
+        if block_given?
+          yield self
+          @children.each do |branch|
+            yield branch
+          end
+        else
+          [self]+@children.map{|b| b}
+        end
+      end
+
+      def index
+        self.tree.get_branch_index(self)
+      end
+
+      def siblings
+        index=self.index
+        {
+          :before=>self.tree.branches[index-1],
+          :after=>self.tree.branches[index+1]
+        }
+      end
+
+      def append(*args)
+        move_to(:append,*args)
+      end
+
+      def after(*args)
+        move_to(:after,*args)
+      end
+
+      def before(*args)
+        move_to(:before,*args)
+      end
+
+      def prepend(*args)
+        move_to(:prepend,*args)
+      end
+
+      def self.get_or_create(*args)
+        options=args ? args.extract_options! : {}
+        args||=[]
+        possible_object=args[0]
+
+        if possible_object.is_a?(String)
+          self.new(possible_object,options.merge(:title=>possible_object))
+        elsif possible_object.is_a?(self)
+          possible_object
+        else
+          self.new(possible_object,options)
+        end
+      end
+
+      def get_or_create(*args)
+        self.class.get_or_create(*args)
+      end
+
+      private
+
+      def move_to(position,*args)
+        branch=get_or_create(*args)
+        raise ArgumentError("Can't #{position} without branch.") unless branch
+        if [:before,:after].include?(position) && !branch.tree
+          raise ArgumentError, "Can't move in not-existing tree!"
+        end
+        new_branch=case position
+        when :append
+          self.children.append(branch)
+        when :prepend
+          self.children.prepend(branch)
+        when :after
+          branch.tree.before(branch,self)
+        when :before
+          branch.tree.after(branch,self)
+        end
+        new_branch.instance_variable_set(:"@level",new_branch.level+([:append,:prepend].include?(position) ? 1 : 0))
+        new_branch
+      end
+
+
+      def set_object(args)
+        @object=if args[0].is_a?(Lolita::Navigation::Tree)
+          @level=0
+          args[0]
+        else
+          args[0]
+        end
+      end
+
+      def set_default_values
+        @name||="branch_#{self.__id__}"
+        @level||=0
+      end
+
+      def assign_attributes_from_options
+        @options.each{|key,value|
+          if self.respond_to?(:"#{key}=")
+            self.send(:"#{key}=",@options.delete(key))
+          end
+        }
+      end
+    end
+  end
 end

data/lib/lolita/navigation/tree.rb

@@ -1,117 +1,117 @@
-module Lolita
-  module Navigation
-    class Tree
-      include Enumerable
-      include Lolita::Hooks
-
-      class<<self
-        def remember(tree)
-          @@trees||={}
-          @@trees[tree.name.to_sym]=tree
-        end
-
-        def [](name)
-          @@trees||={}
-          @@trees[name]
-        end
-      end
-
-      add_hooks :before_branch_added, :after_branch_added
-
-      attr_reader :name,:root,:default_position,:branches,:parent
-
-      def initialize(name)
-        @name=name
-        @default_possition=:append
-        @branches=[]
-      end
-
-      def each 
-        @branches.each do |branch|
-          yield branch
-          if branch.children.any?
-            branch.children.each do |child|
-              yield child
-            end
-          end
-        end
-      end
-
-      def root?
-        !parent
-      end
-
-      def method_missing method_name, *args
-        @branches.send(method_name.to_sym,*args)
-      end
-
-
-      def append(*branch)
-        adding_branch(*branch) do |fixed_branch|
-          @branches<<fixed_branch
-        end
-      end
-
-      def prepend(*branch)
-        adding_branch(*branch) do |fixed_branch|
-          @branches.unshift(fixed_branch)
-        end
-      end
-
-      def after(given_branch,*other_branch) 
-        index=get_branch_index(given_branch)
-
-        adding_branch(*other_branch) do |fixed_branch|
-          put_in_branches(fixed_branch,index)
-        end
-      end
-
-      def before(given_branch,*other_branch)
-        index=get_branch_index(given_branch)
-
-        adding_branch(*other_branch) do |fixed_branch|
-          put_in_branches(fixed_branch,index-1)
-        end
-      end
-
-      def get_branch_index(given_branch)
-        @branches.each_with_index{|branch,index|
-          return index if given_branch==branch
-        }
-        raise ArgumentError, "Branch #{given_branch.inspect} not exists in #{self.inspect}"
-      end
-
-      def set_parent(new_parent)
-        @parent=new_parent
-      end
-      
-      private
-
-      def adding_branch *branch
-        self.run(:before_branch_added,*branch)
-        fixed_branch=fix_branch(*branch)
-        yield fixed_branch
-        @last_branch=fixed_branch
-        self.run(:after_branch_added,fixed_branch)
-        fixed_branch
-      end
-
-      def fix_branch(*branch)
-        unless branch[0].is_a?(Lolita::Navigation::Branch)
-          options=branch.extract_options!
-          Lolita::Navigation::Branch.get_or_create(*branch,options.merge(:tree=>self))
-        else
-          branch[0].tree=self
-          branch[0]
-        end
-      end
-
-      def put_in_branches branch,index
-        before_part=@branches.slice(0,index+1) || []
-        after_part=@branches.slice(index+1,@branches.size-index) || []
-        @branches=before_part+[branch]+after_part
-      end
-
-    end
-  end
+module Lolita
+  module Navigation
+    class Tree
+      include Enumerable
+      include Lolita::Hooks
+
+      class<<self
+        def remember(tree)
+          @@trees||={}
+          @@trees[tree.name.to_sym]=tree
+        end
+
+        def [](name)
+          @@trees||={}
+          @@trees[name]
+        end
+      end
+
+      add_hooks :before_branch_added, :after_branch_added
+
+      attr_reader :name,:root,:default_position,:branches,:parent
+
+      def initialize(name)
+        @name=name
+        @default_possition=:append
+        @branches=[]
+      end
+
+      def each 
+        @branches.each do |branch|
+          yield branch
+          if branch.children.any?
+            branch.children.each do |child|
+              yield child
+            end
+          end
+        end
+      end
+
+      def root?
+        !parent
+      end
+
+      def method_missing method_name, *args
+        @branches.send(method_name.to_sym,*args)
+      end
+
+
+      def append(*branch)
+        adding_branch(*branch) do |fixed_branch|
+          @branches<<fixed_branch
+        end
+      end
+
+      def prepend(*branch)
+        adding_branch(*branch) do |fixed_branch|
+          @branches.unshift(fixed_branch)
+        end
+      end
+
+      def after(given_branch,*other_branch) 
+        index=get_branch_index(given_branch)
+
+        adding_branch(*other_branch) do |fixed_branch|
+          put_in_branches(fixed_branch,index)
+        end
+      end
+
+      def before(given_branch,*other_branch)
+        index=get_branch_index(given_branch)
+
+        adding_branch(*other_branch) do |fixed_branch|
+          put_in_branches(fixed_branch,index-1)
+        end
+      end
+
+      def get_branch_index(given_branch)
+        @branches.each_with_index{|branch,index|
+          return index if given_branch==branch
+        }
+        raise ArgumentError, "Branch #{given_branch.inspect} not exists in #{self.inspect}"
+      end
+
+      def set_parent(new_parent)
+        @parent=new_parent
+      end
+      
+      private
+
+      def adding_branch *branch
+        self.run(:before_branch_added,*branch)
+        fixed_branch=fix_branch(*branch)
+        yield fixed_branch
+        @last_branch=fixed_branch
+        self.run(:after_branch_added,fixed_branch)
+        fixed_branch
+      end
+
+      def fix_branch(*branch)
+        unless branch[0].is_a?(Lolita::Navigation::Branch)
+          options=branch.extract_options!
+          Lolita::Navigation::Branch.get_or_create(*branch,options.merge(:tree=>self))
+        else
+          branch[0].tree=self
+          branch[0]
+        end
+      end
+
+      def put_in_branches branch,index
+        before_part=@branches.slice(0,index+1) || []
+        after_part=@branches.slice(index+1,@branches.size-index) || []
+        @branches=before_part+[branch]+after_part
+      end
+
+    end
+  end
 end