flickrie 0.3.0 → 0.3.1

data/README.md

@@ -13,12 +13,20 @@ not a string representing that time (often in a timestamp (integer) format).
 That's what wrappers should be for.
 
 The method names here aren't called the same as Flickr's API methods, but they follow a pattern which
-shouldn't be too difficult to learn. Also, some attribute names that you
+shouldn't be too difficult to learn. Take a look at the "Covered API
+methods" section of this readme.
+
+Also, some attribute names that you
 get from the response are changed. So, for example, the `last_update`
 attribute is called `updated_at`, and the `candownload` attribute is
 called `can_download?`. After all, this is a **ruby** wrapper, so it
 should be written in Ruby/Rails fashion :)
 
+There are 2 things that are different from the Flickr's API documentation:
+- "photoset" is here just "set". This is because the word "photoset" is actually
+incorrect, since sets can also hold videos.
+- "person" is here refered to as "user".
+
 ## Examples of usage
 
 You first need to install the gem.
@@ -50,10 +58,6 @@ photo.owner       # => #<User: nsid="67313352@N04", ...>
 photo.owner.nsid  # => "67313352@N04"
 ```
 
-Note that, what Flickr refers to as "photoset" in its documentation, I
-refer to as "set". This is because the word "photoset" is actually
-incorrect, since sets can also hold videos.
-
 You can also throw in some parameters to `Flickrie.photos_from_set` to get more information about photos. For example,
 
 ```ruby

data/lib/flickrie/media/tag.rb

@@ -6,11 +6,11 @@ module Flickrie
       def content; @info['_content'] end
 
       def machine_tag?
-        @info['machine_tag'].to_i == 1
+        @info['machine_tag'].to_i == 1 if @info['machine_tag']
       end
 
       def author
-        User.new('nsid' => @info['author'])
+        User.new('nsid' => @info['author']) if @info['author']
       end
 
       def initialize(info)

data/lib/flickrie/media.rb

@@ -13,7 +13,6 @@ module Flickrie
     def title;          @info['title']        end
     def description;    @info['description']  end
     def tags;           @info['tags']         end
-    def machine_tags;   @info['machine_tags'] end
     def media_status;   @info['media_status'] end
     def path_alias;     @info['pathalias']    end
 
@@ -29,6 +28,10 @@ module Flickrie
       Location.new(@info['location']) if @info['location']
     end
 
+    def machine_tags
+      tags.select { |tag| tag.machine_tag? } if tags
+    end
+
     def geo_permissions
       if @info['geoperms']
         Visibility.new \
@@ -152,6 +155,12 @@ module Flickrie
           }
           info['usage'] = {}
 
+          unless info['tags'].nil?
+            info['tags'] = info['tags'].split(' ').map do |tag_content|
+              Tag.new('_content' => tag_content)
+            end
+          end
+
           new(info)
         end
       end
@@ -178,8 +187,8 @@ module Flickrie
         new.get_sizes(info)
       end
 
-      def from_search(info)
-        from_user(info)
+      def from_search(hash)
+        from_user(hash)
       end
     end
     extend(ClassMethods)

data/lib/flickrie/version.rb

@@ -1,3 +1,3 @@
 module Flickrie
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/test/media_test.rb

@@ -135,8 +135,8 @@ 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 '', media.machine_tags.join(' ')
     assert_equal 2, media.views_count
     assert_equal '0', media.license.id
     assert_equal true, media.primary?
@@ -178,8 +178,8 @@ 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 '', media.machine_tags.join(' ')
     assert_equal 2, media.views_count
     assert_equal '0', media.license.id
     assert_not_nil media.url
@@ -226,8 +226,8 @@ 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 '', media.machine_tags.join(' ')
     assert_equal 2, media.views_count
     assert_equal '0', media.license.id
     assert_not_nil media.url

data/test/photo_test.rb

@@ -145,4 +145,17 @@ class PhotoTest < Test::Unit::TestCase
         assert_nil photo.height
       end
   end
+
+  def test_other_api_calls
+    # add_photo_tags, get_photo_info, remove_photo_tag,
+    # search_photos, photos_from_contacts
+
+    assert_nothing_raised do
+      Flickrie.add_photo_tags(@photo_id, "janko")
+      photo = Flickrie.get_photo_info(@photo_id)
+      tag = photo.tags.find { |tag| tag.content == "janko" }
+      Flickrie.remove_photo_tag(tag.id)
+      Flickrie.search_photos(:user_id => @user_nsid)
+    end
+  end
 end

data/test/video_test.rb

@@ -65,4 +65,20 @@ class VideoTest < Test::Unit::TestCase
     assert_nil video.download_url
     assert_nil video.mobile_download_url
   end
+
+  def test_other_api_calls
+    # add_video_tags, remove_video_tag,
+    # search_videos, videos_from_contacts,
+    # public_videos_from_user, videos_from_set
+
+    assert_nothing_raised do
+      Flickrie.add_video_tags(@video_id, "janko")
+      video = Flickrie.get_video_info(@video_id)
+      tag = video.tags.find { |tag| tag.content == "janko" }
+      Flickrie.remove_video_tag(tag.id)
+      Flickrie.search_videos(:user_id => @user_nsid)
+      Flickrie.public_videos_from_user(@user_nsid)
+      Flickrie.videos_from_set(@set_id)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrie
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70199659891200 !ruby/object:Gem::Requirement
+  requirement: &70134907783700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70199659891200
+  version_requirements: *70134907783700
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70199659890040 !ruby/object:Gem::Requirement
+  requirement: &70134907780840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70199659890040
+  version_requirements: *70134907780840
 description: This gem is a nice wrapper for the Flickr API with an intuitive interface.
 email:
 - janko.marohnic@gmail.com
@@ -62,7 +62,6 @@ files:
 - lib/flickrie/user.rb
 - lib/flickrie/version.rb
 - lib/flickrie/video.rb
-- test/client_test.rb
 - test/instance_test.rb
 - test/license_test.rb
 - test/location_test.rb
@@ -101,7 +100,6 @@ summary: The reason why I did this gem is because the other ones either weren't
   call wasn't processed almost at all. It doesn't seem too bad at first, but after
   a while you realize it's not pretty. So I wanted to make it pretty :)
 test_files:
-- test/client_test.rb
 - test/instance_test.rb
 - test/license_test.rb
 - test/location_test.rb

data/test/client_test.rb

@@ -1,40 +0,0 @@
-# encoding: utf-8
-require 'test'
-require 'flickrie/client'
-
-class ClientTest < Test::Unit::TestCase
-  def setup
-    @client = Flickrie.client
-    @set_id = 72157629851991663
-    @media_id = 7093038981
-    @user_nsid = '67131352@N04'
-  end
-
-  def test_internals
-    assert_equal ENV['FLICKR_API_KEY'], Flickrie.api_key
-    assert_instance_of Flickrie::Client, @client
-  end
-
-  def test_api_calls
-    assert_nothing_raised do
-      # people
-      @client.find_user_by_email('janko.marohnic@gmail.com')
-      @client.find_user_by_username('Janko Marohnić')
-      @client.get_user_info(@user_nsid)
-      @client.public_media_from_user(@user_nsid)
-
-      # photos
-      @client.get_media_info(@media_id)
-      @client.get_media_sizes(@media_id)
-      @client.search_media(:user_id => @user_nsid)
-
-      # licenses
-      @client.get_licenses
-
-      # photosets
-      @client.get_set_info(@set_id)
-      @client.sets_from_user(@user_nsid)
-      @client.media_from_set(@set_id)
-    end
-  end
-end