flickrie 0.1.0 → 0.1.1

data/README.md

@@ -117,7 +117,7 @@ Flickrie.shared_secret = "<your shared secret>"
 
 url = Flickrie.get_authorization_url
 puts "Visit this url to authorize: #{url}"
-puts "Then enter the code that was displayed: "
+puts "If you agreed, the code was displayed afterwards. Enter it: "
 code = gets.strip
 Flickrie.authorize!(code)
 puts "You're all done! Now go make some authenticated requests. Make me proud, son."

data/lib/flickrie/client.rb

@@ -14,7 +14,7 @@ module Flickrie
             :consumer_secret => shared_secret,
             :token => token,
             :token_secret => token_secret
-          conn.response :json, :content_type => /\bjson$/
+          conn.response :json, :content_type => /(text\/plain)|(json)$/
           conn.adapter Faraday.default_adapter
         end
 
@@ -87,6 +87,10 @@ module Flickrie
     end
 
     # photos
+    def add_media_tags(media_id, tags)
+      post 'flickr.photos.addTags', :photo_id => media_id, :tags => tags
+    end
+
     def get_media_info(media_id)
       get 'flickr.photos.getInfo', :photo_id => media_id
     end
@@ -95,6 +99,10 @@ module Flickrie
       get 'flickr.photos.getSizes', :photo_id => media_id
     end
 
+    def remove_media_tag(tag_id)
+      post 'flickr.photos.removeTag', :tag_id => tag_id
+    end
+
     def search_media(params = {})
       params[:extras] = [params[:extras], 'media'].compact.join(',')
       get 'flickr.photos.search', params

data/lib/flickrie/media.rb

@@ -1,5 +1,6 @@
 require 'flickrie/media/visibility'
 require 'flickrie/media/note'
+require 'flickrie/media/tag'
 require 'flickrie/location'
 require 'date'
 
@@ -110,12 +111,7 @@ module Flickrie
       info['description'] = info['description']['_content']
       info['comments_count'] = info.delete('comments')['_content']
       info['dates']['uploaded'] = info.delete('dateuploaded')
-      info['machine_tags'] = info['tags']['tag'].
-        select { |tag| tag['machine_tag'].to_i == 1 }.
-        map { |tag| tag['_content']}.join(' ')
-      info['tags'] = info['tags']['tag'].
-        select { |tag| tag['machine_tag'].to_i == 0 }.
-        map { |tag| tag['_content']}.join(' ')
+      info['tags'] = info['tags']['tag'].map { |info| Tag.new(info) }
 
       @info.update(info)
       self

data/lib/flickrie/version.rb

@@ -1,3 +1,3 @@
 module Flickrie
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/flickrie.rb

@@ -41,6 +41,12 @@ module Flickrie
     end
 
     # photos
+    def add_media_tags(media_id, tags)
+      client.add_media_tags(media_id, tags)
+    end
+    alias add_photo_tags add_media_tags
+    alias add_video_tags add_media_tags
+
     def get_media_info(media_id)
       response = client.get_media_info(media_id)
       Media.from_info(response.body['photo'])

data/test/media_test.rb

@@ -11,6 +11,9 @@ end
 class MediaTest < Test::Unit::TestCase
   def setup
     Flickrie.api_key = ENV['FLICKR_API_KEY']
+    Flickrie.shared_secret = ENV['FLICKR_SHARED_SECRET']
+    Flickrie.token = ENV['FLICKR_TOKEN']
+    Flickrie.token_secret = ENV['FLICKR_TOKEN_SECRET']
     @media_id = 6946979188
     @set_id = 72157629851991663
     @user_nsid = '67131352@N04'
@@ -33,8 +36,12 @@ class MediaTest < Test::Unit::TestCase
     assert_equal '7049', media.server
     assert_equal 8, media.farm
     assert_equal 'IMG_0796', media.title
-    assert_equal 'luka', media.tags
-    assert_equal '', media.machine_tags
+
+    assert_equal 'luka', media.tags.join(' ')
+    assert_equal @user_nsid, media.tags.first.author.nsid
+    assert_equal 'luka', media.tags.first.raw
+    assert_equal false, media.tags.first.machine_tag?
+
     assert_equal 1, media.views_count
     assert_equal 1, media.comments_count
     assert_equal '0', media.license.id
@@ -65,14 +72,14 @@ class MediaTest < Test::Unit::TestCase
     assert_equal false, media.visibility.family?
     assert_equal nil, media.visibility.contacts?
 
-    assert_equal false, media.can_comment?
-    assert_equal false, media.can_add_meta?
+    assert_equal true, media.can_comment?
+    assert_equal true, media.can_add_meta?
     assert_equal true, media.can_everyone_comment?
     assert_equal false, media.can_everyone_add_meta?
 
     assert_equal true, media.can_download?
-    assert_equal false, media.can_blog?
-    assert_equal false, media.can_print?
+    assert_equal true, media.can_blog?
+    assert_equal true, media.can_print?
     assert_equal false, media.can_share?
 
     assert_equal false, media.has_people?
@@ -262,6 +269,17 @@ class MediaTest < Test::Unit::TestCase
     assert_equal nil, media.visibility.contacts?
   end
 
+  def test_add_media_tags
+    media = Flickrie.get_photo_info(@media_id)
+    tags_before_change = media.tags.join(' ')
+    Flickrie.add_media_tags(@media_id, "janko")
+    media.get_info
+    assert_equal [tags_before_change, "janko"].join(' '),
+      media.tags.join(' ')
+    tag_id = media.tags.find { |tag| tag.content == "janko" }.id
+    Flickrie.client.remove_media_tag(tag_id)
+  end
+
   def test_methods_returning_nil
     media = Flickrie::Photo.new
 

data/test/set_test.rb

@@ -30,8 +30,8 @@ class SetTest < Test::Unit::TestCase
     assert_equal 'Speleologija', set.title
     assert_equal 'Slike sa škole speleologije Velebit.', set.description
 
-    assert_equal 99, set.media_count
-    assert_equal 98, set.photos_count
+    assert_equal 98, set.media_count
+    assert_equal 97, set.photos_count
     assert_equal 1, set.videos_count
     assert_equal 0, set.comments_count
     assert_equal 0, set.views_count
@@ -62,8 +62,8 @@ class SetTest < Test::Unit::TestCase
     assert_equal 'Speleologija', set.title
     assert_equal 'Slike sa škole speleologije Velebit.', set.description
 
-    assert_equal 99, set.media_count
-    assert_equal 98, set.photos_count
+    assert_equal 98, set.media_count
+    assert_equal 97, set.photos_count
     assert_equal 1, set.videos_count
     assert_equal 0, set.comments_count
     assert_equal 0, set.views_count

data/test/user_test.rb

@@ -44,7 +44,7 @@ I'm a programmer, and I'm gonna program a badass Ruby library for Flickr.
     assert_instance_of Time, user.first_taken
     assert_instance_of Time, user.first_uploaded
 
-    assert_equal 99, user.media_count
+    assert_equal 98, user.media_count
   end
 
   def test_find_user_by_username_or_email

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrie
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70166247860000 !ruby/object:Gem::Requirement
+  requirement: &70192223006740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166247860000
+  version_requirements: *70192223006740
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70166247859580 !ruby/object:Gem::Requirement
+  requirement: &70192223005740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166247859580
+  version_requirements: *70192223005740
 description: This gem is a nice wrapper for the Flickr API with an intuitive interface.
 email:
 - janko.marohnic@gmail.com
@@ -64,7 +64,6 @@ files:
 - test/license_test.rb
 - test/location_test.rb
 - test/media_test.rb
-- test/oauth_test.rb
 - test/photo_test.rb
 - test/set_test.rb
 - test/user_test.rb
@@ -101,7 +100,6 @@ test_files:
 - test/license_test.rb
 - test/location_test.rb
 - test/media_test.rb
-- test/oauth_test.rb
 - test/photo_test.rb
 - test/set_test.rb
 - test/user_test.rb

data/test/oauth_test.rb

@@ -1,22 +0,0 @@
-require 'test/unit'
-require 'flickrie'
-
-class OAuthTest < Test::Unit::TestCase
-  def setup
-    @photo_id = 6946979188
-    Flickrie.api_key = ENV['FLICKR_API_KEY']
-    Flickrie.shared_secret = ENV['FLICKR_SHARED_SECRET']
-    Flickrie.token = ENV['FLICKR_TOKEN']
-    Flickrie.token_secret = ENV['FLICKR_TOKEN_SECRET']
-  end
-
-  def test_permissions
-    assert_nothing_raised do
-      Flickrie.client.get "flickr.photos.getPerms", :photo_id => @photo_id
-      Flickrie.client.post "flickr.photos.setSafetyLevel", :photo_id => @photo_id, :safety_level => 1
-    end
-    assert_raises(Flickrie::Error) do
-      Flickrie.client.get "flickr.photos.delete", :photo_id => @photo_id
-    end
-  end
-end