aspector 0.12.2 → 0.12.3

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  #- rbx-18mode
+  #- rbx-19mode
+# uncomment this line if your project needs to run something other than `rake`:
+script: bundle exec rspec spec
+#gemfile: Gemfile.travis
+

data/Gemfile

@@ -4,13 +4,13 @@ group :development do
   gem "rspec"
   gem "jeweler", "~> 1.6.4"
 
-  gem 'ruby-prof'
+  gem 'ruby-prof', :platforms => [:mri]
 
   gem "guard", "~> 0.8.4"
   gem "guard-bundler", "~> 0.1.3"
   gem "guard-rspec", "~> 0.5.2"
   gem "guard-shell", "~> 0.1.1"
-  gem 'rb-fsevent', "~> 0.4.3.1"
+  gem 'rb-fsevent', "~> 0.4.3.1", :platforms => [:mri]
   gem 'growl', "~> 1.0.3"
 
   gem 'awesome_print'

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     awesome_print (1.0.2)
-    coderay (1.0.5)
+    coderay (1.0.7)
     diff-lcs (1.1.3)
     git (1.2.5)
     growl (1.0.3)
@@ -20,25 +20,32 @@ GEM
       git (>= 1.2.5)
       rake
     method_source (0.7.1)
-    pry (0.9.8.4)
+    pry (0.9.9.6)
       coderay (~> 1.0.5)
       method_source (~> 0.7.1)
       slop (>= 2.4.4, < 3)
+    pry (0.9.9.6-java)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
+      spoon (~> 0.0)
     rake (0.9.2.2)
     rb-fsevent (0.4.3.1)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    ruby-prof (0.10.8)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    ruby-prof (0.11.2)
     slop (2.4.4)
+    spoon (0.0.1)
     thor (0.14.6)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/README.rdoc

@@ -1,4 +1,5 @@
 = aspector
+{<img src="https://secure.travis-ci.org/gcao/aspector.png" />}[http://travis-ci.org/gcao/aspector]
 
 aspector = ASPECT Oriented Ruby programming
 
@@ -50,6 +51,18 @@ gem install aspector
   # do_that
   # test
 
+== Notes
+  To use a different logger, e.g. Logem::Logger, run below command
+
+  ASPECTOR_LOGGER=Logem::Logger LOGEM_LOG_LEVEL=trace ruby -rlogem examples/cache_aspect.rb
+
+  Explanation:
+  ASPECTOR_LOGGER=Logem::Logger  => set logger to Logem::Logger class
+  LOGEM_LOG_LEVEL=trace          => set logem log level to trace
+  -rlogem                        => require logem otherwise it might not be available
+                                    when the logger is initialized. This could be handled by
+                                    bundler etc though.
+
 == Contributing to aspector
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-0.12.2
+0.12.3

data/aspector.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "aspector"
-  s.version = "0.12.2"
+  s.version = "0.12.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guoliang Cao"]
-  s.date = "2012-07-03"
+  s.date = "2012-10-09"
   s.description = ""
   s.email = "gcao99@gmail.com"
   s.extra_rdoc_files = [
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     ".irbrc",
     ".rspec",
     ".rvmrc",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "Guardfile",
@@ -34,6 +35,7 @@ Gem::Specification.new do |s|
     "examples/aspector_apply_example.rb",
     "examples/aspector_example.rb",
     "examples/cache_aspect.rb",
+    "examples/design_by_contract.rb",
     "examples/exception_handler.rb",
     "examples/implicit_method_option_test.rb",
     "examples/logging_aspect.rb",
@@ -47,6 +49,7 @@ Gem::Specification.new do |s|
     "lib/aspector/deferred_logic.rb",
     "lib/aspector/deferred_option.rb",
     "lib/aspector/logger.rb",
+    "lib/aspector/logging.rb",
     "lib/aspector/method_matcher.rb",
     "lib/aspector/module_extension.rb",
     "lib/aspector/object_extension.rb",

data/examples/design_by_contract.rb

@@ -0,0 +1,71 @@
+# Design by contract example
+
+class A
+
+  def initialize
+    @transactions = []
+    @total = 0
+  end
+
+  def buy price
+    @transactions << price
+    @total += price
+  end
+
+  def sell price
+    @transactions << price # Wrong
+    @total -= price
+  end
+
+end
+
+##############################
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'aspector'
+
+class Object
+  def assert bool, message = 'Assertion failure'
+    unless bool
+      $stderr.puts message
+      $stderr.puts caller
+    end
+  end
+end
+
+class ContractExample < Aspector::Base
+
+  before do |price, &block|
+    assert price > 0, "Price is #{price}, should be greater than 0"
+  end
+
+  after :result_arg => false do |*_, &block|
+    sum = @transactions.reduce(&:+)
+    assert @total == sum, "Total(#{@total}) and sum of transactions(#{sum}) do not match"
+  end
+
+end
+
+##############################
+
+ContractExample.apply A, :methods => %w[buy sell]
+
+a = A.new
+a.buy 10
+a.sell 10
+a.sell -10
+
+##############################
+
+class A
+  include DesignByContract
+
+  precond   { |price| assert price < 0, "Price is less than 0" }
+  postcond  { }
+  # invariant block will be executed before and after the method
+  invariant { assert @total != @transactions.reduce(&:sum), "Total and sum of transactions do not equal" }
+  def buy price
+  end
+end
+

data/examples/implicit_method_option_test.rb

@@ -18,7 +18,6 @@ class ImplicitMethodOptionTest < Aspector::Base
   end
 end
 
-# ImplicitMethodOptionTest.apply A, :method => 'test'
 ImplicitMethodOptionTest.apply A, :method => "test"
 
 ##############################

data/lib/aspector.rb

@@ -1,3 +1,4 @@
+require 'aspector/logging'
 require 'aspector/logger'
 
 require 'aspector/object_extension'

data/lib/aspector/base.rb

@@ -64,7 +64,11 @@ module Aspector
     end
 
     def aop_logger
-      @aop_logger ||= Logger.new(self, self.class.logger.level)
+      return @aop_logger if @aop_logger
+
+      @aop_logger = Logging.get_logger(self)
+      @aop_logger.level = self.class.logger.level
+      @aop_logger
     end
     alias logger aop_logger
 
@@ -120,7 +124,7 @@ module Aspector
       advices = aop_filter_advices advices, method
       return if advices.empty?
 
-      aop_logger.log Logger::APPLY_TO_METHOD, method
+      aop_logger.log Logging::DEBUG, 'apply-to-method', method
       before_apply_to_method method, advices
 
       scope ||=
@@ -255,7 +259,7 @@ module Aspector
       rescue
         # ignore undefined method error
         if @aop_options[:old_methods_only]
-          aop_logger.log Logger::METHOD_NOT_FOUND, method
+          aop_logger.log Logging::WARN, 'method-not-found', method
         end
 
         return
@@ -281,7 +285,7 @@ module Aspector
       aspect = self
 
       code = METHOD_TEMPLATE.result(binding)
-      aspect.aop_logger.log Logger::GENERATE_CODE, method, code
+      aspect.aop_logger.log Logging::DEBUG, 'generate-code', method, code
       @aop_context.class_eval code, __FILE__, __LINE__ + 4
     end
 
@@ -293,116 +297,116 @@ module Aspector
 % end
 
     define_method :<%= method %> do |*args, &block|
-% if aop_logger.visible?(Logger::TRACE)
-      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::ENTER_GENERATED_METHOD
+% if aop_logger.visible?(Logging::TRACE)
+      aspect.aop_logger.log <%= Logging::TRACE %>, '<%= method %>', 'enter-generated-method'
 % end
 
       if aspect.aop_disabled?
-% if aop_logger.visible?(Logger::TRACE)
-        aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::EXIT_BECAUSE_DISABLED
+% if aop_logger.visible?(Logging::TRACE)
+        aspect.aop_logger.log <%= Logging::TRACE %>, '<%= method %>', 'exit--generated-method'
 % end
         return orig_method.bind(self).call(*args, &block)
       end
 
 % if is_outermost
-    result = catch(:aop_returns) do
+      result = catch(:aop_returns) do
 % end
 
 % unless before_advices.empty?
-      # Before advices
+        # Before advices
 % end
 % before_advices.each do |advice|
-%   if aop_logger.visible?(Logger::TRACE)
-      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::BEFORE_INVOKE_ADVICE, '<advice <%= advice.index %>>'
+%   if aop_logger.visible?(Logging::TRACE)
+        aspect.aop_logger.log <%= Logging::TRACE %>, '<%= method %>', 'before-invoke-advice', '<advice <%= advice.index %>>'
 % end
-      result = <%= advice.with_method %> <%
-        if advice.options[:aspect_arg] %>aspect, <% end %><%
-        if advice.options[:method_arg] %>'<%= method %>', <% end
-        %>*args
-% if aop_logger.visible?(Logger::TRACE)
-      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::AFTER_INVOKE_ADVICE, '<advice <%= advice.index %>>'
+        result = <%= advice.with_method %> <%
+          if advice.options[:aspect_arg] %>aspect, <% end %><%
+          if advice.options[:method_arg] %>'<%= method %>', <% end
+          %>*args
+% if aop_logger.visible?(Logging::TRACE)
+        aspect.aop_logger.log <%= Logging::TRACE %>, '<%= method %>', 'after--invoke-advice', '<advice <%= advice.index %>>'
 % end
 %   if advice.options[:skip_if_false]
-      unless result
-% if aop_logger.visible?(Logger::TRACE)
-        aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::EXIT_FROM_BEFORE_FILTER, '<advice <%= advice.index %>>'
+        unless result
+% if aop_logger.visible?(Logging::TRACE)
+          aspect.aop_logger.log <%= Logging::TRACE %>, '<%= method %>', 'exit-method-due-to-before-filter', '<advice <%= advice.index %>>'
 % end
-        return
+          return
       end
 %   end
 % end
 
 % if around_advice
-      # Around advice
-% if aop_logger.visible?(Logger::TRACE)
-      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::BEFORE_INVOKE_ADVICE, '<advice <%= around_advice.index %>>'
+        # Around advice
+% if aop_logger.visible?(Logging::TRACE)
+        aspect.aop_logger.log <%= Logging::TRACE %>, '<%= method %>', 'before-invoke-advice', '<advice <%= around_advice.index %>>'
 % end
-% if aop_logger.visible?(Logger::TRACE)
-      proxy = lambda do |*args, &block|
-        aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::BEFORE_INVOKE_PROXY
-        res = wrapped_method.bind(self).call *args, &block
-        aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::AFTER_INVOKE_PROXY
-        res
-      end
-      result = <%= around_advice.with_method %> <%
-        if around_advice.options[:aspect_arg] %>aspect, <% end %><%
-        if around_advice.options[:method_arg] %>'<%= method %>', <% end
-        %>proxy, *args, &block
+% if aop_logger.visible?(Logging::TRACE)
+        proxy = lambda do |*args, &block|
+          aspect.aop_logger.log <%= Logging::TRACE %>, '<%= method %>', 'before-invoke-proxy'
+          res = wrapped_method.bind(self).call *args, &block
+          aspect.aop_logger.log <%= Logging::TRACE %>, '<%= method %>', 'after--invoke-proxy'
+          res
+        end
+        result = <%= around_advice.with_method %> <%
+          if around_advice.options[:aspect_arg] %>aspect, <% end %><%
+          if around_advice.options[:method_arg] %>'<%= method %>', <% end
+          %>proxy, *args, &block
 % else
-      result = <%= around_advice.with_method %> <%
-        if around_advice.options[:aspect_arg] %>aspect, <% end %><%
-        if around_advice.options[:method_arg] %>'<%= method %>', <% end
-        %>wrapped_method.bind(self), *args, &block
+        result = <%= around_advice.with_method %> <%
+          if around_advice.options[:aspect_arg] %>aspect, <% end %><%
+          if around_advice.options[:method_arg] %>'<%= method %>', <% end
+          %>wrapped_method.bind(self), *args, &block
 % end
-% if aop_logger.visible?(Logger::TRACE)
-      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::AFTER_INVOKE_ADVICE, '<advice <%= around_advice.index %>>'
+% if aop_logger.visible?(Logging::TRACE)
+        aspect.aop_logger.log <%= Logging::TRACE %>, '<%= method %>', 'after--invoke-advice', '<advice <%= around_advice.index %>>'
 % end
 
 % else
 
-      # Invoke original method
-% if aop_logger.visible?(Logger::TRACE)
-      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::BEFORE_WRAPPED_METHOD
+        # Invoke original method
+% if aop_logger.visible?(Logging::TRACE)
+        aspect.aop_logger.log <%= Logging::TRACE %>, '<%= method %>', 'before-wrapped-method'
 % end
-      result = orig_method.bind(self).call *args, &block
-% if aop_logger.visible?(Logger::TRACE)
-      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::AFTER_WRAPPED_METHOD
+        result = orig_method.bind(self).call *args, &block
+% if aop_logger.visible?(Logging::TRACE)
+        aspect.aop_logger.log <%= Logging::TRACE %>, '<%= method %>', 'after--wrapped-method'
 % end
 
 % end
 
 % unless after_advices.empty?
-      # After advices
+        # After advices
 %   after_advices.each do |advice|
-% if aop_logger.visible?(Logger::TRACE)
-      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::BEFORE_INVOKE_ADVICE, '<advice <%= advice.index %>>'
+% if aop_logger.visible?(Logging::TRACE)
+        aspect.aop_logger.log <%= Logging::TRACE %>, '<%= method %>', 'before-invoke-advice', '<advice <%= advice.index %>>'
 % end
 %     if advice.options[:result_arg]
-      result = <%= advice.with_method %> <%
-        if advice.options[:aspect_arg] %>aspect, <% end %><%
-        if advice.options[:method_arg] %>'<%= method %>', <% end %><%
-        if advice.options[:result_arg] %>result, <% end
-        %>*args
+        result = <%= advice.with_method %> <%
+          if advice.options[:aspect_arg] %>aspect, <% end %><%
+          if advice.options[:method_arg] %>'<%= method %>', <% end %><%
+          if advice.options[:result_arg] %>result, <% end
+          %>*args
 %     else
-      <%= advice.with_method %> <%
-        if advice.options[:aspect_arg] %>aspect, <% end %><%
-        if advice.options[:method_arg] %>'<%= method %>', <% end
-        %>*args
+        <%= advice.with_method %> <%
+          if advice.options[:aspect_arg] %>aspect, <% end %><%
+          if advice.options[:method_arg] %>'<%= method %>', <% end
+          %>*args
 %     end
-% if aop_logger.visible?(Logger::TRACE)
-      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::AFTER_INVOKE_ADVICE, '<advice <%= advice.index %>>'
+% if aop_logger.visible?(Logging::TRACE)
+        aspect.aop_logger.log <%= Logging::TRACE %>, '<%= method %>', 'after--invoke-advice', '<advice <%= advice.index %>>'
 % end
 %   end
 % end
 
 % if is_outermost
-      result
+        result
 
-    end # end of catch
+      end # end of catch
 % end
 
-% if aop_logger.visible?(Logger::TRACE)
-      aspect.aop_logger.log_method_call '<%= method %>', Aspector::Logger::EXIT_GENERATED_METHOD
+% if aop_logger.visible?(Logging::TRACE)
+      aspect.aop_logger.log <%= Logging::TRACE %>, '<%= method %>', 'exit--generated-method'
 % end
       result
     end

data/lib/aspector/base_class_methods.rb

@@ -4,7 +4,7 @@ module Aspector
       ::Aspector::Base.extend(self)
 
       def aop_enable
-        aop_logger.log Logger::ENABLE_ASPECT
+        aop_logger.log Logging::INFO, 'enable-aspect'
         send :define_method, :aop_disabled? do
         end
 
@@ -13,7 +13,7 @@ module Aspector
       alias enable aop_enable
 
       def aop_disable
-        aop_logger.log Logger::DISABLE_ASPECT
+        aop_logger.log Logging::INFO, 'disable-aspect'
         send :define_method, :aop_disabled? do
           true
         end
@@ -22,11 +22,19 @@ module Aspector
       end
       alias disable aop_disable
 
+      # if ENV["ASPECTOR_LOGGER"] is set, use it
+      # else try to load logem and use Logem::Logger
+      # else use built in logger
       def aop_logger
-        @aop_logger ||= Logger.new(self)
+        @aop_logger ||= Logging.get_logger(self)
       end
       alias logger aop_logger
 
+      def aop_logger= logger
+        @aop_logger = logger
+      end
+      alias logger= aop_logger=
+
       def aop_advices
         @aop_advices ||= []
       end
@@ -42,7 +50,7 @@ module Aspector
 
         targets = rest.unshift target
         result = targets.map do |target|
-          aop_logger.log Logger::APPLY, target, options.inspect
+          aop_logger.log Logging::INFO, 'apply', target, options.inspect
           aspect_instance = new(target, options)
           aspect_instance.send :aop_apply
           aspect_instance
@@ -64,7 +72,7 @@ module Aspector
       def aop_before *methods, &block
         aop_advices << advice = aop_create_advice(Aspector::AdviceMetadata::BEFORE, self, methods, &block)
         advice.index = aop_advices.size
-        aop_logger.log Logger::DEFINE_ADVICE, advice
+        aop_logger.log Logging::INFO, 'define-advice', advice
         advice
       end
       alias before aop_before
@@ -72,7 +80,7 @@ module Aspector
       def aop_before_filter *methods, &block
         aop_advices << advice = aop_create_advice(Aspector::AdviceMetadata::BEFORE_FILTER, self, methods, &block)
         advice.index = aop_advices.size
-        aop_logger.log Logger::DEFINE_ADVICE, advice
+        aop_logger.log Logging::INFO, 'define-advice', advice
         advice
       end
       alias before_filter aop_before_filter
@@ -80,7 +88,7 @@ module Aspector
       def aop_after *methods, &block
         aop_advices << advice = aop_create_advice(Aspector::AdviceMetadata::AFTER, self, methods, &block)
         advice.index = aop_advices.size
-        aop_logger.log Logger::DEFINE_ADVICE, advice
+        aop_logger.log Logging::INFO, 'define-advice', advice
         advice
       end
       alias after aop_after
@@ -88,7 +96,7 @@ module Aspector
       def aop_around *methods, &block
         aop_advices << advice = aop_create_advice(Aspector::AdviceMetadata::AROUND, self, methods, &block)
         advice.index = aop_advices.size
-        aop_logger.log Logger::DEFINE_ADVICE, advice
+        aop_logger.log Logging::INFO, 'define-advice', advice
         advice
       end
       alias around aop_around
@@ -96,7 +104,7 @@ module Aspector
       def aop_raw *methods, &block
         aop_advices << advice = aop_create_advice(Aspector::AdviceMetadata::RAW, self, methods, &block)
         advice.index = aop_advices.size
-        aop_logger.log Logger::DEFINE_ADVICE, advice
+        aop_logger.log Logging::INFO, 'define-advice', advice
         advice
       end
       alias raw aop_raw

data/lib/aspector/logger.rb

@@ -1,67 +1,23 @@
 module Aspector
   class Logger
-    # Log levels
-    ERROR = 50
-    WARN  = 40
-    INFO  = 30
-    DEBUG = 20
-    TRACE = 10
-
-    DEFAULT_VISIBLE_LEVEL = INFO
-
-    # Actions
-    DEFINE_ADVICE          = ["define-advice"  , INFO]
-    APPLY                  = ["apply"          , INFO]
-    APPLY_TO_METHOD        = ["apply-to-method", DEBUG]
-    ENABLE_ASPECT          = ["enable-aspect"  , INFO]
-    DISABLE_ASPECT         = ["disable-aspect" , INFO]
-    GENERATE_CODE          = ["generate-code"  , DEBUG]
-
-    ENTER_GENERATED_METHOD = ["enter-generated-method", TRACE]
-    EXIT_GENERATED_METHOD  = ["exit--generated-method", TRACE]
-    EXIT_BECAUSE_DISABLED  = ["exit--because-disabled", TRACE]
-    BEFORE_INVOKE_ADVICE   = ["before-invoke-advice"  , TRACE]
-    AFTER_INVOKE_ADVICE    = ["after--invoke-advice"  , TRACE]
-    BEFORE_WRAPPED_METHOD  = ["before-wrapped-method" , TRACE]
-    AFTER_WRAPPED_METHOD   = ["after--wrapped-method" , TRACE]
-    BEFORE_INVOKE_PROXY    = ["before-invoke-proxy"   , TRACE]
-    AFTER_INVOKE_PROXY     = ["after--invoke-proxy"   , TRACE]
-
-    # Unexpected behaviors
-    METHOD_NOT_FOUND       = ["method-not-found"      , WARN]
 
     attr_reader :context
-    attr_writer :level
+    attr_accessor :level
 
-    def initialize context, level = nil
+    def initialize context
       @context = context
-      @level = level
-    end
-
-    def level
-      return @level if @level
 
       if (level_string = ENV['ASPECTOR_LOG_LEVEL'])
         @level = string_to_level(level_string)
       else
-        @level = DEFAULT_VISIBLE_LEVEL
+        @level = Logging::DEFAULT_VISIBLE_LEVEL
       end
     end
 
-    def log action_level, *args
-      action, level = *action_level
-
-      return if self.level > level
-
-      puts log_prefix(level) << action << " | " << args.join(" | ")
-    end
-
-    def log_method_call method, action_level, *args
-      action, level = *action_level
-
+    def log level, *args
       return if self.level > level
 
-      puts log_prefix(level) << method << " | " << action << " | " << args.join(" | ")
+      puts log_prefix(level) << args.join(" | ")
     end
 
     def visible? level
@@ -71,7 +27,7 @@ module Aspector
     private
 
     def log_prefix level
-      s = "Aspector | " << level_to_string(level) << " | "
+      s = "#{Time.now} | Aspector | " << level_to_string(level) << " | "
       if context.is_a? Aspector::Base
         s << context.class.to_s << " | " << context.aop_target.to_s << " | "
       else
@@ -81,24 +37,25 @@ module Aspector
 
     def level_to_string level
       case level
-      when ERROR then "ERROR"
-      when WARN  then "WARN "
-      when INFO  then "INFO "
-      when DEBUG then "DEBUG"
-      when TRACE then "TRACE"
+      when Logging::ERROR then "ERROR"
+      when Logging::WARN  then "WARN "
+      when Logging::INFO  then "INFO "
+      when Logging::DEBUG then "DEBUG"
+      when Logging::TRACE then "TRACE"
       else level.to_s
       end
     end
 
     def string_to_level level_string
-      return DEFAULT_VISIBLE_LEVEL if level_string.nil? or level_string.strip == ''
+      return Logging::DEFAULT_VISIBLE_LEVEL if level_string.nil? or level_string.strip == ''
 
       case level_string.downcase
-      when 'error' then ERROR
-      when 'warn'  then WARN
-      when 'info'  then INFO
-      when 'debug' then DEBUG
-      when 'trace' then TRACE
+        when 'error' then Logging::ERROR
+        when 'warn'  then Logging::WARN
+        when 'info'  then Logging::INFO
+        when 'debug' then Logging::DEBUG
+        when 'trace' then Logging::TRACE
+        when 'none'  then Logging::NONE
       end
     end
   end

data/lib/aspector/logging.rb

@@ -0,0 +1,38 @@
+module Aspector
+  module Logging
+    # Log levels
+    NONE  = 10000
+    ERROR = 50
+    WARN  = 40
+    INFO  = 30
+    DEBUG = 20
+    TRACE = 10
+
+    DEFAULT_VISIBLE_LEVEL = INFO
+
+    def self.get_logger context
+      if logger_class_name = ENV["ASPECTOR_LOGGER"]
+        begin
+          logger_class = constanize(logger_class_name)
+          logger_class.new(context)
+        rescue => e
+          $stderr.puts e.message
+
+          Logger.new(context)
+        end
+      else
+        Logger.new(context)
+      end
+    end
+
+    private
+
+    def self.constanize class_name
+      unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)+)\z/ =~ class_name
+        raise NameError, "#{class_name} is not a valid constant name!"
+      end
+
+      Object.module_eval("::#{$1}", __FILE__, __LINE__)
+    end
+  end
+end

data/lib/aspector/module_extension.rb

@@ -20,7 +20,7 @@ module Aspector
 
         yield if block_given?
       ensure
-        remove_instance_variable aop_applied_flag
+        remove_instance_variable aop_applied_flag if instance_variable_defined? aop_applied_flag
       end
     end
 
@@ -44,7 +44,9 @@ module Aspector
 
         yield if block_given?
       ensure
-        eigen_class.send :remove_instance_variable, aop_applied_flag
+        if eigen_class.instance_variable_defined? aop_applied_flag
+          eigen_class.send :remove_instance_variable, aop_applied_flag
+        end
       end
     end
 

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ ENV["ASPECTOR_LOG_LEVEL"] ||= "warn"
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rubygems'
 require 'rspec'
 require 'rspec/autorun'
 require 'aspector'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aspector
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -199,6 +199,7 @@ files:
 - .irbrc
 - .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -212,6 +213,7 @@ files:
 - examples/aspector_apply_example.rb
 - examples/aspector_example.rb
 - examples/cache_aspect.rb
+- examples/design_by_contract.rb
 - examples/exception_handler.rb
 - examples/implicit_method_option_test.rb
 - examples/logging_aspect.rb
@@ -225,6 +227,7 @@ files:
 - lib/aspector/deferred_logic.rb
 - lib/aspector/deferred_option.rb
 - lib/aspector/logger.rb
+- lib/aspector/logging.rb
 - lib/aspector/method_matcher.rb
 - lib/aspector/module_extension.rb
 - lib/aspector/object_extension.rb
@@ -268,7 +271,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2407230077532113164
+      hash: 117622238641443179
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: