factorio-mod 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adcb31d23a6438f33528e0690b06f8134759979b6d4fc7fbce2f9fb25f3cbc13
-  data.tar.gz: 07df7cc9b6882fe8248f123b9f88896041099c6cc2d55964473a8d5aebf71b44
+  metadata.gz: 8cc46a6267996d8e4e5891e39918998a66ad25b738d85d44814426685662ea89
+  data.tar.gz: 83c21b87bdcd20990724ed98814c9bbde13280fba66a2d6d815dd5113bb10558
 SHA512:
-  metadata.gz: 8039d46e1b26cc7241af59ad447ed76b10e9975e72875da517d1d24342dbebf9c866af9a9aaa287393892b1cc62b3a9b6b97531be2620934d97f7ac611482632
-  data.tar.gz: a3860020ad29e8e513c02b30a1e77ce6829ffab221f35a7d142c0ded64bc15001fa252ee4ac9c8a7a0326d1992447ba2c2f67fb703661bf65542e3fea5b4640d
+  metadata.gz: 77486d9176c9398349bd7befbfab82ae12d02c3f77e7cdafa42933d4898be00f8b1596c4433e010149ab661de3ea63fbc5628352c7524b7cf7a199d0dd4acbe7
+  data.tar.gz: 5b1902aa35d4dd2a704e0ee50aeb0bab8c9c741aabf30a584c85e1d34cbe5cbc324b9152b1b0a2d66e97ab22fa168e618066d9e035b2d254464e63115f583314

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factorio-mod (0.3.0)
+    factorio-mod (0.4.0)
       nokogiri (~> 1.8)
 
 GEM
@@ -10,15 +10,20 @@ GEM
     ast (2.4.0)
     bump (0.6.1)
     coco (0.15.0)
+    coderay (1.1.2)
     diff-lcs (1.3)
     jaro_winkler (1.5.1)
+    method_source (0.9.0)
     mini_portile2 (2.3.0)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     parallel (1.12.1)
     parser (2.5.1.2)
       ast (~> 2.4.0)
     powerpack (0.1.2)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rainbow (3.0.0)
     rake (10.5.0)
     rspec (3.8.0)
@@ -53,9 +58,10 @@ DEPENDENCIES
   bundler (~> 1.16)
   coco
   factorio-mod!
+  pry
   rake (~> 10.0)
   rspec (~> 3.0)
   rubocop
 
 BUNDLED WITH
-   1.16.4
+   1.16.6

data/Rakefile

@@ -5,5 +5,3 @@ require 'bump/tasks'
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
-
-Bump.tag_by_default = true

data/bin/console

@@ -7,8 +7,8 @@ require 'factorio/mod'
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+require 'pry'
+Pry.start
 
-require 'irb'
-IRB.start(__FILE__)
+# require 'irb'
+# IRB.start(__FILE__)

data/factorio-mod.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bump'
   spec.add_development_dependency 'coco'
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rubocop'
 
   spec.add_dependency 'nokogiri', '~> 1.8'

data/lib/factorio/mod.rb

@@ -1,3 +1,5 @@
+require 'bundler/setup'
+
 require 'factorio/mod/version'
 
 require 'factorio/mod/mod'

data/lib/factorio/mod/download.rb

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

data/lib/factorio/mod/mod.rb

@@ -36,52 +36,61 @@ module Factorio
       table.xpath xpath
     end
 
-    # @return [String, String] `csrf_token` and cookie
-    def self.csrf_and_cookie
-      resp = open 'https://mods.factorio.com/login'
-      cookie = resp.meta['set-cookie'].split('; ')[0]
-      csrf_token = Nokogiri::HTML(resp).css('#csrf_token @value').to_s
-      [csrf_token, cookie]
-    end
-    private_class_method :csrf_and_cookie
-
     public
 
-    # rubocop:disable MethodLength
-
     # Map each value with table header.
     # @param table_header [Array] table header in order
     # @param line [Nokogiri::HTML] `<tr>`
-    # @return [Hash] table with the table header as key
+    # @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]
-        if key == 'Download'
-          href = item.xpath('a/@href').to_s
-          raise NotLoginError if href =~ %r{^/login}
-          obj.uri = MOD_URI + href
-        else
-          obj.set(key, item.text)
-        end
+        obj.set(key, item)
       end
     end
 
-    # rubocop:enable MethodLength
-
     # Get the logged in cookie.
-    # @param username [String]
-    # @param password [String]
+    #
+    # @example
+    #   # use firefox nightly
+    #   Selenium::WebDriver::Firefox::Binary.path =
+    #     `which firefox-nightly`.chomp
+    #   # open firefox
+    #   driver = Selenium::WebDriver.for :firefox
+    #   cookie = Factorio::Mod.login_cookie(driver)
+    #   # the browser will automatically close
+    # @param driver [Selenium::WebDriver::Driver] Web Driver
+    # @param autoclose [Bool] automatically close the browser after logging in
     # @return [String] The logged in cookie
-    def self.login_cookie(username, password)
-      csrf_token, cookie = csrf_and_cookie
-      data = URI.encode_www_form(
-        'csrf_token' => csrf_token,
-        'username'   => username,
-        'password'   => password
-      )
-      resp = Net::HTTP.post(URI(MOD_URI + '/login'), data, 'Cookie' => cookie)
-      resp.response['set-cookie'].split('; ')[0]
+    def self.login_cookie(driver, autoclose = true)
+      begin
+        driver.navigate.to 'https://mods.factorio.com/login'
+      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}"
+    end
+
+    # Extend relative links to absolute links
+    # @param rel [String] relative link
+    # @return [String] absolute link
+    # @raise [NotLoginError]
+    def self.extend_uri(rel)
+      raise NotLoginError if rel =~ %r{^/login}
+      MOD_URI + rel
+    end
+
+    # Get href in Nokogiri node
+    # @param item [Nokogiri::HTML]
+    # @return [String] relative link
+    def self.get_href(item)
+      extend_uri(item.xpath('a/@href').text)
     end
 
     # Get the title (also known as _display name_) of the Mod
@@ -100,7 +109,7 @@ module Factorio
     # Get the GitHub URI.
     # @return [String] GitHub URI
     def github
-      uri = data_table('Source').xpath('a/@href').to_s
+      uri = @mod.any.xpath('//a[@class="source-code-link"]/@href').text
       return if uri.empty?
       uri
     end
@@ -123,11 +132,18 @@ module Factorio
     def license_uri
       data_table('License').xpath('a/@href').to_s
     end
+    alias license_link license_uri
 
     # Get the author of the Mod.
     # @return [String] author
     def author
-      data_table('Owner').xpath('a').text
+      @mod.any.xpath('//div[@class="mod-card-author"]/a').text
+    end
+
+    # Whether Mod is deprecated
+    # @return [Bool] is deprecated
+    def deprecated?
+      !@mod.any.xpath('//span[@class="mod-card-title-deprecated"]').empty?
     end
 
     # Get the totle number of downloads of Mod.
@@ -157,5 +173,12 @@ module Factorio
         Mod.bind_td_to_th head, line
       end
     end
+
+    # Get latest download uri by download button in card
+    # @return [String] download uri
+    def latest_download_uri
+      Mod.get_href(@mod.any.css('.mod-download-button'))
+    end
+    alias latest_download_link latest_download_uri
   end
 end

data/lib/factorio/mod/version.rb

@@ -1,5 +1,5 @@
 module Factorio
   class Mod
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factorio-mod
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - 71e6fd52
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-09 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement