log4ever 0.0.2 → 0.0.3

data/Gemfile

@@ -2,4 +2,3 @@ source :rubygems
 gem 'log4r'
 gem 'active_support'
 gem 'nokogiri'
-

data/README.md

@@ -7,7 +7,7 @@ log4ever is simple logger for evernote. It is available as an extension of [log4
     require 'log4r/evernote'
 
     logger = Log4r::Logger.new("Evernote")
-    logger.outputters = Log4r::StdoutOutputter.new('console')
+    logger.level = Log4r::INFO
     formatter = Log4r::PatternFormatter.new(
         :pattern => "%d %C[%l]: %M ",
         :date_format => "%Y/%m/%d %H:%M:%Sm"
@@ -32,7 +32,15 @@ Output:
 
     2012-08-06 21:12:31 Evernote[INFO]: log output
 
-The output results are stored in Evernote.
+The output results are stored in Evernote.  
+
+###ChangeLog
+* 0.0.1
+First release.
+* 0.0.2
+Remove unnecessary processing.
+* 0.0.3
+If tag, notebook does not exist, it will be created.
 
 ##License
 Licensed under the MIT

data/lib/log4r/evernote.rb

@@ -15,7 +15,7 @@ require "Evernote/EDAM/note_store"
 require "Evernote/EDAM/limits_constants.rb"
 
 module Log4ever
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
   class TypeError < StandardError; end
   module ShiftAge
     DAILY = 1
@@ -28,6 +28,7 @@ module Log4r
   include Log4ever
   class MyEvernote
     @@note_store = nil
+    
     def initialize(env, auth_token)
       if @@note_store.nil?
         @env = env
@@ -54,7 +55,9 @@ module Log4r
     
     # get registerd tag list
     def get_tags(tag_names)
-      tag_names.map{|tag_name| get_tag(tag_name)}
+      tag_names.map do |tag_name|
+        get_tag(tag_name) || create_tag(tag_name)
+      end
     end
 
     # get registered tag object
@@ -62,11 +65,24 @@ module Log4r
       return if tag_name.empty?
       tag_name = to_ascii(tag_name)
       @@note_store.listTags(@@auth_token).each do |tag|
-        return tag if tag_name == tag.name
+        if tag_name == tag.name
+          Logger.log_internal { "Get tag: #{tag_name}" }
+          return tag
+        end
       end
       nil
     end
+    
+    # create tag object
+    def create_tag(tag_name)
+      tag = Evernote::EDAM::Type::Tag.new
+      tag.name = tag_name
+      tag_obj = @@note_store.createTag(@@auth_token, tag)
+      Logger.log_internal { "Create tag: #{tag_name}" }
+      tag_obj
+    end
 
+    # encode for evernote internal charset
     def to_ascii(str)
       str.force_encoding("ASCII-8BIT") unless str.nil?
     end
@@ -75,16 +91,37 @@ module Log4r
   class Notebook < MyEvernote
     def initialize(notebook_name, stack_name)
       return unless @notebook.nil?
+      get(notebook_name, stack_name) || create(notebook_name, stack_name)
+    end
+    
+    # get notebook object
+    def getNotebookObject; @notebook end
+    
+    # get notebook
+    def get(notebook_name, stack_name)
       @@note_store.listNotebooks(@@auth_token).each do |notebook|
         notebook_name = to_ascii(notebook_name)
         stack_name = to_ascii(stack_name)
         if notebook.name == notebook_name && notebook.stack == stack_name
+          Logger.log_internal { "Get notebook: #{stack_name}/#{notebook_name}" }
           @notebook = notebook
           break
         end
       end
+      return @notebook
     end
-
+    
+    # create notebook
+    def create(notebook_name, stack_name)
+      notebook = Evernote::EDAM::Type::Notebook.new
+      notebook.name = notebook_name
+      notebook.stack = stack_name
+      @notebook = @@note_store.createNotebook(@@auth_token, notebook)
+      Logger.log_internal { "Create notebook: #{stack_name}/#{notebook_name}" }
+      @notebook
+    end
+  
+    # notebook guid
     def guid; @notebook.guid end
 
     # clear notebook object
@@ -109,6 +146,9 @@ module Log4r
       getNote
     end
     
+    # get note object
+    def getNoteObject; @note end
+    
     # content size
     def size
       content.bytesize > 0 ? content.bytesize - XML_TEMPLATE_BYTE : 0

data/lib/log4r/outputter/evernoteoutputter.rb

@@ -45,26 +45,28 @@ module Log4r
     def canonical_log(logevent); super end
 
     def write(content)
-      @content = content
       if note_size_requires_roll? || time_requires_roll?
-        create_log
+        create_log(content)
       else
-        update_log
+        update_log(content)
       end
     end
 
     private
-    def create_log
+    # write log to note
+    def create_log(content)
       @note.clear
       @note.title = @name + " - " + Time.now.strftime("%Y-%m-%d %H:%M:%S")
       @note.tags = @tags
-      @note.content = @content
+      @note.content = content
       @note.create
       Logger.log_internal { "Create note: #{@note.guid}" }
     end
     
-    def update_log
-      @note.addContent(@content)
+    # update log in note
+    def update_log(content)
+      @note.addContent(content)
+      @note.tags = @tags
       @note.update
       Logger.log_internal { "Update note: #{@note.guid}" }
     end
@@ -74,10 +76,12 @@ module Log4r
       @note.size == 0 || (@maxsize > 0 && @note.size >= @maxsize)
     end
 
+  # whether or not to rotate rolling
     def time_requires_roll?
       !@endTime.nil? && Time.now.to_i >= @endTime
     end
-
+  
+  # max amount of log in note
     def set_maxsize(options)
       if options.has_key?(:maxsize) || options.has_key?('maxsize')
         maxsize = options[:maxsize] || options['maxsize']
@@ -104,24 +108,8 @@ module Log4r
         @maxsize = 0
       end
     end
-
-    def set_maxtime(options)
-      if options.has_key?(:maxtime) || options.has_key?('maxtime')
-        _maxtime = (options[:maxtime] or options['maxtime']).to_i
-        if _maxtime.class != Fixnum
-          raise TypeError, "Argument 'maxtime' must be an Fixnum", caller
-        end
-        if _maxtime == 0
-          raise TypeError, "Argument 'maxtime' must be > 0", caller
-        end
-        @maxtime = _maxtime
-        @startTime = Time.now
-      else
-        @maxtime = 0
-        @startTime = 0
-      end
-    end
     
+  # rolling interval
     def set_shift_age(options)
       if options.has_key?(:shift_age) || options.has_key?('shift_age')
         _shift_age = (options[:shift_age] or options['shift_age']).to_i
@@ -133,7 +121,6 @@ module Log4r
               Log4ever::ShiftAge::MONTHLY].include? _shift_age
             raise TypeError, "Argument 'shift_age' must be > 0", caller
           end
-          
           now = Time.now
           case _shift_age
           when Log4ever::ShiftAge::DAILY

data/log4ever.gemspec

@@ -10,6 +10,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "log4ever"
   gem.require_paths = ["lib"]
-  gem.version       = '0.0.2'
+  gem.version       = '0.0.3'
 end
 

data/spec/log4ever_spec.rb

@@ -34,19 +34,18 @@ describe Log4ever, 'が実行する処理' do
   before do
     @config_xml = Log4ever::config_xml
   end
-  
+
   describe 'Log4rのEvernote書き出し処理' do
     it '書き出しが成功すること' do
       log_content = "aaa"
       formatter_content = "\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}\s.*?\[.*?\]:\s(.*)\\n"
-      
-      logger.outputters = evernoteOutputter
+      @params[:maxsize] = 1
+      logger.outputters = EvernoteOutputter.new('evernote', @params)
       logger.debug(log_content)
-      
       @evernote = MyEvernote.new(@params[:env], @params[:auth_token])
       @notebook = @evernote.get_notebook(@params[:notebook], @params[:stack])
       @note = @evernote.get_note(@notebook)
-      write_log = @note.content_xml.children[1].children.reverse[1].text
+      write_log = @note.content_xml.children[1].children.reverse[0].text
       if /\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}\s.*?\[.*?\]:\s(.*)/ =~ write_log
         log_content.should == $1.strip
       else
@@ -91,4 +90,27 @@ describe Log4ever, 'が実行する処理' do
       }.should raise_error(ArgumentError)
     end
   end
+  
+  describe 'Log4everの処理' do
+    it 'ノートブックが存在しない場合、新規作成されること' do
+      logger.outputters = evernoteOutputter
+      @evernote = MyEvernote.new(@params[:env], @params[:auth_token])
+      notebook_name = Time.now.to_i.to_s
+      notebook = @evernote.get_notebook(notebook_name, @params[:stack])
+      obj = notebook.get(notebook_name, @params[:stack])
+      obj.name.should == notebook_name
+      obj.stack.should == @params[:stack]
+    end
+  
+    it 'タグが存在しない場合、新規作成されること' do
+      @params[:tags] = [Time.now.to_i.to_s]
+      @params[:maxsize] = 1
+      logger.outputters = EvernoteOutputter.new('evernote', @params)
+      logger.debug("test")
+      evernote = MyEvernote.new(@params[:env], @params[:auth_token])
+      notebook = evernote.get_notebook(@params[:notebook], @params[:stack])
+      note = evernote.get_note(notebook)
+      note.getNoteObject.tagGuids[0].should_not be_empty
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: log4ever
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 +09:00
+date: 2012-08-14 00:00:00.000000000 +09:00
 default_executable: 
 dependencies: []
 description: log4ever is simple logger for evernote. It is available as an extension
@@ -29,6 +29,7 @@ files:
 - config/evernote.auth.test.yml
 - config/log4r.xml
 - gem/log4ever-0.0.1.gem
+- gem/log4ever-0.0.2.gem
 - lib/log4r/evernote.rb
 - lib/log4r/evernote/lib/Evernote/EDAM/errors_constants.rb
 - lib/log4r/evernote/lib/Evernote/EDAM/errors_types.rb