factorio-mod 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d768f70e391360db2b2ae8eae6f7349e1bd26417b1c0829276ee7e13c67fce50
-  data.tar.gz: abbc666ed30d1997a87081f98cc5f92eb504b07e6a2cc8af8039f2135f526485
+  metadata.gz: e8417b98fa7593e0defd4c676d400840e998ab87fd5a63e2c625df220bb8be24
+  data.tar.gz: ecd77d7c281591a9642d193d135552d6b4ac08079b070ce2c53728e8ed6c7160
 SHA512:
-  metadata.gz: 0332a88734cdaf0ee4958cea7b39b9c8038885704f68fae15c3ebd4ac686cb8d2bd1407a67824d5d82320634a376c8ebf43e524e25aeaa56d56a49576f9e1ed2
-  data.tar.gz: c0c38517d2c462cb6e949023a761e2857d634f4d2f2a563e0a6903f5da3d3c4f5001bbdf07101dd3ffd4103a50ec6588fbe87ccceb8d92444bfa659b5db11437
+  metadata.gz: 95279289b28a0d647187119ae06da9af3c4b334d105f491e6dd85ffe7c30b24fe30d0d64e140b1d7be90cca1a30aae38105292c286637676e199b0b8c6caaf26
+  data.tar.gz: 27b3e5dd78066ef18f123407130598c6a37d1b33f5f3b145f855008e38c64437eb68591264daf5d1d97146f65abe3c87177cfe2df0bff037c4705289d2776e32

data/.rubocop.yml

@@ -1,2 +1,2 @@
 AllCops:
-  TargetRubyVersion: '2.4.0'
+  TargetRubyVersion: '2.6.0'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factorio-mod (0.5.5)
+    factorio-mod (0.6.0)
       activesupport (~> 5.2)
       nokogiri (~> 1.8)
 
@@ -14,24 +14,24 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     ast (2.4.0)
-    bump (0.6.1)
+    bump (0.7.0)
     coco (0.15.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.4)
     diff-lcs (1.3)
-    i18n (1.5.1)
+    i18n (1.5.2)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.1)
-    method_source (0.9.0)
+    jaro_winkler (1.5.2)
+    method_source (0.9.2)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    nokogiri (1.10.0)
+    nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
     parallel (1.12.1)
-    parser (2.5.1.2)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rainbow (3.0.0)
@@ -42,26 +42,26 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.58.2)
+    rubocop (0.62.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.4.1)
 
 PLATFORMS
   ruby

data/lib/factorio/mod/cache.rb

@@ -49,9 +49,7 @@ module Factorio
     # Get from cache or download page
     def get(symbol, uri)
       symbol = symbol.to_sym
-      return @cache[symbol] if @cache.key? symbol
-
-      @cache[symbol] = Nokogiri::HTML(URI.open(uri, 'Cookie' => @cookie))
+      @cache[symbol] ||= Nokogiri::HTML(URI.open(uri, 'Cookie' => @cookie))
     rescue OpenURI::HTTPError => e
       raise NoMODError.new "MOD #{@uri.split('/').last} not found", e.io
     end

data/lib/factorio/mod/download.rb

@@ -18,13 +18,13 @@ module Factorio
         game_version: :text.to_proc,
         uri: Mod.method(:get_href).to_proc,
         date: :text.to_proc,
-        times: proc { |item| item.text.to_i }
+        times: :text.to_proc >> :to_i.to_proc
       }.freeze
 
       # set value by table header
       def set(name, value)
         sym = TABLE_HEADER_TO_SYM[name]
-        self[sym] = HANDLE_VALUE[sym].call value
+        tap { |a| a[sym] = HANDLE_VALUE[sym].call value }
       end
     end
   end

data/lib/factorio/mod/exception.rb

@@ -17,13 +17,6 @@ module Factorio
     end
   end
 
-  # The Exception that can't find download
-  class NoDownloadError < StandardError
-    def initialize(msg)
-      super
-    end
-  end
-
   # The Exception that try to visit not exist page
   class NoPageError < StandardError
     def initialize(msg)

data/lib/factorio/mod/mod.rb

@@ -13,7 +13,7 @@ module Factorio
   # puts "It latest version for factorio 0.16 can download at " \
   #   "#{mod.latest_download('0.16')[:uri]}"
   # ```
-  class Mod # rubocop:disable ClassLength
+  class Mod
     # factorio Mod portal website URI
     MOD_URI = 'https://mods.factorio.com'
 
@@ -35,8 +35,7 @@ module Factorio
       table = @mod.information.xpath("//div[@class='mod-page-data-table']")
       return table if key.blank?
 
-      xpath = "//td[../td[@class='data-name'][.='#{key}:']]"
-      table.xpath xpath
+      table.xpath "//td[../td[@class='data-name'][.='#{key}:']]"
     end
 
     public
@@ -46,10 +45,8 @@ module Factorio
     # @param line [Nokogiri::HTML] `<tr>`
     # @return [Download] _download_
     def self.bind_td_to_th(table_header, line)
-      line.css('td').each_with_index.each_with_object(Download.new) \
-        do |(item, index), obj|
-        key = table_header[index]
-        obj.set(key, item)
+      table_header.zip(line.css('td')).inject(Download.new) do |obj, pair|
+        obj.set(*pair)
       end
     end
 
@@ -72,12 +69,10 @@ module Factorio
       rescue Net::ReadTimeout
         retry
       end
-
       sleep(1) while driver.current_url == 'https://mods.factorio.com/login'
-      session = driver.manage.cookie_named('session')[:value]
-      driver.quit if autoclose
 
-      "session=#{session}"
+      "session=#{driver.manage.cookie_named('session')[:value]}" \
+        .tap { driver.quit if autoclose }
     end
 
     # @return [String, String] `csrf_token` and cookie
@@ -108,8 +103,8 @@ module Factorio
         'username' => username,
         'password' => password
       )
-      resp = Net::HTTP.post(URI(MOD_URI + '/login'), data, 'Cookie' => cookie)
-      resp.response['set-cookie'].split('; ').first
+      Net::HTTP.post(URI(MOD_URI + '/login'), data, 'Cookie' => cookie) \
+               .response['set-cookie'].split('; ').first
     end
 
     # Extend relative links to absolute links
@@ -117,9 +112,7 @@ module Factorio
     # @return [String] absolute link
     # @raise [NotLoginError]
     def self.extend_uri(rel)
-      raise NotLoginError if rel =~ %r{^/login}
-
-      MOD_URI + rel
+      MOD_URI + rel.tap { |a| raise NotLoginError if a =~ %r{^/login} }
     end
 
     # Get href in Nokogiri node
@@ -176,7 +169,7 @@ module Factorio
     # Whether Mod is deprecated
     # @return [Bool] is deprecated
     def deprecated?
-      !@mod.any.xpath('//span[@class="mod-card-title-deprecated"]').empty?
+      @mod.any.xpath('//span[@class="mod-card-title-deprecated"]').any?
     end
 
     # Get the totle number of downloads of Mod.
@@ -189,13 +182,9 @@ module Factorio
     # Get the latest _download_ of the Mod.
     # @param version [String] factorio version
     # @return [Download]
-    def latest_download(version = nil)
-      return download_list.last if version.blank?
-
-      download_list.each do |download|
-        return download if download.game_version == version.to_s
-      end
-      raise NoDownloadError, "can't found #{name} for factorio #{version}"
+    def latest_download(version = nil, ifnone = nil)
+      version.blank? && download_list.last ||
+        download_list.find(ifnone) { |d| d.game_version == version.to_s }
     end
 
     # Get the _download_ for all of version.
@@ -203,9 +192,7 @@ module Factorio
     def download_list
       table = @mod.downloads.css 'table.mod-page-downloads-table'
       head = table.css('thead tr th').map(&:text)
-      table.css('tbody tr').map do |line|
-        Mod.bind_td_to_th head, line
-      end
+      table.css('tbody tr').map { |line| Mod.bind_td_to_th(head, line) }
     end
 
     # Get latest download uri by download button in card

data/lib/factorio/mod/version.rb

@@ -2,6 +2,6 @@
 
 module Factorio
   class Mod
-    VERSION = '0.5.5'
+    VERSION = '0.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factorio-mod
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - 71e6fd52
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-13 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,8 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Get the info of Factorio's MOD.