gnomikologikon-fortune 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce4dc01ee4c3d6ab5fc8ccf97fb38775fcd6563ec4233219768d5571f2d629c6
-  data.tar.gz: 95bb3c956ed93f74321af37c6bc05c315621afabb973af9db28678e5068f22bb
+  metadata.gz: dab21852657c1964bbcc1dedfa7f332bc75fdfa3724050eed63f3c39931bb415
+  data.tar.gz: c4456a60d52755901461ec4e1415da71969dbdd35404520dfbf263d50ca08501
 SHA512:
-  metadata.gz: a007e3038bec41a3c20b13aba61d7214e01922b29cacbbaaad789de8e31ced3173be31ca4ffd5bdd7a9c0a60bc111a75608c5e17e941005796b453825c5a568c
-  data.tar.gz: 8feaba3f9b015a7fad6f8c30ce22a70720fa4eff873c4b03ece8d7c8bd5580acc4cfae64c9212dfe8c33a68e22570cddfd74b544e315f323d6c3a4d620e4c439
+  metadata.gz: 38873acd2a993c18de756e44e40a542d7a9c96fd6fcbf342976ec00c40a15eb5a4eed7f841b84be78a8d06d2da9b54370992b5606f6ffed2e987f2be75246c8e
+  data.tar.gz: 2653fcd2086ea4d99bb931c4d2ceb3648b8bdda26db0d4c528893b8f61b5c32f7fad0a84325ec25221d2b922fb386d1f5e5d896c489e12a2ab75d56f9c62c8f0

data/Gemfile.lock

@@ -1,47 +1,47 @@
 PATH
   remote: .
   specs:
-    gnomikologikon-fortune (1.0.2)
+    gnomikologikon-fortune (1.0.3.pre.dev)
       httparty
-      nokogiri (~> 1.10)
+      nokogiri (~> 1.12.5)
       ruby-progressbar
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
-    httparty (0.18.1)
+    ast (2.4.2)
+    httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
-    minitest (5.14.3)
+    mime-types-data (3.2021.0901)
+    minitest (5.14.4)
     multi_xml (0.6.0)
-    nokogiri (1.11.1-x86_64-linux)
+    nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     racc (1.5.2)
     rainbow (3.0.0)
-    rake (13.0.3)
-    rdoc (6.3.0)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
-    rubocop (1.8.1)
+    rake (13.0.6)
+    rdoc (6.3.2)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rubocop (1.22.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
+    rubocop-ast (1.12.0)
+      parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   x86_64-linux
@@ -54,4 +54,4 @@ DEPENDENCIES
   rubocop (~> 1.7)
 
 BUNDLED WITH
-   2.2.5
+   2.2.27

data/gnomikologikon-fortune.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.description   = "This is a ruby application that downloads quotes from https://gnomikologikon.gr and
                         automatically converts them to files that can be used with the fortune command."
   spec.homepage      = "https://github.com/teogramm/gnomikologikon-fortune"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org/"
 
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = `git ls-files -- exe/*`.split("\n").map { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "nokogiri", "~>1.10"
+  spec.add_dependency "nokogiri", "~>1.12.5"
   spec.add_dependency "httparty"
   spec.add_dependency "ruby-progressbar"
 

data/lib/gnomikologikon/ui.rb

@@ -71,41 +71,57 @@ module Gnomika
   private
 
   ##
-  # Converts given selection into an array of indexes.
+  # Converts given selection into an array of integers.
   # Throws an ArgumentError if the selection is invalid. An error message is included in the exception.
   # This function must be used with a single selection (e.g 3 or 3-5), not with a list of many selections (e.g 1,2,3...)
-  # @param selection String of the selection
-  # @param max_available_index Used w
-  # @return Array of indexes included in the selection
-  def self.selection_to_array(selection, max_available_index)
+  # @param selection_string String of the selection
+  # @param max_available_index Maximum allowed value
+  # @return Array with the selected items
+  def self.selection_to_array(selection_string, max_available_index)
+    selection = []
     # Check if selection is a range
-    if selection.include?("-")
-      # Try to process it as a range
-      range_start, range_end = selection.split("-")
-      begin
-        range_start = Integer(range_start)
-        range_end = Integer(range_end)
-        # Check if range is correct. Start must be smaller or equal than end and end must be smaller or equal
-        # to max_available index
-        if range_start > range_end || range_end > max_available_index || range_start < 1
-          raise ArgumentError
-        end
-        return (range_start..range_end).to_a
-      rescue ArgumentError
-        raise ArgumentError.new "Invalid range! (#{selection.strip})"
-      end
-    else
-      # Assume selection is an integer
-      begin
-        number = Integer(selection)
+    begin
+      if selection_string.include?("-")
+        # Try to process it as a range
+        selection = process_range(selection_string,max_available_index)
+      else
+        # Assume selection is an integer
+        number = Integer(selection_string)
         # Check limits
         if number < 1 || number > max_available_index
-          raise ArgumentError
+          raise ArgumentError.new "Invalid selection! (#{selection_string.strip})"
         end
-        return [number]
-      rescue
-        raise ArgumentError.new "Invalid selection! (#{selection.strip})"
+        selection = [number]
       end
+    rescue ArgumentError => e
+      raise e
+    end
+    selection
+  end
+
+  ##
+  # Tries to convert given string to a range of integers. Input string must be of the form a-b
+  # @param upper_limit Maximum allowed value
+  # @return Array of integers in the range
+  # @raise ArgumentError if given selection string is not a valid range
+  def self.process_range(selection_string, upper_limit)
+    range_start, range_end = selection_string.split("-")
+    range_start = Integer(range_start)
+    range_end = Integer(range_end)
+    # Check if range is correct. Start must be smaller or equal than end and end must be smaller or equal
+    # to upper_limit
+    unless is_valid_range?(range_start,range_end,upper_limit)
+      raise ArgumentError.new "Invalid range! (#{selection_string.strip})"
     end
+    (range_start..range_end).to_a
+  end
+
+  ##
+  # Checks if a range with the given parameters is valid. A range is valid if:
+  # 1. start <= end
+  # 2. end <= upper_limit
+  # 3. start > 0
+  def self.is_valid_range?(range_start,range_end,upper_limit)
+    not (range_start > range_end || range_end > upper_limit || range_start < 1)
   end
-end
+end

data/lib/gnomikologikon/version.rb

@@ -2,6 +2,6 @@
 
 module Gnomika
   module Ruby
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/lib/gnomikologikon/web_processing.rb

@@ -18,9 +18,7 @@ module Gnomika
     doc = Nokogiri::HTML.parse(response.body)
     # Each "big" category is stored in a table with class "authrst"
     category_tables = doc.xpath("//table[@class='authrst']")
-
     categories = []
-
     category_tables.each do |table|
       # Get category name. Category names are stored in td elements with class "authrsh"
       category_name = table.xpath("tr/td[@class='authrsh']").text
@@ -69,24 +67,7 @@ module Gnomika
     quotes_tables = doc.xpath("//table[@class='quotes']//td[@class='quote']")
     quotes = []
     quotes_tables.each do |quote|
-      # Get quote contents
-      content = quote.at_xpath("./text()").text
-      # Check if there is an explanation
-      explanation = quote.xpath("./table[@class='expth']//td")
-      unless explanation.empty?
-        # If an explanation exists, there are two td elements
-        # Remove pavla
-        explanation = explanation.reject{|element| element["class"] == "pavla"}
-        # Keep the explanation td element
-        explanation = explanation[0]
-        content << "\n(#{explanation.text})"
-      end
-      # Check if there is a comment
-      comment = quote.xpath("./p[contains(@class, 'comnt')]")
-      unless comment.nil?
-        # Do not add comment if it does not contain text
-        content << "\n#{comment.text}" unless comment.text.empty?
-      end
+      content = get_quote_contents(quote)
       # HTML p elements with class auth0-auth4 contain quote author and additional information (e.g. book)
       # Get the text of all auth p elements and combine them in a string
       author = quote.xpath(".//p[contains(@class, 'auth')]")
@@ -95,4 +76,30 @@ module Gnomika
     end
     quotes
   end
+
+  private
+
+  ##
+  # Gets and formats the contents of a quote from the given HTML code.
+  # @param html_quote Nokogiri HTML Node. The node should be a td element with class "quote"
+  def self.get_quote_contents(html_quote)
+    # Get quote contents
+    content = html_quote.at_xpath("./text()").text
+    # Check if there is an explanation
+    # If there is one explanation will be an empty array
+    explanation = html_quote.xpath("./table[@class='expth']//td")
+    unless explanation.empty?
+      # If an explanation exists, there are two td elements
+      # Remove pavla
+      explanation = explanation.reject{|element| element["class"] == "pavla"}
+      # Keep the explanation td element
+      explanation = explanation[0]
+      content << "\n(#{explanation.text})"
+    end
+    # Check if there is a comment
+    comment = html_quote.xpath("./p[contains(@class, 'comnt')]")
+    # Do not add comment if it does not contain text
+    content << "\n#{comment.text}" unless comment&.text.empty?
+    content
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnomikologikon-fortune
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Theodoros Grammenos
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.12.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.12.5
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -152,14 +152,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A tool to generate cookies for the fortune command from https://gnomikologikon.gr