superators 0.9.0 → 0.9.1

data/lib/superators/macro.rb

@@ -13,7 +13,7 @@ module SuperatorMixin
     if respond_to_superator? sup
       __send__ superator_definition_name_for(sup), operand
     else
-      raise NameError, "Superator #{sup} has not been defined on #{self.class}" unless superator_definition
+      raise NoMethodError, "Superator #{sup} has not been defined on #{self.class}"
     end
   end
   
@@ -29,7 +29,7 @@ module SuperatorMixin
   
   def superator(operator, &block)
     raise ArgumentError, "block not supplied" unless block_given?
-    raise NameError, "Not a valid superator!" unless superator_valid?(operator)
+    raise ArgumentError, "Not a valid superator!" unless superator_valid?(operator)
     
     real_operator = real_operator_from_superator operator
     
@@ -46,7 +46,7 @@ module SuperatorMixin
       # When we get to the method defining, we have to know whether the superator had to be aliased
       # or if it's new entirely.
       define_method(real_operator) do |operand|
-        if operand.kind_of? SuperatorFlag
+        if operand.kind_of?(SuperatorFlag) && operand.superator_queue.any?
           sup = operand.superator_queue.unshift(real_operator).join
           operand.superator_queue.clear
           
@@ -56,7 +56,7 @@ module SuperatorMixin
           if respond_to? alias_for_real_method
             __send__(alias_for_real_method, operand)
           else
-            raise NameError, "undefined method #{real_operator} for #{operand.inspect}:#{operand.class}"
+            raise NoMethodError, "undefined method #{real_operator} for #{operand.inspect}:#{operand.class}"
           end
         end
       end
@@ -77,7 +77,7 @@ module SuperatorMixin
           end
         end
       else
-        raise NameError, "undefined superator #{sup} for #{self.inspect}:#{self.class}"
+        raise NoMethodError, "undefined superator #{sup} for #{self.inspect}:#{self.class}"
       end
     end
   end

data/lib/superators/version.rb

@@ -1,4 +1,4 @@
 class Superators
-  MAJOR,MINOR,TINY = 0,9,0
+  MAJOR,MINOR,TINY = 0,9,1
   VERSION = [MAJOR,MINOR,TINY].join '.'
 end

data/spec/superator_spec.rb

@@ -54,6 +54,7 @@ describe "The 'superator' macro" do
     end.new
     lambda { victim <<   Object.new }.should throw_symbol(:original_method)
     lambda { victim <<~~ Object.new }.should throw_symbol(:superator)
+    
   end
 
   # This one is going to be very difficult to implement. method_added() maybe?
@@ -67,6 +68,20 @@ describe "The 'superator' macro" do
     lambda { victim.new() <~~ Object.new }.should throw_symbol(:superator)
   end
   
+  it "should allow the 'real' operator to be called within the superator definition" do
+    victim = "Super"
+    class << victim
+      superator "++" do |operand|
+        upcase + operand.upcase
+      end
+      superator "-~+~-" do |operand|
+        self + operand
+      end
+    end
+    (victim ++ "ators").should == "SUPERATORS"
+    lambda { victim -~+~- "man" }.should_not raise_error
+  end
+  
 end
 
 describe "Defined binary superators" do
@@ -99,6 +114,7 @@ describe "Defined binary superators" do
       end.new <--- Object.new
     end.should throw_symbol(:last)
   end
+
 end
 
 describe "The superator_send method" do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: superators
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
-date: 2007-08-22 00:00:00 +01:00
+  version: 0.9.1
+date: 2007-08-29 00:00:00 -07:00
 summary: Superators add new sexy operators to your Ruby objects.
 require_paths: 
 - lib