flickr-objects 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da97710af16b03fe15e23c1bd8c523db79b26b85
-  data.tar.gz: 65ee1ec70dacbda2850ba99d10247d8b681f4880
+  metadata.gz: f4f95d067768c10e04a1fb7203b1f3cd56e8bffd
+  data.tar.gz: 3ff31499a4b3488adbbbc7637bf60102dc935c0f
 SHA512:
-  metadata.gz: 8375724b89bbd0aa84bde3355309e773e40497eebc0a3030dd65d8d5c2e2684a8e6212333c1633455002c9620d02b91e7d93814d6d5cf524c7e46e2b84f45f9c
-  data.tar.gz: 40fa5a43230f9f4f0ad3d0ac1c24d69f2269a4afdd0141129d68facde2e4c729f4f6fded406f8fb832054ef6c257535528b852a0a0925f6d1900a5ea95995687
+  metadata.gz: 5bec77a91adb2e1dce4af3d7b824af6ca9ad3a3497407966aff7142545f7573285a4cabcddd8642ffa529d4bfc31b0a44a6e4e1da4f050dcac12c4a559c09b70
+  data.tar.gz: 0fad102f3f9318886421298b64cb2fff2a0f0c77047e1d407a3c8875c693d8c5e023f09f7ba1cecfd21b7892168ed4f26f1f234ccf700e9514450432b3840951

data/lib/flickr/client.rb

@@ -24,11 +24,6 @@ module Flickr
       :Upload => "upload",
       :OAuth  => "oauth"
 
-    DEFAULTS = {
-      open_timeout: 8,
-      timeout:      10,
-    }
-
     def initialize
       @connection = Faraday.new(url, connection_options) do |builder|
         builder.use Flickr::Middleware::CatchTimeout
@@ -82,11 +77,11 @@ module Flickr
     end
 
     def open_timeout
-      Flickr.open_timeout || DEFAULTS[:open_timeout]
+      Flickr.open_timeout
     end
 
     def timeout
-      Flickr.timeout || DEFAULTS[:timeout]
+      Flickr.timeout
     end
 
     def use_ssl?

data/lib/flickr/configuration.rb

@@ -50,15 +50,11 @@ module Flickr
     # Time to wait for the connection to Flickr to open. After that
     # {Flickr::TimeoutError} is thrown.
     #
-    # Default is `5` seconds.
-    #
     attr_accessor :open_timeout
     ##
     # Time to wait for the first block of response from Flickr. After that
     # {Flickr::TimeoutError} is thrown.
     #
-    # Default is `10` seconds.
-    #
     attr_accessor :timeout
 
     ##

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.first(9) | sizes.map(&:name) | ["Original"]
+            sizes.map(&:name) | ["Original"]
           },
         ],
         largest_size: [

data/lib/flickr/object/photo.rb

@@ -213,6 +213,19 @@ module Flickr
         dup.largest!
       end
 
+      ##
+      # Changes the size of the photo.
+      #
+      def size!(name)
+        if name != nil and not Size.exists?(name)
+          raise ArgumentError, "\"#{name}\" isn't a valid photo size"
+        end
+
+        @size = Size.new(name)
+
+        self
+      end
+
       ##
       # @return [self]
       # @see Flickr::Api::Photo#get_info
@@ -330,21 +343,6 @@ module Flickr
         api.set_license(id, license_id, params)
       end
 
-      private
-
-      ##
-      # Changes the size of the photo.
-      #
-      def size!(name)
-        if name != nil and not Size.exists?(name)
-          raise ArgumentError, "\"#{name}\" isn't a valid photo size"
-        end
-
-        @size = Size.new(name)
-
-        self
-      end
-
     end
 
   end

data/lib/flickr/object/set.rb

@@ -56,6 +56,7 @@ module Flickr
       def get_photos(params = {})
         api.get_photos(id, params)
       end
+      alias photos get_photos
 
       ##
       # @return [response]

data/lib/flickr/sanitized_file.rb

@@ -36,10 +36,10 @@ module Flickr
         @file = @original[:tempfile]
         @content_type = @original[:type]
         @path = @original[:tempfile].path
-      elsif file?
+      elsif io?
         @file = @original
         @content_type = @original.content_type if @original.respond_to?(:content_type)
-        @path = @original.path
+        @path = @original.path if @original.respond_to?(:path)
       elsif string?
         @file = File.open(@original)
         @content_type = nil
@@ -57,8 +57,8 @@ module Flickr
       defined?(Sinatra) and @original.is_a?(Hash)
     end
 
-    def file?
-      @original.respond_to?(:read) and @original.respond_to?(:path)
+    def io?
+      @original.respond_to?(:read)
     end
 
     def string?

data/lib/flickr/version.rb

@@ -1,5 +1,5 @@
 module Flickr
 
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flickr-objects
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday