chakin-rb 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 101e6f71bf9445e30473598577f9a34d769ef86b
-  data.tar.gz: c7c00f11e8fda927e65f89320a50358b9412ed25
+  metadata.gz: b84417581a3b637fd8983910da40f5b606854c11
+  data.tar.gz: 34be171f2ae48889ff6a8656bfe8a125a4a647d7
 SHA512:
-  metadata.gz: 3e3f3a0d0450c78d76173c6e934a94909b6b8c25286bf4124600a42f82f0c35672c2b01fb72dc57e4a625bbb327fb078ebc47c1e8952945a3e2c8870e53e238c
-  data.tar.gz: bf4d328fb293a305fe28a21c9ec5f67fc3cad769adbb1c589f68d4705c5fafa837e6a998a7af4dcd0d6a354617bd73b1f00509bf6e4dce742a71109322c04f38
+  metadata.gz: 89ea491cc2ff13af0389e2f01d044ba2369b4bafa8e9e548c586d4494234cf16d083e13ea034c3ab4f75d1f9fac5acc376f769e4c32f1424301dc76e958b2e4c
+  data.tar.gz: b82efb6ccbd6c7aafb7fc638e9f7fbd959c64621854b512995b7ba2127a1d230859c9ef5e482f05e9b8ac299468bccd15fcbd80a2b7e9125bdbc0818fcf566aa

data/.gitignore

@@ -9,5 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
-
+*.gem
 Gemfile.lock

data/lib/chakin-rb/chakin.rb

@@ -6,6 +6,12 @@ require 'net/http'
 require 'fileutils'
 
 module Chakin
+  class HttpRedirect < StandardError
+    attr_reader :new_url
+    def initialize(new_url)
+      @new_url = new_url
+    end
+  end
   class Error < StandardError; end
   module Downloader
     def load_datasets(path = File.join(__dir__, 'datasets.csv'))
@@ -26,33 +32,47 @@ module Chakin
       url = row['URL']
       raise 'The word vector you specified was not found. Please specify correct name.' if url.nil?
 
-      progressbar = ProgressBar.create
+
       file_name = url.split('/')[-1]
 
       FileUtils.mkdir_p(save_dir) unless File.exist?(save_dir)
 
       save_path = File.join(save_dir, file_name)
+      begin
+        download_file(save_path, url)
+      rescue Chakin::HttpRedirect => e
+        download_file(save_path, e.new_url)
+      end
+      save_path
+    end
+
+    def download_file(save_path, url)
+      progressbar = ProgressBar.create
 
       f = File.open(save_path, 'wb')
       begin
         my_uri = URI.parse(url)
+        http = Net::HTTP.new(my_uri.host, my_uri.port)
 
-        Net::HTTP.start(my_uri.host) do |http|
-          http.request_get(my_uri.path) do |resp|
-            total_size = resp.content_length
-            progressbar.total = total_size
+        if my_uri.instance_of?(URI::HTTPS)
+          http.use_ssl = true
+        end
 
-            resp.read_body do |segment|
-              progressbar.progress += segment.size
-              f.write(segment)
-            end
+        http.request_get(my_uri.path) do |resp|
+          total_size = resp.content_length
+          progressbar.total = total_size
+
+          if resp.code == "302"
+            raise HttpRedirect.new(resp.header['Location'])
+          end
+          resp.read_body do |segment|
+            progressbar.progress += segment.size
+            f.write(segment)
           end
         end
       ensure
         f.close
       end
-
-      save_path
     end
 
     def search(lang = '')

data/lib/chakin-rb/version.rb

@@ -1,3 +1,3 @@
 module Chakin
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chakin-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Joseph Emmanuel Dayo