gastly 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61481db693dd21bbbe481bc40e94cda224eeb786
-  data.tar.gz: 406d4be2fa87cb64536a8e687a1935b965e3227a
+  metadata.gz: 2e380ceb3db540ad9ed92bfa89e2b80d49283996
+  data.tar.gz: f7c93c82e5a3f8b1d5d15ef2c831d295cd917c78
 SHA512:
-  metadata.gz: 6350109f7427759e9ea898cd7caa9965efb869ce2bfd2f3c4b7dfbf02b58a9a49aaf9d94d35fc7ec387f5db9b51693d1d6ef91eb8dc7f953430b388057c153a1
-  data.tar.gz: adac8e9e13cd50ccd1b8a3bc4c1ae44a20c39057e18c7ed078116dc24bc3a3cf9fc80e2bc65cf25fcc16444d1b64ab5350bc788450ff4894d32afd691ed5c56d
+  metadata.gz: abbafd3fef69db4563e9f73840c1e109676c27538b0541c11ba0353a413884b2dee4ac18ea50708b9fd90ad55eeee8b328551365f19b94f557966f347c3ee41b
+  data.tar.gz: 1b163d12b37ab611656dbd018f6c5845571ed368f766f89474618ab939ea6199582435ddf6f3d1d58743633f87a8852eb12e8effc3471424ec6d7ecd3b692db6

data/.travis.yml

@@ -1,3 +1,4 @@
+dist: trusty
 language: ruby
 rvm:
   - 2.1.7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.0 (16/07/2016)
+
+### Enhancements
+
+* Remove support ActiveSupport
+
 ## 0.3.0 (29/01/2016)
 
 ### Enhancements

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in gastly.gemspec
 gemspec
 
-gem 'coveralls', require: false
+gem 'coveralls', require: false

data/gastly.gemspec

@@ -25,5 +25,4 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'phantomjs', '~> 2.1.1'
   spec.add_dependency 'mini_magick', '~> 4.2'
-  spec.add_dependency 'activesupport', '>= 3.1'
 end

data/lib/gastly.rb

@@ -1,8 +1,7 @@
 require 'phantomjs'
 require 'mini_magick'
-require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/object/blank'
 
+require_relative 'gastly/utils'
 require_relative 'gastly/phantomjs_patch'
 require_relative 'gastly/image'
 require_relative 'gastly/screenshot'

data/lib/gastly/exceptions.rb

@@ -1,7 +1,5 @@
 module Gastly
   class FetchError < StandardError
-    attr_reader :url
-
     def initialize(url)
       super("Unable to load #{url}")
     end

data/lib/gastly/phantomjs_patch.rb

@@ -4,6 +4,8 @@ module Phantomjs
   end
 
   class Platform
+    RETRY_COUNT = 5
+
     class << self
       def install!
         STDERR.puts "Phantomjs does not appear to be installed in #{phantomjs_path}, installing!"
@@ -16,18 +18,18 @@ module Phantomjs
         FileUtils.mkdir_p temp_dir
 
         Dir.chdir temp_dir do
-          unless download_via_curl or download_via_wget
-            raise "\n\nFailed to load phantomjs! :(\nYou need to have cURL or wget installed on your system.\nIf you have, the source of phantomjs might be unavailable: #{package_url}\n\n"
+          unless download_via_curl || download_via_wget
+            fail "\n\nFailed to load phantomjs! :(\nYou need to have cURL or wget installed on your system.\nIf you have, the source of phantomjs might be unavailable: #{package_url}\n\n"
           end
 
           case package_url.split('.').last
-            when 'bz2'
-              system "bunzip2 #{File.basename(package_url)}"
-              system "tar xf #{File.basename(package_url).sub(/\.bz2$/, '')}"
-            when 'zip'
-              system "unzip #{File.basename(package_url)}"
-            else
-              raise "Unknown compression format for #{File.basename(package_url)}"
+          when 'bz2'
+            system "bunzip2 #{File.basename(package_url)}"
+            system "tar xf #{File.basename(package_url).sub(/\.bz2$/, '')}"
+          when 'zip'
+            system "unzip #{File.basename(package_url)}"
+          else
+            fail "Unknown compression format for #{File.basename(package_url)}"
           end
 
           # Find the phantomjs build we just extracted
@@ -52,28 +54,32 @@ module Phantomjs
           end
         end
 
-        raise 'Failed to install phantomjs. Sorry :(' unless File.exist?(phantomjs_path)
+        fail 'Failed to install phantomjs. Sorry :(' unless File.exist?(phantomjs_path)
       end
 
       private
 
       def download_via_curl
-        system "curl -L -O #{package_url} #{curl_proxy_options}"
+        system "curl -L --retry #{RETRY_COUNT} -O #{package_url} #{curl_proxy_options}"
       end
 
       def download_via_wget
-        system "wget #{package_url} #{wget_proxy_options}"
+        system "wget -t #{RETRY_COUNT} #{package_url} #{wget_proxy_options}"
       end
 
       def curl_proxy_options
-        return '' if Phantomjs.proxy_host.nil? && Phantomjs.proxy_port.nil?
+        return '' if proxy_options_exist?
         "-x #{Phantomjs.proxy_host}:#{Phantomjs.proxy_port}"
       end
 
       def wget_proxy_options
-        return '' if Phantomjs.proxy_host.nil? && Phantomjs.proxy_port.nil?
+        return '' if proxy_options_exist?
         "-e use_proxy=yes -e http_proxy=#{Phantomjs.proxy_host}:#{Phantomjs.proxy_port}"
       end
+
+      def proxy_options_exist?
+        Phantomjs.proxy_host.nil? && Phantomjs.proxy_port.nil?
+      end
     end
   end
 end

data/lib/gastly/screenshot.rb

@@ -12,7 +12,8 @@ module Gastly
 
     # @param url [String] The full url to the site
     def initialize(url, **kwargs)
-      kwargs.assert_valid_keys(:timeout, :browser_width, :browser_height, :selector, :cookies, :proxy_host, :proxy_port)
+      hash = Gastly::Utils::Hash.new(kwargs)
+      hash.assert_valid_keys(:timeout, :browser_width, :browser_height, :selector, :cookies, :proxy_host, :proxy_port)
 
       @url = url
       @cookies = kwargs.delete(:cookies)
@@ -39,14 +40,14 @@ module Gastly
     %w(timeout browser_width browser_height).each do |name|
       define_method name do                                 # def timeout
         instance_variable_get("@#{name}") ||                #   @timeout ||
-            self.class.const_get("default_#{name}".upcase)  #       self.class.const_get('DEFAULT_TIMEOUT')
+          self.class.const_get("default_#{name}".upcase)    #     self.class.const_get('DEFAULT_TIMEOUT')
       end                                                   # end
     end
 
     private
 
     def proxy_options
-      return '' if proxy_host.blank? && proxy_port.blank?
+      return '' if proxy_host.nil? && proxy_port.nil?
       "--proxy=#{proxy_host}:#{proxy_port}"
     end
 
@@ -59,8 +60,8 @@ module Gastly
         output:   image.path
       }
 
-      params[:selector] = selector if selector.present?
-      params[:cookies]  = parameterize(cookies).join(',') if cookies.present?
+      params[:selector] = selector if selector
+      params[:cookies]  = parameterize(cookies).join(',') if cookies
 
       parameterize(params)
     end
@@ -71,10 +72,11 @@ module Gastly
       hash.map { |key, value| "#{key}=#{value}" }
     end
 
-    def handle_output(output)
+    def handle_output(out)
+      output = Gastly::Utils::String.new(out)
       return unless output.present?
 
-      error = case output
+      error = case output.string
               when /^FetchError:(.+)/     then Gastly::FetchError
               when /^RuntimeError:(.+)/m  then Gastly::PhantomJSError
               else UnknownError

data/lib/gastly/utils.rb

@@ -0,0 +1,2 @@
+require_relative 'utils/hash'
+require_relative 'utils/string'

data/lib/gastly/utils/hash.rb

@@ -0,0 +1,29 @@
+module Gastly
+  module Utils
+    class Hash
+      attr_reader :hash
+
+      def initialize(hash = {})
+        @hash = hash.to_h
+      end
+
+      # Validates all keys in a hash match <tt>*valid_keys</tt>, raising
+      # +ArgumentError+ on a mismatch.
+      #
+      # Note that keys are treated differently than HashWithIndifferentAccess,
+      # meaning that string and symbol keys will not match.
+      #
+      #   { name: 'Rob', years: '28' }.assert_valid_keys(:name, :age) # => raises "ArgumentError: Unknown key: :years. Valid keys are: :name, :age"
+      #   { name: 'Rob', age: '28' }.assert_valid_keys('name', 'age') # => raises "ArgumentError: Unknown key: :name. Valid keys are: 'name', 'age'"
+      #   { name: 'Rob', age: '28' }.assert_valid_keys(:name, :age)   # => passes, raises nothing
+      def assert_valid_keys(*valid_keys)
+        valid_keys.flatten!
+        hash.each_key do |k|
+          unless valid_keys.include?(k)
+            fail ArgumentError.new("Unknown key: #{k.inspect}. Valid keys are: #{valid_keys.map(&:inspect).join(', ')}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gastly/utils/string.rb

@@ -0,0 +1,36 @@
+module Gastly
+  module Utils
+    class String
+      BLANK_RE = /\A[[:space:]]*\z/
+
+      attr_reader :string
+
+      def initialize(string = '')
+        @string = string.to_s
+      end
+
+      # A string is blank if it's empty or contains whitespaces only:
+      #
+      #   ''.blank?       # => true
+      #   '   '.blank?    # => true
+      #   "\t\n\r".blank? # => true
+      #   ' blah '.blank? # => false
+      #
+      # Unicode whitespace is supported:
+      #
+      #   "\u00a0".blank? # => true
+      #
+      # @return [true, false]
+      def blank?
+        BLANK_RE === string
+      end
+
+      # An object is present if it's not blank.
+      #
+      # @return [true, false]
+      def present?
+        !blank?
+      end
+    end
+  end
+end

data/lib/gastly/version.rb

@@ -1,3 +1,3 @@
 module Gastly
-  VERSION = '0.3.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gastly
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Mikhail Grachev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
 description: Create screenshots or previews of web pages using Gastly. Under the hood
   Phantom.js and MiniMagick.
 email:
@@ -135,6 +121,9 @@ files:
 - lib/gastly/phantomjs_patch.rb
 - lib/gastly/screenshot.rb
 - lib/gastly/script.js
+- lib/gastly/utils.rb
+- lib/gastly/utils/hash.rb
+- lib/gastly/utils/string.rb
 - lib/gastly/version.rb
 homepage: https://github.com/mgrachev/gastly
 licenses: []