mirror-api 0.0.7 → 0.0.8

data/lib/mirror-api/request.rb

@@ -20,7 +20,18 @@ module Mirror
       end
 
       def invoke_url
-        @invoke_url ||="#{self.host}/mirror/v1/#{@resource}/#{@id ? @id : ''}"
+        return @invoke_url unless @invoke_url.nil?
+        @invoke_url ="#{self.host}/mirror/v1/#{@resource}/#{@id ? @id : ''}"
+        @invoke_url += "/attachments/#{attachment_id ? attachment_id : ''}" if attachments
+        @invoke_url
+      end
+
+      def attachment_id
+        attachments[:id] if attachments
+      end
+
+      def attachments
+        params[:attachments] if params
       end
 
       def params

data/lib/mirror-api/resource.rb

@@ -11,12 +11,13 @@ module Mirror
         raise "Invalid credentials #{credentials}" unless @credentials
       end
 
-      def list(params={})
-        Request.new(@credentials, make_options(params)).get
+      def list(*args)
+        handle_list(args)
+        
       end
 
       def create(params)
-        Request.new(@credentials, make_options(params, 200)).post
+        Request.new(@credentials, make_options(params)).post
       end
       alias insert create
 
@@ -33,8 +34,8 @@ module Mirror
         Request.new(@credentials, item_options(id, params)).patch
       end
 
-      def delete(id)
-        Request.new(@credentials, item_options(id)).delete
+      def delete(id, params=nil)
+        Request.new(@credentials, item_options(id, params)).delete
       end
 
     private
@@ -45,6 +46,15 @@ module Mirror
       def item_options(id, params=nil, status=200)
         {:resource => @resource_name, :id => id, :params => params, :expected_response => status}
       end
+
+      def handle_list(args)
+        if args.first.is_a?(String)
+          Request.new(@credentials, item_options(args[0], args[1])).get
+        else
+          Request.new(@credentials, make_options(args[0])).get
+        end
+      end
+
     end
   end
 end

data/lib/mirror-api/version.rb

@@ -1,5 +1,5 @@
 module Mirror
   module Api
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/spec/client_spec.rb

@@ -23,7 +23,7 @@ describe Mirror::Api::Client do
                          headers: JSON.parse(fixture("timeline_item_response_headers.json", true)))
          end
 
-         it "should insert plain text items", :focus => true do
+         it "should insert plain text items" do
            item = @api.timeline.create({text: @msg})
            item.should_not be_nil
            item.created.should == "2012-09-25T23:28:43.192Z"  # see fixture
@@ -34,7 +34,7 @@ describe Mirror::Api::Client do
        context "with invalid params" do
          before do
            @msg = "123"
-           @body = {text: @msg}
+           @body = {random: @msg}
            stub_request(:post, "https://www.googleapis.com/mirror/v1/timeline/").
                with(body: @body,
                     headers: json_post_request_headers(@body.to_json)).
@@ -44,7 +44,7 @@ describe Mirror::Api::Client do
 
          it "should not insert the item" do
 
-           item = @api.timeline.create({random: "123"})
+           item = @api.timeline.create(@body)
            item.should be_nil
          end
 
@@ -69,7 +69,7 @@ describe Mirror::Api::Client do
                        headers: {})
         end
 
-        it "should get the location for @id", :focus => true do
+        it "should get the location for @id" do
           location = @api.locations.get(@id)
           location.should_not be_nil
           location.displayName.should == "Home"  # see fixture
@@ -89,7 +89,7 @@ describe Mirror::Api::Client do
 
         it "should not get the item" do
 
-          item = @api.timeline.create({random: "123"})
+          item = @api.timeline.get(@id)
           item.should be_nil
         end
       end 
@@ -107,7 +107,7 @@ describe Mirror::Api::Client do
                        headers: {})
         end
 
-        it "should return a list of locations", :focus => true do
+        it "should return a list of locations" do
           locations = @api.locations.list()
           locations.should_not be_nil
           locations.items.count.should == 2  # see fixture
@@ -139,7 +139,7 @@ describe Mirror::Api::Client do
           @id = "blah"
           stub_request(:delete, "https://www.googleapis.com/mirror/v1/contacts/#{@id}").
                   with(headers: json_get_request_headers).
-             to_return(status: 422,
+             to_return(status: 400,
                        body: {},
                        headers: {})
         end
@@ -328,6 +328,137 @@ describe Mirror::Api::Client do
 
   end
 
+  describe "timeline attachments" do
+    
+    context "delete" do
+      context "with valid params" do
+        before do
+          @timeline_id = "1234"
+          @attachment_id = "123123312"
+          stub_request(:delete, "https://www.googleapis.com/mirror/v1/timeline/#{@timeline_id}/attachments/#{@attachment_id}").
+                  with(headers: json_get_request_headers).
+             to_return(status: 200,
+                       body: {},
+                       headers: {})
+        end
+        it "should return nil" do
+          timeline_attachment = @api.timeline.delete(@timeline_id, {attachments:{id: @attachment_id}})
+          timeline_attachment.should == nil
+        end
+      end
+
+      context "with invalid params" do
+        before do
+          @timeline_id = "1234"
+          @attachment_id = "blah"
+          stub_request(:delete, "https://www.googleapis.com/mirror/v1/timeline/#{@timeline_id}/attachments/#{@attachment_id}").
+                  with(headers: json_get_request_headers).
+             to_return(status: 400,
+                       body: {},
+                       headers: {})
+        end
+        it "should return nil" do
+          timeline_attachment = @api.timeline.delete(@timeline_id, {attachments:{id: @attachment_id}})
+          timeline_attachment.should == nil
+        end
+      end
+    end
+
+    context "get" do
+      context "with valid params" do
+        before do
+          @timeline_id = "1234"
+          @attachment_id = "123123312"
+          stub_request(:get, "https://www.googleapis.com/mirror/v1/timeline/#{@timeline_id}/attachments/#{@attachment_id}").
+                  with(headers: json_get_request_headers).
+             to_return(status: 200,
+                       body: fixture("timeline_item_attachments_item.json", true),
+                       headers: {})
+        end
+        it "should return timeline_attachment with id '1234'" do
+          timeline_attachment = @api.timeline.get(@timeline_id, {attachments:{id: @attachment_id}})
+          timeline_attachment.id == '1234'
+        end
+      end
+
+      context "with invalid params" do
+        before do
+          @timeline_id = "1234"
+          @attachment_id = "blah"
+          stub_request(:get, "https://www.googleapis.com/mirror/v1/timeline/#{@timeline_id}/attachments/#{@attachment_id}").
+                  with(headers: json_get_request_headers).
+             to_return(status: 404,
+                       body: {},
+                       headers: {})
+        end
+        it "should return nil" do
+          timeline_attachment = @api.timeline.get(@timeline_id, {attachments:{id: @attachment_id}})
+          timeline_attachment.should == nil
+        end
+      end
+    end
+
+    #TODO: Support file upload
+    # context "insert" do
+    #   context "with valid params" do
+    #     before do
+    #       @timeline_id = "1234"
+    #       @file = fixture_file_upload('files/fry.png', 'image/png')
+    #       @params = {uploadType: 'media'}
+
+    #       stub_request(:post, "https://www.googleapis.com/mirror/v1/timeline/#{@timeline_id}/attachments?uploadType=media").
+    #         with(
+    #           headers: json_post_request_headers(@body.to_json)).
+    #         to_return(status: 200,
+    #           body: fixture("timeline_item_attachments_item.json", true),
+    #           headers: {})
+    #     end
+    #     it "should return timeline_attachment with id '1234'" do
+    #       timeline_attachment = @api.timeline.delete(@timeline_id, {attachments:{id: @attachment_id}})
+    #       timeline_attachment.id == '1234ß'
+    #     end
+    #   end
+
+    #   context "with invalid params" do
+    #     before do
+    #       @body = {canIHazContact: "Really you thought that was valid?!"}
+
+    #       stub_request(:post, "https://www.googleapis.com/mirror/v1/contacts/").
+    #         with(body: @body,
+    #           headers: json_post_request_headers(@body.to_json)).
+    #         to_return(status: 404,
+    #           body: {},
+    #           headers: {})
+    #     end
+    #     it "should return nil" do
+    #       contact = @api.contacts.insert(@body)
+    #       contact.should == nil
+    #     end
+    #   end
+    # end
+
+   # TODO correct resource#list method to handle attachments
+    context "list" do
+      context "with valid params" do
+        before do
+          @timeline_id = "1234"
+          stub_request(:get, "https://www.googleapis.com/mirror/v1/timeline/#{@timeline_id}/attachments/").
+                  with(headers: json_get_request_headers).
+                    to_return(status: 200,
+                       body: fixture("timeline_item_attachments_list.json", true),
+                       headers: {})
+        end
+
+        it "should return a list of contacts", :focus => true do
+          attachments = @api.timeline.list(@timeline_id, {attachments: {} })
+          attachments.should_not be_nil
+          attachments.items.count.should == 2  # see fixture
+        end
+      end
+    end
+
+  end
+
   def json_post_request_headers(body)
     {
         'Accept'=>'application/json',

data/spec/fixtures/timeline_item_attachments_item.json

@@ -0,0 +1,6 @@
+{
+  "id": "1234",
+  "contentType": "image/png",
+  "contentUrl": "https://www.evernote.com/shard/s28/sh/be536e15-5664-4533-b46e-ee4f09a9ed26/4cc92448e68787d8d054839e9ccd6273/deep/0/Pasted%20Image%204/25/13%2012:18%20AM.png",
+  "isProcessingContent": false
+}

data/spec/fixtures/timeline_item_attachments_list.json

@@ -0,0 +1,18 @@
+
+{
+  "kind": "mirror#attachmentsList",
+  "items": [
+    {
+      "id": "1234",
+      "contentType": "image/png",
+      "contentUrl": "https://www.evernote.com/shard/s28/sh/be536e15-5664-4533-b46e-ee4f09a9ed26/4cc92448e68787d8d054839e9ccd6273/deep/0/Pasted%20Image%204/25/13%2012:18%20AM.png",
+      "isProcessingContent": false
+    },
+    {
+      "id": "0987",
+      "contentType": "image/png",
+      "contentUrl": "https://www.evernote.com/didnt_want_to_upload_anything_fun.png",
+      "isProcessingContent": false
+    }
+  ]
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirror-api
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -213,9 +213,12 @@ files:
 - spec/client_spec.rb
 - spec/fixtures/contacts_item.json
 - spec/fixtures/contacts_list.json
+- spec/fixtures/files/fry.png
 - spec/fixtures/locations_item.json
 - spec/fixtures/locations_list.json
 - spec/fixtures/timeline_item.json
+- spec/fixtures/timeline_item_attachments_item.json
+- spec/fixtures/timeline_item_attachments_list.json
 - spec/fixtures/timeline_item_response_headers.json
 - spec/spec_helper.rb
 homepage: https://github.com/ciberch/mirror-api
@@ -246,8 +249,11 @@ test_files:
 - spec/client_spec.rb
 - spec/fixtures/contacts_item.json
 - spec/fixtures/contacts_list.json
+- spec/fixtures/files/fry.png
 - spec/fixtures/locations_item.json
 - spec/fixtures/locations_list.json
 - spec/fixtures/timeline_item.json
+- spec/fixtures/timeline_item_attachments_item.json
+- spec/fixtures/timeline_item_attachments_list.json
 - spec/fixtures/timeline_item_response_headers.json
 - spec/spec_helper.rb