picasa 0.6.1 → 0.6.2

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "vcr", github: "myronmarston/vcr"
+gem "vcr", :github => "myronmarston/vcr"
 gem "rake"
 gem "minitest", "3.5.0", :platform => :ruby_18
 

data/lib/picasa/presenter/album.rb

@@ -10,13 +10,13 @@ module Picasa
 
       # @return [Array<Presenter::Photo>]
       def entries
-        @entries ||= safe_retrieve(parsed_body, "entry").map { |photo| Photo.new(photo) }
+        @entries ||= array_wrap(safe_retrieve(parsed_body, "entry")).map { |photo| Photo.new(photo) }
       end
       alias :photos :entries
 
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
+        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
       end
 
       # @return [Presenter::Media]

data/lib/picasa/presenter/album_list.rb

@@ -10,13 +10,13 @@ module Picasa
 
       # @return [Array<Presenter::Album>]
       def entries
-        @entries ||= safe_retrieve(parsed_body, "entry").map { |entry| Album.new(entry) }
+        @entries ||= array_wrap(safe_retrieve(parsed_body, "entry")).map { |entry| Album.new(entry) }
       end
       alias :albums :entries
 
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
+        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
       end
 
       # @return [String]

data/lib/picasa/presenter/comment.rb

@@ -10,7 +10,7 @@ module Picasa
 
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
+        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
       end
 
       # @return [DateTime]

data/lib/picasa/presenter/comment_list.rb

@@ -10,13 +10,13 @@ module Picasa
 
       # @return [Array<Presenter::Comment>]
       def entries
-        @entries ||= safe_retrieve(parsed_body, "entry").map { |entry| Comment.new(entry) }
+        @entries ||= array_wrap(safe_retrieve(parsed_body, "entry")).map { |entry| Comment.new(entry) }
       end
       alias :comments :entries
 
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
+        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
       end
 
       # @return [String]

data/lib/picasa/presenter/media.rb

@@ -5,7 +5,7 @@ module Picasa
     class Media < Base
       # @return [Array<Presenter::Thumbnail>]
       def thumbnails
-        @thumbnails ||= safe_retrieve(parsed_body, "media$thumbnail").map { |thumbnail| Thumbnail.new(thumbnail) }
+        @thumbnails ||= array_wrap(safe_retrieve(parsed_body, "media$thumbnail")).map { |thumbnail| Thumbnail.new(thumbnail) }
       end
 
       # @return [String]

data/lib/picasa/presenter/photo.rb

@@ -5,7 +5,7 @@ module Picasa
     class Photo < Base
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
+        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
       end
 
       # @return [Presenter::Media]

data/lib/picasa/presenter/tag.rb

@@ -10,7 +10,7 @@ module Picasa
 
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
+        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
       end
 
       # @return [DateTime]

data/lib/picasa/presenter/tag_list.rb

@@ -10,13 +10,13 @@ module Picasa
 
       # @return [Array<Presenter::Tag>]
       def entries
-        @entries ||= safe_retrieve(parsed_body, "entry").map { |entry| Tag.new(entry) }
+        @entries ||= array_wrap(safe_retrieve(parsed_body, "entry")).map { |entry| Tag.new(entry) }
       end
       alias :tags :entries
 
       # @return [Array<Presenter::Link>]
       def links
-        @links ||= safe_retrieve(parsed_body, "link").map { |link| Link.new(link) }
+        @links ||= array_wrap(safe_retrieve(parsed_body, "link")).map { |link| Link.new(link) }
       end
 
       # @return [String]

data/lib/picasa/utils.rb

@@ -12,6 +12,7 @@ module Picasa
       end
     end
 
+
     def retrieve(hash, keys)
       return if !hash.kind_of?(Hash) || !hash.has_key?(keys.first)
 
@@ -22,6 +23,17 @@ module Picasa
       end
     end
 
+    # Ported from activesupport gem
+    def array_wrap(object)
+      if object.nil?
+        []
+      elsif object.respond_to?(:to_ary)
+        object.to_ary || [object]
+      else
+        [object]
+      end
+    end
+
     def map_to_integer(value)
       value && value.to_i
     end
@@ -45,6 +57,6 @@ module Picasa
       end.join("&")
     end
 
-    module_function :safe_retrieve, :retrieve, :map_to_integer, :map_to_boolean, :map_to_date, :inline_query
+    module_function :safe_retrieve, :retrieve, :array_wrap, :map_to_integer, :map_to_boolean, :map_to_date, :inline_query
   end
 end

data/lib/picasa/version.rb

@@ -1,3 +1,3 @@
 module Picasa
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/test/api/album_test.rb

@@ -66,6 +66,10 @@ describe Picasa::API::Album do
     it "has entries" do
       assert_equal 1, @album_list.entries.size
     end
+
+    it "has no photo entries" do
+      assert_equal [], @album_list.entries.first.photos
+    end
   end
 
   describe "#show" do

data/test/utils_test.rb

@@ -43,6 +43,12 @@ describe Picasa::Utils do
     end
   end
 
+  describe "#array_wrap" do
+    it "wraps hash into array" do
+      assert_equal [{:wt => :f}], Picasa::Utils.array_wrap({:wt => :f})
+    end
+  end
+
   describe "#map_to_integer" do
     it "does not convert nil value" do
       assert_nil Picasa::Utils.map_to_integer(nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picasa
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty