flickrie 0.2.1 → 0.2.2

data/.gitignore

@@ -1,4 +1,4 @@
 TODO.md
 Gemfile.lock
 *.gem
-development.rb
+pkg/

data/LICENSE

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -54,7 +54,7 @@ Note that, what Flickr refers to as "photoset" in its documentation, I
 refer to as "set". This is because the word "photoset" is actually
 incorrect, since sets can also hold videos.
 
-You can also throw in some parameters to `.photos_from_set` to get more information about photos. For example,
+You can also throw in some parameters to `Flickrie.photos_from_set` to get more information about photos. For example,
 
 ```ruby
 photos = Flickrie.photos_from_set(819234, :extras => 'owner_name,last_update,tags,views')
@@ -110,7 +110,8 @@ photo.width      # => 320
 ```
 
 You can see the full list of available methods and attributes in the
-[documentation](http://rubydoc.info/gems/flickrie/0.1.2/frames).
+[documentation](http://rubydoc.info/gems/flickrie/0.1.2/frames). Also,
+be sure to check the [wiki](https://github.com/janko-m/flickrie/wiki) for some additional info and tips.
 
 ## Authentication
 
@@ -139,6 +140,9 @@ request_token.get_authorization_url(:permissions => "read")
 to ask only for "read" permissions from the user. Available permissions
 are "read", "write" and "delete".
 
+To see how to make authentication in a web application, see [this](https://github.com/janko-m/flickrie/wiki/Authentication-in-web-applications) wiki
+page.
+
 ## A few words
 
 Now, I covered only a few out of many Flickr's API methods using this approach, but I'll constantly update this gem with new API methods. For all of the methods I didn't cover, you can call them using `Flickrie.client`, like this:
@@ -200,4 +204,4 @@ basis of this gem.
 
 ## License
 
-[MIT](http://github.com/janko-m/flickrie/blob/master/LICENSE)
+[MIT](https://github.com/janko-m/flickrie/blob/master/LICENSE)

data/Rakefile

@@ -1,4 +1,5 @@
-#!/usr/bin/env rake
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 CURRENT_DIR = File.expand_path(File.dirname(__FILE__))
 

data/flickrie.gemspec

@@ -17,5 +17,4 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'faraday_middleware'
   gem.add_dependency 'simple_oauth'
-  gem.add_dependency 'addressable'
 end

data/lib/flickrie/oauth.rb

@@ -1,6 +1,5 @@
 require 'faraday_middleware'
 require 'faraday_middleware/response_middleware'
-require 'simple_oauth'
 
 module Flickrie
   module OAuth
@@ -15,11 +14,11 @@ module Flickrie
 
       Faraday.new(URL) do |connection|
         connection.request :oauth, oauth_params
-        connection.use ParseFlickrResponse
+        connection.use ParseResponseParams
         connection.adapter Faraday.default_adapter
       end.
         tap do |connection|
-          connection.builder.insert_before ParseFlickrResponse, StatusCheck
+          connection.builder.insert_before ParseResponseParams, StatusCheck
         end
     end
 
@@ -34,15 +33,10 @@ module Flickrie
     class Error < StandardError
     end
 
-    class ParseFlickrResponse < FaradayMiddleware::ResponseMiddleware
-      dependency do
-        require 'addressable/uri' unless defined?(Addressable)
-      end
-
+    class ParseResponseParams < FaradayMiddleware::ResponseMiddleware
       define_parser do |body|
-        parser = Addressable::URI.new
-        parser.query = body
-        parser.query_values
+        params_array = body.split('&').map { |param| param.split('=') }
+        Hash[*params_array.flatten]
       end
     end
 
@@ -78,12 +72,14 @@ module Flickrie
       extend Token
 
       def get_authorization_url(options = {})
-        url = Addressable::URI.parse(URL)
+        require 'uri'
+        url = URI.parse(URL)
         url.path += "/authorize"
-        url.query_values = {
+        params = {
           :oauth_token => token,
           :perms => options[:permissions] || options[:perms]
         }
+        url.query = params.map { |k, v| "#{k}=#{v}" }.join('&')
         url.to_s
       end
     end

data/lib/flickrie/version.rb

@@ -1,3 +1,3 @@
 module Flickrie
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/test/media_test.rb

@@ -42,7 +42,7 @@ class MediaTest < Test::Unit::TestCase
     assert_equal 'luka', media.tags.first.raw
     assert_equal false, media.tags.first.machine_tag?
 
-    assert_equal 1, media.views_count
+    assert_equal 2, media.views_count
     assert_equal 1, media.comments_count
     assert_equal '0', media.license.id
     assert_equal 0, media.safety_level
@@ -141,7 +141,7 @@ class MediaTest < Test::Unit::TestCase
     assert_equal 'IMG_0796', media.title
     assert_equal 'luka', media.tags
     assert_equal '', media.machine_tags
-    assert_equal 1, media.views_count
+    assert_equal 2, media.views_count
     assert_equal '0', media.license.id
     assert_equal true, media.primary?
     assert_not_nil media.url
@@ -184,7 +184,7 @@ class MediaTest < Test::Unit::TestCase
     assert_equal 'IMG_0796', media.title
     assert_equal 'luka', media.tags
     assert_equal '', media.machine_tags
-    assert_equal 1, media.views_count
+    assert_equal 2, media.views_count
     assert_equal '0', media.license.id
     assert_not_nil media.url
     assert_equal 'ready', media.media_status
@@ -232,7 +232,7 @@ class MediaTest < Test::Unit::TestCase
     assert_equal 'IMG_0796', media.title
     assert_equal 'luka', media.tags
     assert_equal '', media.machine_tags
-    assert_equal 1, media.views_count
+    assert_equal 2, media.views_count
     assert_equal '0', media.license.id
     assert_not_nil media.url
     assert_equal 'ready', media.media_status

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrie
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70145016897960 !ruby/object:Gem::Requirement
+  requirement: &70320778626240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70145016897960
+  version_requirements: *70320778626240
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70145016897320 !ruby/object:Gem::Requirement
+  requirement: &70320778623960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,18 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70145016897320
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: &70145016896660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70145016896660
+  version_requirements: *70320778623960
 description: This gem is a nice wrapper for the Flickr API with an intuitive interface.
 email:
 - janko.marohnic@gmail.com
@@ -56,7 +45,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- finished_api_methods.md
 - flickrie.gemspec
 - lib/flickrie.rb
 - lib/flickrie/client.rb

data/finished_api_methods.md

@@ -1,84 +0,0 @@
-# activity
-
-# auth
-
-# auth.oauth
-
-# blogs
-
-# collections
-
-# commons
-
-# contacts
-
-# favorites
-
-# galleries
-
-# groups
-
-# groups.members
-
-# groups.pools
-
-# interestingness
-
-# machinetags
-
-# panda
-
-# people
-
-- flickr.people.findByEmail
-- flickr.people.findByUsername
-- flickr.people.getInfo
-- flickr.people.getPublicPhotos
-
-# photos
-
-- flickr.photos.getInfo
-- flickr.photos.getSizes
-- flickr.photos.search
-
-# photos.comments
-
-# photos.geo
-
-# photos.licenses
-
-- flickr.photos.licenses.getInfo
-
-# photos.notes
-
-# photos.people
-
-# photos.suggestions
-
-# photos.transform
-
-# photos.upload
-
-# photosets
-
-- flickr.photosets.getInfo
-- flickr.photosets.getList
-- flickr.photosets.getPhotos
-
-# photosets.comments
-
-# places
-
-# prefs
-
-# push
-
-# reflection
-
-# stats
-
-# tags
-
-# test
-
-# urls