simple-flickr 0.1.2 → 0.1.3

data/Rakefile

@@ -8,7 +8,7 @@ task :default => :spec
 
 spec = Gem::Specification.new do |s|
   s.name         = 'simple-flickr'
-  s.version      = '0.1.2'
+  s.version      = '0.1.3'
   s.summary      = "A wrapper for Flickrs REST API"
   s.description  = "A wrapper for Flickrs REST API."
 

data/lib/simple-flickr.rb

@@ -55,3 +55,4 @@ require 'simple-flickr/person'
 require 'simple-flickr/photos'
 require 'simple-flickr/photo'
 require 'simple-flickr/photo_set'
+require 'simple-flickr/group'

data/lib/simple-flickr/group.rb

@@ -0,0 +1,29 @@
+module Flickr
+  
+  # Represents a Flickr Group
+  #
+  # You can find the Flickr::Group by the NSID
+  class Group
+    include Proxy
+    
+    def initialize( xml, client ) # :nodoc: 
+      super( xml, client )
+
+      @attributes['id'] = xml['nsid'] || xml['id']
+      @attributes['name'] ||= xml.search('name').text
+      @attributes['description'] ||= xml.search('description').text
+      @attributes['members'] = xml.search('members').text.to_i 
+    end
+
+    def self.find_by_id( nsid, client )
+      return nil unless nsid.is_a? String
+      xml = client.request( 'groups.getInfo', :group_id => nsid )
+
+      new( xml.at('group'), client )
+    end
+
+    def photos( options = {} )
+      Photo.api_query( 'photos.search', @client, :group_id => id )
+    end
+  end
+end

data/lib/simple-flickr/person.rb

@@ -32,6 +32,11 @@ module Flickr
       Photo.api_query( 'people.getPublicPhotos', @client, options.merge(:user_id => id)  )
     end
     
+    def groups
+      xml = @client.request( 'people.getPublicGroups', :user_id => id )
+      return xml.search('group').collect { |g| Flickr::Group.new(g, @client) }
+    end
+
     # Return the persons photosets.
     # 
     # === Returns

data/lib/simple-flickr/photo.rb

@@ -17,8 +17,13 @@ module Flickr
       super( xml, client )
       @attributes['title'] ||= xml.search('title').text
       @attributes['description'] = xml.search('description').text
-      @attributes['uploaded_at'] = Time.at((@attributes.delete('dateuploaded') or @attributes.delete('dateupload')).to_i)
+      @attributes['uploaded_at'] = Time.at((@attributes.delete('dateuploaded') or @attributes.delete('dateupload')).to_i).utc
       @attributes['owner'] ||= xml.at('owner').attributes['nsid'] if xml.at('owner')
+      @attributes['taken_at'] = begin
+        Time.parse("#{@attributes.delete('datetaken')} UTC") if @attributes.include?('datetaken')
+      rescue ArgumentError
+        nil
+      end
     end
 
     # Get the person associated with this photo

data/lib/simple-flickr/proxy.rb

@@ -38,7 +38,7 @@ module Flickr
     
     # This maps method calls to attributes.
     def method_missing( method, *args ) # :nodoc:
-      return @attributes[method.to_s] if @attributes[method.to_s]
+      return @attributes[method.to_s] if @attributes.include?(method.to_s)
       super
     end
 

data/spec/client_spec.rb

@@ -14,8 +14,8 @@ describe Flickr::Client do
     @flickr.should_receive( :open ).with( Flickr::Client::REST_ENDPOINT + '?api_key=my-api-key&method=flickr.favorites.getList&per_page=4&user_id=123456789N00' ).and_return( VALID_FLICKR_RESPONSE )
     @flickr.request( 'favorites.getList', :user_id => '123456789N00', :per_page => 4 )
   end
-  
-  [Errno::ETIMEDOUT,Timeout::Error.new(nil), OpenURI::HTTPError.new(nil,nil), Errno::ECONNRESET, SocketError, Errno::ECONNREFUSED].each do |e| 
+
+  [Errno::ETIMEDOUT, Timeout::Error, OpenURI::HTTPError.new(nil,nil), Errno::ECONNRESET, SocketError, Errno::ECONNREFUSED].each do |e|
     it "should raise an appropriate error if open-uri raises #{e}" do
       @flickr.should_receive( :open ).and_raise( e )
       proc { @flickr.request( 'test.echo' ) }.should raise_error( Flickr::RequestError )

data/spec/group_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe Flickr::Group do 
+  before( :each ) do 
+    @client = mock( 'Flickr::Client' )
+    @xml = Hpricot.parse( '<group id="34427465497@N01" iconserver="1" lang="en-us" ispoolmoderated="0"><name>GNEverybody</name><description>The group for GNE players</description><members>69</members><privacy>3</privacy><throttle count="10" mode="month" remaining="3"/></group>' )
+    @group = Flickr::Group.new( @xml.at('group'), @client )
+  end
+
+  it 'should include proxy' do 
+    Flickr::Group.included_modules.include?( Flickr::Proxy ).should == true
+  end
+
+  it 'should use the passed in client' do 
+    @group.instance_variable_get( :'@client' ).should == @client
+  end
+  
+  it 'should return photos in the group' do 
+    photos = mock('photos')
+    Flickr::Photo.should_receive( :api_query ).with( 'photos.search', @client, :group_id => '34427465497@N01' ).and_return( photos )
+    @group.photos.should == photos
+  end
+
+  it 'it should find the group by the id' do 
+    @client.should_receive( :request ).with( 'groups.getInfo', :group_id => '34427465497@N01' ).and_return( @xml )
+    group = Flickr::Group.find_by_id( '34427465497@N01', @client )
+    group.id.should == '34427465497@N01'
+    group.name.should == 'GNEverybody'
+    group.should be_instance_of( Flickr::Group )
+  end
+  
+  it 'should return nil if something invalid is passed in (non string)' do 
+    Flickr::Group.find_by_id(nil, @client).should == nil
+  end
+end

data/spec/person_spec.rb

@@ -82,6 +82,16 @@ describe Flickr::Person do
     Flickr::Photo.should_receive( :api_query ).with( 'people.getPublicPhotos', @client, :user_id => '12037949754@N01', :per_page => 2 ).and_return( photos )
     @person.photos( :per_page => 2).should == photos    
   end
+
+  it 'should return the users public groups' do 
+    group_xml = Hpricot.parse( '<rsp stat="ok"><group nsid="34427469792@N01" name="FlickrCentral" admin="0" eighteenplus="0" /></rsp>' )
+    @client.should_receive( :request ).with( 'people.getPublicGroups', :user_id => '12037949754@N01' ).and_return( group_xml )
+    groups = @person.groups
+    groups[0].should be_kind_of(Flickr::Group)
+    groups[0].id.should == '34427469792@N01'
+    groups[0].name.should == 'FlickrCentral'
+  end
+
   
   it 'should return the users favorites' do 
     photos = mock( 'photos' )

data/spec/photo_spec.rb

@@ -59,6 +59,26 @@ describe Flickr::Photo do
   
     @client.should_receive( :request ).with( 'person.listPhotos', :foo => 'bar' ).and_return( photosets_xml )
     Flickr::Photos.should_receive( :new ).with( photosets_xml.at('photoset'), @client )
-    Flickr::Photo.api_query(  'person.listPhotos', @client, :foo => 'bar')  
+    Flickr::Photo.api_query(  'person.listPhotos', @client, :foo => 'bar')
+  end
+
+  it 'should parse dates' do
+    xml = Hpricot.parse( '<photos page="2" pages="89" perpage="10" total="881"><photo id="2636" owner="47058503995@N01" farm="1" secret="a123456" server="2" title="test_04" ispublic="1" isfriend="0" isfamily="0" datetaken="2006-04-15 00:00:00" dateupload="1191939237" /></photos>' )
+
+    photo = Flickr::Photo.new( xml.at('photo'), @client )
+
+    photo.taken_at.should == Time.parse("2006-04-15 00:00:00 UTC")
+    photo.taken_at.should be_utc
+
+    photo.uploaded_at.should == Time.parse("2007-10-09 14:13:57 UTC")
+    photo.uploaded_at.should be_utc
+  end
+
+  it 'should ignore parsing errors on date taken' do
+    xml = Hpricot.parse( '<photos page="2" pages="89" perpage="10" total="881"><photo id="2636" owner="47058503995@N01" farm="1" secret="a123456" server="2" title="test_04" ispublic="1" isfriend="0" isfamily="0" datetaken="2006-04-00 00:00:00" dateupload="1191939237" /></photos>' )
+
+    photo = Flickr::Photo.new( xml.at('photo'), @client )
+
+    photo.taken_at.should be_nil
   end
 end

data/spec/proxy_spec.rb

@@ -5,13 +5,12 @@ class Flickr::ProxyTest
 end
 
 describe Flickr::ProxyTest do
+  before( :each ) do 
+    @client = mock( 'Flickr::Client' )
+    @xml = Hpricot.parse( '<doc><proxytest id="2636" var1="test" foo="bar" /></doc>' ).at( 'proxytest' )
+  end
   
   describe 'when dealing with attributes' do 
-    before( :each ) do 
-      @client = mock( 'Flickr::Client' )
-      @xml = Hpricot.parse( '<doc><proxytest id="2636" var1="test" foo="bar" /></doc>' ).at( 'proxytest' )
-    end
-
     it 'should set the attributes' do 
       proxy = Flickr::ProxyTest.new( @xml, @client )
       proxy.id.should == "2636"
@@ -45,4 +44,4 @@ describe Flickr::ProxyTest do
       Flickr::ProxyTest.api_query( 'proxytest.getList', @client ).should == [test1,test2]
     end
   end
-end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simple-flickr
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jerrett Taylor
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 -07:00
+date: 2010-06-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 0
         version: 0.8.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: A wrapper for Flickrs REST API.
 email: jerrett@gmail.com
 executables: []
@@ -34,6 +43,7 @@ files:
 - README
 - Rakefile
 - spec/client_spec.rb
+- spec/group_spec.rb
 - spec/person_spec.rb
 - spec/photo_set_spec.rb
 - spec/photo_spec.rb
@@ -42,6 +52,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - lib/simple-flickr/client.rb
+- lib/simple-flickr/group.rb
 - lib/simple-flickr/person.rb
 - lib/simple-flickr/photo.rb
 - lib/simple-flickr/photo_set.rb
@@ -61,18 +72,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A wrapper for Flickrs REST API