scribbler 0.1.3 → 0.2.3

data/lib/scribbler/base.rb

@@ -64,7 +64,6 @@ module Scribbler
       class_eval(&block)
       Base.include_in_application
       BaseIncluder.include_includeables
-      build_methods
     end
 
     # Simply returns the configurator class.
@@ -162,7 +161,7 @@ module Scribbler
     # Returns Nothing
     def self.apply_to_log(location, options={})
       if can_apply_to_log? location, options
-        File.open(find_file_at(location), 'a') do |f|
+        File.open log_at(location), 'a' do |f|
           f.puts build_with_template(options)
         end
       end
@@ -176,33 +175,6 @@ module Scribbler
          options[:custom_fields].present?)
     end
 
-    # Attempts to turn a symbol or string into the *_log_location method that
-    # was auto-build based on Configurator.logs and finds the file path
-    #
-    # location  - a string or symbol that will be turned into a *_log_location
-    #             method
-    #
-    # Examples
-    #
-    #   Base.find_file_at :a_file
-    #   # => <#Path:...>      # The method `a_file_log_location` exists
-    #
-    #   Base.find_file_at :another_file
-    #   # => :another_file    # The method `another_file_log_location` does not exist
-    #
-    # Returns Nothing
-    def self.find_file_at(location)
-      if location.is_a?(Symbol) or location.is_a?(String)
-        real_method = location.to_s + "_log_location"
-        if respond_to?(real_method)
-          location = send(real_method)
-        else
-          location = "#{config.log_directory.to_s}/#{location.to_s}"
-        end
-      end
-      location
-    end
-
     # If the config agrees, attempt to include our special methods
     # in the main application object.
     #

data/lib/scribbler/configurator.rb

@@ -22,20 +22,6 @@ module Scribbler
                          end
     end
 
-    # List of strings or symbols that represent logs we want methods
-    # generated for
-    #
-    # Default: []
-    #
-    # Examples
-    #
-    # Scribbler::Configurator.logs
-    # # => ['copy', 'destroy']
-    #
-    # Returns list of logs
-    def self.logs
-      @logs ||= []
-    end
 
     # Boolean used for deciding whether or not Scribbler should
     # define #*_log_location methods and a .log method in a rails application

data/lib/scribbler/includeables.rb

@@ -17,29 +17,32 @@ module Scribbler
 
   module Includeables
     extend ActiveSupport::Concern
+    module ClassMethods
+      def log_location_regex
+        /(?<file>.*)_log_location$/
+      end
 
-    included do
-      build_methods
-    end
+      # Public: defines methods for log location. The first element
+      # defines the prefix for the method so "subseason" = subseason_log_location.
+      # The second element defines the name of the logfile so "subseason" =
+      # root_of_app/log/subseason.log
+      #
+      # Examples
+      #
+      #   subseason_log_location
+      #   # => #<Pathname:/path_to_ngin/log/subseason_copy_structure.log>
+      #
+      # Returns Pathname to log
+      def method_missing(name, *args, &block)
+        (match = name.to_s.match log_location_regex) ? log_at(match[:file]) : super
+      end
 
-    module ClassMethods
-      def build_methods
-        # Public: defines methods for log location. The first element
-        # defines the prefix for the method so "subseason" = subseason_log_location.
-        # The second element defines the name of the logfile so "subseason" =
-        # root_of_app/log/subseason.log
-        #
-        # Examples
-        #
-        #   subseason_log_location
-        #   # => #<Pathname:/path_to_ngin/log/subseason_copy_structure.log>
-        #
-        # Returns Pathname to log
-        Scribbler::Base.config.logs.each do |value|
-          define_singleton_method "#{value}_log_location" do
-            File.join Scribbler::Configurator.log_directory, "#{value}.log"
-          end
-        end
+      def respond_to?(name)
+        (m = name.to_s.match log_location_regex) ? !!m : super
+      end
+
+      def log_at(file_name)
+        File.join Scribbler::Configurator.log_directory, "#{file_name}.log"
       end
 
       # Public: Save ourselves some repetition. Notifies error to NewRelic

data/lib/scribbler/version.rb

@@ -1,3 +1,3 @@
 module Scribbler
-  VERSION = '0.1.3'
+  VERSION = '0.2.3'
 end

data/spec/scribbler/base_spec.rb

@@ -35,7 +35,6 @@ module Scribbler
     describe "configure" do
       it "kicks off the module and sends includes" do
         subject.should_receive(:include_in_application).once
-        subject.should_receive(:build_methods).once # Twice if we didn't stub below method
         BaseIncluder.should_receive(:include_includeables).once
         subject.configure do
         end
@@ -124,32 +123,17 @@ module Scribbler
         options = { :message => "..." }
         file = mock(:puts => true)
         subject.should_receive(:build_with_template).with options
-        subject.should_receive(:send).with "test_log_log_location"
+        subject.should_receive(:log_at).with :test_log
         File.should_receive(:open).and_yield(file)
         subject.apply_to_log :test_log, options
       end
-    end
 
-    describe "find file at" do
       it "doesn't find a file method" do
         # in case we have bad config data lingering
         subject.stub(:respond_to?).with('test_log_log_location').and_return false
         subject.should_not_receive(:test_log_log_location)
         Rails.should_receive(:root).and_raise(NameError)
-        subject.find_file_at(:test_log).should == "#{subject.config.log_directory}/test_log"
-      end
-
-      it "finds a file method defined" do
-        subject.configure do
-          config.logs = %w[test_log]
-        end
-        subject.should_receive(:test_log_log_location).once
-        subject.find_file_at :test_log
-      end
-
-      it "isn't a string or a symbol and just returns the input" do
-        path = Pathname.new '/'
-        subject.find_file_at(path).should be(path)
+        subject.log_at(:test_log).should == "#{subject.config.log_directory}/test_log.log"
       end
     end
   end

data/templates/scribbler.rb

@@ -15,20 +15,6 @@ Scribbler::Base.configure do
   #
   # config.log_directory = File.new '/a/better/path'
   #
-  #
-  # A list of the logs you'd like location methods for. if the logs list
-  # has:
-  #
-  #   ['log1']
-  #
-  # You are afforded a Base.log1_log_location method and you may do:
-  #
-  #   Base.log :log1, ....
-  #
-  # REQUIRED
-  #
-  # config.logs = %w[log1 log2]
-  #
   # This option enables log templating. Each time you log a message you
   # can have it automatically wrapped in some sugar. The default is something
   # like:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scribbler
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -140,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2034944693787141554
+      hash: -3735178954186904383
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2034944693787141554
+      hash: -3735178954186904383
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24