tagful 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5af551adaa68565b0f1fbe40f255e3648b5c5ec
-  data.tar.gz: 7dcb4e485e45033699f19a4b73b45b308c65b6aa
+  metadata.gz: a5b681c48a71c6e5cc302881cb7f8b837142d26b
+  data.tar.gz: cae00f8965dbf63edb5a5d2490e3a01b27e302c2
 SHA512:
-  metadata.gz: 9f199d9b6269b61a7fecd74780aa44085788597e0bf1a6c4a99017021327b896db5cbaee78e7307a7e46ce87bfd757656071df96c04f9b4930a41b8fcab42244
-  data.tar.gz: e411cefdf656d91d541e6c361918a4435d0cb1b3fb5b0a751e3a46813c0ca6789665bd611a01f4a560c6b786301657ae736360281366e3f3550dae1a3c822baf
+  metadata.gz: 20687a579bb972a1a8390b965c5b5dd2e9770d5a1448c654e8a55e30cc48d7b07f38244262601a51043a953aa73286f9005c79d67ccb14eb9901278c17f9aa84
+  data.tar.gz: a94463b8039c9dd4950e0aef6bfb24199d0ec607bef6d6bcde5474942de1dab92eae4904e38308ebe2e377b138a62450fa9cff6f835d834d61e663282f87a1f4

data/lib/tagful/version.rb

@@ -1,3 +1,3 @@
 module Tagful
-  VERSION = "1.0.1"
+  VERSION = "1.0.4"
 end

data/lib/tagful.rb

@@ -1,6 +1,8 @@
 require "tagful/version"
 
 module Tagful
+  DEFAULT_ERROR_MODULE_NAME = 'Error'
+
   class NotFound < ArgumentError; end
 
   def self.included(base)
@@ -30,7 +32,7 @@ module Tagful
           error_class = @tagful_error_module_or_class
         else
           error_module = @tagful_error_module_or_class
-          error_module ||= 'Error'
+          error_module ||= DEFAULT_ERROR_MODULE_NAME
         end
       else
         if error_module_or_class.is_a?(Class)
@@ -41,35 +43,46 @@ module Tagful
       end
 
       if error_class
-        class_eval(<<-CODE)
-          module TagfulMethods
-            #{visibility}
-            def #{method_id}(*args)
-              super
+        m = class_eval('module TagfulMethods; end; TagfulMethods')
+
+        m.module_eval do
+          define_method(method_id) do |*args, &block|
+            begin
+              super(*args, &block)
             rescue => e
-              raise #{error_class}, e.message
+              raise error_class, e.message
             end
           end
+          send visibility, method_id
+        end
 
-          prepend(TagfulMethods)
-        CODE
+        class_eval do
+          prepend(m)
+        end
       else
-        class_eval(<<-CODE)
-          unless defined?(#{error_module})
-            module #{error_module}; end
-          end
+        if error_module == DEFAULT_ERROR_MODULE_NAME
+          error_module = class_eval(<<-CODE)
+            unless defined?(#{error_module})
+              module #{error_module}; end
+            end
+            #{error_module}
+          CODE
+        end
 
-          module TagfulMethods
-            #{visibility}
-            def #{method_id}(*args)
-              super
+        m = class_eval('module TagfulMethods; end; TagfulMethods')
+        m.module_eval do
+          define_method(method_id) do |*args, &block|
+            begin
+              super(*args, &block)
             rescue => e
-              e.extend(#{error_module}) and raise
+              e.extend(error_module) and raise
             end
           end
-
-          prepend(TagfulMethods)
-        CODE
+          send visibility, method_id
+        end
+        class_eval do
+          prepend(m)
+        end
       end
       method_id
     end

data/spec/tagful_spec.rb

@@ -97,6 +97,78 @@ RSpec.describe Tagful do
     tagful :take_cheese!, NotFound
   end
 
+  module Bar
+    def bar
+      'top bar'
+    end
+  end
+
+  class Foo
+    module Bar
+      def self.to_s
+        'Bug!'
+      end
+
+      def bar
+        'Foo::Bar'
+      end
+    end
+
+    include Tagful
+
+    tagful_with ::Bar
+
+    tagful\
+    def bug
+      raise 'bug'
+    end
+  end
+
+  class Buzz < StandardError
+    def buzz
+      'top buzz'
+    end
+  end
+
+  class Fizz
+    class Buzz < StandardError
+      def buzz
+        'Buzz::buzz'
+      end
+    end
+
+    include Tagful
+
+    tagful_with ::Buzz
+
+    tagful\
+    def fizz
+      raise 'buzz'
+    end
+  end
+
+  class Anonymous
+    include Tagful
+
+    def anonymous_module
+      raise 'anonymouse module'
+    end
+    tagful :anonymous_module, Module.new {
+      def anonymous
+        'anonymous module'
+      end
+    }
+
+    def anonymous_class
+      raise 'anonymouse class'
+    end
+    tagful :anonymous_class, Class.new(StandardError) {
+      def anonymous
+        'anonymous class'
+      end
+    }
+  end
+
   describe '.tagful_with' do
     it 'tagged method with specified Module' do
       expect { Robot.new.to_evil }.to raise_error(Robot::Broken, ':(')
@@ -113,6 +185,24 @@ RSpec.describe Tagful do
         expect { Pizza.new('bug') }.to raise_error(Pizza::Dirty, 'something wrong in pizza factory: bug')
       end
     end
+
+    context 'tagged with top level module, but the same name module exists in class' do
+      it 'tagged by top level module' do
+        expect { Foo.new.bug }.to raise_error do |error|
+          expect(error).to be_an(::Bar)
+          expect(error.bar).to eq 'top bar'
+        end
+      end
+    end
+
+    context 'tagged with top level class, but the same name class exists in class' do
+      it 'tagged by top level class' do
+        expect { Fizz.new.fizz }.to raise_error do |error|
+          expect(error).to be_an(::Buzz)
+          expect(error.buzz).to eq 'top buzz'
+        end
+      end
+    end
   end
 
   describe '.tagful' do
@@ -149,5 +239,21 @@ RSpec.describe Tagful do
         expect { Pizza.new.take_cheese! }.to raise_error(Pizza::NotFound, 'not found: cheese')
       end
     end
+
+    context 'tagged with anonymouse class' do
+      it 'raise tagged error class' do
+        expect { Anonymous.new.anonymous_class }.to raise_error do |error|
+          expect(error.anonymous).to eq 'anonymous class'
+        end
+      end
+    end
+
+    context 'tagged with anonymouse module' do
+      it 'raise tagged error module' do
+        expect { Anonymous.new.anonymous_module }.to raise_error do |error|
+          expect(error.anonymous).to eq 'anonymous module'
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagful
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - Seiei Higa