frill 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/frill/frill.rb

@@ -26,7 +26,7 @@ module Frill
     end
 
     def after decorator
-      decorator.before self
+      move(Frill.decorators.index(decorator) + 1)
     end
 
     def first
@@ -37,6 +37,7 @@ module Frill
     def move index
       Frill.decorators.delete self
       Frill.decorators.insert index, self
+      Frill.decorators.compact!
     end
   end
 end

data/spec/frill_spec.rb

@@ -61,33 +61,47 @@ describe Frill do
   end
 
   describe Frill::ClassMethods do
-    let(:module1) { Module.new { include Frill } }
-    let(:module2) { Module.new { include Frill } }
+    before do
+      module Module1
+        include Frill
+      end
+
+      module Module2
+        include Frill
+      end
+
+      module Module3
+        include Frill
+      end
+    end
 
     describe ".before" do
       it "inserts the current module before the requested module in Frill's list of decorators" do
-        Frill.decorators.should == [module1, module2]
+        Frill.decorators.should == [Module1, Module2, Module3]
 
-        module2.before module1
-        Frill.decorators.should == [module2, module1]
+        Module2.before Module1
+        Module3.before Module2
+        Frill.decorators.should == [Module3, Module2, Module1]
       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]
+        Frill.decorators.should == [Module1, Module2, Module3]
 
-        module1.after module2
-        Frill.decorators.should == [module2, module1]
+        Module1.after Module2
+        Module3.after Module2
+        Frill.decorators.first.should == Module2
+        Frill.decorators.last(2).should =~ [Module1, Module3]
       end
     end
 
     describe ".first" do
       it "inserts the current module at the beginning of the list of Frill's decorators" do
-        Frill.decorators.should == [module1, module2]
+        Frill.decorators.should == [Module1, Module2, Module3]
 
-        module2.first
-        Frill.decorators.should == [module2, module1]
+        Module2.first
+        Frill.decorators.first.should == Module2
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frill
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70317754031900 !ruby/object:Gem::Requirement
+  requirement: &70201391629940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.2
   type: :development
   prerelease: false
-  version_requirements: *70317754031900
+  version_requirements: *70201391629940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70317754031320 !ruby/object:Gem::Requirement
+  requirement: &70201391629460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70317754031320
+  version_requirements: *70201391629460
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70317754030280 !ruby/object:Gem::Requirement
+  requirement: &70201391628600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70317754030280
+  version_requirements: *70201391628600
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70317754029580 !ruby/object:Gem::Requirement
+  requirement: &70201391627940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70317754029580
+  version_requirements: *70201391627940
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &70201391627400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70201391627400
 description: 
 email: moonmaster9000@gmail.com
 executables: []