log4ever 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1d08242eefdcd15ca81557ddf95daa8ee7fef2a
-  data.tar.gz: e4d0d198403e78215622fc67b116d925d4f421e6
+  metadata.gz: 45ccb7dce4c1abba539b3fed3173d955ff910090
+  data.tar.gz: 535bc6d931b3934a4558d7a76dd9cecdec8dd5e2
 SHA512:
-  metadata.gz: 874d33d73d14c566a07ce1d6529de7b47616f9e0b4d62fa507d1de2770ce95fe4ed16dd5c5aa6ca5686c067f35013eac4b835e8a448ff188be59b061f277209f
-  data.tar.gz: 92858b9c5d65b9bf2d9e45cf561426131460c5dd946a1b1352f4e7b9eb026346790ac61b7674f226559f43ac86ddbf2c177f93b4727afbb8605a378a98a43ab6
+  metadata.gz: 445d7adcc42c86df9583c9fda61ac7dd69ca6c497415a11d246df6337e0d82bd238c96af5e54250de802b29e2788d59c0edd89a008c12b4386b3d56dfa0be566
+  data.tar.gz: 8d1acff1092c8dbf5643ffb262ab7bd74a052dad4d1f914e58e6bf0e4db8014095212953e49fcdbd99fefc99f3d4deeaad49e3c30f1f9b48fce907ab68bb3473

data/README.md

@@ -66,6 +66,8 @@ Bug fix.
 Ruby2.0.0 support. Bug fix.
 * 0.1.4
 Add testcase.
+* 0.1.5
+Performance improvement.
 
 ##License
 Licensed under the MIT

data/lib/log4r/evernote.rb

@@ -3,7 +3,7 @@ require 'log4r/outputter/evernoteoutputter'
 require 'evernote_oauth'
 
 module Log4ever
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 
   class EvernoteError < StandardError; end
 
@@ -39,17 +39,20 @@ module Log4ever
     # get registered notebook or create new notebook
     # search the notebook under the stack if stack_name specific
     def notebook
-      Notebook.new(@@auth_store)
+      @notebook = Notebook.new(@@auth_store) if @notebook.nil?
+      @notebook
     end
 
     # get registered note or create new note
     def note(notebook)
-      Note.new(notebook, @@auth_store)
+      @note = Note.new(notebook, @@auth_store) if @note.nil?
+      @note
     end
 
     # get registered tag or create new tag
     def tag(note)
-      Tag.new(note, @@auth_store)
+      @tag = Tag.new(note, @@auth_store) if @tag.nil?
+      @tag
     end
   end
 
@@ -76,14 +79,7 @@ module Log4ever
         end
       end
       # create new notebook if notebook is nil
-      create(notebook_name, stack_name) if @notebook.nil?
-      @notebook
-    end
-
-    # get newest notebook
-    def get!(notebook_name, stack_name = nil)
-      clear
-      get(notebook_name, stack_name)
+      @notebook || create(notebook_name, stack_name)
     end
 
     # create notebook
@@ -112,23 +108,21 @@ module Log4ever
   end
 
   class Note
-    XML_TEMPLATE_BYTE = 237
-
     def initialize(notebook, auth_store)
       return unless @params.nil? || @params.empty?
       @params = {}
-      @auth_store = auth_store
-      @notebook = notebook
-      if !@notebook.kind_of? ::Evernote::EDAM::Type::Notebook
-        raise EvernoteError, "Expected kind of Notebook, got #{@notebook.class}", caller
-      elsif !@notebook.respond_to? 'guid'
-        raise NoMethodError, "#{@notebook.class} do not has method: guid", caller
+      if !notebook.kind_of? ::Evernote::EDAM::Type::Notebook
+        raise EvernoteError, "Expected kind of Notebook, got #{notebook.class}", caller
+      elsif !notebook.respond_to? 'guid'
+        raise NoMethodError, "#{notebook.class} do not has method: guid", caller
       end
+      @notebook = notebook
+      @auth_store = auth_store
     end
 
     # content size
     def size
-      content.bytesize > 0 ? content.bytesize - XML_TEMPLATE_BYTE : 0
+      content.bytesize
     end
 
     # note guid
@@ -164,10 +158,22 @@ module Log4ever
       "<div style=\"font-family: Courier New\">" + text + "</div></en-note>"
     end
 
+    # get note content text
+    def content
+      return @content_ unless @content_.nil?
+      @note.nil? and get
+      @content_ = !@note.nil? && !@note.guid.nil? ? @auth_store.note_store.getNoteContent(@auth_store.auth_token, @note.guid) : ""
+    end
+
+    # get note content xml object
+    def content_xml
+      return @content_xml unless @content_xml.nil?
+      @content_xml = Nokogiri::XML(content)
+    end
+
     # create note
     def create
       @auth_store.note_store.createNote(@auth_store.auth_token, createNote)
-      clear
     end
 
     # update note
@@ -175,13 +181,6 @@ module Log4ever
       @auth_store.note_store.updateNote(@auth_store.auth_token, updateNote)
     end
 
-    # clear note object
-    def clear
-      @params = {}
-      @note = @content_ = @content_xml = nil
-      initialize(@notebook)
-    end
-
     # get latest note object
     def get
       return @note unless @note.nil?
@@ -200,10 +199,9 @@ module Log4ever
       @note
     end
 
-    # get latest note object(newest object)
+    # force get latest note object
     def get!
-      clear
-      get
+      clear and get
     end
 
     # create note object
@@ -228,22 +226,9 @@ module Log4ever
       Time.at(ut.to_f)
     end
 
-    # get note content text
-    def content
-      return @content_ unless @content_.nil?
-      @note.nil? and get
-      @content_ = !@note.nil? && !@note.guid.nil? ? @auth_store.note_store.getNoteContent(@auth_store.auth_token, @note.guid) : ""
-    end
-
-    # get note content xml object
-    def content_xml
-      return @content_xml unless @content_xml.nil?
-      @content_xml = Nokogiri::XML(content)
-    end
-
-    # clear note object
+    # clear
     def clear
-      @note = nil
+      @note = @content_ = @content_xml = nil
     end
   end
 
@@ -271,18 +256,6 @@ module Log4ever
       end
     end
 
-    # get newest tag objects
-    def get!
-      clear
-      get
-    end
-
-    # clear note object
-    def clear
-      @tags = nil
-      @tag_guids = nil
-    end
-
     private
     # create tag object
     def create(tag_name)

data/lib/log4r/outputter/evernoteoutputter.rb

@@ -13,41 +13,41 @@ module Log4r
     def initialize(_name, hash = {})
       super(_name, hash)
       validate(hash)
-    end
-
-    # synchronize note
-    def sync
-      @note = @evernote.note(@notebook)
-      @tag = @evernote.tag(@note)
+      evernote = Log4ever::Evernote.new(@auth_token, @is_sandbox)
+      @notebook = evernote.notebook.get(@notebook_name, @stack_name)
+      @note = evernote.note(@notebook)
+      @tag = evernote.tag(@note)
       @tag.names = @tags
-      set_maxsize(@hash) # for rolling
-      set_shift_age(@hash) # for rolling
+      set_maxsize(hash)   # for rolling
+      set_shift_age(hash) # for rolling
+      @hash = hash
     end
 
     # validation of evernote parameters
     def validate(hash)
-      is_sandbox = hash[:sandbox] || hash['sandbox'] || false
-      raise ArgumentError, "Sandbox must be type of boolean" unless is_sandbox == false || is_sandbox == true
+      @is_sandbox = hash[:sandbox] || hash['sandbox'] || false
+      raise ArgumentError, "Sandbox must be type of boolean" unless @is_sandbox == false || @is_sandbox == true
       @auth_token = hash[:auth_token] || hash['auth_token'] || ""
       raise ArgumentError, "Must specify from auth token" if @auth_token.empty?
-      notebook_name = to_utf8(hash[:notebook] || hash['notebook'] || "")
-      raise ArgumentError, "Must specify from notebook" if notebook_name.empty?
-      stack_name = to_utf8(hash[:stack] || hash['stack'])
-      @evernote = Log4ever::Evernote.new(@auth_token, is_sandbox)
+      @notebook_name = to_utf8(hash[:notebook] || hash['notebook'] || "")
+      raise ArgumentError, "Must specify from notebook" if @notebook_name.empty?
+      @stack_name = to_utf8(hash[:stack] || hash['stack'])
       @tags = to_utf8(hash[:tags] || hash['tags'] || [])
-      notebook = @evernote.notebook
-      @notebook = notebook.get(notebook_name, stack_name)
-      @hash = hash
-      sync
     end
 
     def canonical_log(logevent); super end
 
+    # sync
+    def sync_note
+      @note.get!
+      update_maxtime(@hash) # update rolling status
+    end
+
     # write log
     def write(content)
-      sync
       if note_size_requires_roll? || time_requires_roll? || different_tag?
         create_log(content)
+        sync_note
       else
         update_log(content)
       end
@@ -56,7 +56,6 @@ module Log4r
     private
     # write log to note
     def create_log(content)
-      @note.clear
       @note.title = to_utf8(@name) + " - " + Time.now.strftime("%Y-%m-%d %H:%M:%S")
       @note.tags = @tag.get
       @note.content = to_utf8(content)
@@ -74,7 +73,7 @@ module Log4r
 
     # more expensive, only for startup
     def note_size_requires_roll?
-      @note.size == 0 || (@maxsize > 0 && @note.size >= @maxsize)
+      @note.size == 0 || (@maxsize > 0 && @note.size > @maxsize)
     end
 
     # whether or not to rotate
@@ -145,6 +144,8 @@ module Log4r
       end
     end
 
+    alias_method :update_maxtime, :set_shift_age
+
     # encode for evernote internal charset
     # convert character encoding to UTF-8 from Shift_JIS or EUC-JP
     def to_utf8(mixed)

data/log4ever.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency('activesupport', '>= 4.0.4')
   gem.add_dependency('i18n', '>= 0.6.9')
   gem.add_dependency('evernote_oauth', '>= 0.2.3')
-  gem.version       = '0.1.4'
+  gem.version       = '0.1.5'
   gem.license       = 'MIT'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log4ever
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - mapserver2007
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r