evertils 0.3.22 → 0.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: defd9cbab62144b4b40c1c1b0f0b555cc23273e1
-  data.tar.gz: f502d4347c1f41a6a1afe8bbfc77faaae9278f6e
+  metadata.gz: 0b4bd61f2af2b06593fac31f09d04e7178dff145
+  data.tar.gz: 1f901acc3a972cbb973527ec47bdbd4e92fb99eb
 SHA512:
-  metadata.gz: d68f78b8627152733304f5a14c5afdfc811216582a7b6dbd7f7601af360a92420e3b1a76897000d9b58cc0e107d47107c7c562811301a4154fe58a329bb2b0ea
-  data.tar.gz: 4701bbacd9b46654cc616d93be6284dd2538f0cf708bb385cc7202d0d8fa8dd432c961bd71acbee8f622c53f26f91883e46253bad0db60193a48d029fe98fc84
+  metadata.gz: dd45e26d46697f7e71368a85c55c97985326abbd294e339e633f8baed0590a223be17d9699b7a5900df2afe1bc569967368415a08a9e57e648f57920663e6b12
+  data.tar.gz: dc9689defda9748be92ab0cb961821a6c47690d840a0d4a8c0bd18a5aa400870c759edfcf31ad2726e3eabbad0b265e7c36bc5ff25116fe1bd5a9b17b59c736e

data/lib/evertils/controllers/log.rb

@@ -9,8 +9,8 @@ module Evertils
       end
 
       # Send arbitrary text to the daily log
-      def message(text)
-        Notify.error('Text argument is required', {}) if text.nil?
+      def message(text = nil)
+        return Notify.error('A message is required', {}) if text.nil?
 
         note = @note_helper.wait_for(:Daily)
         edit_conf = {
@@ -18,6 +18,8 @@ module Evertils
           append: text
         }
 
+        return Notify.error("Note not found") if note.entity.nil?
+
         modify(note, edit_conf)
       end
 
@@ -36,7 +38,11 @@ module Evertils
 
         if nearest_ul.empty?
           node = xml_helper.ul(li)
-          target.children.before(node)
+          if target.children.size.zero?
+            target.add_child(node)
+          else
+            target.children.before(node)
+          end
         else
           nearest_ul.children.after(li)
         end

data/lib/evertils/helpers/api-enml-handler.rb

@@ -58,14 +58,18 @@ module Evertils
       # lets replace it with a new DTD if that is the case
       # @since 0.3.15
       def fix_dtd
-        if @xml.children[0].is_a?(Text)
+        node = @xml.children[0]
+
+        if node.is_a?(ProcessingInstruction)
+          node = node.next
+
           # remove the existing broken DTD
-          @xml.children[0].remove
+          node.remove
           # create a new one (note: output is overridden in DTD class defined
           # below ApiEnmlHandler)
           dtd = DTD.new('DOCTYPE', @xml)
 
-          @xml.children.first.before(dtd)
+          @xml.children.first.after(dtd)
         end
       end
 

data/lib/evertils/helpers/note.rb

@@ -3,8 +3,6 @@ module Evertils
     class Note
       attr_reader :model
 
-      MAX_SEARCH_SIZE = 21
-
       # Create the Note object
       def initialize
         @model = Evertils::Common::Query::Simple.new
@@ -18,13 +16,17 @@ module Evertils
         Notify.info("Waiting for #{notebook}...")
         note = find_note(notebook)
 
-        # didn't find it the first time?  wait and try again
-        if note.entity.nil?
-          (1..MAX_SEARCH_SIZE).each do |iter|
-            Notify.info(" (#{iter}) #{notebook}")
-            note = find_note(notebook, true)
-            break unless note.entity.nil? || iter == MAX_SEARCH_SIZE
+        begin
+          # didn't find it the first time?  wait and try again
+          if note.entity.nil?
+            (1..Evertils::Type::Base::MAX_SEARCH_SIZE).each do |iter|
+              Notify.info(" (#{iter}) #{notebook}")
+              note = find_note(notebook, true)
+              break unless note.entity.nil? || iter == Evertils::Type::Base::MAX_SEARCH_SIZE
+            end
           end
+        rescue Interrupt
+          Notify.warning('Cancelled wait')
         end
 
         note

data/lib/evertils/type.rb

@@ -4,7 +4,7 @@ module Evertils
       attr_reader :title, :content, :notebook
 
       COLOUR = 0xffffff
-      MAX_SEARCH_SIZE = 21
+      MAX_SEARCH_SIZE = 11
 
       #
       # @since 0.3.7

data/lib/evertils/version.rb

@@ -1,3 +1,3 @@
 module Evertils
-  VERSION = '0.3.22'.freeze
+  VERSION = '0.3.23'.freeze
 end

data/lib/evertils.rb

@@ -25,7 +25,6 @@ require 'evertils/helpers/results'
 require 'evertils/helpers/api-enml-handler'
 require 'evertils/config'
 require 'evertils/request'
-require 'evertils/utils'
 require 'evertils/controller'
 require 'evertils/router'
 require 'evertils/helper'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evertils
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.23
 platform: ruby
 authors:
 - Ryan Priebe
@@ -143,7 +143,6 @@ files:
 - lib/evertils/types/monthly.rb
 - lib/evertils/types/priority-queue.rb
 - lib/evertils/types/weekly.rb
-- lib/evertils/utils.rb
 - lib/evertils/version.rb
 homepage: http://rubygems.org/gems/evertils
 licenses:

data/lib/evertils/utils.rb

@@ -1,123 +0,0 @@
-module Evertils
-  class Utils
-    @cache = Hash.new
-
-    # Gets a list of files from the current directory with a specific extension
-    def self.get_files(ext)
-      @cache[:files] ||= Hash.new
-      @cache[:files][ext] ||= []
-
-      Dir["*.#{ext}"].each do |file|
-        @cache[:files][ext].push file
-      end
-
-      @cache[:files][ext]
-    end
-
-    # Gets a list of all files in the project with a specific extension
-    def self.get_all_files(ext, ignore_paths = '')
-      @cache[:files] ||= Hash.new
-      @cache[:files][ext] ||= []
-
-      if @cache[:files][ext].empty?
-        Dir["**/*.#{ext}"].each do |file|
-          if !ignore_paths.empty?
-            # file is a widget
-            if /\/#{ignore_paths}/.match(file)
-              @cache[:files][ext].push file
-            end
-          else
-            # file is not a widget
-            @cache[:files][ext].push file
-          end
-        end
-      end
-
-      @cache[:files][ext]
-    end
-
-    # Gets a list of files from the current git commit queue with a specific
-    # extension
-    def self.get_files_from_git(ext)
-      @cache[:files] ||= Hash.new
-      @cache[:files][ext] ||= []
-
-      modified_files = `git status --porcelain`.split("\n")
-      modified_files.each do |file|
-        if file.match(/#{ext}/)
-          @cache[:files][ext].push file.strip.match(/[A-Z ]+(.*)/)[1]
-        end
-      end
-
-      @cache[:files][ext]
-    end
-
-    # Generate a filename
-    def self.generate_path(branch, time, identifier)
-      # create the directory if needed
-      Logs.mkdir identifier
-
-      # create a new log file with a path based on the input parameters
-      #Log.new(identifier, branch, time)
-    end
-
-    # Convert hash keys to symbols
-    def self.symbolize_keys(hash)
-      Hash[hash.map{ |k, v| [k.to_sym, v] }]
-    end
-
-     # Create a directory wherever the script is called from, if required
-    def self.mklocaldir(name)
-      dir = "#{Dir.pwd}/#{name.downcase}/"
-
-      if !Dir.exist? dir
-        Dir.mkdir dir
-      else
-        dir
-      end
-    end
-
-    def self.os
-      begin
-        @os ||= (
-          host_os = RbConfig::CONFIG['host_os']
-          case host_os
-          when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-            :windows
-          when /darwin|mac os/
-            :macosx
-          when /linux/
-            :linux
-          when /solaris|bsd/
-            :unix
-          else
-            raise TypeError, "unknown os: #{host_os.inspect}"
-          end
-        )
-      rescue e
-        Notify.error("#{e}\n#{e.backtrace.join("\n")}", show_time: false)
-      end
-    end
-
-    def self.json?(string)
-      begin
-        !!JSON.parse(string)
-      rescue
-        false
-      end
-    end
-
-    def self.http_response_code(url = nil)
-      begin
-        request = Net::HTTP.get_response(URI.parse(url || "http://google.com"))
-        request.code.to_i
-      rescue
-        500
-      end
-    end
-
-    def self.has_internet_connection?
-      Utils.http_response_code < 499
-    end
-  end
-end