brakefast 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eb0828ea86e50b2c475a7d88359d907e350bc20
-  data.tar.gz: 40e8588718b3babe9075ae23d86deae3128090c0
+  metadata.gz: 17b82ae8da9b3f8749d996d2af4de3c61be6f8e7
+  data.tar.gz: 4b93ff71c794ef12005ca7d0f86e416fe1c5fe7c
 SHA512:
-  metadata.gz: c109fa8a8021c1f9b06d952f6edf71a9b860de7f4ed7c965050ae6fa3870f87908f99a72aac1852bd0540149ebcb55986b590faf59fded74ff2c8c51f37126a4
-  data.tar.gz: 0a193a1b9474c0a524030fbcbfcdcbfc1a8e76f684ff39ee155fbec1044ca95815d3ccbcb71ac3922898bfabcd6a5e5483156db04b8e79e9237c79e380a4c2c4
+  metadata.gz: 429bc836fb6e392b8b5166c475df8c73abc97e9fb3e995a5d74fe823ad9fea292bdfe3a6ee25d6c942edb9ed81516924098549ad3bcfba0cd14e398daec50abb
+  data.tar.gz: db5b1c1e3d65523d4208b3bcb705d916454b1f39c312c79c0cb88106aff8f19458a3516d4e154e0f0e06357043fdfb0769eb53246bc10d46a3b5883947760e24

data/lib/brakefast/detector/base.rb

@@ -7,7 +7,6 @@ module Brakefast
 
       attr_reader :vulnerability
       def_delegator :@vulnerability, :method, :target_method_name
-      def_delegator :@vulnerability, :message, :message
       def_delegator :@vulnerability, :file, :file
       def_delegator :@vulnerability, :line, :line
 
@@ -40,18 +39,49 @@ module Brakefast
         raise "override me"
       end
 
+      def message
+        vulnerability.message
+      end
+
+      def escaped_message
+        message.gsub("'", "\\\\'")
+      end
+
       private
 
       def create_module_name(s)
         s.to_s.gsub("::", "__") + "BrakefastHook"
       end
 
-      def create_hook(module_name, hookee_mod)
-        name = create_module_name(module_name)
-        Brakefast.const_set(name, hookee_mod)
-        ::Object.const_get(module_name).class_eval %Q{
-          prepend Brakefast::#{name}
-        }
+      def create_hook
+        name = create_module_name(target_module_name)
+        if Brakefast.const_defined?(name)
+          mod = Brakefast.const_get(name)
+        else
+          mod = Module.new
+          mod.module_eval %Q{
+            def self.prepended(base)
+              class << base
+                self.prepend(ClassMethods)
+              end
+            end
+            module ClassMethods
+            end
+          }
+        end
+
+        yield(mod)
+
+        # prepend once and create module once only.
+        if mod.name.nil?
+          Brakefast.const_set(name, mod)
+          mod = target_module_name.to_s.constantize rescue nil
+          if mod
+            mod.class_eval %Q{
+              prepend Brakefast::#{name}
+            }
+          end
+        end
       end
     end
   end

data/lib/brakefast/detector/generic_warnings.rb

@@ -5,17 +5,24 @@ module Brakefast
 
       def set_detector_module
         if target_module_name && target_method_name
-          mod = Module.new
-          mod.module_eval %Q{
-            def #{target_method_name}
-              n = Brakefast::Notification::GenericWarnings.new(self, '#{message}',
-                                                               '#{file}','#{line}')
-              Brakefast.notification_collector.add(n)
-              super
+          create_hook do |mod|
+            if md = /\A(#{target_module_name}|s\(:self\))\.(.*)/.match(target_method_name)
+              m = mod.const_get(:ClassMethods)
+              name = md[2]
+            else
+              m = mod
+              name = target_method_name
             end
-          }
 
-          create_hook(target_module_name, mod)
+            m.module_eval %Q{
+              def #{name}(*args)
+                n = Brakefast::Notification::GenericWarnings.new(self, '#{escaped_message}',
+                                                                 '#{file}','#{line}')
+                Brakefast.notification_collector.add(n)
+                super
+              end
+            }
+          end
         end
       end
 

data/lib/brakefast/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Brakefast
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brakefast
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-30 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uniform_notifier