picasa 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02d51d52ccbf5d0255b0327c42963269e4b7a5e8
-  data.tar.gz: 073d56384b7055c8d9d5ab289f77ee1f1b146347
+  metadata.gz: ed0c5ff921d846bba81d3bc6bc90bf340f22e235
+  data.tar.gz: 814262697dbbbc9ddf9da9e2e6735bf93428f087
 SHA512:
-  metadata.gz: 41529357a1fa264ef5fec9b8fb11f39cbe74f07f0fc3d6046d8dd4adc0a3db80727dcc30c14ae5de32ad7c20ca3b2a6022d5b197da604b3e30340bc058bcf292
-  data.tar.gz: ed5469728b41ea29d2c1918787c1cc0d2a5773c69401bdc1abe492c3a360c2ee6205614377b98f86e3250865090fd3c94f36347bcbf1931294aa37f145c92b55
+  metadata.gz: 389af531ef0538a6a3c4eee3dc31a0f916f1be7f257e9bf8766e23b38e07694475ac8d97bb3f44eb262df69f7ee89a23bbd62c2849578454b5cadeaf42d4777a
+  data.tar.gz: 92316513cbdd65a16ef2f691550dae8f1c7ad267cefe20fb72170b89838639593ca294f8e75945942cb70b85788d172c0908518a7216243ddcaddff9487f8682

data/.travis.yml

@@ -1,12 +1,13 @@
 language: ruby
+sudo: false
+cache: bundler
 bundler_args: --without extra
 notifications:
   disabled: true
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.0
+  - 2.1
 
 env:
   - JSON_PARSER=oj
   - JSON_PARSER=yajl
-  - JSON_PARSER=json_pure

data/Gemfile

@@ -6,10 +6,9 @@ gem "multi_json"
 
 group :extra do
   gem "thor"
-  gem "debugger"
+  gem "byebug"
 end
 
 # JSON parsers
 gem "oj"
 gem "yajl-ruby"
-gem "json_pure"

data/README.md

@@ -97,6 +97,7 @@ Picasa uses gzipped requests to speedup fetching results. Benchmarks are availab
 * [Ionut-Cristian Florescu](https://github.com/icflorescu)
 * [Sébastien Grosjean](https://github.com/ZenCocoon)
 * [Grant Gardner](https://github.com/lwoggardner)
+* [Anton Astashov](https://github.com/astashov)
 
 ## Copyright
 

data/lib/picasa/presenter/exif.rb

@@ -0,0 +1,57 @@
+require "picasa/presenter/base"
+
+module Picasa
+  module Presenter
+    class Exif < Base
+
+      # @return [Float]
+      def fstop
+        @fstop ||= map_to_float(safe_retrieve(parsed_body, "exif$fstop"))
+      end
+
+      # @return [String]
+      def make
+        @make ||= safe_retrieve(parsed_body, "exif$make")
+      end
+
+      # @return [String]
+      def model
+        @model ||= safe_retrieve(parsed_body, "exif$model")
+      end
+
+      # @return [Float]
+      def exposure
+        @exposure ||= map_to_float(safe_retrieve(parsed_body, "exif$exposure"))
+      end
+
+      # @return [Boolean]
+      def flash
+        @flash ||= map_to_boolean(safe_retrieve(parsed_body, "exif$flash"))
+      end
+
+      # @return [Float]
+      def focal_length
+        @focal_length ||= map_to_float(safe_retrieve(parsed_body, "exif$focallength"))
+      end
+
+      # @return [Integer]
+      def iso
+        @iso ||= map_to_integer(safe_retrieve(parsed_body, "exif$iso"))
+      end
+
+      # @return [DateTime]
+      def time
+        @time ||= begin
+          if value = safe_retrieve(parsed_body, "exif$time")
+            DateTime.strptime((value.to_f / 1000).round.to_s, '%s')
+          end
+        end
+      end
+
+      # @return [String]
+      def image_unique_id
+        @image_unique_id ||= safe_retrieve(parsed_body, "exif$imageUniqueID")
+      end
+    end
+  end
+end

data/lib/picasa/presenter/photo.rb

@@ -1,4 +1,5 @@
 require "picasa/presenter/base"
+require "picasa/presenter/exif"
 
 module Picasa
   module Presenter
@@ -28,6 +29,21 @@ module Picasa
         @etag ||= safe_retrieve(parsed_body, "gd$etag")
       end
 
+      # @return [Exif]
+      def exif
+        @exif ||= Exif.new(safe_retrieve(parsed_body, "exif$tags"))
+      end
+
+      # @return [Float]
+      def latitude
+        @latitude ||= map_to_float(location && location.split(" ")[0])
+      end
+
+      # @return [Float]
+      def longitude
+        @longitude ||= map_to_float(location && location.split(" ")[1])
+      end
+
       # @return [DateTime]
       def published
         @published ||= map_to_date(safe_retrieve(parsed_body, "published"))
@@ -107,6 +123,12 @@ module Picasa
       def video_status
         @video_status ||= safe_retrieve(parsed_body, "gphoto$videostatus")
       end
+
+      private
+
+      def location
+        @location ||= safe_retrieve(parsed_body, "georss$where", "gml$Point", "gml$pos")
+      end
     end
   end
 end

data/lib/picasa/utils.rb

@@ -37,6 +37,10 @@ module Picasa
       value && value.to_i
     end
 
+    def map_to_float(value)
+      value && value.to_f
+    end
+
     def map_to_date(value)
       value && DateTime.parse(value)
     end
@@ -56,6 +60,6 @@ module Picasa
       end.join("&")
     end
 
-    module_function :safe_retrieve, :retrieve, :array_wrap, :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, :map_to_float
   end
 end

data/lib/picasa/version.rb

@@ -1,3 +1,3 @@
 module Picasa
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/test/presenter/photo_test.rb

@@ -0,0 +1,20 @@
+require "helper"
+
+describe Picasa::Presenter::Photo do
+  def setup
+    # TODO: find a way to retrieve this from cassettes
+    @data = {"xmlns$exif"=>"http://schemas.google.com/photos/exif/2007", "xmlns$app"=>"http://www.w3.org/2007/app", "xmlns"=>"http://www.w3.org/2005/Atom", "xmlns$gphoto"=>"http://schemas.google.com/photos/2007", "xmlns$media"=>"http://search.yahoo.com/mrss/", "xmlns$gd"=>"http://schemas.google.com/g/2005", "gd$etag"=>"\"YD0qeyI.\"", "id"=>{"$t"=>"https://picasaweb.google.com/data/entry/user/106136347770555028022/albumid/5793892606777564353/photoid/5806295577614146146"}, "published"=>{"$t"=>"2012-11-02T19:12:16.000Z"}, "updated"=>{"$t"=>"2012-11-02T19:12:16.566Z"}, "app$edited"=>{"$t"=>"2012-11-02T19:12:16.566Z"}, "category"=>[{"scheme"=>"http://schemas.google.com/g/2005#kind", "term"=>"http://schemas.google.com/photos/2007#photo"}], "title"=>{"$t"=>"Lena"}, "summary"=>{"$t"=>""}, "content"=>{"type"=>"image/jpeg", "src"=>"https://lh5.googleusercontent.com/-k4MaJY-F7Ao/UJQbEJSc2mI/AAAAAAAADvA/oDLr5F6-xho/Lena.jpg"}, "link"=>[{"rel"=>"http://schemas.google.com/g/2005#feed", "type"=>"application/atom+xml", "href"=>"https://picasaweb.google.com/data/feed/api/user/106136347770555028022/albumid/5793892606777564353/photoid/5806295577614146146?alt=json&authkey=Gv1sRgCNmigd3KrbOHLA"}, {"rel"=>"alternate", "type"=>"text/html", "href"=>"https://picasaweb.google.com/106136347770555028022/ThorTesting02?authkey=Gv1sRgCNmigd3KrbOHLA#5806295577614146146"}, {"rel"=>"http://schemas.google.com/photos/2007#canonical", "type"=>"text/html", "href"=>"https://picasaweb.google.com/lh/photo/uzMvHBCIb3kHVheiGO2QCCUdvMQllM3aC4Soztgbiog"}, {"rel"=>"self", "type"=>"application/atom+xml", "href"=>"https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5793892606777564353/photoid/5806295577614146146?alt=json&authkey=Gv1sRgCNmigd3KrbOHLA"}, {"rel"=>"edit", "type"=>"application/atom+xml", "href"=>"https://picasaweb.google.com/data/entry/api/user/106136347770555028022/albumid/5793892606777564353/photoid/5806295577614146146?authkey=Gv1sRgCNmigd3KrbOHLA"}, {"rel"=>"edit-media", "type"=>"image/jpeg", "href"=>"https://picasaweb.google.com/data/media/api/user/106136347770555028022/albumid/5793892606777564353/photoid/5806295577614146146?authkey=Gv1sRgCNmigd3KrbOHLA"}, {"rel"=>"http://schemas.google.com/photos/2007#report", "type"=>"text/html", "href"=>"https://picasaweb.google.com/lh/reportAbuse?uname=106136347770555028022&aid=5793892606777564353&iid=5806295577614146146"}], "gphoto$id"=>{"$t"=>"5806295577614146146"}, "gphoto$albumid"=>{"$t"=>"5793892606777564353"}, "gphoto$access"=>{"$t"=>"private"}, "gphoto$width"=>{"$t"=>"337"}, "gphoto$height"=>{"$t"=>"720"}, "gphoto$size"=>{"$t"=>"81352"}, "gphoto$checksum"=>{"$t"=>""}, "gphoto$timestamp"=>{"$t"=>"1351883536000"}, "gphoto$imageVersion"=>{"$t"=>"3824"}, "gphoto$commentingEnabled"=>{"$t"=>"true"}, "gphoto$commentCount"=>{"$t"=>0}, "gphoto$license"=>{"$t"=>"ALL_RIGHTS_RESERVED", "id"=>0, "name"=>"Wszelkie prawa zastrzeżone", "url"=>""}, "exif$tags"=>{"exif$imageUniqueID"=>{"$t"=>"8a69034d54f38875a7c44db612085818"}}, "media$group"=>{"media$content"=>[{"url"=>"https://lh5.googleusercontent.com/-k4MaJY-F7Ao/UJQbEJSc2mI/AAAAAAAADvA/oDLr5F6-xho/Lena.jpg", "height"=>512, "width"=>240, "type"=>"image/jpeg", "medium"=>"image"}], "media$credit"=>[{"$t"=>"Wojciech Wnętrzak"}], "media$description"=>{"$t"=>"", "type"=>"plain"}, "media$keywords"=>{}, "media$thumbnail"=>[{"url"=>"https://lh5.googleusercontent.com/-k4MaJY-F7Ao/UJQbEJSc2mI/AAAAAAAADvA/oDLr5F6-xho/s72/Lena.jpg", "height"=>72, "width"=>34}, {"url"=>"https://lh5.googleusercontent.com/-k4MaJY-F7Ao/UJQbEJSc2mI/AAAAAAAADvA/oDLr5F6-xho/s144/Lena.jpg", "height"=>144, "width"=>68}, {"url"=>"https://lh5.googleusercontent.com/-k4MaJY-F7Ao/UJQbEJSc2mI/AAAAAAAADvA/oDLr5F6-xho/s288/Lena.jpg", "height"=>288, "width"=>135}], "media$title"=>{"$t"=>"Lena", "type"=>"plain"}}}
+  end
+
+  it "returns nil when no latitude" do
+    photo = Picasa::Presenter::Photo.new(@data)
+
+    assert_nil photo.latitude
+  end
+
+  it "returns nil when no longitude" do
+    photo = Picasa::Presenter::Photo.new(@data)
+
+    assert_nil photo.longitude
+  end
+end

data/test/utils_test.rb

@@ -59,6 +59,17 @@ describe Picasa::Utils do
     end
   end
 
+  describe "#map_to_float" do
+    it "does not convert nil value" do
+      assert_nil Picasa::Utils.map_to_float(nil)
+    end
+
+    it "converts given value to float" do
+      assert_in_delta 101.123, Picasa::Utils.map_to_float("101.123")
+    end
+  end
+
+
   describe "#map_to_date" do
     it "does not convert nil value" do
       assert_nil Picasa::Utils.map_to_date(nil)

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: picasa
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Wojciech Wnętrzak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
 description: Ruby client for Google Picasa API
@@ -115,8 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -148,6 +148,7 @@ files:
 - lib/picasa/presenter/comment.rb
 - lib/picasa/presenter/comment_list.rb
 - lib/picasa/presenter/content.rb
+- lib/picasa/presenter/exif.rb
 - lib/picasa/presenter/link.rb
 - lib/picasa/presenter/media.rb
 - lib/picasa/presenter/photo.rb
@@ -197,6 +198,7 @@ files:
 - test/fixtures/sample.3gp
 - test/fixtures/sample.txt
 - test/helper.rb
+- test/presenter/photo_test.rb
 - test/template_test.rb
 - test/utils_test.rb
 homepage: https://github.com/morgoth/picasa
@@ -209,17 +211,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple Google Picasa managment
@@ -258,5 +260,7 @@ test_files:
 - test/fixtures/sample.3gp
 - test/fixtures/sample.txt
 - test/helper.rb
+- test/presenter/photo_test.rb
 - test/template_test.rb
 - test/utils_test.rb
+has_rdoc: