url2png 0.3.4 → 0.3.5

data/Gemfile

@@ -1,13 +1,9 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.6.0"
-  gem "bundler", "~> 1.1.3"
+  gem "rspec", "~> 2.11.0"
   gem "jeweler", "~> 1.8.3"
   gem "rcov", ">= 0"
-end
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     git (1.2.5)
     jeweler (1.8.3)
       bundler (~> 1.0)
@@ -9,20 +9,19 @@ GEM
       rake
     rake (0.9.2.2)
     rcov (0.9.9)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.3)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.1.3)
   jeweler (~> 1.8.3)
   rcov
-  rspec (~> 2.6.0)
+  rspec (~> 2.11.0)

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/lib/url2png/helpers/common.rb

@@ -2,18 +2,18 @@ module Url2png
   module Helpers
     module Common
       extend self
-      
+
       # ------------------
       # complete image tag
-      
-      
+
+
       def url2png_image_tag url, options = {}
         # parse size
         dim = Url2png::Dimensions.parse(options)
-        
+
         # ensure image alt 
         alt = options.key?(:alt) ? options.delete(:alt) : url
-        
+
         # build image tag
         img =  '<img'
         img << " src='#{ url2png_image_url(url, options) }'"
@@ -24,16 +24,16 @@ module Url2png
           img << " #{ k }=#{ v }" unless v.nil? || v == ''
         end
         img << ' />'
-        img.html_safe
+        img.respond_to?(:html_safe) ? img.html_safe : img # Utilize ActiveSupport if loaded
       end
-      
-      
+
+
       # --------------------------
       # only the url for the image
       def url2png_image_url url, options = {}
         # parse size
         dim = Url2png::Dimensions.parse(options)
-        
+
         case Url2png.mode
         when 'dummy'
           'data:image/png;base64,
@@ -60,11 +60,11 @@ module Url2png
           ICAgICAgICAgICAgPHJkZjpCYWcvPgogICAgICAgICA8L2RjOnN1YmplY3Q+CiAgICAgIDwvcmRm
           OkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgrlPw1BAAAAFElEQVQIHWM8
           fPjwfwYgYAIRIAAAMrgDTJyW2igAAAAASUVORK5CYII='.gsub(/\n/,'')
-          
+
         when 'placehold'
           "http://placehold.it/#{ dim[:size] }"
-          
-        else               
+
+        else
           # build parameters portion of URL
           case Url2png.api_version
           when 'v6'
@@ -72,11 +72,11 @@ module Url2png
             # v6 #
             # http://api.url2png.com/v6/<APIKEY>/<TOKEN>/png/?url=google.com
             ######
-            
+
             # check for unavailable options
             options_alias = [:max_width, :max_height]
-            options_available = [:delay, :force, :fullpage, :thumbnail_max_width, :thumbnail_max_height, :viewport]
-            
+            options_available = [:delay, :force, :fullpage, :thumbnail_max_width, :thumbnail_max_height, :viewport, :format]
+
             # assign alias to valid option
             options_alias.each do |key|
               if options.key?(key)
@@ -93,17 +93,13 @@ module Url2png
                 end
               end
             end
-            
-            # options_alias.each do |key|
-            #   if options.include?(key) then options.delete(key) end
-            # end
-          
-            
+
             options = check_options(options, options_available)
-            
+
             # add url to options query
             options[:url] = url
-            
+
+
             query_string = options.
                 sort_by {|s| s[0].to_s }. # sort query by keys for uniformity
                 select {|s| s[1] }.       # skip empty options
@@ -112,38 +108,40 @@ module Url2png
 
             # generate token
             token = Url2png.token query_string
-          
-          
-            "http://api.url2png.com/v6/#{Url2png.api_key}/#{token}/png/?#{query_string}"          
-          
+
+            # set the format of the asset requested
+            format = options[:format] || "png"
+
+            "http://api.url2png.com/v6/#{Url2png.api_key}/#{token}/#{format}/?#{query_string}"
+
           when 'v4'
             ######
             # v4 #
             # http://beta.url2png.com/v4/<APIKEY>/<TOKEN>/<VIEWPORT>-<THUMBNAIL>-<FULL>/<TARGET>
             ######
-            
+
             # check for unavailable options
             options_available = [:size, :thumbnail, :browser_size, :delay, :fullscreen]
             options = check_options(options, options_available)
-            
+
             # escape the url
             safe_url= CGI::escape(url)
-            
+
             # generate token
             token = Url2png.token safe_url
-            
+
             # build options portion of URL
             url_options = []
-            
+
             # set thumbnail
             options[:thumbnail] ||= options[:size]
-              
+
             url_options << "t#{ options[:thumbnail] }"
             url_options << "s#{ options[:browser_size] }" if options[:browser_size]
             url_options << "d#{ options[:delay] }" if options[:delay]
             url_options << "FULL" if options[:fullscreen]
             url_options_string = url_options.join('-')
-            
+
             # build image url
             File.join(
               "http://beta.url2png.com",
@@ -153,33 +151,33 @@ module Url2png
               url_options_string,
               safe_url
             )
-            
+
           when 'v3'
             ######
             # v3 #
             ######
-          
+
             # http://api.url2png.com/v3/api_key/security_hash/bounds/url
-          
+
             options_available = [:fullscreen, :size]
             options = check_options(options, options_available)
-            
+
             # escape the url
             safe_url= CGI::escape(url)
-          
+
             # generate token
             token = Url2png.token safe_url
-          
+
             # custom size or default_size
             size = options[:size] || Url2png.default_size
-            
+
             # build options portion of URL
             if options[:fullscreen]
               bounds = "FULL"
             else
               bounds = size
             end
-            
+
             # build image url
             File.join(
               "http://api.url2png.com",
@@ -190,12 +188,12 @@ module Url2png
               safe_url
             )
           end
-          
+
         end
       end
-      
+
       def check_options options, options_available
-  
+
         # filter out unavailable options
         options = options.select do |key, value|
           if options_available.include? key 
@@ -204,20 +202,20 @@ module Url2png
             # size is a special option, only usable in the gem
             homepage = "https://github.com/robinhoudmeyers/url2png-gem"
             raise "#{options} \n \"#{key}\" is not a valid option \nCheck the gem homepage for information about options: #{homepage}" unless key == :size
-            
+
           end
         end
       end
-      
+
       # -----
       # Alias
       def site_image_tag url, options = {}
         url2png_image_tag(url, options)
       end
-      
+
       def site_image_url url, options = {}
         url2png_image_url(url, options)
       end
     end
   end
-end
+end

data/spec/helpers/common_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe Url2png do
+  include Url2png::Helpers::Common
+
+  before(:all) do
+    Url2png.config({
+      :api_key => "P4DBEC0200EE98",
+      :private_key => "S169B0E051EAC6794B3EC9F385866187R"
+    })
+  end
+
+  describe "site_image_tag" do
+    it "should return the url of the http://pasparout.com image" do
+      site_image_tag('http://pasparout.com').should_not be_nil
+    end
+  end
+
+  describe "site_image_url" do
+    it "should encode the thumbnail max width when provided" do
+      site_image_url('http://www.nytimes.com/', :thumbnail_max_width => '200').should =~ %r{thumbnail_max_width=200}
+    end
+
+    it "should encode the thumbnail max height when provided" do
+      site_image_url('http://www.nytimes.com/', :thumbnail_max_height => '400').should =~ %r{thumbnail_max_height=400}
+    end
+
+    it "should encode the viewport size when provided" do
+      site_image_url('http://www.nytimes.com/', :viewport => '200x300').should =~ %r{viewport=200x300}
+    end
+
+    it "should encode the delay when provided" do
+      site_image_url('http://www.nytimes.com/', :delay => 3).should =~ %r{delay=3}
+    end
+
+    it "should encode the fullpage flag when provided" do
+      site_image_url('http://www.nytimes.com/', :fullpage => true).should =~ %r{fullpage=true}
+    end
+
+    it "should concatenate options by using ampersands" do
+      site_image_url('http://www.nytimes.com/', :delay => 3, :fullpage => true).should =~ %r{delay=3&fullpage=true}
+    end
+
+    it "should request the png format by default" do
+      site_image_url('http://www.nytimes.com/').should =~ %r{png}
+    end
+
+    it "should request the json format" do
+      site_image_url('http://www.nytimes.com/', :format => :json).should =~ %r{json}
+    end
+
+    it "should request the png format" do
+      site_image_url('http://www.nytimes.com/', :format => :png).should =~ %r{png}
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -8,5 +8,7 @@ require 'url2png'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
-end
+  config.filter_run :focused => true
+  config.run_all_when_everything_filtered = true
+  config.alias_example_to :fit, :focused => true
+end

data/url2png.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "url2png"
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["robinhoudmeyers", "wout fierens", "fuzzyalej", "ceritium", "lukemelia"]
-  s.date = "2012-10-08"
+  s.date = "2012-11-16"
   s.description = "Generate screenshots from websites almost instantly at any preferred size using ruby and the url2png.com API"
   s.email = "houdmeyers@gmail.com"
   s.extra_rdoc_files = [
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
     "lib/url2png/dimensions.rb",
     "lib/url2png/helpers/common.rb",
     "lib/url2png/rails.rb",
-    "spec/helpers/common_rspec.rb",
+    "spec/helpers/common_spec.rb",
     "spec/spec_helper.rb",
     "spec/url2png_spec.rb",
     "url2png.gemspec"
@@ -46,21 +46,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["> 2.6.0"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.1.3"])
+      s.add_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rspec>, ["> 2.6.0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.1.3"])
+    s.add_dependency(%q<rspec>, ["~> 2.11.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rspec>, ["> 2.6.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: url2png
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -22,23 +22,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -46,7 +30,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +102,7 @@ files:
 - lib/url2png/dimensions.rb
 - lib/url2png/helpers/common.rb
 - lib/url2png/rails.rb
-- spec/helpers/common_rspec.rb
+- spec/helpers/common_spec.rb
 - spec/spec_helper.rb
 - spec/url2png_spec.rb
 - url2png.gemspec
@@ -137,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2433164738939015678
+      hash: -2645353561694603571
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/helpers/common_rspec.rb

@@ -1,38 +0,0 @@
-require 'spec_helper'
-require 'url2png/helpers/common'
-
-describe Url2png do
-  include Url2png::Helpers::Common
-  before(:all) do
-    Url2png::Config.public_key = "P4DBEC0200EE98"
-    Url2png::Config.shared_secret = "S169B0E051EAC6794B3EC9F385866187R"
-  end
-  
-  describe "site_image_tag" do
-    it "should return the url of the http://pasparout.com image" do
-      site_image_tag('http://pasparout.com').should_not be_nil
-    end
-  end
-  
-  describe "site_image_url" do
-    it "should encode the thumbnail size when provided" do
-      site_image_url('http://www.nytimes.com/', :thumbnail => '200x300').should =~ %r{t200x300}
-    end
-    
-    it "should encode the initial browser size when provided" do
-      site_image_url('http://www.nytimes.com/', :browser_size => '200x300').should =~ %r{s200x300}
-    end
-    
-    it "should encode the delay when provided" do
-      site_image_url('http://www.nytimes.com/', :delay => 3).should =~ %r{d3}
-    end
-    
-    it "should encode the fullscreen capture flag when provided" do
-      site_image_url('http://www.nytimes.com/', :fullscreen => true).should =~ %r{FULL}
-    end
-
-    it "should concatenate options by using hyphens" do
-      site_image_url('http://www.nytimes.com/', :delay => 3, :fullscreen => true).should =~ %r{d3-FULL}
-    end
-  end
-end