flickr-objects 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 804fe3b3024d5bfa5273c6b6ffbb65fd091e85e8
-  data.tar.gz: 3f80d880bbb6f2cfacaa0e11e144eb962ffe3f18
+  metadata.gz: 442add3120c6a46defe96432d84a7ec496a2e574
+  data.tar.gz: 8fddbf4731a2871b8427669bc85a235328f91b67
 SHA512:
-  metadata.gz: 2c98b7affe1fe3deba5842e135d2640cdf9404c4f36035e0c26e23ef3626590e9725a6a1e2d01ad4228a2a8853e082efdb83f7fb1fa1a3e4245d6979b384fc59
-  data.tar.gz: c25d0c5f1570a5299c54ba64e30230c3eb2c6f59b23081fe8bf1889aac6d86260ab4303813c58593cf4ed0b372b11c5f742aa44171cd15ed379734bce4760f70
+  metadata.gz: 8e23ac266dc1d3d2cf6155433a24e5a46bc7c7ebdde2f010bad05b41a2e410ccc8bab1fe7ca200facfdb6750e2603b9945c4b0eb3c1bb4d5efd7881b6233262e
+  data.tar.gz: 8f72874f1ace3b9ba50b827b0cba0516f8a0cc78429db37838ae1d0208be65e45ad2150c516ae081e6049739b824ddb6ae427a70678c69a97067ca05f6686dbe

data/README.md

@@ -6,6 +6,12 @@ This gem is an object-oriented wrapper for the [Flickr API](http://flickr.com/ap
 - Source code: [https://github.com/janko-m/flickr-objects](https://github.com/janko-m/flickr-objects)
 - API Documentation: [http://rubydoc.info/github/janko-m/flickr-objects/master/frames](http://rubydoc.info/github/janko-m/flickr-objects/master/frames)
 
+The gem has been tested on the following Ruby versions:
+
+- MRI 1.9.3
+- MRI 2.0
+- MRI 2.1
+
 ## Installation and setup
 
 Add it to your `Gemfile`, and run `bundle install`.

data/lib/flickr/object/attribute_locations/photo.rb

@@ -129,7 +129,7 @@ module Flickr
               @attributes["sizes"] && @attributes["sizes"]["size"].find { |h| h["label"] == size.label }
             end
 
-            sizes.map(&:name)
+            SIZES.first(9) | sizes.map(&:name) | ["Original"]
           },
         ],
         largest_size: [
@@ -140,15 +140,29 @@ module Flickr
         ],
         source_url: [
           -> { @attributes["url_#{@size.abbreviation}"] },
-          -> { @attributes["sizes"]["size"].find { |hash| hash["label"] == @size.label }["source"] }
+          -> { @attributes["sizes"]["size"].find { |hash| hash["label"] == @size.label }["source"] },
+          -> {
+            if @size.between?(Size.new("Square 75"), Size.new("Large 1024"))
+              url = "https://farm#{farm}.staticflickr.com/#{server}/#{id}_#{secret}"
+              url << "_#{@size.other_abbreviation}" if @size.other_abbreviation =~ /\w/
+              url << ".jpg"
+              url
+            elsif @size == Size.new("Original")
+              url = "https://farm#{farm}.staticflickr.com/#{server}/#{id}"
+              url << "_#{@attributes.fetch("originalsecret")}"
+              url << "_o"
+              url << ".#{@attributes.fetch("originalformat")}"
+              url
+            end
+          },
         ],
         height: [
           -> { @attributes["height_#{@size.abbreviation}"] },
-          -> { @attributes["sizes"]["size"].find { |hash| hash["label"] == @size.label }["height"] }
+          -> { @attributes["sizes"]["size"].find { |hash| hash["label"] == @size.label }["height"] },
         ],
         width: [
           -> { @attributes["width_#{@size.abbreviation}"] },
-          -> { @attributes["sizes"]["size"].find { |hash| hash["label"] == @size.label }["width"] }
+          -> { @attributes["sizes"]["size"].find { |hash| hash["label"] == @size.label }["width"] },
         ],
         url: [
           -> { "http://www.flickr.com/photos/#{owner.id}/#{id}" if owner.id && id },

data/lib/flickr/object/photo/size.rb

@@ -19,6 +19,10 @@ module Flickr
         # Used by Flickr for hash key names.
         #
         ABBREVIATIONS = %w[sq t q s n m z c l h k o]
+        ##
+        # Used by Flickr for generating source URLs.
+        #
+        OTHER_ABBREVIATIONS = %w[s t q m n - z c b]
 
         ##
         # Used by Flickr in response from "flickr.photos.getSizes".
@@ -43,13 +47,30 @@ module Flickr
           all.include? new(name)
         end
 
-        attr_reader :name, :type, :number, :abbreviation, :label
+        attr_reader :name
 
         def initialize(name)
-          @name          = name
-          @type, @number = name.split
-          @abbreviation  = ABBREVIATIONS[NAMES.index(name)]
-          @label         = LABELS[NAMES.index(name)]
+          @name = name
+        end
+
+        def type
+          name.split[0]
+        end
+
+        def number
+          name.split[1]
+        end
+
+        def abbreviation
+          ABBREVIATIONS[NAMES.index(name)]
+        end
+
+        def other_abbreviation
+          OTHER_ABBREVIATIONS[NAMES.index(name)]
+        end
+
+        def label
+          LABELS[NAMES.index(name)]
         end
 
         ##

data/lib/flickr/object/photo.rb

@@ -332,11 +332,7 @@ module Flickr
           raise ArgumentError, "\"#{name}\" isn't a valid photo size"
         end
 
-        if available_sizes.include? name
-          @size = Size.new(name)
-        else
-          @size = nil
-        end
+        @size = Size.new(name)
 
         self
       end

data/lib/flickr/version.rb

@@ -1,5 +1,5 @@
 module Flickr
 
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flickr-objects
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday