flickr-objects 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86c3505e2229c1d398d2993def2dc600aa553479
-  data.tar.gz: b3d7201ba2d5045c32170346dbd6488124f1b61c
+  metadata.gz: 7de03cf589dcbc788d7f5379898849697d77727a
+  data.tar.gz: 6e5ecd527db406c9d5c04b32941f16f74c05a925
 SHA512:
-  metadata.gz: 6dbee233ae370d5646d4774f91e4555a294442abebad859b4c21b3d5516f9ff558e71f014934abdc6d5b0380f7e04d704ee1a30f0dd7820b6d6b9b1e28f18dfc
-  data.tar.gz: ffb3356c91cb905667b10465250e9f72a22edfa9a34a06cdadb0522702330eb68fa6ca3a54746693616cdab560e9745e518f1de3a4dd291a377c1f20d6f55e2b
+  metadata.gz: aaf84c71ca0dd4ec410f392d39982e4a6a69eca500acd225cde9378bfbdb26223151a733783301ef39b74eca6aaf518a7ac80b913d6bf8aa6bb9811fce4b528e
+  data.tar.gz: 391211fca29b2f3a713cc6e8fa343d76b8d067830300be0c9040fcadd8f8769f56a7c7254aaf8af80fc4d72ff5b24715bbc522551df172657cad8095ee89126e

data/README.md

@@ -157,16 +157,34 @@ photo.title #=> "Dandelions"
 
 See [`Flickr.upload`](http://rubydoc.info/github/janko-m/flickr-objects/master/Flickr/Api/General#upload-instance_method).
 
+## Pagination
+
+```ruby
+Flickr.configure do |config|
+  config.pagination = :will_paginate
+end
+```
+```ruby
+@photos = Flickr.photos.search(user_id: "78733179@N04", page: params[:page], per_page: 10)
+```
+```erb
+<%= will_paginate @photos %>
+```
+
+Flickr gives you pagination on almost every request that returns a collection of objects.
+This gem supports both [WillPaginate](https://github.com/mislav/will_paginate) (`:will_paginate`)
+and [Kaminari](https://github.com/amatsuda/kaminari) (`:kaminari`).
+
 ## Few words
 
 Many of the API methods are not covered yet (because they are so many).
 I believe I covered all the important ones, but if you wish for me to
-cover certain new ones, feel free to contact me via [Twitter](https://twitter.com/m_janko).
+cover certain new ones, feel free to contact me via [Twitter](https://twitter.com/jankomarohnic).
 I also wouldn't mind getting a pull request ;)
 
 ## Social
 
-You can follow me on Twitter, I'm [@m_janko](https://twitter.com/m_janko).
+You can follow me on Twitter, I'm [@jankomarohnic](https://twitter.com/jankomarohnic).
 
 ## License
 

data/lib/flickr/client/data.rb

@@ -34,11 +34,7 @@ module Flickr
       end
 
       def url
-        if use_ssl?
-          "https://secure.flickr.com/services"
-        else
-          "http://api.flickr.com/services"
-        end
+        "https://api.flickr.com/services"
       end
 
     end

data/lib/flickr/client/upload.rb

@@ -42,11 +42,7 @@ module Flickr
       end
 
       def url
-        if use_ssl?
-          "https://secure.flickr.com/services"
-        else
-          "http://api.flickr.com/services"
-        end
+        "https://api.flickr.com/services"
       end
 
     end

data/lib/flickr/object/list.rb

@@ -65,7 +65,7 @@ module Flickr
       end
 
       ##
-      # @deprecated It provides #find_by_<attribute> methods, but they are now
+      # @deprecated It provides `#find_by_<attribute>` methods, but they are now
       #   deprecated in favor of the obviously superior {#find_by} (repeating
       #   ActiveRecord's mistake :P).
       #

data/lib/flickr/object.rb

@@ -15,13 +15,6 @@ module Flickr
       :List, :Photo, :Person, :Set, :UploadTicket, :Permissions, :Location,
       :Visibility
 
-    ##
-    # @private
-    #
-    def self.api_class
-      Flickr::Api.const_get(name.match(/^Flickr::Object::/).post_match)
-    end
-
     ##
     # Overriding Flickr::Attributes#attribute to add a default location.
     # This means that `:<attribute>` will always first be searched in
@@ -133,7 +126,9 @@ module Flickr
     private
 
     def api
-      self.class.api_class.new(@access_token)
+      api_name = self.class.name.match(/^Flickr::Object::/).post_match
+      api_class = Flickr::Api.const_get(api_name)
+      api_class.new(@access_token)
     end
   end
 

data/lib/flickr/version.rb

@@ -1,5 +1,5 @@
 module Flickr
 
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 
 end

metadata

@@ -1,181 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: flickr-objects
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.6
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: simple_oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.35.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.35.1
 description: This gem is an object-oriented wrapper for the Flickr API.
@@ -185,59 +185,59 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - LICENSE
-- lib/flickr/api/abstract/params_processor.rb
+- README.md
+- lib/flickr-objects.rb
+- lib/flickr.rb
+- lib/flickr/api.rb
 - lib/flickr/api/abstract.rb
+- lib/flickr/api/abstract/params_processor.rb
 - lib/flickr/api/general.rb
 - lib/flickr/api/person.rb
 - lib/flickr/api/photo.rb
 - lib/flickr/api/set.rb
 - lib/flickr/api/upload_ticket.rb
-- lib/flickr/api.rb
 - lib/flickr/attributes.rb
 - lib/flickr/base_converter.rb
+- lib/flickr/client.rb
 - lib/flickr/client/data.rb
 - lib/flickr/client/oauth.rb
 - lib/flickr/client/upload.rb
-- lib/flickr/client.rb
 - lib/flickr/configuration.rb
 - lib/flickr/error.rb
 - lib/flickr/middleware.rb
 - lib/flickr/oauth.rb
+- lib/flickr/object.rb
 - lib/flickr/object/attribute_locations/list.rb
 - lib/flickr/object/attribute_locations/location.rb
 - lib/flickr/object/attribute_locations/permissions.rb
-- lib/flickr/object/attribute_locations/person/upload_status.rb
 - lib/flickr/object/attribute_locations/person.rb
+- lib/flickr/object/attribute_locations/person/upload_status.rb
+- lib/flickr/object/attribute_locations/photo.rb
 - lib/flickr/object/attribute_locations/photo/exif.rb
 - lib/flickr/object/attribute_locations/photo/note.rb
 - lib/flickr/object/attribute_locations/photo/tag.rb
-- lib/flickr/object/attribute_locations/photo.rb
 - lib/flickr/object/attribute_locations/set.rb
 - lib/flickr/object/attribute_locations/upload_ticket.rb
 - lib/flickr/object/attribute_locations/visibility.rb
+- lib/flickr/object/list.rb
 - lib/flickr/object/list/kaminari.rb
 - lib/flickr/object/list/normal.rb
 - lib/flickr/object/list/will_paginate.rb
-- lib/flickr/object/list.rb
 - lib/flickr/object/location.rb
 - lib/flickr/object/permissions.rb
-- lib/flickr/object/person/upload_status.rb
 - lib/flickr/object/person.rb
+- lib/flickr/object/person/upload_status.rb
+- lib/flickr/object/photo.rb
 - lib/flickr/object/photo/exif.rb
 - lib/flickr/object/photo/note.rb
 - lib/flickr/object/photo/size.rb
 - lib/flickr/object/photo/tag.rb
-- lib/flickr/object/photo.rb
 - lib/flickr/object/set.rb
 - lib/flickr/object/upload_ticket.rb
 - lib/flickr/object/visibility.rb
-- lib/flickr/object.rb
 - lib/flickr/sanitized_file.rb
 - lib/flickr/version.rb
-- lib/flickr-objects.rb
-- lib/flickr.rb
 homepage: http://janko-m.github.com/flickr-objects
 licenses:
 - MIT
@@ -248,17 +248,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: This gem is an object-oriented wrapper for the Flickr API.