phantomjs-helper 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f14a442f426beabbc56f22f50c53eec8e7025e80
-  data.tar.gz: 4b2fdb20b403f963ca01bf200e9bc737013c5d29
+  metadata.gz: ad393013067a3062ce026e603e44c2abefc69a53
+  data.tar.gz: 7266f6a18f827bc8714283378234169fad9bd5ef
 SHA512:
-  metadata.gz: 35c0adbe230238f60973c745854b48d16e381e277b64fdf6195e09eefb8744c6798f9fc4f6a56ce5db172f938b790bdb80f7a55c3378e8e62fa3553052fd91d9
-  data.tar.gz: 4d9a858cccb23923eda35c02982c57d31bec8ae4a2e0186659d5c534e5e1201f2a3d14dca8efb0c2c78e5c3ad087fa37e10aabb3943ccf3b6fa6008b4c249875
+  metadata.gz: aedd710628fa2f38ba3550c8b802ec97f7e5cc207e069969f1e07b327a1b45e67b81929408b384f78a77adfdd84cbb5aea3a245c232449cd5b89a2bd31d9c737
+  data.tar.gz: 2b5c7d23cda3c60e77eb5f8753e6d6608a073f94b5bd76ead3d3346ceafe5fedda5dbee824ff87e412a22b94a274e18a0b40b2077fb16cf6d885f837f903295e

data/lib/phantomjs/helper.rb

@@ -1,10 +1,10 @@
 require 'phantomjs/helper/version'
 require 'phantomjs/helper/bitbucket_download_parser'
+require 'phantomjs/helper/extractor'
 require 'fileutils'
 require 'rbconfig'
 require 'open-uri'
-require 'zip'
-require 'ffi-libarchive'
+require 'openssl'
 
 module Phantomjs
   class Helper
@@ -27,12 +27,12 @@ module Phantomjs
       Dir.chdir install_dir do
         FileUtils.rm_f filename
         File.open(filename, 'wb') do |saved_file|
-          URI.parse(url).open('rb') do |read_file|
+          URI.parse(url).open('rb',{:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE}) do |read_file|
             saved_file.write(read_file.read)
           end
         end
         raise "Could not download #{url}" unless File.exists? filename
-        extract filename
+        Extractor.extract(filename, binary_path)
         FileUtils.rm_f filename
       end
       raise "Could not unzip #{filename} to get #{binary_path}" unless File.exists? binary_path
@@ -53,30 +53,6 @@ module Phantomjs
 
     private 
 
-    def extract(filename)
-      case File.extname(filename)
-        when '.zip'
-          Zip::File.open(filename) do |zip_file|
-            entry = zip_file.glob('**/bin/phantomjs*').first
-            raise "Could not find phantomjs binary in zip archive #{filename}" unless entry
-            FileUtils.rm_f entry.name
-            entry.extract(File.basename(entry.name))
-          end
-        when '.bz2'
-          Archive.read_open_filename(filename) do |ar|
-            ar.each_entry do |e|
-              if e.pathname.include?('bin/phantomjs')
-                File.open(binary_path, 'wb') do |saved_file|
-                  saved_file.write(ar.read_data)
-                end
-              end
-            end
-          end
-        else
-          raise "Do not know how to extract binary from #{filename}"
-      end
-    end
-
     def driver_name
       /phantomjs-.*-#{platform}/
     end

data/lib/phantomjs/helper/bitbucket_download_parser.rb

@@ -1,5 +1,6 @@
 require 'nokogiri'
 require 'open-uri'
+require 'openssl'
 
 module Phantomjs
   class Helper
@@ -10,7 +11,7 @@ module Phantomjs
       def initialize(driver_name, url:, open_uri_provider: OpenURI)
         @driver_name = driver_name
         @url = url
-        @source = open_uri_provider.open_uri(url)
+        @source = open_uri_provider.open_uri(url, {:ssl_verify_mode => OpenSSL::SSL::VERIFY_NONE})
       end
 
       def downloads

data/lib/phantomjs/helper/extractor.rb

@@ -0,0 +1,46 @@
+require 'fileutils'
+
+module Phantomjs
+  class Extractor
+    class << self
+      def extract(archive_file, destination)
+        case File.extname(archive_file)
+          when '.zip'
+            extract_zip(archive_file, destination)
+          when '.bz2'
+            extract_bz2(archive_file, destination)
+          else
+            raise "Do not know how to extract binary from #{archive_file}"
+        end
+      end
+
+      private
+
+      def extract_zip(archive_file, destination)
+        require 'zip'
+        Zip::File.open(archive_file) do |zip_file|
+          entry = zip_file.glob('**/bin/phantomjs*').first
+          raise "Could not find phantomjs binary in zip archive #{archive_file}" unless entry
+          FileUtils.rm_f destination
+          entry.extract(destination)
+        end
+      end
+
+      def extract_bz2(archive_file, destination)
+        require 'ffi-libarchive'
+        Archive.read_open_filename(archive_file) do |ar|
+          ar.each_entry do |e|
+            if e.pathname.include?('bin/phantomjs')
+              File.open(destination, 'wb') do |saved_file|
+                saved_file.write(ar.read_data)
+              end
+              return
+            end
+          end
+        end
+        raise "Could not find phantomjs binary in archive #{archive_file}"
+      end
+    end
+
+  end
+end

data/lib/phantomjs/helper/version.rb

@@ -1,5 +1,5 @@
 module Phantomjs
   class Helper
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phantomjs-helper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Rasmus Bergholdt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -100,6 +100,7 @@ files:
 - bin/phantomjs-update
 - lib/phantomjs/helper.rb
 - lib/phantomjs/helper/bitbucket_download_parser.rb
+- lib/phantomjs/helper/extractor.rb
 - lib/phantomjs/helper/version.rb
 - phantomjs-helper.gemspec
 - spec/assets/bitbucket_downloads.html
@@ -126,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Easy installation and use of Phantomjs.