prtscr 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe0b347b301bcef2d7d9dcf35af6eb5f7a6e20c5
-  data.tar.gz: a378d0284e411d94fe039ea6bf0c2bef73907050
+  metadata.gz: 8c5c49d2442534e189e5907a9edd239479ec9b6d
+  data.tar.gz: 7d66cde279445b94f5c084e8f381b58031a84603
 SHA512:
-  metadata.gz: 9a6d22cc11db17140d9bebeaf5266513966d47cf7d581f47f4804e66385bcdd8ebc6b21759497bceb05a2d40ebb12a49073264f96732f7bd90e3590b3015fb68
-  data.tar.gz: a93a3d2976cb7d9d37b3630775a0f3f2122205656ef9ead689415c3dda8c919a0cc98fe89b2a2a37efe9fcd4969eb507c6c7f9321da9d262cbe1e850abb90172
+  metadata.gz: b280d624379f28c8fdec5241c26517444ab994ba5c17c7eb783729d12ef5b9b9d2febb49744c1e124ca33e8860e5f66cad5470d5229d8282c846025d244e3ea3
+  data.tar.gz: 7530dcf63710dedb263c1644bc7a2458fba3e4582fd825025960fcf6066fc88e450195e862b7992f25543769024de348bdc15379bdabf7c345fd91f60f85f471

data/lib/prtscr.rb

@@ -1,10 +1,11 @@
 require "prtscr/version"
+require "base64"
 
 module Prtscr
 
   def self.get(data)
     d = {
-      version: 'v1',
+      version: 'v2',
       width: '1280',
       height: '1024',
       scale: '500',
@@ -14,10 +15,18 @@ module Prtscr
       host: 'prtscr.ru'
     }.merge(data)
 
-    d[:url] = URI.encode_www_form_component(d[:url])
-    d[:sign] = Digest::MD5.hexdigest([d[:width], d[:height], d[:scale], d[:format], d[:timestamp], d[:key], d[:url], d[:secret]].join(''))
-    d[:size] = [d[:width], d[:height]].join('x')
-    [d[:scheme], d[:host], d[:version], d[:size], d[:scale], d[:format], d[:timestamp], d[:key], d[:sign], d[:url]].join('/')
+    if d[:version] == 'v1'
+      d[:url] = URI.encode_www_form_component(d[:url])
+      d[:sign] = Digest::MD5.hexdigest([d[:width], d[:height], d[:scale], d[:format], d[:timestamp], d[:key], d[:url], d[:secret]].join(''))
+      d[:size] = [d[:width], d[:height]].join('x')
+      return [d[:scheme], d[:host], d[:version], d[:size], d[:scale], d[:format], d[:timestamp], d[:key], d[:sign], d[:url]].join('/')
+    elsif d[:version] == 'v2'
+      d[:url] = Base64.urlsafe_encode64(d[:url])
+      d[:sign] = Digest::MD5.hexdigest([d[:width], d[:height], d[:scale], d[:timestamp], d[:key], d[:url], d[:format], d[:secret]].join(''))
+      d[:size] = [d[:width], d[:height]].join('x')
+
+      return [[d[:scheme], d[:host], d[:version], d[:size], d[:scale], d[:timestamp], d[:key], d[:sign], d[:url]].join('/'), d[:format]].join('.')
+    end
   end
 
 end

data/lib/prtscr/version.rb

@@ -1,3 +1,3 @@
 module Prtscr
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/prtscr.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["vick.orel@gmail.com"]
 
   spec.summary       = "PrtScr.ru API gem"
-  spec.description   = "Website screenshot API gem"
+  spec.description   = "Website screenshot API gem for http://prtscr.ru"
   spec.homepage      = "https://github.com/vickodin/prtscr"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prtscr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - vickodin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Website screenshot API gem
+description: Website screenshot API gem for http://prtscr.ru
 email:
 - vick.orel@gmail.com
 executables: []