gastly 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a44ef15ac998bc80a529ceb87f868e53c8ce61bf
-  data.tar.gz: 75a64b654c9031160a85aff58f5ef47b2f1add23
+  metadata.gz: 72868583159f8e35a055086dbba4130ad364589e
+  data.tar.gz: 7f86570ddc94846083a66fddc3e20234ae7ecef6
 SHA512:
-  metadata.gz: 8d110af0420f000a7851a1c21855ec111d4924ce34df3b5677fb8db1c57835fc541a96596e5f2c5fc1366955ba16b69a4df1c66db9ec5a40d25430cadc18ad78
-  data.tar.gz: 83e1dd27eb9f8122bc86764c03a2c837f512742300d86e905b188fe3f934e2e60139e091b0d0ae43d4122f2b76c0c1966448efdf46c2eb435d33522dae397da0
+  metadata.gz: 3fe604a0a919d5d76a6be7358074e1348da096919c4db9217361d23fca30efc4d39a55d5e491772a692a87f521060a003be5c9a5820570bb9191a10b4a8bfa14
+  data.tar.gz: da9a98e0fe76658bb2a779623205e0628124c5138e0dd564c2bfe09b014e4ecf227913c7b4918f99b10991ba908d495735eef9741eadbdb313979a9feb6c4951

data/.coveralls.yml

@@ -0,0 +1 @@
+repo_token: Yl4eB6CrBH8Jq6D02bBV5MxCtrNfDGP4L

data/.ruby-version

@@ -0,0 +1 @@
+2.2.3

data/.travis.yml

@@ -1,6 +1,11 @@
+dist: trusty
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
   - 2.1.7
-  - 2.2.3
+  - 2.2.3
+  - 2.3.0
+before_install:
+  - mkdir travis-phantomjs
+  - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
+  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
+  - export PATH=$PWD/travis-phantomjs:$PATH

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.4 (24/01/2016)
+
+### Enhancements
+
+* Code optimization
+
 ## 0.2.3 (23/11/2015)
 
 ### Enhancements

data/Gemfile

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

data/README.md

@@ -3,6 +3,8 @@
 [![Gem Version](https://badge.fury.io/rb/gastly.svg)](http://badge.fury.io/rb/gastly)
 [![Dependency Status](https://gemnasium.com/mgrachev/gastly.svg)](https://gemnasium.com/mgrachev/gastly)
 [![Code Climate](https://codeclimate.com/github/mgrachev/gastly/badges/gpa.svg)](https://codeclimate.com/github/mgrachev/gastly)
+[![Build Status](https://travis-ci.org/mgrachev/gastly.svg?branch=master)](https://travis-ci.org/mgrachev/gastly)
+[![Coverage Status](https://coveralls.io/repos/github/mgrachev/gastly/badge.svg?branch=master)](https://coveralls.io/github/mgrachev/gastly?branch=master)
 
 Create screenshots or previews of web pages using Gastly. Under the hood [Phantom.js](https://github.com/ariya/phantomjs/) and [MiniMagick](https://github.com/minimagick/minimagick). Gastly, I choose you!
 

data/Rakefile

@@ -1 +1,6 @@
+require 'bundler/setup'
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec

data/gastly.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.9'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rspec', '~> 3.4.0'
 
   spec.add_dependency 'phantomjs2', '~> 2.0'
   spec.add_dependency 'mini_magick', '~> 4.2'

data/lib/gastly.rb

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

data/lib/gastly/exceptions.rb

@@ -8,4 +8,5 @@ module Gastly
   end
 
   PhantomJSError = Class.new(RuntimeError)
+  UnknownError   = Class.new(RuntimeError)
 end

data/lib/gastly/image.rb

@@ -1,25 +1,29 @@
-require 'mini_magick'
-
 module Gastly
   class Image
-    attr_reader :file
+    attr_reader :image
 
-    def initialize(tempfile)
-      @file = MiniMagick::Image.open(tempfile.path)
-      tempfile.unlink
+    # @param image [MiniMagick::Image] Instance of MiniMagick::Image
+    def initialize(image)
+      @image = image
     end
 
+    # @param width [Fixnum] Image width
+    # @param height [Fixnum] Image height
     def resize(width:, height:)
       dimensions = "#{width}x#{height}"
-      @file.resize(dimensions)
+      image.resize(dimensions)
     end
 
+    # @param ext [String] Image extension
+    # @return [MiniMagick::Image] Instance
     def format(ext)
-      @file.format(ext)
+      image.format(ext)
     end
 
+    # @param output [String] Full path to image
+    # @return [String] Full path to image
     def save(output)
-      @file.write(output)
+      image.write(output)
       output
     end
   end

data/lib/gastly/screenshot.rb

@@ -1,51 +1,46 @@
-require 'phantomjs'
-require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/object/blank'
-
 module Gastly
   class Screenshot
     SCRIPT_PATH = File.expand_path('../script.js', __FILE__)
     DEFAULT_TIMEOUT = 0
     DEFAULT_BROWSER_WIDTH = 1440
     DEFAULT_BROWSER_HEIGHT = 900
-    DEFAULT_FILE_NAME = 'output'.freeze
     DEFAULT_FILE_FORMAT = '.png'.freeze
 
+    attr_reader :image
     attr_writer :timeout, :browser_width, :browser_height
     attr_accessor :url, :selector, :cookies, :proxy_host, :proxy_port
-    attr_reader :tempfile
 
+    # @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)
 
       @url = url
-      @tempfile = Tempfile.new([DEFAULT_FILE_NAME, DEFAULT_FILE_FORMAT])
-      self.cookies = kwargs.delete(:cookies)
-
-      kwargs.each { |key, value| instance_variable_set(:"@#{key}", value) }
-    end
-
-    def timeout
-      @timeout || DEFAULT_TIMEOUT
-    end
+      @cookies = kwargs.delete(:cookies)
 
-    def browser_width
-      @browser_width || DEFAULT_BROWSER_WIDTH
-    end
+      @image = MiniMagick::Image.create(DEFAULT_FILE_FORMAT, false) # Disable validation
 
-    def browser_height
-      @browser_height || DEFAULT_BROWSER_HEIGHT
+      kwargs.each { |key, value| instance_variable_set(:"@#{key}", value) }
     end
 
+    # Capture image via PhantomJS and save to output file
+    #
+    # @return [Gastly::Image] Instance of Gastly::Image
     def capture
+      # This necessary to install PhantomJS via proxy
       Phantomjs.proxy_host = proxy_host if proxy_host
       Phantomjs.proxy_port = proxy_port if proxy_port
 
       output = Phantomjs.run(proxy_options, SCRIPT_PATH.to_s, *prepared_params)
+      handle_output(output)
 
-      handle_exception(output) if output.present?
+      Gastly::Image.new(image)
+    end
 
-      Gastly::Image.new(tempfile)
+    %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')
+      end                                                   # end
     end
 
     private
@@ -61,23 +56,28 @@ module Gastly
         timeout:  timeout,
         width:    browser_width,
         height:   browser_height,
-        output:   tempfile.path
+        output:   image.path
       }
 
       params[:selector] = selector if selector.present?
-      params[:cookies]  = hash_to_array(cookies).join(',') if cookies.present?
+      params[:cookies]  = parameterize(cookies).join(',') if cookies.present?
 
-      hash_to_array(params)
+      parameterize(params)
     end
 
-    def hash_to_array(data)
-      data.map { |key, value| "#{key}=#{value}" }
+    # @param hash [Hash]
+    # @return [Array] Array of parameterized strings
+    def parameterize(hash)
+      hash.map { |key, value| "#{key}=#{value}" }
     end
 
-    def handle_exception(output)
+    def handle_output(output)
+      return unless output.present?
+
       error = case output
               when /^FetchError:(.+)/     then Gastly::FetchError
               when /^RuntimeError:(.+)/m  then Gastly::PhantomJSError
+              else UnknownError
               end
 
       fail error, Regexp.last_match(1)

data/lib/gastly/version.rb

@@ -1,3 +1,3 @@
 module Gastly
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: gastly
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Mikhail Grachev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: phantomjs2
   requirement: !ruby/object:Gem::Requirement
@@ -102,8 +116,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -138,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Create screenshots or previews of web pages using Gastly. Gastly, I choose