ruby-smugmug 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f18f75f74b04a31f48790624e603d7a1a4c12886
+  data.tar.gz: 11e2d02d25249dd8f78a43f3640112cf2d403209
+SHA512:
+  metadata.gz: b786b040771111e7d030f3bce693009cd1896f2ccfbdf49973d650c392b02d94a68780b9a7e01013e42bb9ef0a855924da8770c1eaefd5e579615ac34f348448
+  data.tar.gz: 81d10bc3985f01ec1d6b854ef10f02dd8d68d76d17d56db669e825c2abb33b10b34a66c656d784364d80bc86a9a73cbd07120a855a5b7e3041175cc21568cf7f

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Placester, Inc
+Copyright (c) 2012 Zachary Anker
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/smugmug/client.rb

@@ -63,6 +63,16 @@ module SmugMug
       @http.request(:uploading, args)
     end
 
+    ##
+    # Sign a url with OAuth tokens. Useful when you e.g. want to sign private photo URLs,
+    # because otherwise you cannot access them in a cookie-less environment
+    # @param [String] method HTTP method that the request is sent as
+    # @param [String] uri Full URL of the request
+    # @param [Hash] form_args Args to be passed to the server, optional
+    def sign_request(method, url, form_args = {})
+      @http.sign_request(method, url, form_args)
+    end
+
     ##
     # Direct mapping of SmugMug 1.3.0 API, either see http://wiki.smugmug.net/display/API/API+1.3.0 or the README for examples
     #
@@ -82,4 +92,4 @@ module SmugMug
       end
     end
   end
-end
+end

data/lib/smugmug/http.rb

@@ -1,4 +1,3 @@
-require "cgi"
 require "openssl"
 require "base64"
 require "net/http"
@@ -17,7 +16,7 @@ module SmugMug
     #
     def initialize(args)
       @config = args
-      @digest = OpenSSL::Digest::Digest.new("SHA1")
+      @digest = OpenSSL::Digest.new("SHA1")
 
       @headers = {"Accept-Encoding" => "gzip"}
       if args[:user_agent]
@@ -25,13 +24,19 @@ module SmugMug
       else
         @headers["User-Agent"] = "Ruby-SmugMug v#{SmugMug::VERSION}"
       end
+
+      args[:http] = args.fetch(:http,{})  #checks for the existance of :http, sets to nill if does not exist.
+      @http_proxy_host = args[:http].fetch(:proxy_host,nil)
+      @http_proxy_port = args[:http].fetch(:proxy_port,nil)
+      @http_proxy_user = args[:http].fetch(:proxy_user,nil)
+      @http_proxy_pass = args[:http].fetch(:proxy_pass,nil)
     end
 
     def request(api, args)
       uri = api == :uploading ? UPLOAD_URI : API_URI
       args[:method] = "smugmug.#{api}" unless api == :uploading
 
-      http = ::Net::HTTP.new(uri.host, uri.port)
+      http = ::Net::HTTP.new(uri.host, uri.port, @http_proxy_host, @http_proxy_port, @http_proxy_user, @http_proxy_pass)
       http.set_debug_output(@config[:debug_output]) if @config[:debug_output]
 
       # Configure HTTPS if needed
@@ -135,19 +140,34 @@ module SmugMug
       args["oauth_timestamp"] = Time.now.utc.to_i
       args["oauth_token"] = @config[:user][:token]
 
+      # RFC 1738 (http://www.ietf.org/rfc/rfc1738.txt) says:
+      #
+      #     Thus, only alphanumerics, the special characters "$-_.+!*'(),", and
+      #     reserved characters used for their reserved purposes may be used
+      #     unencoded within a URL.
+      #
+      # However, if we don't escape apostrophes and parentheses the SmugMug API fails
+      # with an invalid signature error:
+      #
+      #     Error #35, invalid signature (SmugMug::OAuthError)
+      #
+      # To overcome this, define a new unreserved character list and use this in URI::escape
+      unreserved = "\\-_.!~*a-zA-Z\\d"
+      unsafe = Regexp.new("[^#{unreserved}]", false, 'N')
+
       # Sort the params
       sorted_args = []
       args.sort.each do |key, value|
-        sorted_args.push("#{key.to_s}=#{CGI::escape(value.to_s)}")
+        sorted_args.push("#{key.to_s}=#{URI::escape(value.to_s, unsafe)}")
       end
 
       postdata = sorted_args.join("&")
 
       # Final string to hash
-      sig_base = "#{method}&#{CGI::escape("#{uri.scheme}://#{uri.host}#{uri.path}")}&#{CGI::escape(postdata)}"
+      sig_base = "#{method}&#{URI::escape("#{uri.scheme}://#{uri.host}#{uri.path}", unsafe)}&#{URI::escape(postdata, unsafe)}"
 
       signature = OpenSSL::HMAC.digest(@digest, "#{@config[:oauth_secret]}&#{@config[:user][:secret]}", sig_base)
-      signature = CGI::escape(Base64.encode64(signature).chomp)
+      signature = URI::escape(Base64.encode64(signature).chomp, unsafe)
 
       if uri == API_URI
         "#{postdata}&oauth_signature=#{signature}"

data/lib/smugmug/version.rb

@@ -1,3 +1,3 @@
 module SmugMug
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ruby-smugmug
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Zachary Anker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.8'
 description: Gem for reading and writing data from the SmugMug 1.3.0 API.
 email:
 - zach.anker@gmail.com
@@ -50,6 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- Rakefile
 - lib/ruby-smugmug.rb
 - lib/smugmug/api_category.rb
 - lib/smugmug/api_methods.rb
@@ -57,31 +55,28 @@ files:
 - lib/smugmug/exceptions.rb
 - lib/smugmug/http.rb
 - lib/smugmug/version.rb
-- LICENSE
-- README.md
-- Rakefile
 homepage: http://github.com/zanker/ruby-smugmug
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: ruby-smugmug
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: SmugMug 1.3.0 API gem
 test_files: []
+has_rdoc: