digitalpardoe-rflickr 2.0.0.pre.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 7596bae6878e18dab1003f43bf3967c325e16a73
-  data.tar.gz: e29c316402a4b7f1ba1501521dbda6df2afbe98e
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzdhNDQ3ODMyZWI4MTk3ZDRmNzk2ODJiMTczOTYxMTM2ZmM0ZGU1Mg==
+  data.tar.gz: !binary |-
+    ZTMzNjdiZDQ5NTQzODlmYjQ0YmU0NjA0MDhjNWJlNTlmNTI2MDI4NA==
 SHA512:
-  metadata.gz: 2b0dd68fa6db8dba33ae5cfdf717b243ad90d1317d77117de647952b8e39f29f5134a2278feb19ab81f7a43e178b7891176dad15ac2acc9fb78507419323acd7
-  data.tar.gz: 83e1fe9d4fe531d710458d73e5b1230fa7df309c54e377a53571992070a592ae4a6feeedbc9a4bb8a9d4a0d31f4b3c89b06351287fd215b9afe6ffa341e7bdda
+  metadata.gz: !binary |-
+    Mzc0NjhkMDNhODQ2OWZmMjliZTcxNGNhZTViZmJmNTgyOWUyY2MyNjg5OTk0
+    MTMyNWI5YWRjODUzNzQyNmE2MjdjNWRlYzFhYWQ0ZDc3NzNiNTU3YzNhMDI3
+    NTNkMWRlZWRjNmEyMzU3ZDNiMmI2OWI1ZDM3ZTBhNzQwYmI2Yjk=
+  data.tar.gz: !binary |-
+    MTIzNGU0MjlhODYyODIxZWI2ZWNhOWRmNWJjZDk4YTdlY2Q4N2NiNjliMzRm
+    NmEzOWJmMjcyNmYwNjkwZmQwZjgwZjczZDA2MjQyYTg1ZjczNjA0ODQyZjk2
+    MjhkY2QwZGQ3ZWJiYThkZTk3ZjdhNWVmNjUxM2IwNzU0NjI1MDQ=

data/Gemfile

@@ -1,9 +1,9 @@
 source "http://rubygems.org"
 
 gem "json", "~> 1.8.0"
+gem "excon", "~> 0.41.0"
 
 group :development do
-  gem "rspec", ">= 0"
+  gem "rspec", "~> 2.14.0"
   gem "jeweler", "~> 1.8.4"
-  gem "ZenTest", ">= 0"
 end

data/README.md

@@ -35,6 +35,6 @@ First you'll need an IRB console with rFlickr available so you can `require 'fli
     
 Navigate to the URL provided and authorise the application.
 
-    >> flickr.auth.get_token
+    >> flickr.api.get_token
     
 Store the token received in the response, this is your auth token, you can either use it when you initialise a `Flickr` object or add it at a later point using `flickr.auth_token(AUTH_TOKEN)`.

data/Rakefile

@@ -17,7 +17,7 @@ Jeweler::Tasks.new do |gem|
   gem.name = "digitalpardoe-rflickr"
   gem.homepage = "http://github.com/digitalpardoe/rflickr"
   gem.summary = "rFlickr is a Ruby interface to the Flickr API"
-  gem.description = "rFlickr is a clone of the original RubyForge based rflickr, a Ruby implementation of the Flickr API. It includes a faithful albeit old reproduction of the published API."
+  gem.description = "rFlickr is a connector to the Flickr API, it doesn't do much but it should make working with the Flickr API easier."
   gem.email = "contact@digitalpardoe.co.uk"
   gem.authors = ["Alex Pardoe"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-2.0.0.pre.1
+2.0.0

data/digitalpardoe-rflickr.gemspec

@@ -2,15 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: digitalpardoe-rflickr 2.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "digitalpardoe-rflickr"
-  s.version = "2.0.0.pre.1"
+  s.version = "2.0.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Alex Pardoe"]
-  s.date = "2013-08-12"
-  s.description = "rFlickr is a clone of the original RubyForge based rflickr, a Ruby implementation of the Flickr API. It includes a faithful albeit old reproduction of the published API."
+  s.date = "2014-11-06"
+  s.description = "rFlickr is a connector to the Flickr API, it doesn't do much but it should make working with the Flickr API easier."
   s.email = "contact@digitalpardoe.co.uk"
   s.extra_rdoc_files = [
     "README.md"
@@ -42,8 +44,7 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/digitalpardoe/rflickr"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.2.2"
   s.summary = "rFlickr is a Ruby interface to the Flickr API"
 
   if s.respond_to? :specification_version then
@@ -51,20 +52,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, ["~> 1.8.0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_runtime_dependency(%q<excon>, ["~> 0.41.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.14.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<ZenTest>, [">= 0"])
     else
       s.add_dependency(%q<json>, ["~> 1.8.0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<excon>, ["~> 0.41.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.14.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<ZenTest>, [">= 0"])
     end
   else
     s.add_dependency(%q<json>, ["~> 1.8.0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<excon>, ["~> 0.41.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.14.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<ZenTest>, [">= 0"])
   end
 end
 

data/lib/flickr/api.rb

@@ -13,7 +13,7 @@ class Api
 		args = {'api_key' => @api.tokens.api_key, 'perms' => perms, 'frob' => @frob}
 		args = @api.sign_request(args)
 
-		Request.build_url('http://flickr.com/services/auth/', args)
+		Request.build_url('https://flickr.com/services/auth/', args)
 	end
 
 	def get_token(frob=@frob)

data/lib/flickr/interaction/flickr_api_request.rb

@@ -7,7 +7,7 @@ require 'flickr/interaction/request'
 class FlickrApiRequest
 	API_RSP = 'json'
 	API_REQ = 'rest'
-	API_URL = "http://api.flickr.com/services/#{API_REQ}/"
+	API_URL = "https://api.flickr.com/services/#{API_REQ}/"
 
 	attr_reader :tokens
 

data/lib/flickr/interaction/request.rb

@@ -1,8 +1,8 @@
-require 'net/http'
+require 'excon'
 require 'uri'
 
 class Request
-    def self.make(url, arguments, get)
+  def self.make(url, arguments, get)
 		get ? get(url, arguments) : post(url, arguments)
 	end
 
@@ -16,22 +16,11 @@ class Request
 	end
 
 	private
-	def self.get(url, arguments)
-		connection.get URI.parse(build_url(url, arguments))
+	def self.get(url, arguments)    
+		Excon.get("#{url}?" + URI.encode_www_form(arguments)).body
 	end
 
 	def self.post(url, arguments)
-		connection.post_form URI.parse(url), arguments
-	end
-
-	def self.connection
-		if proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
-			proxy = URI.parse(proxy)
-			agent = Net::HTTP.Proxy(proxy.host, proxy.port)
-		else
-			agent = Net::HTTP
-		end
-
-		agent
+    Excon.post(url, body: URI.encode_www_form(arguments), headers: { "Content-Type" => "application/x-www-form-urlencoded" }).body
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: digitalpardoe-rflickr
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Alex Pardoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -25,50 +25,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.41.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.41.0
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
-  name: ZenTest
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-description: rFlickr is a clone of the original RubyForge based rflickr, a Ruby implementation
-  of the Flickr API. It includes a faithful albeit old reproduction of the published
-  API.
+        version: 1.8.4
+description: rFlickr is a connector to the Flickr API, it doesn't do much but it should
+  make working with the Flickr API easier.
 email: contact@digitalpardoe.co.uk
 executables: []
 extensions: []
@@ -108,17 +107,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: rFlickr is a Ruby interface to the Flickr API