croudia 1.4.0 → 1.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmU2ZDc5NjMxNmJjMTkxNGY4NTc5MzY2NzMxYjI5Mzk5ZTc4YWJiMA==
+    M2ZlNGY3ZWJhMGUwODEwNGE3MjcyNmE0YmQ2YjBmMzk2YWQyMTM4Yg==
   data.tar.gz: !binary |-
-    NTYyMWRlMjZkMGU0MzRkM2RmYTRiNmJmNmU5OGNiNTdmOWNkYjY0MQ==
+    YTg0ZTA2MzY2MDhkNzNmMDE1OGQ4MTYxYjA0ZmY3NTM1ZTFmMDhkNw==
 SHA512:
   metadata.gz: !binary |-
-    ZTRiZTkyMDRmMmJlZTE5OTE4MWUyNTIwMDVjYTQyZTc4NWE0MjNmYTFiZTIw
-    NGViODgzMTAwZWIyYzFmZTkxMGNjY2ZmOWYwYjY3NDA2MDhiNGVjNGNmOWUy
-    YzJkODNlZTQ1NDAwZjZkYmZkMzY5ZWUzOGQ3MjAwNTFlMjYwMTk=
+    Y2QzZDAzYjdlOGY5MGE4MjY1NWVjZjY4MmI4OWQwNmYxZTczNWU0NTc2MDIx
+    YjgwNzAzZTM1MmQ5NzdiNjYyOWFhZDY5Y2M4NDdjMjU5MGRiOTZlZmEyM2Rl
+    ODMyZTZlZGJkNmYxZjQ0ODFjMmQ1MWZhZGUyMTdhMzBkODY2NDM=
   data.tar.gz: !binary |-
-    YmRhZTQ0M2ZlMzA2ODNkNDUzYzM1N2Y1MDViMjVhYTBkYjkyNGVmZjIzZTVi
-    NzFiZDFmOWU5NzQ1NmE4MTdiMzY2MDRmZGM1OTc1OWE1MDFlZWFlODA0MjRm
-    ZmVlZDQ1NWUwZTY0ZmZhODI3MTc4NmYzOTMzZmYzN2JjMWE1MDk=
+    ZWUzNDlhYTk1OWEwZWRhZDk0NjM3ZjY4MjFiNDlkYTRkM2RjN2YzZTg3NDQy
+    MTc3M2I5MWZkZmY2MjUwYWUxMDk1ZWI5MTJlNTIwZjc2NzIzNjU2OGRiZTBi
+    MGRjMGYwNDAwMTc5YmIxMGEzNmYzYTk0N2ZkMmY3NjY3YjBlZDY=

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/wktk/croudia-gem.png)](https://travis-ci.org/wktk/croudia-gem)
 
-A Ruby Wapper for the [Croudia](https://croudia.com) API
+Ruby wrapper for the [Croudia](https://croudia.com) API
 
 This software is not affiliated with [Croudia Inc](http://croudia.co.jp/).
 Croudia is a registered trademark of Croudia Inc. in Japan.

data/croudia.gemspec

@@ -3,8 +3,8 @@ require File.expand_path('../lib/croudia/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ['wktk']
-  gem.email         = ['mail@wktk.jp']
-  gem.description   = 'Ruby Wrapper for the Croudia API'
+  gem.email         = ['wktk30@gmail.com']
+  gem.description   = 'Ruby wrapper for the Croudia API'
   gem.summary       = 'Croudia API'
   gem.homepage      = 'https://github.com/wktk/croudia-gem'
   gem.license       = 'MIT'

data/lib/croudia/api/secret_mails.rb

@@ -50,6 +50,30 @@ module Croudia
         Croudia::SecretMail.new(resp)
       end
 
+      # Send a new secret mail with media
+      #
+      # @see https://developer.croudia.com/docs/26_secret_mails_new_with_media
+      # @overload send_secret_mail_with_media(text, to_user, media, params={})
+      #   @param [String] text Message body
+      #   @param [String, Integer, Croudia::User] to_user Recipient user
+      #   @param [File, #to_io] media Image to upload with
+      #   @param [Hash] params Additional query parameters
+      # @overload send_secret_mail_with_media(params={})
+      #   @param [Hash] params Query parameters
+      #   @option params [File, #to_io] :media Image to upload with
+      #   @option params [String] :screen_name Screen name of the recipient
+      #   @option params [String] :text Message body
+      #   @option params [String, Integer] :user_id ID of the recipient
+      # @return [Croudia::SecretMail] Sent message
+      def send_secret_mail_with_media(text, to_user={}, media={}, params={})
+        merge_text!(params, text, :text)
+        merge_user!(params, to_user)
+        merge_file!(params, media, :media)
+
+        resp = post('/secret_mails/new_with_media.json')
+        Croudia::SecretMail.new(resp)
+      end
+
       # Destroy a secret mail
       #
       # @see https://developer.croudia.com/docs/24_secret_mails_destroy
@@ -71,6 +95,16 @@ module Croudia
         resp = get("/secret_mails/show/#{get_id(id)}.json", params)
         Croudia::SecretMail.new(resp)
       end
+
+      # Get an image attached to a secret mail
+      #
+      # @see https://developer.croudia.com/docs/27_secret_mails_get_secret_photo
+      # @param [String, Integer] id Image ID
+      # @return [String] Raw image
+      def secret_photo(id)
+        get("/secret_mails/get_secret_photo/#{id}")
+      end
+
     end
   end
 end

data/lib/croudia/response/parse_json.rb

@@ -5,6 +5,8 @@ module Croudia
   module Response
     class ParseJSON < Faraday::Response::Middleware
       def on_complete(env)
+        return unless env[:response_headers]['content-type'].to_s.include?('json')
+
         case env[:body]
         when /\A\s*\z/, nil
           env[:body] = nil
@@ -12,8 +14,7 @@ module Croudia
           env[:body] = JSON.parse(env[:body])
         end
       rescue JSON::ParserError => e
-        raise e if env[:status] == 200
-        env[:body] = nil
+        env[:status] == 200 ? raise(e) : env[:body] = nil
       end
     end
   end

data/lib/croudia/version.rb

@@ -1,3 +1,3 @@
 module Croudia
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/spec/croudia/api/account_spec.rb

@@ -9,7 +9,7 @@ describe Croudia::API::Account do
     before do
       stub_get('/account/verify_credentials.json').to_return(
         body: fixture(:user),
-        header: { content_type: 'application/json; charset=utf-8' }
+        headers: { content_type: 'application/json; charset=utf-8' }
       )
     end
 

data/spec/croudia/api/friendships_spec.rb

@@ -94,7 +94,7 @@ describe Croudia::API::Friendships do
         }
       ).to_return(
         body: fixture(:friendship),
-        headers: { content_type: 'appplication/json; charset=utf-8' }
+        headers: { content_type: 'application/json; charset=utf-8' }
       )
     end
 

data/spec/croudia/api/secret_mails_spec.rb

@@ -9,7 +9,7 @@ describe Croudia::API::SecretMails do
     before do
       stub_get('/secret_mails.json').to_return(
         body: fixture(:secret_mails),
-        header: { content_type: 'application/json; charset=utf-8' }
+        headers: { content_type: 'application/json; charset=utf-8' }
       )
     end
 
@@ -29,7 +29,7 @@ describe Croudia::API::SecretMails do
     before do
       stub_get('/secret_mails/sent.json').to_return(
         body: fixture(:secret_mails),
-        header: { content_type: 'application/json; charset=utf-8' }
+        headers: { content_type: 'application/json; charset=utf-8' }
       )
     end
 
@@ -109,11 +109,30 @@ describe Croudia::API::SecretMails do
     end
   end
 
+  describe '#send_secret_mail_with_media' do
+    before do
+      stub_post('/secret_mails/new_with_media.json').to_return(
+        body: fixture(:secret_mail),
+        headers: { content_type: 'application/json; charset=utf-8' }
+      )
+    end
+
+    it 'requests the correct resource' do
+      @client.send_secret_mail_with_media('hi', 1234, fixture('image.jpg'))
+      expect(a_post('/secret_mails/new_with_media.json')).to have_been_made
+    end
+
+    it 'returns Croudia::SecretMail' do
+      subject = @client.send_secret_mail_with_media('hi', 1234, fixture('image.jpg'))
+      expect(subject).to be_a Croudia::SecretMail
+    end
+  end
+
   describe '#destroy_secret_mail' do
     before do
       stub_post('/secret_mails/destroy/1234.json').to_return(
         body: fixture(:secret_mail),
-        headers: { content_type: 'application/json; charset-utf-8' }
+        headers: { content_type: 'application/json; charset=utf-8' }
       )
     end
 
@@ -137,7 +156,7 @@ describe Croudia::API::SecretMails do
     before do
       stub_get('/secret_mails/show/1234.json').to_return(
         body: fixture(:secret_mail),
-        headers: { content_type: 'appplication/json; charset=utf-8' }
+        headers: { content_type: 'application/json; charset=utf-8' }
       )
     end
 
@@ -151,4 +170,23 @@ describe Croudia::API::SecretMails do
       expect(subject).to be_a Croudia::SecretMail
     end
   end
+
+  describe '#secret_photo' do
+    before do
+      stub_get('/secret_mails/get_secret_photo/123').to_return(
+        body: fixture('image.jpg'),
+        headers: { content_type: 'image/jpg' }
+      )
+    end
+
+    it 'requests the correct resource' do
+      @client.secret_photo(123)
+      expect(a_get('/secret_mails/get_secret_photo/123')).to have_been_made
+    end
+
+    it 'returns a photo in String' do
+      expect(@client.secret_photo(123)).to eq fixture('image.jpg').read
+    end
+  end
+
 end

data/spec/croudia/api/statuses_spec.rb

@@ -99,7 +99,7 @@ describe Croudia::API::Statuses do
     before do
       stub_get('/statuses/show/1234.json').to_return(
         body: fixture(:status),
-        header: { content_type: 'application/json; charset=utf-8' }
+        headers: { content_type: 'application/json; charset=utf-8' }
       )
     end
 
@@ -117,7 +117,7 @@ describe Croudia::API::Statuses do
     before do
       stub_post('/statuses/spread/1234.json').to_return(
         body: fixture(:status),
-        header: { content_type: 'application/json: charset=utf-8' }
+        headers: { content_type: 'application/json: charset=utf-8' }
       )
     end
 

data/spec/croudia_spec.rb

@@ -5,7 +5,7 @@ describe Croudia do
     before do
       stub_get('/statuses/public_timeline.json').to_return(
         body: fixture('timeline'),
-        headers: { content_type: 'application/json; charset_utf-8' }
+        headers: { content_type: 'application/json; charset=utf-8' }
       )
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: croudia
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - wktk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -94,9 +94,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.13.0
-description: Ruby Wrapper for the Croudia API
+description: Ruby wrapper for the Croudia API
 email:
-- mail@wktk.jp
+- wktk30@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []