flickr-objects 0.0.2 → 0.1.0

data/lib/flickr/objects/photo.rb

@@ -1,45 +1,113 @@
+require_relative "attribute_values/photo"
+require "flickr/api/photo"
+require "flickr/helpers/base_58"
+
 class Flickr
-  class Photo < Media
-
-    attribute :rotation,   Integer
-
-    attribute :source_url, String
-    attribute :height,     Integer
-    attribute :width,      Integer
-
-    # This creates size methods. For example:
-    #
-    #   small_photo = photo.square150
-    #   small_photo.size #=> "Square 150"
-    #   small_photo.source_url #=> URL to the "Square 150" version
-    #
-    # You can also put the number in the parameter, if you like that version better:
-    #
-    #   photo.square(150)
-    #   photo.square("150")
-    #
-    # You also get the bang versions, which change the receiver:
-    #
-    #   photo.square150!
-    #   photo.square!(150)
-    #
+  class Photo < Object
+
+    attribute :id,                   String
+    attribute :secret,               String
+    attribute :server,               String
+    attribute :farm,                 Integer
+    attribute :title,                String
+    attribute :description,          String
+    attribute :license,              Integer
+    attribute :visibility,           Visibility
+    attribute :safety_level,         Integer
+
+    attribute :owner,                Person
+
+    attribute :uploaded_at,          Time
+    attribute :posted_at,            Time
+    attribute :taken_at,             Time
+    attribute :taken_at_granularity, Integer
+    attribute :updated_at,           Time
+
+    attribute :views_count,          Integer
+    attribute :comments_count,       Integer
+
+    attribute :editability,          Permissions
+    attribute :public_editability,   Permissions
+    attribute :usage,                Permissions
+
+    attribute :notes,                Array[Note]
+    attribute :tags,                 Array[Tag]
+
+    attribute :has_people?,          Boolean
+    attribute :favorite?,            Boolean
+
+    attribute :path_alias,           String
+
+    attribute :location,             Location
+    attribute :location_visibility,  Visibility
+
+    attribute :rotation,             Integer
+
+    attribute :largest_size,         String
+    attribute :available_sizes,      Array[String]
+
+    attribute :source_url,           String
+    attribute :height,               Integer
+    attribute :width,                Integer
+
+    def safe?;       safety_level <= 1 end
+    def moderate?;   safety_level == 2 end
+    def restricted?; safety_level == 3 end
+
+    def url
+      "http://www.flickr.com/photos/#{owner.id}/#{id}/" if owner
+    end
+
+    include Base58
+    def short_url
+      "http://flic.kr/p/#{to_base58(id)}"
+    end
+
+    SIZES = {
+      "Square 75"  => "sq",
+      "Thumbnail"  => "t",
+      "Square 150" => "q",
+      "Small 240"  => "s",
+      "Small 320"  => "n",
+      "Medium 500" => "m",
+      "Medium 640" => "z",
+      "Medium 800" => "c",
+      "Large 1024" => "l",
+      "Large 1600" => "h",
+      "Large 2048" => "k",
+      "Original"   => "o"
+    }
+
+    attr_reader :size
+
     SIZES.keys.each do |size|
       size_name, size_number = size.split(" ").map(&:downcase)
 
       define_method("#{size_name}#{size_number}!") { @size = size; self }
-      define_method("#{size_name}#{size_number}")  { dup.send("#{size_name}#{size_number}!") }
+      define_method("#{size_name}#{size_number}")  { dup.send("#{__method__}!") }
 
       if size_number
-        define_method("#{size_name}!") {|size_number| send("#{size_name}#{size_number}!") }
-        define_method("#{size_name}")  {|size_number| send("#{size_name}#{size_number}") }
+        define_method("#{size_name}!") { |size_number| send("#{size_name}#{size_number}!") }
+        define_method("#{size_name}")  { |size_number| send("#{size_name}#{size_number}") }
       end
-    end
 
-    def size
-      @size
+      define_method("#{size_name}#{size_number}_or_smaller!") do
+        sizes = SIZES.keys.reverse.drop_while { |s| s != size }
+        @size = sizes.find { |s| @hash["url_#{SIZES[s]}"] }
+        self
+      end
+      define_method("#{size_name}#{size_number}_or_smaller") { dup.send("#{__method__}!") }
+
+      define_method("#{size_name}#{size_number}_at_least!") do
+        sizes = SIZES.keys.drop_while { |s| s != size }.reverse
+        @size = sizes.find { |s| @hash["url_#{SIZES[s]}"] }
+        self
+      end
+      define_method("#{size_name}#{size_number}_at_least") { dup.send("#{__method__}!") }
     end
 
     def largest!; @size = largest_size; self end
     def largest;  dup.largest!               end
+
   end
 end

data/lib/flickr/objects/set.rb

@@ -1,3 +1,6 @@
+require_relative "attribute_values/set"
+require "flickr/api/set"
+
 class Flickr
   class Set < Object
 
@@ -11,20 +14,16 @@ class Flickr
 
     attribute :owner,          Person
 
-    attribute :media_count,    Integer
+    attribute :photos_count,   Integer
     attribute :views_count,    Integer
     attribute :comments_count, Integer
-    attribute :photos_count,   Integer
-    attribute :videos_count,   Integer
 
     attribute :permissions,    Permissions
 
     attribute :created_at,     Time
     attribute :updated_at,     Time
 
-    attribute :primary_media,  Media
     attribute :primary_photo,  Photo
-    attribute :primary_video,  Video
 
   end
 end

data/lib/flickr/objects/tag.rb

@@ -1,3 +1,5 @@
+require_relative "attribute_values/tag"
+
 class Flickr
   class Tag < Object
 

data/lib/flickr/objects/upload_ticket.rb

@@ -1,16 +1,18 @@
+require_relative "attribute_values/upload_ticket"
+require "flickr/api/upload_ticket"
+
 class Flickr
   class UploadTicket < Object
 
-    attribute :id,        String
-    attribute :status,    Integer
-    attribute :invalid?,  Boolean
+    attribute :id,      String
+    attribute :status,  Integer
+    attribute :invalid, Integer
 
-    attribute :media,     Media
-    attribute :photo,     Photo
-    attribute :video,     Video
+    attribute :photo,   Photo
 
     def complete?; status == 1 end
     def failed?;   status == 2 end
 
+    def invalid?; invalid == 1 end
   end
 end

data/lib/flickr/objects/visibility.rb

@@ -1,3 +1,5 @@
+require_relative "attribute_values/visibility"
+
 class Flickr
   class Visibility < Object
 

data/lib/flickr/objects.rb

@@ -3,9 +3,7 @@ require "flickr/object"
 class Flickr
   # Official objects
   class Person < Object; end
-  class Media  < Object; end
-  class Photo  < Media;  end
-  class Video  < Media;  end
+  class Photo  < Object; end
   class Set    < Object; end
 
   # Meta objects
@@ -16,14 +14,11 @@ class Flickr
   class Location     < Object; end
   class UploadTicket < Object; end
 
-  class Collection  < Object; end
+  autoload :List, "flickr/objects/list"
 end
 
 objects = Flickr::Object.children.dup
 objects.each do |object|
   underscored_name = object.name.split("::").last.split(/(?<=\w)(?=[A-Z])/).map(&:downcase).join("_")
   require "flickr/objects/#{underscored_name}"
-  require "flickr/objects/attribute_values/#{underscored_name}"
-  require "flickr/api/#{underscored_name}"
-  require "flickr/api/api_methods/#{underscored_name}"
 end

data/lib/flickr/version.rb

@@ -1,3 +1,3 @@
 class Flickr
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/flickr.rb

@@ -15,7 +15,12 @@ class Flickr
   def self.api_methods
     @api_methods ||= Hash.new { |hash, key| hash[key] = [] }
   end
+
+  def self.deprecation_warn(message)
+    warn "[FLICKR OBJECTS] #{message}"
+  end
 end
 
 require "flickr/objects"
 require "flickr/api"
+require "flickr/oauth"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickr-objects
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.14'
 description: This gem is an object-oriented wrapper for the Flickr API.
 email:
 - janko.marohnic@gmail.com
@@ -148,51 +196,34 @@ extra_rdoc_files: []
 files:
 - README.md
 - LICENSE
-- lib/flickr/api/api_methods/collection.rb
 - lib/flickr/api/api_methods/flickr.rb
-- lib/flickr/api/api_methods/location.rb
-- lib/flickr/api/api_methods/media.rb
-- lib/flickr/api/api_methods/note.rb
-- lib/flickr/api/api_methods/permissions.rb
 - lib/flickr/api/api_methods/person.rb
 - lib/flickr/api/api_methods/photo.rb
 - lib/flickr/api/api_methods/set.rb
-- lib/flickr/api/api_methods/tag.rb
 - lib/flickr/api/api_methods/upload_ticket.rb
-- lib/flickr/api/api_methods/video.rb
-- lib/flickr/api/api_methods/visibility.rb
-- lib/flickr/api/collection.rb
 - lib/flickr/api/flickr.rb
-- lib/flickr/api/location.rb
-- lib/flickr/api/media.rb
-- lib/flickr/api/note.rb
-- lib/flickr/api/permissions.rb
 - lib/flickr/api/person.rb
 - lib/flickr/api/photo.rb
 - lib/flickr/api/set.rb
-- lib/flickr/api/tag.rb
 - lib/flickr/api/upload_ticket.rb
-- lib/flickr/api/video.rb
-- lib/flickr/api/visibility.rb
 - lib/flickr/api.rb
 - lib/flickr/api_caller.rb
 - lib/flickr/client/methods_client.rb
-- lib/flickr/client/middleware/retry.rb
-- lib/flickr/client/middleware.rb
 - lib/flickr/client/upload_client.rb
 - lib/flickr/client.rb
 - lib/flickr/configuration.rb
+- lib/flickr/errors.rb
 - lib/flickr/helpers/base_58.rb
 - lib/flickr/helpers/boolean.rb
 - lib/flickr/helpers/core_ext.rb
-- lib/flickr/helpers/inheritable_attr_accessor.rb
+- lib/flickr/middleware.rb
+- lib/flickr/oauth.rb
 - lib/flickr/object/attribute/converter.rb
 - lib/flickr/object/attribute/finder.rb
 - lib/flickr/object/attribute.rb
 - lib/flickr/object.rb
-- lib/flickr/objects/attribute_values/collection.rb
+- lib/flickr/objects/attribute_values/list.rb
 - lib/flickr/objects/attribute_values/location.rb
-- lib/flickr/objects/attribute_values/media.rb
 - lib/flickr/objects/attribute_values/note.rb
 - lib/flickr/objects/attribute_values/permissions.rb
 - lib/flickr/objects/attribute_values/person.rb
@@ -200,11 +231,9 @@ files:
 - lib/flickr/objects/attribute_values/set.rb
 - lib/flickr/objects/attribute_values/tag.rb
 - lib/flickr/objects/attribute_values/upload_ticket.rb
-- lib/flickr/objects/attribute_values/video.rb
 - lib/flickr/objects/attribute_values/visibility.rb
-- lib/flickr/objects/collection.rb
+- lib/flickr/objects/list.rb
 - lib/flickr/objects/location.rb
-- lib/flickr/objects/media.rb
 - lib/flickr/objects/note.rb
 - lib/flickr/objects/permissions.rb
 - lib/flickr/objects/person.rb
@@ -212,7 +241,6 @@ files:
 - lib/flickr/objects/set.rb
 - lib/flickr/objects/tag.rb
 - lib/flickr/objects/upload_ticket.rb
-- lib/flickr/objects/video.rb
 - lib/flickr/objects/visibility.rb
 - lib/flickr/objects.rb
 - lib/flickr/version.rb
@@ -239,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2444191243502827259
+      hash: -330563932466293642
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/flickr/api/api_methods/collection.rb

@@ -1,4 +0,0 @@
-class Flickr
-  class Collection < Object
-  end
-end

data/lib/flickr/api/api_methods/location.rb

@@ -1,4 +0,0 @@
-class Flickr
-  class Location < Object
-  end
-end

data/lib/flickr/api/api_methods/media.rb

@@ -1,14 +0,0 @@
-class Flickr
-  class Media < Object
-    class_api_method :get_from_contacts, "flickr.photos.getContactsPhotos"
-    class_api_method :search,            "flickr.photos.search"
-
-    instance_api_method :add_tags,         "flickr.photos.addTags"
-    instance_api_method :delete,           "flickr.photos.delete"
-    instance_api_method :get_info!,        "flickr.photos.getInfo"
-    instance_api_method :get_sizes!,       "flickr.photos.getSizes"
-    instance_api_method :remove_tag,       "flickr.photos.removeTag"
-    instance_api_method :set_content_type, "flickr.photos.setContentType", aliases: [:content_type=]
-    instance_api_method :set_tags,         "flickr.photos.setTags",        aliases: [:tags=]
-  end
-end

data/lib/flickr/api/api_methods/note.rb

@@ -1,4 +0,0 @@
-class Flickr
-  class Note < Object
-  end
-end

data/lib/flickr/api/api_methods/permissions.rb

@@ -1,4 +0,0 @@
-class Flickr
-  class Permissions < Object
-  end
-end

data/lib/flickr/api/api_methods/tag.rb

@@ -1,4 +0,0 @@
-class Flickr
-  class Tag < Object
-  end
-end

data/lib/flickr/api/api_methods/video.rb

@@ -1,4 +0,0 @@
-class Flickr
-  class Video < Media
-  end
-end

data/lib/flickr/api/api_methods/visibility.rb

@@ -1,4 +0,0 @@
-class Flickr
-  class Visibility < Object
-  end
-end

data/lib/flickr/api/collection.rb

@@ -1,4 +0,0 @@
-class Flickr
-  class Collection < Object
-  end
-end

data/lib/flickr/api/location.rb

@@ -1,4 +0,0 @@
-class Flickr
-  class Location < Object
-  end
-end

data/lib/flickr/api/media.rb

@@ -1,52 +0,0 @@
-class Flickr
-  class Media < Object
-    def add_tags(tags, params = {})
-      client.post flickr_method(__method__), params.merge(photo_id: id, tags: tags)
-      tags
-    end
-
-    def delete(params = {})
-      client.post flickr_method(__method__), params.merge(photo_id: id)
-      self
-    end
-
-    def self.get_from_contacts(params = {})
-      response = client.get flickr_method(__method__), handle_extras(params)
-      Collection.new(response["photos"].delete("photo"), Media, response["photos"], client)
-    end
-
-    def get_info!(params = {})
-      response = client.get flickr_method(__method__), params.merge(photo_id: id)
-      @hash.update(response["photo"])
-      self
-    end
-
-    def get_sizes!(params = {})
-      response = client.get flickr_method(__method__), params.merge(photo_id: id)
-      @hash.update(response["sizes"])
-      self
-    end
-
-    def remove_tag(tag_id, params = {})
-      client.post flickr_method(__method__), params.merge(photo_id: id, tag_id: tag_id)
-      tag_id
-    end
-
-    def self.search(params = {})
-      response = client.get flickr_method(__method__), handle_extras(params)
-      Collection.new(response["photos"].delete("photo"), self, response["photos"], client)
-    end
-
-    def set_content_type(content_type, params = {})
-      client.post flickr_method(__method__), params.merge(photo_id: id, content_type: content_type)
-      content_type
-    end
-    alias content_type= set_content_type
-
-    def set_tags(tags, params = {})
-      client.post flickr_method(__method__), params.merge(photo_id: id, tags: tags)
-      tags
-    end
-    alias tags= set_tags
-  end
-end

data/lib/flickr/api/note.rb

@@ -1,4 +0,0 @@
-class Flickr
-  class Note < Object
-  end
-end

data/lib/flickr/api/permissions.rb

@@ -1,4 +0,0 @@
-class Flickr
-  class Permissions < Object
-  end
-end

data/lib/flickr/api/tag.rb

@@ -1,4 +0,0 @@
-class Flickr
-  class Tag < Object
-  end
-end

data/lib/flickr/api/video.rb

@@ -1,11 +0,0 @@
-class Flickr
-  class Video < Media
-    def self.get_from_contacts(params = {})
-      super(params).select { |media| media.is_a?(self) }
-    end
-
-    def self.search(params = {})
-      super(params.merge(media: "videos"))
-    end
-  end
-end

data/lib/flickr/api/visibility.rb

@@ -1,4 +0,0 @@
-class Flickr
-  class Visibility < Object
-  end
-end

data/lib/flickr/client/middleware/retry.rb

@@ -1,29 +0,0 @@
-class Flickr
-  class Client < Faraday::Connection
-    module Middleware
-      class Retry < Faraday::Middleware
-        def initialize(app, options = {})
-          super(app)
-          @retries, options = options, {} if options.is_a? Integer
-          @retries ||= options.fetch(:max, 2).to_i
-          @sleep     = options.fetch(:interval, 0).to_f
-          @errmatch  = options.fetch(:exceptions) { [Errno::ETIMEDOUT, 'Timeout::Error', Faraday::Error::TimeoutError] }
-        end
-
-        def call(env)
-          retries = @retries
-          begin
-            @app.call(env)
-          rescue *@errmatch
-            if retries > 0
-              retries -= 1
-              sleep @sleep if @sleep > 0
-              retry
-            end
-            raise
-          end
-        end
-      end
-    end
-  end
-end