frill 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/frill/frill.rb

@@ -7,10 +7,11 @@ module Frill
   end
 
   def self.decorators
-    list.to_a
+    @decorators ||= list.to_a
   end
 
   def self.reset!
+    @decorators = nil
     @list = nil
   end
 
@@ -42,7 +43,7 @@ module Frill
     end
 
     def add label
-      @nodes[label] ||= Node.new label
+      nodes[label] ||= Node.new label
     end
 
     def move_before label1, label2
@@ -51,19 +52,19 @@ module Frill
 
       node1.move_before node2
 
-      detect_cycles
+      CycleDetecter.detect! nodes
     end
 
     def [](label)
-      @nodes[label]
+      nodes[label]
     end
 
     def empty?
-      @nodes.empty?
+      nodes.empty?
     end
 
     def include? label
-      @nodes.keys.include? label
+      nodes[label]
     end
 
     def index label
@@ -71,37 +72,65 @@ module Frill
     end
 
     def to_a
-      lists = []
+      array = []
 
-      @nodes.values.each do |node|
-        unless lists.include? node.label
-          first = node.first
-          lists += first.to_a
-        end
+      nodes.values.each do |node|
+        array += construct_array(node) unless array.include? node.label
       end
 
-      lists
+      array
     end
 
     private
+    attr_reader :nodes
 
-    def detect_cycles
-      @nodes.values.each do |node|
-        visited = {}
-        visited[node.label] = true
+    def construct_array node
+      array = []
+      current_node = node.first
 
-        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
+      while current_node
+        array << current_node.label
+        current_node = current_node.next
+      end
+
+      array
+    end
+
+    class CycleDetecter
+      def self.detect! nodes
+        new(nodes).detect!
+      end
+
+      def initialize(nodes)
+        @nodes = nodes
+        @visited = {}
+      end
+
+      def detect!
+        nodes.values.each do |node|
+          fan_out node unless visited[node.label]
         end
+      end
+
+
+      private
+
+      attr_reader :nodes, :visited
+
+      def fan_out(node)
+        visited[node.label] = true
+
+        fan :next, node
+        fan :previous, node
+      end
+
+      def fan(direction, start_node)
+        current_node = start_node.send direction
 
-        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
+          current_node = current_node.send direction
         end
       end
     end
@@ -125,47 +154,16 @@ module Frill
       end
 
       def first
-        node = nil
-        current_node = self
-
-        until node
-          if current_node.previous
-            current_node = current_node.previous
-          else
-            node = current_node
-          end
-        end
-
-        node
+        first_node = self
+        first_node = first_node.previous while first_node.previous
+        first_node
       end
 
       def last
-        current_node = self
-        last_node = nil
-
-        until last_node
-          if current_node.next
-            current_node = current_node.next
-          else
-            last_node = current_node
-          end
-        end
-
+        last_node = self
+        last_node = last_node.next while last_node.next
         last_node
       end
-
-      def to_a
-        current_node = self
-
-        list = []
-
-        until current_node == nil
-          list << current_node.label
-          current_node = current_node.next
-        end
-
-        list
-      end
     end
   end
 end

data/spec/frill_spec.rb

@@ -71,10 +71,10 @@ describe Frill do
 
     describe ".before" do
       it "inserts the current module before the requested module in Frill's list of decorators" do
+        Module4.before Module3
         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(Module3).should be < Frill.decorators.index(Module2)
@@ -93,19 +93,19 @@ describe Frill do
 
     describe ".before" do
       it "inserts the current module before the requested module in Frill's list of decorators" do
-        Frill.decorators.should == [Module1, Module2, Module3]
+        Frill.list.to_a.should == [Module1, Module2, Module3]
 
         Module1.before Module2
-        Frill.decorators.should == [Module1, Module2, Module3]
+        Frill.list.to_a.should == [Module1, Module2, Module3]
 
         Module3.before Module2
-        Frill.decorators.should == [Module3, Module1, Module2]
+        Frill.list.to_a.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.should == [Module1, Module2, Module3]
+        Frill.list.to_a.should == [Module1, Module2, Module3]
 
         Module1.after Module2
         Module3.after Module2
@@ -136,10 +136,11 @@ describe Frill do
 
       it "should throw exceptions when cycles are detected" do
         g = Frill::List.new
+        g.move_before "c", "b"
         g.move_before "b", "a"
 
         expect { 
-          g.move_before "a", "b"
+          g.move_before "a", "c"
         }.to raise_exception(Frill::CyclicDependency)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frill
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70180336114600 !ruby/object:Gem::Requirement
+  requirement: &70351976271960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.2
   type: :development
   prerelease: false
-  version_requirements: *70180336114600
+  version_requirements: *70351976271960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70180336113640 !ruby/object:Gem::Requirement
+  requirement: &70351976271340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70180336113640
+  version_requirements: *70351976271340
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70180336113120 !ruby/object:Gem::Requirement
+  requirement: &70351976270520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70180336113120
+  version_requirements: *70351976270520
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70180336112420 !ruby/object:Gem::Requirement
+  requirement: &70351976270000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70180336112420
+  version_requirements: *70351976270000
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70180336111800 !ruby/object:Gem::Requirement
+  requirement: &70351976269480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70180336111800
+  version_requirements: *70351976269480
 description: 
 email: moonmaster9000@gmail.com
 executables: []