video_grabber 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bbee13d4ae0796b33295453c63e3a641dee76ab
-  data.tar.gz: c318dcdb591b476ac96a96400aa2b48ae971e22a
+  metadata.gz: be3fad3a188a7f87df6e1da1aa2c2ab9047a4c3f
+  data.tar.gz: a166877391ef4641acd1c893dd47b12c8ff0f6ab
 SHA512:
-  metadata.gz: 0ee241c69a7e5f6bc09f33eb5cb02fa20f9bea92d297b5cf0d27b3a559b04d9d710f6d2bb6f1f2385d0191934239b4b1fb3869e0f685a9e4ba0bc98e3b335f4e
-  data.tar.gz: 69ada5d434f0950cfb452ad46f1e22a301ac9e5133438e7f3e7b809be7e4a70769d355a1e336c3954ffd20102b2cb5e66933bac97f01418a4d8512120d78c95c
+  metadata.gz: edef2ec15170fd779860673c5ae004fe71c7bb786abc609db5633dbe1cebb64abca0266838582a75b55467e97d7f9b58fdbdaba8daeb89268552f78b64422ec9
+  data.tar.gz: 6e488a487db380a33869a39c2acf911842a1d4e909059672f86cf1c0dcbe00981b48282242c60c4d061d3d51bf5333adc8a4c750514b0275e69e4d9a555abf44

data/Gemfile.lock

@@ -1,16 +1,18 @@
 PATH
   remote: .
   specs:
-    video_grabber (1.4.0)
+    video_grabber (1.8.0)
       headless
       nokogiri
-      selenium-webdriver (~> 2.53.4)
+      phantomjs
+      pry
+      selenium-webdriver
       watir
 
 GEM
   remote: https://rubygems.org/
   specs:
-    childprocess (0.6.2)
+    childprocess (0.6.3)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.1)
     commonwatir (4.0.0)
@@ -21,6 +23,7 @@ GEM
     mini_portile2 (2.1.0)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
+    phantomjs (2.1.1.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -57,10 +60,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.11)
-  pry
   rake (~> 10.0)
   rspec (~> 3.0)
   video_grabber!
 
 BUNDLED WITH
-   1.12.5
+   1.14.6

data/README.md

@@ -30,7 +30,7 @@ irb(main):001:0> require 'video_grabber'
 
 ## Requirements
 
-`video_grabber` relies on Firefox and [Headless](https://github.com/leonid-shevtsov/headless) (unless you specifically disable it). To get Headless working you will need linux and `xvfb`.
+If you plan to use Firefox as your browser, `video_grabber` will then rely on [Headless](https://github.com/leonid-shevtsov/headless) (unless you specifically disable it). To get Headless working you will need linux and `xvfb`.
 
 Install `xvfb` on Debian:
 
@@ -68,9 +68,10 @@ Or you can directly pass the param `keep_browser_open` during initialization.
  - **url:** The url of the resource containing the video(s)
  -  **timeout:**  *(default: 60)* The timeout for the scraper. Will trigger a `VideoGrabber::Timeout` if the delay is met.
  - **keep_browser_open** *(default: false)* If activated, will keep the scraper's browser open as long as you do not stop it (using the `stop` public method.). 
- - **headless_enabled** *(default: true)* If disabled, will open your Firefox browser to crawl your links.
+ - **headless_enabled** *(default: true)* If disabled, will open your browser to crawl your links.
+ - **browser** *(default: :firefox)* Set the browser which will be used to browse websites .
 - **html_attributes** *(default: {controls: true})* This option enables you to pass html attributes that will be passed to your crawled links elements.
- - **firefox_extension_path** If passed, your Scraper instance will run using the given extension (`.xpi` file). Useful if you want to benefit from an Adblocker for instance
+ - **firefox_extension_path** If passed, your Scraper instance will run using the given extension (`.xpi` file). Your browser has to be set at Firefox. Useful if you want to benefit from an Adblocker for instance
 
 ## Versioning
 

data/lib/video_grabber/config.rb

@@ -23,13 +23,14 @@ module VideoGrabber
   class Configuration
 
     attr_accessor :url, :keep_browser_open, :timeout, :headless_enabled,
-                  :firefox_extension_path, :html_attributes
+                  :firefox_extension_path, :html_attributes, :browser
 
     def initialize
       @keep_browser_open = false
       @timeout           = 60
       @headless_enabled  = true
       @html_attributes   = { controls: true }
+      @browser           = :firefox
     end
   end
 end

data/lib/video_grabber/scraper.rb

@@ -2,7 +2,7 @@ module VideoGrabber
   class Scraper
 
     attr_reader :url, :browser, :timeout, :keep_browser_open, :headless_enabled,
-                :firefox_extension_path, :profile, :html_attributes
+                :firefox_extension_path, :profile, :html_attributes, :browser_type
 
     def initialize(config)
       @keep_browser_open      = config.keep_browser_open
@@ -11,6 +11,7 @@ module VideoGrabber
       @headless_enabled       = config.headless_enabled
       @firefox_extension_path = config.firefox_extension_path
       @html_attributes        = config.html_attributes
+      @browser_type           = config.browser
     end
 
     def start
@@ -53,10 +54,10 @@ module VideoGrabber
     def open_browser
       start_headless
 
-      @profile       = ::Selenium::WebDriver::Firefox::Profile.new ; load_extension
+      @profile       = ::Selenium::WebDriver::Firefox::Profile.new && load_extension if firefox_extension_path
       client         = Selenium::WebDriver::Remote::Http::Default.new
       client.timeout = timeout
-      @browser       = ::Watir::Browser.new(:firefox, profile: profile, http_client: client)
+      @browser       = ::Watir::Browser.new(browser_type, profile: profile, http_client: client)
     end
 
     def start_headless

data/lib/video_grabber/version.rb

@@ -1,3 +1,3 @@
 module VideoGrabber
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

data/lib/video_grabber.rb

@@ -7,6 +7,7 @@ require 'headless'
 require 'nokogiri'
 require 'watir'
 require 'cgi'
+require 'phantomjs'
 require 'pry'
 
 module VideoGrabber

data/video_grabber.gemspec

@@ -26,10 +26,11 @@ Gem::Specification.new do |spec|
   spec.executables   = ['video_grabber']
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'selenium-webdriver', '~> 2.53.4'
+  spec.add_dependency 'selenium-webdriver'
   spec.add_dependency 'watir'
   spec.add_dependency 'headless'
   spec.add_dependency 'nokogiri'
+  spec.add_dependency 'phantomjs'
   spec.add_dependency 'pry'
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: video_grabber
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - sidney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.53.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.53.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: watir
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: phantomjs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +161,7 @@ files:
 - lib/video_grabber/scraper.rb
 - lib/video_grabber/version.rb
 - pkg/video_grabber-1.1.0.gem
+- pkg/video_grabber-1.8.0.gem
 - pkg_checksum
 - video_grabber-1.0.0.gem
 - video_grabber.gemspec
@@ -171,9 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: VideoGrabber is a simple tool to get video tags from a given URL
 test_files: []
-has_rdoc: