evertils-common 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5c3bbd18a393a156658617c52141aac0f240d20
-  data.tar.gz: 3a2c99ccf274dd74564e4455ad99da612a5d8aeb
+  metadata.gz: 5373e916dd2c6812cf51d1fb29552c4a31e4e849
+  data.tar.gz: 411679ae6c66dfc2f84ed56eae1195409409a5b5
 SHA512:
-  metadata.gz: 4dfe0cb7e60bdf8df02e1310476bb651bd70fa4209bc6dfae4ddf97d02d8b1e2c9dcf362fa5d8f1e585a31967725a1c13a63ba58a429a7624d0b33ddb7deb4ef
-  data.tar.gz: 1da86f2c6fed45d76ba2a7a241c93dcc5828aa4cc29d949708fe270fbeb6e546559708f41185d993e3ef57ccdbaa8e4b1991ce03d73f003d7672b82631118c6f
+  metadata.gz: 31a683b20d62bff159d805ecff5345b9dd1e2d78673b10859f2886af7ec724bdb97fc142fe7dcfbcc9b566097f6defa71e78e70c015523a9d596b04f31e9e7f7
+  data.tar.gz: 98d9a69fedef985a87162eacdf63674fd771ac1bddd45e3ac5f04356c9c60100bfd5f25e13844e35d7c8bf1197291b66f97239910f0eb1bedb7707764b48a49d

data/.hound.yml

@@ -0,0 +1,2 @@
+ruby:
+  config_file: .rubocop.yml

data/.rubocop.yml

@@ -0,0 +1,320 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-07-26 11:49:15 -0600 using RuboCop version 0.42.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/DeprecatedClassMethods:
+  Exclude:
+    - 'lib/evertils/common/entity/notebooks.rb'
+
+# Offense count: 1
+Lint/ShadowingOuterLocalVariable:
+  Exclude:
+    - 'lib/evertils/test/base.rb'
+
+# Offense count: 1
+# Configuration parameters: ContextCreatingMethods.
+Lint/UselessAccessModifier:
+  Exclude:
+    - 'lib/evertils/common/authentication.rb'
+
+# Offense count: 9
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/evertils/common/entity/note.rb'
+    - 'lib/evertils/common/query/simple.rb'
+
+# Offense count: 10
+Metrics/AbcSize:
+  Max: 46
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 117
+
+# Offense count: 2
+Metrics/CyclomaticComplexity:
+  Max: 20
+
+# Offense count: 65
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 176
+
+# Offense count: 13
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 45
+
+# Offense count: 2
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 6
+
+# Offense count: 1
+Metrics/PerceivedComplexity:
+  Max: 11
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: prefer_alias, prefer_alias_method
+Style/Alias:
+  Exclude:
+    - 'lib/evertils/common/entity/note.rb'
+    - 'lib/evertils/common/entity/notes.rb'
+
+# Offense count: 1
+Style/ClassVars:
+  Exclude:
+    - 'lib/evertils/test/base.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/ColonMethodCall:
+  Exclude:
+    - 'lib/evertils/common/converter/yaml_to_enml.rb'
+    - 'lib/evertils/common/entity/note.rb'
+    - 'lib/evertils/common/entity/notebooks.rb'
+    - 'lib/evertils/common/entity/stack.rb'
+    - 'lib/evertils/test/base.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: Keywords.
+# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW
+Style/CommentAnnotation:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Exclude:
+    - 'lib/evertils/common/manager/note.rb'
+    - 'lib/evertils/common/manager/notebook.rb'
+    - 'lib/evertils/common/manager/tag.rb'
+
+# Offense count: 25
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/EmptyLines:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty_lines, no_empty_lines
+Style/EmptyLinesAroundClassBody:
+  Exclude:
+    - 'lib/evertils/common/converter/yaml_to_enml.rb'
+    - 'lib/evertils/test/base.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty_lines, no_empty_lines
+Style/EmptyLinesAroundModuleBody:
+  Exclude:
+    - 'lib/evertils/common.rb'
+    - 'lib/evertils/test.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
+Style/ExtraSpacing:
+  Exclude:
+    - 'Rakefile'
+    - 'lib/evertils/test/base.rb'
+
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/evertils/common/authentication.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, ruby19_no_mixed_keys, hash_rockets
+Style/HashSyntax:
+  Exclude:
+    - 'Rakefile'
+    - 'lib/evertils/common/authentication.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'Rakefile'
+    - 'lib/evertils/common/authentication.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: normal, rails
+Style/IndentationConsistency:
+  Exclude:
+    - 'lib/evertils/common/converter/yaml_to_enml.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/LeadingCommentSpace:
+  Exclude:
+    - 'test/test_notes.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/MethodCallParentheses:
+  Exclude:
+    - 'lib/evertils/common/enml.rb'
+
+# Offense count: 10
+# Cop supports --auto-correct.
+Style/NegatedIf:
+  Exclude:
+    - 'lib/evertils/common/enml.rb'
+    - 'lib/evertils/common/entity/note.rb'
+    - 'lib/evertils/common/entity/notebook.rb'
+    - 'lib/evertils/common/entity/notebooks.rb'
+    - 'lib/evertils/common/entity/stack.rb'
+    - 'lib/evertils/common/query/time.rb'
+    - 'lib/evertils/test/base.rb'
+
+# Offense count: 16
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedOctalStyle, SupportedOctalStyles.
+# SupportedOctalStyles: zero_with_o, zero_only
+Style/NumericLiteralPrefix:
+  Exclude:
+    - 'test/test_notes.rb'
+    - 'test/test_time_queries.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'lib/evertils/common/entity/notes.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'evertils-common.gemspec'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/PerlBackrefs:
+  Exclude:
+    - 'lib/evertils/common/kernel.rb'
+
+# Offense count: 3
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+Style/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/evertils/common.rb'
+    - 'lib/evertils/common/generic.rb'
+    - 'lib/evertils/test.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+Style/RedundantBegin:
+  Exclude:
+    - 'lib/evertils/common/authentication.rb'
+    - 'lib/evertils/common/entity/note.rb'
+    - 'lib/evertils/common/entity/notebooks.rb'
+    - 'lib/evertils/common/entity/stack.rb'
+    - 'lib/evertils/common/query/simple.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Exclude:
+    - 'lib/evertils/common/kernel.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment.
+Style/SpaceAroundOperators:
+  Exclude:
+    - 'Rakefile'
+    - 'lib/evertils/common/authentication.rb'
+    - 'lib/evertils/test/base.rb'
+
+# Offense count: 114
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
+# IgnoredMethods: respond_to, define_method
+Style/SymbolProc:
+  Exclude:
+    - 'lib/evertils/common/converter/yaml_to_enml.rb'
+    - 'lib/evertils/common/enml.rb'
+
+# Offense count: 32
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: final_newline, final_blank_line
+Style/TrailingBlankLines:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+# SupportedStyles: comma, consistent_comma, no_comma
+Style/TrailingCommaInLiteral:
+  Exclude:
+    - 'lib/evertils/common/authentication.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/TrailingWhitespace:
+  Exclude:
+    - 'lib/evertils/common/converter/yaml_to_enml.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/UnneededPercentQ:
+  Exclude:
+    - 'evertils-common.gemspec'
+
+# Offense count: 8
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: snake_case, camelCase
+Style/VariableName:
+  Exclude:
+    - 'lib/evertils/common/authentication.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Style/ZeroLengthPredicate:
+  Exclude:
+    - 'lib/evertils/common/authentication.rb'
+    - 'lib/evertils/test/base.rb'

data/Rakefile

@@ -18,6 +18,7 @@ task :cleanup do
   end
 end
 
+
 # hack from
 # http://stackoverflow.com/questions/1689504/how-do-i-make-a-rake-task-run-after-all-other-tasks-i-e-a-rake-afterbuild-tas
 current_tasks =  Rake.application.top_level_tasks

data/evertils-common.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'mime-types'
   spec.add_runtime_dependency "evernote-thrift"
-  spec.add_runtime_dependency "notifaction"
+  spec.add_runtime_dependency "notifaction", "~> 0.4.3"
 end

data/lib/evertils/common.rb

@@ -4,6 +4,8 @@ require 'yaml'
 require 'mime/types'
 require 'date'
 
+require 'evertils/common/kernel'
+require 'evertils/common/generic'
 require 'evertils/common/enml'
 require 'evertils/common/entity'
 require 'evertils/common/query'

data/lib/evertils/common/authentication.rb

@@ -2,7 +2,7 @@ require 'singleton'
 
 module Evertils
   module Common
-    class Authentication
+    class Authentication < Common::Generic
       include Singleton
 
       def initialize
@@ -16,6 +16,8 @@ module Evertils
 
           # prepare the main data model access point
           prepare_note_store
+        rescue Evernote::EDAM::Error::EDAMUserException => e
+          handle_edam_errors(e)
         rescue Evernote::EDAM::Error::EDAMSystemException => e
           handle_edam_errors(e)
         end
@@ -36,9 +38,10 @@ module Evertils
           else
             @noteStore.method(func.to_s).call(Evertils.token)
           end
+        rescue Evernote::EDAM::Error::EDAMUserException => e
+          handle_edam_errors(e)
         rescue Evernote::EDAM::Error::EDAMSystemException => e
-          Notify.warning e.inspect
-          nil
+          handle_edam_errors(e)
         end
       end
 
@@ -49,9 +52,10 @@ module Evertils
           else
             @userStore.method(func.to_s).call
           end
+        rescue Evernote::EDAM::Error::EDAMUserException => e
+          handle_edam_errors(e)
         rescue Evernote::EDAM::Error::EDAMSystemException => e
-          Notify.warning e.inspect
-          nil
+          handle_edam_errors(e)
         end
       end
 
@@ -64,6 +68,10 @@ module Evertils
         userStoreProtocol = Thrift::BinaryProtocol.new(userStoreTransport)
         @userStore = ::Evernote::EDAM::UserStore::UserStore::Client.new(userStoreProtocol)
         @user = call_user(:getUser, Evertils.token)
+        @major_ver = ::Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR
+        @minor_ver = ::Evernote::EDAM::UserStore::EDAM_VERSION_MINOR
+
+        @version = "#{@major_ver}.#{@minor_ver}"
 
         if Evertils.is_test?
           Notify.spit "TEST USER: #{info[:user]}"
@@ -79,16 +87,14 @@ module Evertils
       end
 
       def requires_update
-        #entity = @userStore.checkVersion("evernote-data", ::Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR, ::Evernote::EDAM::UserStore::EDAM_VERSION_MINOR)
-        entity = call_user(:checkVersion, "evernote-data", ::Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR, ::Evernote::EDAM::UserStore::EDAM_VERSION_MINOR)
-
-        @version = "#{::Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR}.#{::Evernote::EDAM::UserStore::EDAM_VERSION_MINOR}"
-
-        !entity
+        !call_user(:checkVersion, "evernote-data", @major_ver, @minor_ver)
       end
 
+      private
+
       def handle_edam_errors(e)
         Notify.warning("Problem authenticating, EDAM code #{e.errorCode}")
+        Notify.warning("Type: #{e.class}")
 
         case e.errorCode
         when 1
@@ -131,11 +137,10 @@ module Evertils
           minutes = (e.rateLimitDuration/60).to_i
           message = "You are rate limited!  Wait #{minutes} minutes"
         end
-        
+
         Notify.warning(message)
         exit(0)
       end
-
     end
   end
 end