skydrive 0.1.4 → 0.1.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8dd29de148895797d3e7940429482ab71fffe3f8
+  data.tar.gz: 423f8fb0f4dcee7445107e63b503129909f297ae
+SHA512:
+  metadata.gz: b55e670e67eaecf4461b7db75d2a0c802532f195af8bbeb8669cf7e58204c64b213483495698a49f44a293c18d5775976abb89b0a903b7e0e8736f66517865c6
+  data.tar.gz: b29844c21ec9b74a0072ddd350c48e53e70a18eb972dc66f058cc7facf326534ef3597a41b5e7b5de2ddb278a345a8f1521ac89cb86d491410ce6421ffae89aa

data/Gemfile

@@ -1,11 +1,13 @@
-source :rubygems
+source "https://rubygems.org"
 
 group :osx do
   gem "growl"
+  gem 'terminal-notifier'
+  gem 'terminal-notifier-guard'
 end
 
 group :linux do
-  gem "rb-inotify", "~> 0.8.8"
+  gem "rb-inotify", '~> 0.9'
   gem "libnotify"
 end
 

data/lib/skydrive.rb

@@ -21,6 +21,7 @@ module Skydrive
   require 'skydrive/photo'
   require 'skydrive/album'
   require 'skydrive/audio'
+  require 'skydrive/video'
   require 'skydrive/error'
   require 'skydrive/comment'
   require 'skydrive/notebook'

data/lib/skydrive/audio.rb

@@ -2,30 +2,6 @@ module Skydrive
   # A user's audio file in SkyDrive.
   class Audio < Skydrive::File
 
-    # The size, in bytes, of the audio
-    # @return [Integer]
-    def size
-      object["size"]
-    end
-
-    # The number of comments associated with the audio
-    # @return [Integer]
-    def comments_count
-      object["comments_count"]
-    end
-
-    # A value that indicates whether comments are enabled for the audio
-    # @return [Boolean]
-    def comments_enabled
-      object["comments_enabled"]
-    end
-
-    # The URL to use to download the audio from SkyDrive
-    # @return [String]
-    def source
-      object["source"]
-    end
-
     # The audio's title
     # @return [String]
     def title
@@ -68,18 +44,5 @@ module Skydrive
       object["picture"]
     end
 
-    # The link that can be used to download the audio file
-    # @return [String]
-    def download_link
-      url = client.get("/#{id}/content", :download => true, :suppress_redirects => true)["location"]
-    end
-
-    # Download the audio file
-    def download
-      uri = URI(download_link)
-      response = HTTParty.get("http://#{uri.host}#{uri.path}?#{uri.query}")
-      response.parsed_response
-    end
-
   end
 end

data/lib/skydrive/client.rb

@@ -48,7 +48,7 @@ module Skydrive
     # Get the acting user
     # @return [Hash]
     def me
-      response = self.class.get("/me").parsed_response
+      response = JSON.load(self.class.get("/me").parsed_response)
     end
 
     # Refresh the access token

data/lib/skydrive/file.rb

@@ -16,7 +16,7 @@ module Skydrive
 
     # A value that indicates whether comments are enabled for the file
     # @return [Boolean]
-    def comments_enabled
+    def comments_enabled?
       object["comments_enabled"]
     end
 

data/lib/skydrive/object.rb

@@ -103,7 +103,7 @@ module Skydrive
     end
 
     # Make a comment about the object
-    # @params [Hash] options
+    # @param [Hash] options
     # @option options [String] :message The comment 
     def comment options={}
       client.post("/#{id}/comments", options)

data/lib/skydrive/operations.rb

@@ -1,7 +1,7 @@
 module Skydrive
   # The basic operations
   module Operations
-    
+
     # Your home folder
     # @return [Skydrive::Folder]
     def my_skydrive
@@ -120,6 +120,11 @@ module Skydrive
       response = put("/#{object_id}", options)
     end
 
+    # Get an object by its id
+    # @param [String] id The id of the object you want
+    def get_skydrive_object_by_id id
+      response = get("/#{id}")
+    end
 
     alias :update_folder :update_skydrive_object
     alias :update_album :update_skydrive_object
@@ -169,7 +174,7 @@ module Skydrive
     # Comment about an object
     # @param [String] object_id ID of the object
     # @param [Hash] options
-    # @options options [String] :message The comment message
+    # @option options [String] :message The comment message
     def create_comment object_id, options={}
       response = post("/#{object_id}/comments", options)
     end

data/lib/skydrive/photo.rb

@@ -1,17 +1,91 @@
 module Skydrive
   # A user's photo in SkyDrive.
   class Photo < Skydrive::File
-    # The link that can be used to download the photo
+
+    # The number of tags on the photo
+    # @return [Integer]
+    def tags_count
+      object["tags_count"]
+    end
+
+    # Whether tags are enabled for the photo
+    # @return [Integer]
+    def tags_enabled?
+      object["tags_enabled"]
+    end
+
+    
+    # A URL of the photo's picture.
     # @return [String]
-    def download_link
-      url = client.get("/#{id}/content", :download => true, :suppress_redirects => true)["location"]
+    def picture
+      object["picture"]
+    end
+
+    # Info about various sizes of the photos
+    # @return [Array<Hash>]
+    def images
+      object["images"]
+    end
+    
+    # Time when the photo was taken
+    # @return [Time]
+    def when_taken
+      Time.new object["when_taken"] if object["when_taken"]
+    end
+
+    # Height of the photo in pixels
+    # @return [Integer]
+    def height
+      object["height"]
     end
 
-    # Download the photo
-    def download
-      uri = URI(download_link)
-      response = HTTParty.get("http://#{uri.host}#{uri.path}?#{uri.query}")
-      response.parsed_response
+    # Width of the photo in pixels
+    # @return [Integer]
+    def width
+      object["width"]
     end
+
+    # The location where the photo was taken.
+    # @return [Hash]
+    def location
+      object["location"]
+    end
+
+    # The manufacturer of the camera that took the photo.
+    # @return [String]
+    def camera_make
+      object["camera_make"]
+    end
+
+    # The brand and model number of the camera that took the photo.
+    # @return [String]
+    def camera_model
+      object["camera_model"]
+    end
+
+    # The f-number that the photo was taken at
+    # @return [Float]
+    def focal_ratio
+      object["focal_ratio"]
+    end
+
+    # The focal length that the photo was taken at
+    # @return [Float]
+    def focal_length
+      object["focal_length"]
+    end
+
+    # The numerator of the shutter speed that the photo was taken at
+    # @return [Integer]
+    def exposure_numerator
+      object["exposure_numerator"]
+    end
+
+    # The denominator of the shutter speed that the photo was taken at
+    # @return [Integer]
+    def exposure_denominator
+      object["exposure_denominator"]
+    end
+
   end
 end

data/lib/skydrive/user.rb

@@ -4,49 +4,50 @@ module Skydrive
     # User's home directory
     # @return [Skydrive::Folder]
     def skydrive
-      response = get("/#{id}/skydrive")
+      response = client.get("/#{id}/skydrive")
+      Skydrive::Folder.new(client, response)
     end
 
     # User's camera_roll folder
     # @return [Skydrive::Folder]
     def camera_roll
-      response = get("/#{id}/skydrive/camera_roll")
+      response = client.get("/#{id}/skydrive/camera_roll")
     end
 
     # User's documents
     # @return [Skydrive::Folder]
     def documents
-      response = get("/#{id}/skydrive/my_documents")
+      response = client.get("/#{id}/skydrive/my_documents")
     end
 
     # User's default album
     # @return [Skydrive::Album]
     def photos
-      response = get("/#{id}/skydrive/my_photos")
+      response = client.get("/#{id}/skydrive/my_photos")
     end
 
     # User's public documents
     # @return [Skydrive::Folder]
     def public_documents
-      response = get("/#{id}/skydrive/public_documents")
+      response = client.get("/#{id}/skydrive/public_documents")
     end
 
     # User's shared items
     # @return [Skydrive::Collection]
     def shared_stuff
-      response = get("/#{id}/skydrive/shared")
+      response = client.get("/#{id}/skydrive/shared")
     end
 
     # User's recent documents
     # @return [Skydrive::Collection]
     def recent_documents
-      response = get("/#{id}/skydrive/recent_docs")
+      response = client.get("/#{id}/skydrive/recent_docs")
     end
 
     # User's total and remaining storage quota
     # @return [Hash] contains keys quota and available
     def storage_quota
-      response = get("/#{id}/skydrive/quota")
+      response = client.get("/#{id}/skydrive/quota")
     end
 
   end

data/lib/skydrive/version.rb

@@ -1,5 +1,5 @@
 # Skydrive base module
 module Skydrive
   # The gem version
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/skydrive/video.rb

@@ -1,17 +1,5 @@
 module Skydrive
   # A user's video in SkyDrive.
   class Video < Skydrive::File
-    # The link that can be used to download the video file
-    # @return [String]
-    def download_link
-      url = client.get("/#{id}/content", :download => true, :suppress_redirects => true)["location"]
-    end
-
-    # Download the video file
-    def download
-      uri = URI(download_link)
-      response = HTTParty.get("http://#{uri.host}#{uri.path}?#{uri.query}")
-      response.parsed_response
-    end
   end
 end

data/skydrive.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'httparty', '>= 0.11.0'
   gem.add_dependency 'activesupport'
   gem.add_dependency 'httmultiparty'
-  gem.add_dependency 'oauth2'
+  gem.add_dependency 'oauth2', ">= 0.9.2"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rb-inotify"
+  gem.add_development_dependency "rb-fsevent", "~> 0.9"
   gem.add_development_dependency "guard"
   gem.add_development_dependency "guard-rspec"
   gem.add_development_dependency "simplecov"

data/spec/skydrive/audio_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+describe Skydrive::Audio do
+
+  let :audio do
+    JSON.load %{
+      {
+        "id" : "file.a6b2a7e8f2515e5e.A6B2A7E8F2515E5E\!144",
+        "from" : {
+            "name" : "Stig Struve-Christensen",
+            "id" : "a6b2a7e8f2515e5e"
+        },
+        "name" : "SampleAudio.mp3",
+        "description" : null,
+        "parent_id" : "folder.a6b2a7e8f2515e5e",
+        "size" : 8414449,
+        "upload_location" : "https://apis.live.net/v5.0/file.a6b2a7e8f2515e5e.A6B2A7E8F2515E5E!144/content/",
+        "comments_count" : 0,
+        "comments_enabled" : false,
+        "is_embeddable" : false,
+        "source" : "http://storage.live.com/s1p60U8Xs4UzIXTScrTioalE-ZaVFiDQBA15MS2BwcsuNjfG64Z2fw-DAjXnPuqC47YR40_xAoPD8aRGhtna9ZFZ9_oO4BTz4CWF973DTXMxc5U3TntcQ9qEA/SampleAudio.mp3:Binary",
+        "link" : "https://skydrive.live.com/redir.aspx?cid\u003d22688711f5410e6c\u0026page\u003dview\u0026resid\u003d22688711F5410E6C!582\u0026parid\u003d22688711F5410E6C!581",
+        "type" : "audio",
+        "title" : "My Sample Audio",
+        "artist" : "My Favorite Artist",
+        "album" : "My Favorite Album",
+        "album_artist" : "My Favorite Artist",
+        "genre" : "Easy Listening",
+        "duration" : 225000,
+        "picture" : "https://storage.live.com/items/A6B2A7E8F2515E5E!144:MobileReady/SampleAudio.mp3?psid=1&ck=0&ex=720",
+        "shared_with" : {
+            "access" : "Just me"
+        },
+        "created_time" : "2012-09-23T22:00:57+0000",
+        "updated_time" : "2012-09-03T22:00:57+0000"
+      }
+    }
+  end
+
+  subject {Skydrive::Audio.new(skydrive_test_client, audio)}
+  describe '#title' do
+    it "should return the title of the audio" do
+      subject.title.should == audio["title"]
+    end
+  end
+
+  describe '#artist' do
+    it "should return the artist's name for the audio" do
+      subject.artist.should == audio["artist"]
+    end
+  end
+
+  describe '#album' do
+    it "should return the album name" do
+      subject.album.should == audio["album"]
+    end
+  end
+
+  describe '#album_artist' do
+    it "should return the name of the album artist" do
+      subject.album_artist.should == audio["album_artist"]
+    end
+  end
+
+  describe '#genre' do
+    it "should return the genre of the audio" do
+      subject.genre.should == audio["genre"]
+    end
+  end
+
+  describe '#duration' do
+    it "should return the duration of the audio" do
+      subject.duration.should == audio["duration"]
+    end
+  end
+
+  describe '#picture' do
+    it "should return the url to view the audio's picture on SkyDrive" do
+      subject.picture.should == audio["picture"]
+    end
+  end
+end

data/spec/skydrive/comment_spec.rb

@@ -13,14 +13,19 @@ describe Skydrive::Comment do
     })
   end
 
-  subject {skydrive_test_client}
+  subject { Skydrive::Comment.new(skydrive_test_client, comment)}
 
-  before :each do
-    stub_request(:get, "https://apis.live.net/v5.0/comment.22688711f5410e6c.22688711f0410e6c!818.22688711F5410E6C!979?access_token=access_token").to_return(:status => 200, :body => comment.to_json, :headers => {})
-    @comment = skydrive_test_client.get("/comment.22688711f5410e6c.22688711f0410e6c!818.22688711F5410E6C!979")
+  it "should return the message associated with the comment" do
+    subject.message.should  eql "A lighthouse built on some rocks."
   end
 
-  it "should return the message associated with the comment" do
-    @comment.message.should  eql "A lighthouse built on some rocks."
+  it "should return comment as the type" do
+    subject.type.should == "comment"
+  end
+
+  it "should delete the comment" do
+    stub_request(:delete, "https://apis.live.net/v5.0/comment.22688711f5410e6c.22688711f0410e6c!818.22688711F5410E6C!979?access_token=access_token").
+         to_return(:status => 204, :body => "", :headers => {})
+    subject.delete.should be_true
   end
 end

data/spec/skydrive/file_spec.rb

@@ -37,4 +37,44 @@ describe Skydrive::File do
       subject.from.should be_a(Skydrive::User)
     end
   end
+
+  describe '#size' do
+    it "should return the size of the file in bytes" do
+      subject.size.should == file["size"]
+    end
+  end
+
+  describe '#comments_count' do
+    it "should return the count of comments associated with the file" do
+      subject.comments_count.should == file["comments_count"]
+    end
+  end
+
+  describe '#comments_enabled?' do
+    it "should return whether comments are enabled for the file" do 
+      subject.should be_comments_enabled
+    end
+  end
+
+  describe '#source' do 
+    it "should return the URL to use to download the file from SkyDrive" do
+      subject.source.should == file["source"]
+    end
+  end
+
+  describe '#download_link' do
+    it "should give the download link for the file" do
+      stub_request(:get, "https://apis.live.net/v5.0/file.22688711f5410e6c.22688711F5410E6C!942/content?access_token=access_token&download=true&suppress_redirects=true").to_return(:status => 200, :body => {"location" => "http://dummylocation.com"}.to_json, :headers => {})
+      subject.download_link.should == "http://dummylocation.com"
+    end
+  end
+
+  describe '#download' do
+    it "should download the file" do
+      stub_request(:get, "https://apis.live.net/v5.0/file.22688711f5410e6c.22688711F5410E6C!942/content?access_token=access_token&download=true&suppress_redirects=true").to_return(:status => 200, :body => {"location" => "http://dummylocation.com/path?dummy_param=value"}.to_json, :headers => {})
+      stub_request(:get, "http://dummylocation.com/path?dummy_param=value").
+         to_return(:status => 200, :body => "\322\204\371\225Q", :headers => {})
+      subject.download.should == "\322\204\371\225Q"
+    end 
+  end
 end

data/spec/skydrive/oauth/client_spec.rb

@@ -35,7 +35,7 @@ describe Skydrive::Oauth::Client do
         :headers  => {
           'Accept'        =>  '*/*',
           'Content-Type'  =>  'application/x-www-form-urlencoded',
-          'User-Agent'    =>  'Faraday v0.8.7'
+          'User-Agent'    =>  "Faraday v#{Gem.loaded_specs['faraday'].version}"
         }
       ).to_return(
         :status   => 200, :body => {

data/spec/skydrive/object_spec.rb

@@ -31,14 +31,14 @@ describe Skydrive::Object do
     subject.id.should == "folder.8c8ce076ca27823f.8C8CE076CA27823F!142"
   end
 
-  it "should return the owner user of the object" do
-    subject.from.should be_a(Skydrive::User)
-  end
-
   it "should return the name of the object" do
     subject.name.should == "My Sample Folder in Album 1"
   end
 
+  it "should return the owner user of the object" do
+    subject.from.should be_a(Skydrive::User)
+  end
+
   it "should return the description of the object" do
     subject.description.should == ""
   end
@@ -79,4 +79,63 @@ describe Skydrive::Object do
     subject.to_hash.should == folder
   end
 
+  it "should delete the object" do
+    stub_request(:delete, "https://apis.live.net/v5.0/folder.8c8ce076ca27823f.8C8CE076CA27823F!142?access_token=access_token").to_return(:status => 204, :body => "", :headers => {})
+    subject.delete.should == true
+  end
+
+  describe '#comments' do
+
+    let :comments do
+      JSON.load(%{{
+        "data": [
+          {
+            "id": "comment.22688711f5410e6c.22688711f0410e6c!818.22688711F5410E6C!979",
+            "from": {
+              "name": "Roberto Tamburello", 
+              "id": "8c8ce076ca27823f"
+            }, 
+            "message": "A lighthouse built on some rocks.", 
+            "created_time": "2011-04-21T23:21:28+0000"
+          }
+        ]
+      }})
+    end
+    before :each do
+      stub_request(:get, "https://apis.live.net/v5.0/folder.8c8ce076ca27823f.8C8CE076CA27823F!142/comments?access_token=access_token").to_return(:status => 200, :body => comments.to_json, :headers => {})
+    end 
+
+    it "should return a collection" do
+      subject.comments.should be_a Skydrive::Collection
+    end
+
+    it "should get the comments associated with the object" do
+      subject.comments.items.should each { |item|
+        item.should be_a Skydrive::Comment
+      }
+    end
+  end
+
+  describe '#comment' do
+    let :comment do
+      JSON.load(%{
+        {
+          "id": "comment.22688711f5410e6c.22688711f0410e6c!818.22688711F5410E6C!979",
+          "from": {
+            "name": "Roberto Tamburello", 
+            "id": "8c8ce076ca27823f"
+          }, 
+          "message": "A lighthouse built on some rocks.", 
+          "created_time": "2011-04-21T23:21:28+0000"
+        } 
+      })
+
+    end
+    it 'should add a comment for the object' do
+      stub_request(:post, "https://apis.live.net/v5.0/folder.8c8ce076ca27823f.8C8CE076CA27823F!142/comments?access_token=access_token").with({:messge => "hello"}).to_return(:status => 200, :body => comment.to_json, :headers => {})
+      subject.comment.should be_a Skydrive::Comment
+    end
+    
+  end
+  
 end

data/spec/skydrive/photo_spec.rb

@@ -0,0 +1,254 @@
+require 'spec_helper'
+describe Skydrive::Photo do
+  let :photo do
+    JSON.load %{
+      {
+         "id": "file.de57f4126ed7e411.DE57F4126ED7E411!128", 
+         "from": {
+            "name": "Nuno Bento", 
+            "id": "de57f4126ed7e411"
+         }, 
+         "name": "Maui-2012_0034.JPG", 
+         "description": null, 
+         "parent_id": "folder.de57f4126ed7e411.DE57F4126ED7E411!126", 
+         "size": 561683, 
+         "comments_count": 1, 
+         "comments_enabled": true, 
+         "tags_count": 0, 
+         "tags_enabled": true,
+         "is_embeddable": true, 
+         "picture": "http://storage.live.com/s1pKk5vzd-gdPanbzKYhB0nQGn8wGq5DSgqvrgIHU1NTXA4e2-spGkAhQjW1d9pcgKAGLB4NsEsSvDoREmdx5w-JiFrinEJJuEoz08Ws_IFupkX2bPSvy5qmths9ijwvDrXi1OBCWk9GW9Kt-qNNOAA9g/Maui09_0034.JPG:Thumbnail", 
+         "source": "http://storage.live.com/s1pKk5vzd-gdPanbzKYhB0nQGn8wGq5DSgqvrgIHU1NTXA4e2-spGkAhQjW1d9pcgKAGLB4NsEsSvDoREmdx5w-JiFrinEJJuEoz08Ws_IFupkX2bPSvy5qmths9ijwvDrXi1OBCWk9GW9Kt-qNNOAA9g/Maui09_0034.JPG:HighRes", 
+         "upload_location": "https://apis.live.net/v5.0/file.de57f4126ed7e411.DE57F4126ED7E411!128/content/", 
+         "images": [
+            {
+               "height": 450, 
+               "width": 600, 
+               "source": "http://storage.live.com/s1pKk5vzd-gdPanbzKYhB0nQGn8wGq5DSgqvrgIHU1NTXA4e2-spGkAhQjW1d9pcgKAGLB4NsEsSvDoREmdx5w-JiFrinEJJuEoz08Ws_IFupkX2bPSvy5qmths9ijwvDrXi1OBCWk9GW9Kt-qNNOAA9g/Maui09_0034.JPG:WebReady", 
+               "type": "normal"
+            }, {
+               "height": 132, 
+               "width": 176, 
+               "source": "http://storage.live.com/s1pKk5vzd-gdPanbzKYhB0nQGn8wGq5DSgqvrgIHU1NTXA4e2-spGkAhQjW1d9pcgKAGLB4NsEsSvDoREmdx5w-JiFrinEJJuEoz08Ws_IFupkX2bPSvy5qmths9ijwvDrXi1OBCWk9GW9Kt-qNNOAA9g/Maui09_0034.JPG:MobileReady", 
+               "type": "album"
+            }, {
+               "height": 72, 
+               "width": 96, 
+               "source": "http://storage.live.com/s1pKk5vzd-gdPanbzKYhB0nQGn8wGq5DSgqvrgIHU1NTXA4e2-spGkAhQjW1d9pcgKAGLB4NsEsSvDoREmdx5w-JiFrinEJJuEoz08Ws_IFupkX2bPSvy5qmths9ijwvDrXi1OBCWk9GW9Kt-qNNOAA9g/Maui09_0034.JPG:Thumbnail", 
+               "type": "thumbnail"
+            }, {
+               "height": 1200, 
+               "width": 1600, 
+               "source": "http://storage.live.com/s1pKk5vzd-gdPanbzKYhB0nQGn8wGq5DSgqvrgIHU1NTXA4e2-spGkAhQjW1d9pcgKAGLB4NsEsSvDoREmdx5w-JiFrinEJJuEoz08Ws_IFupkX2bPSvy5qmths9ijwvDrXi1OBCWk9GW9Kt-qNNOAA9g/Maui09_0034.JPG:HighRes", 
+               "type": "full"
+            }
+         ], 
+         "link": "https://skydrive.live.com/redir.aspx?cid\u003dde57f4126ed7e411\u0026page\u003dview\u0026resid\u003dDE57F4126ED7E411!128\u0026parid\u003dDE57F4126ED7E411!126", 
+         "when_taken": "2008-03-24T23:41:53+0000", 
+         "height": 1200, 
+         "width": 1600, 
+         "type": "photo",
+         "location": {
+             "latitude": 47.65316, 
+             "longitude": -122.135911,
+             "altitude": 43
+         }, 
+         "camera_make": "MyManufacturer",
+         "camera_model": "MyModel",
+         "focal_ratio": 2.8,
+         "focal_length": 3.85,
+         "exposure_numerator": 1,
+         "exposure_denominator": 15, 
+         "shared_with": {
+            "access": "Everyone (public)"
+         }, 
+         "created_time": "2012-12-03T18:14:03+0000", 
+         "updated_time": "2012-12-03T18:31:01+0000"
+      }
+    }
+  end
+
+  subject { Skydrive::Photo.new(skydrive_test_client, photo)}
+
+  describe '#name' do
+    it "should return the name of the photo" do
+      subject.name.should == photo["name"]
+    end
+  end
+
+  describe '#description' do
+    it "should return the description of the photo" do
+      subject.description.should == photo["description"]
+    end
+  end
+
+  describe '#from' do
+    it "should return a user" do
+      subject.from.should be_a Skydrive::User
+    end
+
+    it "should return the info about the user who uploaded the photo" do
+      subject.from.name.should == photo["from"]["name"]
+      subject.from.id.should == photo["from"]["id"]
+    end
+  end
+
+  describe '#tags_count' do
+    it "should give the tags count of the photo" do
+      subject.tags_count.should == 0
+    end
+  end
+
+  describe '#tags_enabled' do
+    it "should return whether tags are enabled for the photo" do
+      subject.tags_enabled?.should == true
+    end
+  end
+
+  describe '#parent_id' do
+    it "should return the parent id of the photo" do
+      subject.parent_id.should == photo["parent_id"]
+    end
+  end
+
+  describe '#size' do
+    it "should return the size of the photo in bytes" do
+      subject.size.should == photo["size"]
+    end
+  end
+
+  describe '#comments_count' do
+    it "should return the comments associated with the photo" do
+      subject.comments_count.should == photo["comments_count"]
+    end
+  end
+
+  describe '#comments_enabled?' do
+    it "should return whether tags are enabled for the photo" do
+      subject.comments_enabled?.should == true
+    end
+  end
+
+  describe '#is_embeddable? ' do
+    it "should return whether the photo can be embedded" do
+      subject.is_embeddable?.should == true
+    end
+  end
+
+  describe '#picture' do
+    it "should return the URL of the photo's picture" do
+      subject.picture.should == photo["picture"]
+    end
+  end 
+
+  describe '#source' do
+    it 'should return the download URL for the photo.' do
+      subject.source.should == photo["source"]
+    end
+  end
+
+  describe 'upload_location' do
+    it "should return the photo's upload location" do
+      subject.upload_location.should == photo["upload_location"]
+    end
+  end
+
+  describe '#images' do
+    it "should return info about the photo's sizes" do
+      subject.images.should == photo["images"]
+    end
+
+    it "should all have hieght, width, source and type" do
+      subject.images.should each { |image|
+        image.keys.should =~ ["height", "source", "type", "width"]
+      }
+    end
+  end
+
+  describe '#link' do 
+    it "should return the url of the photo hosted in Skydrive" do
+      subject.link.should == photo["link"]
+    end
+  end
+
+  describe '#when_taken' do
+    it "should return the time when the photo was taken" do
+      subject.when_taken.should == Time.new(photo["when_taken"])
+    end
+  end
+
+  describe '#download_link' do
+    it "should give the download link for the photo" do
+      stub_request(:get, "https://apis.live.net/v5.0/file.de57f4126ed7e411.DE57F4126ED7E411!128/content?access_token=access_token&download=true&suppress_redirects=true").to_return(:status => 200, :body => {"location" => "http://dummylocation.com"}.to_json, :headers => {})
+      subject.download_link.should == "http://dummylocation.com"
+    end
+  end
+
+  describe '#height' do 
+    it "should return the height of the photo" do
+      subject.height.should == photo["height"]
+    end
+  end
+
+  describe '#width' do
+    it "should return the width of the photo" do
+      subject.width.should == photo["width"]
+    end
+  end
+
+  describe '#location' do
+    it "should return the location where the photo was taken" do
+      subject.location.should == photo["location"]
+    end
+    it "should give latitude, longitude and altitude" do
+      subject.location.keys.should =~ ['latitude', 'longitude', 'altitude']
+    end
+  end
+
+
+  describe '#camera_make' do
+    it "should return the make of the camera with which the photo was taken" do
+      subject.camera_make.should == photo["camera_make"]
+    end
+  end
+
+  describe '#camera_model' do
+    it "should return the brand and model number of the camera that took the photo." do
+      subject.camera_model.should == photo["camera_model"]
+    end
+  end
+
+  describe '#focal_ratio' do
+    it "should return the f-number that the photo was taken at" do
+      subject.focal_ratio.should == photo["focal_ratio"]
+    end
+  end
+
+  describe '#focal_length' do
+    it "should return the focal length that the photo was taken at" do
+      subject.focal_length.should == photo["focal_length"]
+    end
+  end
+
+  describe '#exposure_numerator' do
+    it "should return the numerator of the shutter speed that the photo was taken at" do
+      subject.exposure_numerator.should == photo["exposure_numerator"]
+    end
+  end
+
+  describe '#exposure_denominator' do
+    it "should return the denominator of the shutter speed that the photo was taken at" do
+      subject.exposure_denominator.should == photo["exposure_denominator"]
+    end
+  end
+
+  describe '#download' do
+    it "should download the photo" do
+      stub_request(:get, "https://apis.live.net/v5.0/file.de57f4126ed7e411.DE57F4126ED7E411!128/content?access_token=access_token&download=true&suppress_redirects=true").to_return(:status => 200, :body => {"location" => "http://dummylocation.com/path?dummy_param=value"}.to_json, :headers => {})
+      stub_request(:get, "http://dummylocation.com/path?dummy_param=value").
+         to_return(:status => 200, :body => "\322\204\371\225Q", :headers => {})
+      subject.download.should == "\322\204\371\225Q"
+    end 
+  end
+
+end

data/spec/skydrive/user_spec.rb

@@ -5,6 +5,13 @@ describe Skydrive::User do
       name: "Rony Varghese"
     })
   }
+
+  let(:skydrive){ YAML.load(%{
+      id: "123456"
+      name: "Rony Varghese"
+    })
+
+  }
   subject { Skydrive::User.new(skydrive_test_client, user)}
   it "should return the id of the user" do
     subject.id.should == "123456"
@@ -13,4 +20,9 @@ describe Skydrive::User do
   it "should return the name of the user" do
     subject.name.should == "Rony Varghese"
   end
+
+  it "should return the user's skydrive home folder" do
+    stub_request(:get, "https://apis.live.net/v5.0/123456/skydrive?access_token=access_token").to_return(:status => 200, :body => skydrive.to_json, :headers => {})
+    subject.skydrive.should == 1
+  end
 end

data/spec/skydrive/video_spec.rb

@@ -0,0 +1,4 @@
+require "spec_helper"
+
+describe Skydrive::Video do
+end

metadata

@@ -1,286 +1,265 @@
 --- !ruby/object:Gem::Specification
 name: skydrive
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors:
 - Rony Varghese
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httmultiparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: metric_abc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec_multi_matchers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple ruby client library for Skydrive cloud storage service with OAuth2
@@ -328,30 +307,30 @@ files:
 - spec/skydrive/operations_spec.rb
 - spec/skydrive/photo_spec.rb
 - spec/skydrive/user_spec.rb
+- spec/skydrive/video_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ronyv89/skydrive
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby client library for Microsoft Skydrive
 test_files:
 - spec/skydrive/album_spec.rb
@@ -366,5 +345,6 @@ test_files:
 - spec/skydrive/operations_spec.rb
 - spec/skydrive/photo_spec.rb
 - spec/skydrive/user_spec.rb
+- spec/skydrive/video_spec.rb
 - spec/spec_helper.rb
 has_rdoc: