frill 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/frill/frill.rb

@@ -1,36 +1,42 @@
 module Frill
+  class CyclicDependency < RuntimeError; end
+
   def self.included(base)
-    self.decorators.add base
+    self.list.add base
     base.extend ClassMethods
   end
 
   def self.decorators
-    @decorators ||= Graph.new
+    list.to_a
   end
 
   def self.reset!
-    @decorators = nil
+    @list = nil
   end
 
   def self.decorate object, context
-   decorators.sorted_nodes.each do |d|
+   decorators.each do |d|
      object.extend d if d.frill? object, context
    end
 
    object
   end
 
+  def self.list
+    @list ||= List.new
+  end
+
   module ClassMethods
     def before decorator
-      Frill.decorators.move_before self, decorator
+      Frill.list.move_before self, decorator
     end
 
     def after decorator
-      Frill.decorators.move_after self, decorator
+      Frill.list.move_after self, decorator
     end
   end
 
-  class Graph
+  class List
     def initialize
       @nodes = {}
     end
@@ -44,6 +50,8 @@ module Frill
       node2 = add label2
 
       node1.move_before node2
+
+      detect_cycles
     end
 
     def move_after label1, label2
@@ -51,6 +59,8 @@ module Frill
       node2 = add label2
 
       node1.move_after node2
+
+      detect_cycles
     end
 
     def [](label)
@@ -66,53 +76,78 @@ module Frill
     end
 
     def index label
-      sorted_nodes.index label
+      to_a.index label
     end
 
-    def sorted_nodes
+    def to_a
       lists = []
 
       @nodes.values.each do |node|
         unless lists.include? node.label
-          leaf = node.leaf
-          lists += leaf.to_a
+          first = node.first
+          lists += first.to_a
         end
       end
 
       lists
     end
 
+    private
+
+    def detect_cycles
+      @nodes.values.each do |node|
+        visited = {}
+        visited[node.label] = true
+
+        current_node = node.next
+        while current_node
+          raise Frill::CyclicDependency if visited[current_node.label]
+          visited[current_node.label] = true
+          current_node = current_node.next
+        end
+
+        current_node = node.previous
+        while current_node
+          raise Frill::CyclicDependency if visited[current_node.label]
+          visited[current_node.label] = true
+          current_node = current_node.previous
+        end
+      end
+    end
+
     class Node
-      attr_accessor :parent, :child
+      attr_accessor :next, :previous
       attr_reader :label
 
       def initialize(label)
         @label  = label
-        @parent = nil
-        @child  = nil
+        @next = nil
+        @previous  = nil
       end
 
       def move_before node
-        parent_node = node.leaf
+        next_node = node.first
+        previous_node = self.last
 
-        parent_node.child = self
-        self.parent = parent_node
+        previous_node.next = next_node
+        next_node.previous = previous_node
       end
 
       def move_after node
-        child_node = node.root
+        previous_node = node.last
+        first_node  = first
 
-        self.child = child_node
-        child.parent = self
+        previous_node.next = first_node
+        first_node.previous   = previous_node
       end
 
-      def leaf
+      def first
         node = nil
         current_node = self
 
         until node
-          if current_node.child
-            current_node = current_node.child
+          if current_node.previous
+            current_node = current_node.previous
           else
             node = current_node
           end
@@ -121,19 +156,19 @@ module Frill
         node
       end
 
-      def root
+      def last
         current_node = self
-        root_node = nil
+        last_node = nil
 
-        until root_node
-          if current_node.parent
-            current_node = current_node.parent
+        until last_node
+          if current_node.next
+            current_node = current_node.next
           else
-            root_node = current_node
+            last_node = current_node
           end
         end
 
-        root_node
+        last_node
       end
 
       def to_a
@@ -143,7 +178,7 @@ module Frill
 
         until current_node == nil
           list << current_node.label
-          current_node = current_node.parent
+          current_node = current_node.next
         end
 
         list

data/spec/frill_spec.rb

@@ -71,12 +71,12 @@ describe Frill do
 
     describe ".before" do
       it "inserts the current module before the requested module in Frill's list of decorators" do
-        Module5.before Module4
-        Module4.before Module3
-        Module3.before Module2
         Module2.before Module1
+        Module5.after Module4
+        Module3.before Module2
+        Module4.before Module3
 
-        Frill.decorators.index(Module5).should be < Frill.decorators.index(Module4)
+        Frill.decorators.index(Module5).should be > Frill.decorators.index(Module4)
         Frill.decorators.index(Module3).should be < Frill.decorators.index(Module2)
         Frill.decorators.index(Module2).should be < Frill.decorators.index(Module1)
         Frill.decorators.index(Module4).should be < Frill.decorators.index(Module3)
@@ -93,33 +93,33 @@ describe Frill do
 
     describe ".before" do
       it "inserts the current module before the requested module in Frill's list of decorators" do
-        Frill.decorators.sorted_nodes.should == [Module1, Module2, Module3]
+        Frill.decorators.should == [Module1, Module2, Module3]
 
         Module1.before Module2
-        Frill.decorators.sorted_nodes.should == [Module1, Module2, Module3]
+        Frill.decorators.should == [Module1, Module2, Module3]
 
         Module3.before Module2
-        Frill.decorators.sorted_nodes.should == [Module3, Module1, Module2]
+        Frill.decorators.should == [Module3, Module1, Module2]
       end
     end
 
     describe ".after" do
       it "inserts the current module after the requested module in Frill's list of decorators" do
-        Frill.decorators.sorted_nodes.should == [Module1, Module2, Module3]
+        Frill.decorators.should == [Module1, Module2, Module3]
 
         Module1.after Module2
         Module3.after Module2
 
-        Frill.decorators.sorted_nodes.first.should == Module2
-        Frill.decorators.sorted_nodes.last(2).should =~ [Module1, Module3]
+        Frill.decorators.first.should == Module2
+        Frill.decorators.last(2).should =~ [Module1, Module3]
       end
     end
   end
 
-  describe Frill::Graph do 
+  describe Frill::List do 
     describe "#add" do
-      it "should add an element to the graph" do
-        g = Frill::Graph.new
+      it "should add an element to the list" do
+        g = Frill::List.new
         g.add "hi"
         g["hi"].should_not be_nil
       end
@@ -127,17 +127,28 @@ describe Frill do
 
     describe "#move_before(label1, label2)" do
       it "should move label1 before label2" do
-        g = Frill::Graph.new
+        g = Frill::List.new
         g.move_before "a", "b"
-        g.sorted_nodes.should == ["a", "b"]
+        g.move_before "c", "d"
+        g.move_after  "b", "c"
+        g.to_a.should == ["c", "d", "a", "b"]
       end
     end
 
     describe "#move_after(label1, label2)" do
       it "should move label1 after label2" do
-        g = Frill::Graph.new
+        g = Frill::List.new
         g.move_after "a", "b"
-        g.sorted_nodes.should == ["b", "a"]
+        g.to_a.should == ["b", "a"]
+      end
+
+      it "should throw exceptions when cycles are detected" do
+        g = Frill::List.new
+        g.move_before "b", "a"
+
+        expect { 
+          g.move_before "a", "b"
+        }.to raise_exception(Frill::CyclicDependency)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frill
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70132147962560 !ruby/object:Gem::Requirement
+  requirement: &70245083877380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.2
   type: :development
   prerelease: false
-  version_requirements: *70132147962560
+  version_requirements: *70245083877380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70132147962000 !ruby/object:Gem::Requirement
+  requirement: &70245083876800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70132147962000
+  version_requirements: *70245083876800
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70132147961140 !ruby/object:Gem::Requirement
+  requirement: &70245083875880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70132147961140
+  version_requirements: *70245083875880
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70132147960500 !ruby/object:Gem::Requirement
+  requirement: &70245083875240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70132147960500
+  version_requirements: *70245083875240
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70132147959960 !ruby/object:Gem::Requirement
+  requirement: &70245083874700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70132147959960
+  version_requirements: *70245083874700
 description: 
 email: moonmaster9000@gmail.com
 executables: []