croudia 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb3a0686cfdaa7c6f90d6e512c28a40f6367a6cb
-  data.tar.gz: 8350f383e5f846169b696c6653afd805f6498c16
+  metadata.gz: c980e95cf02f420c143e76e15a2aa2dc0e850ce6
+  data.tar.gz: f654ad400d4ac8195127f94ee359477ebb503d4e
 SHA512:
-  metadata.gz: 1fe3050abdbbd48263071db6435d669386ee2b846739d07db79498525653934aeaff6d24b3aa9ec95b089773affbad8cd0150af9002882fda7b2372a8d577372
-  data.tar.gz: f2f081a62a57f4e20267c9d141eac2138ecc95067240b88466d6b5584ce65ed3c7bdb252c1d70ccd00a0587c424ca9b88767e5e4e35955f3ffb13dd40adb36f6
+  metadata.gz: fc7a71258db70b68d07bed0ae5a5114862edf1717fffa66740aa7f97d2a8eaedca24f5cb21ba0d37e0dfd84041151c9e3abd3129b7f1dfa6fc1c4cc7469f8a9a
+  data.tar.gz: e5ab68cb788c8412aaab28e94da5f8ed18ac16560dd2e726b1c1775f23c5e99281ee6b4b1fea7d0e2d35df96133e1a7b3babf277e79d583df98f57c452147a8c

data/README.md

@@ -32,12 +32,18 @@ croudia = Croudia::Client.new(
 # Get URL
 url = croudia.authorize_url
 
-# Or add scope query in URL
-url = croudia.authrorize_url(scope: "scope_value")
+# Or add state query in URL
+url = croudia.authrorize_url(state: "state_value")
 
 # Retrieve an access token
 access_token = croudia.get_access_token("code param returned by user")
 #=> { "access_token" => " ... ", "refresh_token" => " ... ", ... }
+
+# Refresh an access token
+new_access_token = croudia.get_access_token(
+  grant_type: :refresh_token,
+  refresh_token: "refresh_token"
+)
 ```
 
 ### Using the API

data/croudia.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = 'Ruby Wrapper for the Croudia API'
   gem.summary       = 'Croudia API'
   gem.homepage      = 'https://github.com/wktk/croudia-gem'
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -17,7 +18,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'faraday', '~> 0.8.7'
   gem.add_dependency 'faraday_middleware', '~> 0.9.0'
-  gem.add_dependency 'hashie', '~> 2.0.5'
   gem.add_development_dependency 'rake', '~> 10.1.0'
   gem.add_development_dependency 'rdoc', '~> 4.0.1'
   gem.add_development_dependency 'rspec', '~> 2.14.0'

data/lib/croudia/access_token.rb

@@ -0,0 +1,12 @@
+require 'croudia/base'
+
+module Croudia
+  class AccessToken < Croudia::Base
+    attr_reader :access_token, :refresh_token, :expires_in, :token_type
+    alias :token :access_token
+
+    def to_s
+      access_token
+    end
+  end
+end

data/lib/croudia/api/account.rb

@@ -0,0 +1,17 @@
+require 'croudia/user'
+
+module Croudia
+  module API
+    module Account
+      # Retrieve the Authenticated User
+      #
+      # @params params [Hash] Additional params
+      # @return [Croudia::User] Current user's object
+      def verify_credentials(params={})
+        resp = get('/account/verify_credentials.json', params)
+        Croudia::User.new(resp)
+      end
+      alias current_user verify_credentials
+    end
+  end
+end

data/lib/croudia/api/oauth.rb

@@ -1,3 +1,5 @@
+require 'croudia/access_token'
+
 module Croudia
   module API
     module OAuth
@@ -25,7 +27,8 @@ module Croudia
         params[:client_id] ||= @client_id
         params[:client_secret] ||= @client_secret
         params[:grant_type] ||= 'authorization_code'
-        post('/oauth/token', params)
+        resp = post('/oauth/token', params)
+        Croudia::AccessToken.new(resp)
       end
     end
   end

data/lib/croudia/api/statuses.rb

@@ -50,6 +50,22 @@ module Croudia
         resp = get("/statuses/show/#{status_id}.json", params)
         Croudia::Status.new(resp)
       end
+
+      # Spread a status
+      #
+      # @param status_id [String, Integer, Croudia::Status] Status to spread
+      # @param params [Hash]
+      # @return [Croudia::Status] My status including spreaded status
+      def spread(status_id, params={})
+        case status_id
+        when String, Integer
+        when Croudia::Status
+          status_id = status_id.id_str
+        end
+
+        resp = post("/statuses/spread/#{status_id}.json", params)
+        Croudia::Status.new(resp)
+      end
     end
   end
 end

data/lib/croudia/base.rb

@@ -5,10 +5,10 @@ module Croudia
         mod = Module.new do
           attrs.each do |attr|
             define_method(attr) do
-              @attrs[attr.to_sym]
+              @attrs[attr.to_s] || @attrs[attr.to_sym]
             end
             define_method("#{attr}?") do
-              !!@attrs[attr.to_sym]
+              !!(@attrs[attr.to_s] || @attrs[attr.to_sym])
             end
           end
         end

data/lib/croudia/client.rb

@@ -1,3 +1,4 @@
+require 'croudia/api/account'
 require 'croudia/api/favorites'
 require 'croudia/api/oauth'
 require 'croudia/api/statuses'
@@ -9,6 +10,7 @@ require 'faraday'
 
 module Croudia
   class Client
+    include Croudia::API::Account
     include Croudia::API::Favorites
     include Croudia::API::OAuth
     include Croudia::API::Statuses

data/lib/croudia/creatable.rb

@@ -3,7 +3,7 @@ require 'time'
 module Croudia
   module Creatable
     def created_at
-      @created_at ||= Time.parse(@attrs[:created_at])
+      @created_at ||= Time.parse(@attrs['created_at'])
     end
   end
 end

data/lib/croudia/default.rb

@@ -21,7 +21,6 @@ module Croudia
     MIDDLEWARE = Faraday::Builder.new do |builder|
       builder.request :url_encoded
 
-      builder.response :mashify
       builder.response :json
       builder.response :raise_error
 

data/lib/croudia/identity.rb

@@ -4,8 +4,8 @@ module Croudia
   class Identity < Croudia::Base
     def initialize(*)
       super
-      raise ArgumentError, 'argument must have an :id key' unless id
-      @attrs[:id_str] = id.to_s
+      raise ArgumentError, 'argument must have an "id" key' unless id
+      @attrs['id_str'] ||= id.to_s
     end
 
     # @param other [Croudia::Identity]
@@ -16,7 +16,7 @@ module Croudia
 
     # @return [Integer]
     def id
-      @attrs[:id]
+      @attrs['id'] || @attrs[:id]
     end
   end
 end

data/lib/croudia/status.rb

@@ -14,13 +14,13 @@ module Croudia
       :text, :user
 
     def initialize(attrs={})
-      user = attrs.delete(:user)
-      pss = attrs.delete(:play_spread_status)
-      reply_status = attrs.delete(:reply_status)
+      user = attrs.delete('user')
+      pss = attrs.delete('play_spread_status')
+      reply_status = attrs.delete('reply_status')
       super(attrs)
-      @attrs[:user] = Croudia::User.new(user) if user
-      @attrs[:play_spread_status] = Croudia::Status.new(pss) if pss
-      @attrs[:reply_status] = Croudia::Status.new(reply_status) if reply_status
+      @attrs['user'] = Croudia::User.new(user) if user
+      @attrs['play_spread_status'] = Croudia::Status.new(pss) if pss
+      @attrs['reply_status'] = Croudia::Status.new(reply_status) if reply_status
     end
   end
-end   
+end 

data/lib/croudia/version.rb

@@ -1,3 +1,3 @@
 module Croudia
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/croudia/api/account_spec.rb

@@ -0,0 +1,21 @@
+require 'helper'
+
+describe Croudia::API::Account do
+  before do
+    @client = Croudia::Client.new
+  end
+
+  describe '#verify_credentials' do
+    before do
+      stub_get('/account/verify_credentials.json').to_return(
+        body: fixture(:user),
+        header: { content_type: 'application/json; charset=utf-8' }
+      )
+    end
+
+    it 'requests the correct resource' do
+      @client.verify_credentials
+      expect(a_get('/account/verify_credentials.json')).to have_been_made
+    end
+  end
+end

data/spec/croudia/api/oauth_spec.rb

@@ -49,5 +49,15 @@ describe Croudia::API::OAuth do
           client_secret: 'cs-value',
       })).to have_been_made
     end
+
+    it 'returns the correct token' do
+      access_token = @client.get_access_token(code: 'code_value')
+      expect(access_token['access_token']).to eq 'access_token_value'
+    end
+
+    it 'can return a token via #access_token' do
+      access_token = @client.get_access_token(code: 'code_value')
+      expect(access_token.access_token).to eq 'access_token_value'
+    end
   end
 end

data/spec/croudia/api/statuses_spec.rb

@@ -70,4 +70,18 @@ describe Croudia::API::Statuses do
       expect(a_get('/statuses/show/1234.json')).to have_been_made
     end
   end
+
+  describe '#spread' do
+    before do
+      stub_post('/statuses/spread/1234.json').to_return(
+        body: fixture(:status),
+        header: { content_type: 'application/json: charset=utf-8' }
+      )
+    end
+
+    it 'requests the correct resource' do
+      @client.spread(1234)
+      expect(a_post('/statuses/spread/1234.json')).to have_been_made
+    end
+  end
 end

data/spec/croudia/base_spec.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 describe Croudia::Base do
   before do
-    @base = Croudia::Base.new(id: 1)
+    @base = Croudia::Base.new('id' => 1)
   end
 
   describe '#[]' do
@@ -21,7 +21,7 @@ describe Croudia::Base do
 
   describe '#attrs' do
     it 'returns a hash of attributes' do
-      expect(@base.attrs).to eq({id: 1})
+      expect(@base.attrs).to eq({'id' => 1})
     end
   end
 end

data/spec/croudia/identity_spec.rb

@@ -2,27 +2,27 @@ require 'helper'
 
 describe Croudia::Identity do
   describe '#initialize' do
-    it 'raises ArguentError if :id attr is missing' do
+    it 'raises ArguentError if "id" attr is missing' do
       expect { Croudia::Identity.new }.to raise_error ArgumentError
     end
   end
 
   describe '#==' do
     it 'returns true when objects IDs are the same' do
-      one = Croudia::Identity.new(id: 1, text: 'hoge')
-      two = Croudia::Identity.new(id: 1, text: 'fuga')
+      one = Croudia::Identity.new('id' => 1, 'text' => 'hoge')
+      two = Croudia::Identity.new('id' => 1, 'text' => 'fuga')
       expect(one == two).to be_true
     end
 
     it 'returns false when objects IDs are different' do
-      one = Croudia::Identity.new(id: 1)
-      two = Croudia::Identity.new(id: 2)
+      one = Croudia::Identity.new('id' => 1)
+      two = Croudia::Identity.new('id' => 2)
       expect(one == two).to be_false
     end
 
     it 'returns false when classes are different' do
-      one = Croudia::Identity.new(id: 1)
-      two = Croudia::Base.new(id: 1)
+      one = Croudia::Identity.new('id' => 1)
+      two = Croudia::Base.new('id' => 1)
       expect(one == two).to be_false
     end
   end

data/spec/croudia/status_spec.rb

@@ -3,27 +3,27 @@ require 'helper'
 describe Croudia::Status do
   describe '#==' do
     it 'returns true when objects IDs are the same' do
-      status = Croudia::Status.new(id: 1, text: 'hoge')
-      other = Croudia::Status.new(id: 1, text: 'fuga')
+      status = Croudia::Status.new('id' => 1, 'text' => 'hoge')
+      other = Croudia::Status.new('id' => 1, 'text' => 'fuga')
       expect(status == other).to be_true
     end
 
     it 'returns false when objects IDs are different' do
-      status = Croudia::Status.new(id: 1)
-      other = Croudia::Status.new(id: 2)
+      status = Croudia::Status.new('id' => 1)
+      other = Croudia::Status.new('id' => 2)
       expect(status == other).to be_false
     end
 
     it 'returns false when classes are different' do
-      status = Croudia::Status.new(id: 1)
-      other = Croudia::Identity.new(id: 1)
+      status = Croudia::Status.new('id' => 1)
+      other = Croudia::Identity.new('id' => 1)
       expect(status == other).to be_false
     end
   end
 
   describe '#created_at' do
     it 'returns a Time' do
-      status = Croudia::Status.new(id: 3, created_at: 'Mon, 08 Jul 2013 01:23:45 +0900')
+      status = Croudia::Status.new('id' => 3, 'created_at' => 'Mon, 08 Jul 2013 01:23:45 +0900')
       expect(status.created_at).to be_a Time
     end
   end

data/spec/croudia/user_spec.rb

@@ -3,27 +3,27 @@ require 'helper'
 describe Croudia::User do
   describe '#==' do
     it 'returns true when objects IDs are the same' do
-      user = Croudia::User.new(id: 1, name: 'hoge')
-      other = Croudia::User.new(id: 1, name: 'fuga')
+      user = Croudia::User.new('id' => 1, 'name' => 'hoge')
+      other = Croudia::User.new('id' => 1, 'name' => 'fuga')
       expect(user == other).to be_true
     end
 
     it 'returns false when objects IDs are different' do
-      user = Croudia::User.new(id: 1)
-      other = Croudia::User.new(id: 2)
+      user = Croudia::User.new('id' => 1)
+      other = Croudia::User.new('id' => 2)
       expect(user == other).to be_false
     end
 
     it 'returns false when classes are different' do
-      user = Croudia::User.new(id: 1)
-      other = Croudia::Identity.new(id: 1)
+      user = Croudia::User.new('id' => 1)
+      other = Croudia::Identity.new('id' => 1)
       expect(user == other).to be_false
     end
   end
 
   describe '#created_at' do
     it 'returns a Time' do
-      user = Croudia::User.new(id: 3, created_at: 'Mon, 08 2013 01:23:45 +0900')
+      user = Croudia::User.new('id' => 3, 'created_at' => 'Mon, 08 2013 01:23:45 +0900')
       expect(user.created_at).to be_a Time
     end
   end

data/spec/fixtures/user.json

@@ -0,0 +1 @@
+{"id":7987,"id_str":"7987","name":"wktk","screen_name":"wktk","profile_image_url_https":"https://croudia.com/testimages/download/9423","created_at":"Sun, 29 Jul 2012 19:21:21 +0900","description":"気軽に fav ります。Twitter でも @wktk です。 \r\nhttps://twitter.com/wktk\r\nhttps://github.com/wktk","favorites_count":68,"follow_request_sent":"underdevelopment","followers_count":12,"following":"underdevelopment","friends_count":11,"location":"Japan","statuses_count":26,"protected":false,"url":"http://wktk.jp/"}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: croudia
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - wktk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,20 +38,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +108,8 @@ files:
 - Rakefile
 - croudia.gemspec
 - lib/croudia.rb
+- lib/croudia/access_token.rb
+- lib/croudia/api/account.rb
 - lib/croudia/api/favorites.rb
 - lib/croudia/api/oauth.rb
 - lib/croudia/api/statuses.rb
@@ -136,6 +124,7 @@ files:
 - lib/croudia/status.rb
 - lib/croudia/user.rb
 - lib/croudia/version.rb
+- spec/croudia/api/account_spec.rb
 - spec/croudia/api/favorites_spec.rb
 - spec/croudia/api/oauth_spec.rb
 - spec/croudia/api/statuses_spec.rb
@@ -149,9 +138,11 @@ files:
 - spec/fixtures/access_token.json
 - spec/fixtures/status.json
 - spec/fixtures/timeline.json
+- spec/fixtures/user.json
 - spec/helper.rb
 homepage: https://github.com/wktk/croudia-gem
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -174,6 +165,7 @@ signing_key:
 specification_version: 4
 summary: Croudia API
 test_files:
+- spec/croudia/api/account_spec.rb
 - spec/croudia/api/favorites_spec.rb
 - spec/croudia/api/oauth_spec.rb
 - spec/croudia/api/statuses_spec.rb
@@ -187,4 +179,5 @@ test_files:
 - spec/fixtures/access_token.json
 - spec/fixtures/status.json
 - spec/fixtures/timeline.json
+- spec/fixtures/user.json
 - spec/helper.rb