url2png 0.0.6 → 0.0.7

data/Gemfile

@@ -10,4 +10,4 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
-end
+end

data/README.markdown

@@ -20,7 +20,17 @@ First define your public key and shared secret:
     Url2png::Config.public_key = 'PXXXXXXXXXXXXX'
     Url2png::Config.shared_secret = 'SXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
 
-In Rails you probably want to do that in your application.rb file.
+If you are generating local urls in development you can use a placeholder or dummy image.
+This is done by setting the mode:
+
+    Url2png::Config.mode = :placehold if Rails.env.development?
+
+Options are:
+  - :production (default; will use the url2png api to generate images)
+  - :placehold (will generate images at http://placehold.it)
+  - :dummy (will give a grey base64 data image)
+
+In Rails you probably want to do configuration in an initializer.
 
 
 ### Helpers

data/Rakefile

@@ -17,8 +17,8 @@ Jeweler::Tasks.new do |gem|
   gem.license = "MIT"
   gem.summary = %Q{A ruby gem wrapping the url2png.com screenshot service API}
   gem.description = %Q{Generate screenshots from websites almost instantly at any preferred size using ruby and the url2png.com API}
-  gem.email = "wout@boysabroad.com"
-  gem.authors = ["wout fierens"]
+  gem.email = "wout@impinc.co.uk"
+  gem.authors = ["wout fierens", "fuzzyalej", "ceritium"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/url2png/config.rb

@@ -1,45 +1,59 @@
 module Url2png
+  
   module Config
     
+    # modes
+    MODES = %w{production placehold dummy}
+    
+    def self.mode= mode
+      raise "Url2png error: Invalid mode, only #{ MODES.join(', ') } are allowed" unless MODES.include?(mode.to_s)
+      @url2png_mode ||= mode.to_s
+    end
+    
+    def self.mode
+      @url2png_mode ||= 'production'
+    end
+    
+    # api settings
     def self.api_url protocol
-      Thread.current[:url2png_url] ||= "#{ protocol }api.url2png.com"
+      @url2png_url ||= "#{ protocol }api.url2png.com"
     end
 
     def self.api_version
-      Thread.current[:url2png_version] ||= 'v3'
+      @url2png_version ||= 'v3'
     end
 
     # public key setter and getter
     def self.public_key= key
       raise 'Url2png error: Invalid public key!' unless key.match(/^P/)
-
-      Thread.current[:url2png_key] ||= key
+      @url2png_key ||= key
     end
-    def self.public_key
-      raise 'Url2png error: No public key defined!' if Thread.current[:url2png_key].nil?
 
-      Thread.current[:url2png_key]
+    def self.public_key
+      raise 'Url2png error: No public key defined!' if @url2png_key.nil?
+      @url2png_key
     end
 
     # shared secret setter and getter
     def self.shared_secret= secret
       raise 'Url2png error: Invalid shared secret!' unless secret.match(/^S/)
-
-      Thread.current[:url2png_secret] ||= secret
+      @url2png_secret ||= secret
     end
-    def self.shared_secret
-      raise 'Url2png error: No shared secret defined!' if Thread.current[:url2png_secret].nil?
 
-      Thread.current[:url2png_secret]
+    def self.shared_secret
+      raise 'Url2png error: No shared secret defined!' if @url2png_secret.nil?
+      @url2png_secret
     end
 
     # size
     def self.default_size= size
-      Thread.current[:url2png_size] ||= size
+      @url2png_size ||= size
     end
+
     def self.default_size
-      Thread.current[:url2png_size] ||= '400x400'
+      @url2png_size ||= '400x400'
     end
     
   end
+  
 end

data/lib/url2png/helpers/common.rb

@@ -1,7 +1,7 @@
 module Url2png
   module Helpers
     module Common
-      
+
       def site_image_tag url, options = {}
         dim = Url2png::Dimensions.parse(options)
 
@@ -15,23 +15,57 @@ module Url2png
           img << " #{ k }='#{ v }'" unless v.nil? || v == ''
         end
         img << ' />'
+        img.html_safe
       end
-
+      
       def site_image_url url, options = {}
-        options[:protocol] ||= 'http://'
-        
         dim = Url2png::Dimensions.parse(options)
-
-        # escape the url
-        safe_url = URI.escape(url)
-
-        # generate token
-        token = Digest::MD5.hexdigest("#{ Url2png::Config.shared_secret }+#{ safe_url }")
-
-        # build image url
-        File.join(Url2png::Config.api_url(options[:protocol]), Url2png::Config.api_version, Url2png::Config.public_key, token, dim[:size], safe_url)
+        
+        case Url2png::Config.mode
+        when 'dummy'
+          'data:image/png;base64,
+          iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAADHmlDQ1BJQ0MgUHJvZmlsZQAAeAGF
+          VN9r01AU/tplnbDhizpnEQk+aJFuZFN0Q5y2a1e6zVrqNrchSJumbVyaxiTtfrAH2YtvOsV38Qc+
+          +QcM2YNve5INxhRh+KyIIkz2IrOemzRNJ1MDufe73/nuOSfn5F6g+XFa0xQvDxRVU0/FwvzE5BTf
+          8gFeHEMr/GhNi4YWSiZHQA/Tsnnvs/MOHsZsdO5v36v+Y9WalQwR8BwgvpQ1xCLhWaBpXNR0E+DW
+          ie+dMTXCzUxzWKcECR9nOG9jgeGMjSOWZjQ1QJoJwgfFQjpLuEA4mGng8w3YzoEU5CcmqZIuizyr
+          RVIv5WRFsgz28B9zg/JfsKiU6Zut5xCNbZoZTtF8it4fOX1wjOYA1cE/Xxi9QbidcFg246M1fkLN
+          JK4RJr3n7nRpmO1lmpdZKRIlHCS8YlSuM2xp5gsDiZrm0+30UJKwnzS/NDNZ8+PtUJUE6zHF9fZL
+          RvS6vdfbkZMH4zU+pynWf0D+vff1corleZLw67QejdX0W5I6Vtvb5M2mI8PEd1E/A0hCgo4cZCjg
+          kUIMYZpjxKr4TBYZIkqk0ml0VHmyONY7KJOW7RxHeMlfDrheFvVbsrj24Pue3SXXjrwVhcW3o9hR
+          7bWB6bqyE5obf3VhpaNu4Te55ZsbbasLCFH+iuWxSF5lyk+CUdd1NuaQU5f8dQvPMpTuJXYSWAy6
+          rPBe+CpsCk+FF8KXv9TIzt6tEcuAcSw+q55TzcbsJdJM0utkuL+K9ULGGPmQMUNanb4kTZyKOfLa
+          UAsnBneC6+biXC/XB567zF3h+rkIrS5yI47CF/VFfCHwvjO+Pl+3b4hhp9u+02TrozFa67vTkbqi
+          sXqUj9sn9j2OqhMZsrG+sX5WCCu0omNqSrN0TwADJW1Ol/MFk+8RhAt8iK4tiY+rYleQTysKb5kM
+          XpcMSa9I2S6wO4/tA7ZT1l3maV9zOfMqcOkb/cPrLjdVBl4ZwNFzLhegM3XkCbB8XizrFdsfPJ63
+          gJE722OtPW1huos+VqvbdC5bHgG7D6vVn8+q1d3n5H8LeKP8BqkjCtbCoV8yAAAACXBIWXMAAAsT
+          AAALEwEAmpwYAAABbmlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4
+          PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4
+          bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgog
+          ICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczpkYz0i
+          aHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iPgogICAgICAgICA8ZGM6c3ViamVjdD4K
+          ICAgICAgICAgICAgPHJkZjpCYWcvPgogICAgICAgICA8L2RjOnN1YmplY3Q+CiAgICAgIDwvcmRm
+          OkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgrlPw1BAAAAFElEQVQIHWM8
+          fPjwfwYgYAIRIAAAMrgDTJyW2igAAAAASUVORK5CYII='.gsub(/\n/,'')
+          
+        when 'placehold'
+          "http://placehold.it/#{ dim[:size] }"
+          
+        else
+          options[:protocol] ||= 'http://'
+          
+          # escape the url
+          safe_url = URI.escape(url)
+          
+          # generate token
+          token = Digest::MD5.hexdigest("#{ Url2png::Config.shared_secret }+#{ safe_url }")
+          
+          # build image url
+          File.join(Url2png::Config.api_url(options[:protocol]), Url2png::Config.api_version, Url2png::Config.public_key, token, dim[:size], safe_url)
+        end
+        
       end
-      
+        
     end
   end
 end

data/url2png.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{url2png}
-  s.version = "0.0.6"
+  s.name = "url2png"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["wout fierens"]
-  s.date = %q{2011-06-23}
-  s.description = %q{Generate screenshots from websites almost instantly at any preferred size using ruby and the url2png.com API}
-  s.email = %q{wout@boysabroad.com}
+  s.authors = ["wout fierens", "fuzzyalej", "ceritium"]
+  s.date = "2011-12-01"
+  s.description = "Generate screenshots from websites almost instantly at any preferred size using ruby and the url2png.com API"
+  s.email = "wout@impinc.co.uk"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
@@ -35,11 +35,11 @@ Gem::Specification.new do |s|
     "spec/url2png_spec.rb",
     "url2png.gemspec"
   ]
-  s.homepage = %q{http://github.com/wout/url2png-gem}
+  s.homepage = "http://github.com/wout/url2png-gem"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A ruby gem wrapping the url2png.com screenshot service API}
+  s.rubygems_version = "1.8.11"
+  s.summary = "A ruby gem wrapping the url2png.com screenshot service API"
   s.test_files = [
     "spec/helpers/common_rspec.rb",
     "spec/spec_helper.rb",
@@ -47,7 +47,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,105 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: url2png
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
+version: !ruby/object:Gem::Version
+  version: 0.0.7
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - wout fierens
+- fuzzyalej
+- ceritium
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-23 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157323520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157323520
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2157321920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157321920
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2157320760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157320760
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2157319780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157319780
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2157318140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 6
-        - 0
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *id005
-description: Generate screenshots from websites almost instantly at any preferred size using ruby and the url2png.com API
-email: wout@boysabroad.com
+  version_requirements: *2157318140
+description: Generate screenshots from websites almost instantly at any preferred
+  size using ruby and the url2png.com API
+email: wout@impinc.co.uk
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.markdown
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -117,40 +94,35 @@ files:
 - spec/spec_helper.rb
 - spec/url2png_spec.rb
 - url2png.gemspec
-has_rdoc: true
 homepage: http://github.com/wout/url2png-gem
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -4384475011927731947
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2618384894962089538
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A ruby gem wrapping the url2png.com screenshot service API
-test_files: 
+test_files:
 - spec/helpers/common_rspec.rb
 - spec/spec_helper.rb
 - spec/url2png_spec.rb