flickrie 0.4.0 → 0.4.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Flickrie changelog
 
+## Version 0.4.1
+
+- handle file uploads for Rails and Sinatra smarter (see [this wiki](https://github.com/janko-m/flickrie/wiki/Some-tips.md), tip #7)
+
 ## Version 0.4.0
 
 - covered `flickr.photos.getContactsPhotos`

data/README.md

@@ -247,7 +247,7 @@ basis of this gem.
 
 ## Changelog
 
-You can see the changelog [here]((https://github.com/janko-m/flickrie/blob/master/CHANGELOG.md).
+You can see the changelog [here](https://github.com/janko-m/flickrie/blob/master/CHANGELOG.md).
 
 ## License
 

data/lib/flickrie/upload_client.rb

@@ -39,13 +39,16 @@ module Flickrie
   class UploadClient < Faraday::Connection
     def upload(media, params = {})
       media_file = get_file(media, params[:mime_type])
-      post "upload", {:photo => media_file}.merge(params)
+      media_title = get_title(media)
+      post "upload", {:photo => media_file,
+        :title => media_title}.merge(params)
     end
 
     def replace(media, media_id, params = {})
-      media_file = get_file(media)
+      media_file = get_file(media, params[:mime_type])
+      media_title = get_title(media)
       post "replace", {:photo => media_file,
-                       :photo_id => media_id}.merge(params)
+        :photo_id => media_id, :title => media_title}.merge(params)
     end
 
     private
@@ -70,11 +73,21 @@ module Flickrie
     }.freeze
 
     def get_file(object, mime_type = nil)
-      if object.is_a?(String)
-        Faraday::UploadIO.new(object, mime_type || get_mime_type(object))
-      else
-        object
+      if object.class.name == "String"
+        # file path
+        file_path = object
+        mime_type ||= get_mime_type(file_path)
+      elsif object.class.name == "ActionDispatch::Http::UploadedFile"
+        # Rails
+        file_path = object.tempfile
+        mime_type ||= object.content_type
+      elsif object.class.name == "Hash"
+        # Sinatra
+        file_path = object[:tempfile].path
+        mime_type ||= object[:type]
       end
+
+      Faraday::UploadIO.new(file_path, mime_type)
     end
 
     def get_mime_type(file_path)
@@ -84,5 +97,18 @@ module Flickrie
     rescue NoMethodError
       raise Error, "Don't know mime type for this extension (#{extension})"
     end
+
+    def get_title(object)
+      filename =
+        if object.class.name == "String"
+          File.basename(object)
+        elsif object.class.name == "ActionDispatch::Http::UploadedFile"
+          object.original_filename
+        elsif object.class.name == "Hash"
+          object[:filename]
+        end
+
+      filename.match(/\.\w{3,4}$/).pre_match
+    end
   end
 end

data/lib/flickrie/version.rb

@@ -1,3 +1,3 @@
 module Flickrie
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrie
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70095977665920 !ruby/object:Gem::Requirement
+  requirement: &70287090746520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70095977665920
+  version_requirements: *70287090746520
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70095977665300 !ruby/object:Gem::Requirement
+  requirement: &70287090746080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70095977665300
+  version_requirements: *70287090746080
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &70095977664520 !ruby/object:Gem::Requirement
+  requirement: &70287090745640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70095977664520
+  version_requirements: *70287090745640
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70095977662960 !ruby/object:Gem::Requirement
+  requirement: &70287090745060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095977662960
+  version_requirements: *70287090745060
 description: This gem is a nice wrapper for the Flickr API with an intuitive interface.
 email:
 - janko.marohnic@gmail.com