flickrie 1.5.1 → 1.5.2

data/lib/flickrie/middleware/fix_flickr_data.rb

@@ -18,20 +18,20 @@ module Flickrie
         case flickr_method
         # people
         when 'flickr.people.findByUsername'
-          data['user']['username'] = data['user']['username']['_content']
+          data['user']['username'] = data['user']['username']['_content'] rescue nil
         when 'flickr.people.findByEmail'
-          data['user']['username'] = data['user']['username']['_content']
+          data['user']['username'] = data['user']['username']['_content'] rescue nil
         when 'flickr.people.getInfo'
           %w[username realname location description profileurl mobileurl photosurl].each do |attribute|
-            data['person'][attribute] = data['person'][attribute]['_content']
+            data['person'][attribute] = data['person'][attribute]['_content'] rescue nil
           end
           %w[count firstdatetaken firstdate].each do |photo_attribute|
-            data['person']['photos'][photo_attribute] = data['person']['photos'][photo_attribute]['_content']
+            data['person']['photos'][photo_attribute] = data['person']['photos'][photo_attribute]['_content'] rescue nil
           end
         when 'flickr.test.login'
-          data['user']['username'] = data['user']['username']['_content']
+          data['user']['username'] = data['user']['username']['_content'] rescue nil
         when 'flickr.people.getUploadStatus'
-          data['user']['username'] = data['user']['username']['_content']
+          data['user']['username'] = data['user']['username']['_content'] rescue nil
           data['user']['upload_status'] = {
             'bandwidth' => data['user'].delete('bandwidth'),
             'filesize' => data['user'].delete('filesize'),
@@ -46,10 +46,10 @@ module Flickrie
         when 'flickr.people.getPublicPhotos'
           fix_common!(data)
         when 'flickr.photos.getInfo'
-          data['photo']['title'] = data['photo']['title']['_content']
-          data['photo']['description'] = data['photo']['description']['_content']
-          data['photo']['comments_count'] = data['photo'].delete('comments')['_content']
-          data['photo']['dates']['uploaded'] = data['photo'].delete('dateuploaded')
+          data['photo']['title'] = data['photo']['title']['_content'] rescue nil
+          data['photo']['description'] = data['photo']['description']['_content'] rescue nil
+          data['photo']['comments_count'] = data['photo'].delete('comments')['_content'] rescue nil
+          data['photo']['dates']['uploaded'] = data['photo'].delete('dateuploaded') rescue nil
           data['photo']['tags'] = data['photo']['tags']['tag']
         when 'flickr.photosets.getPhotos'
           data['photoset']['photo'].map! do |media_hash|
@@ -135,14 +135,14 @@ module Flickrie
 
         # photosets
         when 'flickr.photosets.getInfo'
-          data['photoset']['title'] = data['photoset']['title']['_content']
-          data['photoset']['description'] = data['photoset']['description']['_content']
+          data['photoset']['title'] = data['photoset']['title']['_content'] rescue nil
+          data['photoset']['description'] = data['photoset']['description']['_content'] rescue nil
         when 'flickr.photosets.getList'
           data['photosets']['photoset'].map! do |set_hash|
             set_hash['count_photos'] = set_hash.delete('photos')
             set_hash['count_videos'] = set_hash.delete('videos')
-            set_hash['title'] = set_hash['title']['_content']
-            set_hash['description'] = set_hash['description']['_content']
+            set_hash['title'] = set_hash['title']['_content'] rescue nil
+            set_hash['description'] = set_hash['description']['_content'] rescue nil
             set_hash['owner'] = query['user_id'].first
             set_hash
           end

data/lib/flickrie/version.rb

@@ -1,3 +1,3 @@
 module Flickrie
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrie
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70109122251160 !ruby/object:Gem::Requirement
+  requirement: &70237381004760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70109122251160
+  version_requirements: *70237381004760
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70109122250400 !ruby/object:Gem::Requirement
+  requirement: &70237381003940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70109122250400
+  version_requirements: *70237381003940
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70109122249660 !ruby/object:Gem::Requirement
+  requirement: &70237381003160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70109122249660
+  version_requirements: *70237381003160
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &70109122249180 !ruby/object:Gem::Requirement
+  requirement: &70237381002580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70109122249180
+  version_requirements: *70237381002580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70109122248720 !ruby/object:Gem::Requirement
+  requirement: &70237381002100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70109122248720
+  version_requirements: *70237381002100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70109122248260 !ruby/object:Gem::Requirement
+  requirement: &70237381001620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70109122248260
+  version_requirements: *70237381001620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70109122247780 !ruby/object:Gem::Requirement
+  requirement: &70237381001120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -96,10 +96,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70109122247780
+  version_requirements: *70237381001120
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70109122247040 !ruby/object:Gem::Requirement
+  requirement: &70237381000280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -107,7 +107,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *70109122247040
+  version_requirements: *70237381000280
 description: This gem wraps the Flickr API with a nice object-oriented interface.
 email: janko.marohnic@gmail.com
 executables: []
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3993820191450085043
+      hash: -3513964845288430156
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11