rixi 0.1.2 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/rixi.rb

@@ -1,7 +1,35 @@
 # -*- coding: utf-8 -*-
+require 'cgi'
 require 'oauth2'
 require 'json'
 
+module OAuth2
+  class Client
+    # Initializes an AccessToken by making a request to the token endpoint
+    #
+    # @param [Hash] params a Hash of params for the token endpoint
+    # @return [AccessToken] the initalized AccessToken
+    def get_token(params)
+      opts = { :raise_errors => true, :parse => params.delete(:parse)}
+      if options[:token_method] == :post
+        opts[:body] = params
+        opts[:headers] =  { 'Content-Type' => 'application/x-www-form-urlencoded'}
+      else
+        opts[:params] = params
+      end
+      response = request(options[:token_method], token_url, opts)
+      raise Error.new(response) unless response.parsed.is_a?(Hash) && response.parsed['access_token']
+
+      ##
+      ## デフォルトではヘッダーでのAccessToken指定が出来ないため
+      ## 
+      AccessToken.new(self, response.parsed.delete("access_token"), 
+                      :mode => :header,
+                      :header_format => "OAuth %s")
+    end
+  end
+end
+
 class Rixi
   class APIError < StandardError
     attr_reader :response    
@@ -52,8 +80,7 @@ class Rixi
 
   def get_token(code)
     @token = @client.auth_code
-                    .get_token(code,
-                               {:redirect_uri => @redirect_uri})
+                    .get_token(code,{:redirect_uri => @redirect_uri})
   end
   
   #
@@ -95,20 +122,21 @@ class Rixi
       delete_replies        /2/voice/replies/destroy/%s/%s            post
       create_favorite       /2/voice/favorites/create/%s              post
       delete_favorite       /2/voice/favorites/destory/%s/%s          post
-      album                 /2/photo/albums/%s/@self/%o               get
+      albums                /2/photo/albums/%s/@self/%o               get
       recent_album          /2/photo/albums/%s/%s                     get
-      mediaitmes            /2/photo/mediaItems/%s/@self/%s/%o        get
-      recent_media          /2/photo/mediaItems/%s/%o 　　　　        get
+      photos_in_album       /2/photo/mediaItems/%s/@self/%s/%o        get
+      recent_photos         /2/photo/mediaItems/%s/%o 　　　　        get
       comments_album        /2/photo/comments/albums/%s/@self/%s      get
-      comments_media        /2/photo/comments/mediaItems/%s/@self/%s/%s  get
-      favorites_media       /2/phoho/favorites/mediaItems/%s/@self/%s/%s get
+      comments_photo        /2/photo/comments/mediaItems/%s/@self/%s/%s  get
+      favorites_photo       /2/phoho/favorites/mediaItems/%s/@self/%s/%s get
       create_album          /2/photo/albums/%s/@self                  post
       delete_album          /2/photo/albums/%s/@self/%s               delete
       create_comment_album  /2/photo/comments/albums/%s/@self/%s      post
       delete_comment_album  /2/photo/comments/albums/%s/@self/%s/%s   delete
-      create_comment_media  /2/photo/comments/mediaItems/%s/@self/%s/%s/ delete
-      create_favorite_media /2/photo/favorites/mediaItems/%s/@self/%s/%s/ post
-      delete_favorite_media /2/photo/favorites/mediaItems/%s/@self/%s/%s/ delete
+      upload_photo          /2/photo/mediaItems/%s/@self/%s           post_image
+      create_comment_photo  /2/photo/comments/mediaItems/%s/@self/%s/%s/ delete
+      create_favorite_photo /2/photo/favorites/mediaItems/%s/@self/%s/%s/ post
+      delete_favorite_photo /2/photo/favorites/mediaItems/%s/@self/%s/%s/ delete
       messages_inbox        /2/messages/%s/@inbox/%o                  get
       messages_outbox       /2/messages/%s/@outbox/%o                 get
       create_message        /2/messages/%s/@self/@outbox              post
@@ -128,18 +156,15 @@ class Rixi
     if /%s/ =~ path
       define_method method_name do |*args|
         params = args.last.kind_of?(Hash) ? args.pop : { }
-        __send__ http_method, path % args, params
-      end
-    elsif /%o/ =~ path
-      define_method method_name do |*args|
-        params = args.last.kind_of?(Hash) ? args.pop : { }
-        if params.key? :optional_path
-          path.sub!("%o",params[:optional_path].to_s)
-        else
-          path.sub!("/%o","")
+        if /%o/ =~ path
+          if params.key? :optional_path
+            path.sub!("%o",params[:optional_path].to_s)
+          else
+            path.sub!("/%o","")
+          end
         end
         __send__ http_method, path % args, params
-      end      
+      end
     else
       define_method method_name do |params = { }|
         __send__ http_method, path, params
@@ -151,30 +176,36 @@ class Rixi
   # これらのメソッドを呼ぶ
   def get(path, params = { })
     extend_expire()
-    parse_response(@token.get(path,
-                  {:mode => :query,
-                   :params => params.merge({:oauth_token => @token.token})}))
+    parse_response(@token.get(path, :params => params))
   end
 
   def post(path, params = { })
     extend_expire()
+    parse_response(@token.post(path,:params => params))
+  end
+
+  # img は "rb"で開いたFileのインスタンスで渡す
+  def post_image(path, params = { })
+    extend_expire()
+    path += "?title="+ CGI.escape(params[:title]) if params[:title]
     parse_response(@token.post(path,
-                  {:mode => :body,
-                   :params => params.merge({:oauth_token => @token.token})}))
+                               {
+                                 :headers => {
+                                   :content_type  => "image/jpeg",
+                                   :content_length => params[:image].size.to_s,
+                                 },
+                                 :body   => params[:image].read
+                               }))
   end
 
   def delete(path, params = { })
     extend_expire()
-    parse_response(@token.delete(path,
-                  {:mode => :body,
-                   :params => params.merge({:oauth_token => @token.token})}))
+    parse_response(@token.delete(path, :params => params))
   end
 
   def put(path, params = { })
     extend_expire()
-    parse_response(@token.put(path,
-                  {:mode => :body,
-                   :params => params.merge({:oauth_token => @token.token})}))
+    parse_response(@token.put(path, :params => params))
   end
 
   # OAuth2::AccessTokenの仕様上破壊的代入が出来ないため...
@@ -185,7 +216,6 @@ class Rixi
   end
 
   # mixiボイスの投稿を楽にするため
-  # Update APIとかぶるか？！
   def voice_update(status)
     voice_statuses_update(:statsus => status)
   end

data/rixi.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rixi}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{ainame }]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rixi
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &70149873289960 !ruby/object:Gem::Requirement
+  requirement: &70222871326180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149873289960
+  version_requirements: *70222871326180
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70149873288680 !ruby/object:Gem::Requirement
+  requirement: &70222871325260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149873288680
+  version_requirements: *70222871325260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70149873287700 !ruby/object:Gem::Requirement
+  requirement: &70222871324500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70149873287700
+  version_requirements: *70222871324500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70149873286860 !ruby/object:Gem::Requirement
+  requirement: &70222871323880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70149873286860
+  version_requirements: *70222871323880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70149873286100 !ruby/object:Gem::Requirement
+  requirement: &70222871323340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70149873286100
+  version_requirements: *70222871323340
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70149873285280 !ruby/object:Gem::Requirement
+  requirement: &70222871322840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149873285280
+  version_requirements: *70222871322840
 description: Rixi is a simply library for mixi graph api in Ruby.
 email: ainame954@facebook.com
 executables: []
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1741242612359883089
+      hash: 921506224466776057
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: