rixi 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/rixi.rb

@@ -3,12 +3,9 @@ require 'cgi'
 require 'oauth2'
 require 'json'
 
+# monkey patch
 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
@@ -19,13 +16,15 @@ module OAuth2
       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")
+      
+      # デフォルトではヘッダーでのAccessToken指定が出来ないため
+      # modeとheader_formatを追加
+      #AccessToken.from_hash(self, response.parsed)   
+      response = response.parsed
+      AccessToken.new(self, response.delete("access_token") || response.delete(:access_token), 
+                      {:mode => :header,
+                        :header_format => "OAuth %s"
+                      }.merge(response))
     end
   end
 end
@@ -40,26 +39,30 @@ class Rixi
   end
   
   attr_reader :consumer_key, :consumer_secret, :redirect_uri, :token, :client
-
+  
   SITE = 'http://api.mixi-platform.com'
   AUTH_URL ='https://mixi.jp/connect_authorize.pl'
   TOKEN_URL ='https://secure.mixi-platform.com/2/token'
-
+  
   def initialize(params = { })
     if params[:consumer_key] == nil && params[:consumer_secret] == nil
       raise "Rixi needs a consumer_key or consumer_secret."
     end
-
-    @consumer_key    = params[:consumer_key]
-    @consumer_secret = params[:consumer_secret]
-    @redirect_uri    = params[:redirect_uri]
-    @scope           = scope_to_query(params[:scope])
+    
+    @consumer_key    = params.delete :consumer_key
+    @consumer_secret = params.delete :consumer_secret
+    @redirect_uri    = params.delete :redirect_uri
+    @scope           = scope_to_query(params.delete(:scope))
+    
+    params.merge!({
+      :site => SITE,
+      :authorize_url => AUTH_URL,
+      :token_url => TOKEN_URL    
+    })
     @client = OAuth2::Client.new(
           @consumer_key,
           @consumer_secret,
-          :site => SITE,
-          :authorize_url => AUTH_URL,
-          :token_url => TOKEN_URL
+          params
     )
   end
   
@@ -91,7 +94,7 @@ class Rixi
   # 次期バージョンが出来るとするならAPIの種類毎に
   # モジュールに切り分けて実装したいです。
   #
-  # 注：%d は省略可能なpathを表現するために使ってます
+  # 注：%o は省略可能なpathを表現するために使ってます
   # 例えば、友人のつぶやき一覧の取得をするAPIは以下で、
   # /2/voice/statuses/friends_timeline/[Group-ID]?since_id=[つぶやきのID]
   # Group-IDはpathにも含まれますが省略可能です
@@ -99,13 +102,6 @@ class Rixi
   # 指定するとして、:optional_pathが存在しなければAPIのパスから
   # 省略することとします。
   #
-  # 注2：mixiチェック用API /2/share はPOSTメソッドでリクエストする際に、
-  # データをJSON形式で与えるため、未実装です。
-  #
-  # 注3：DiaryAPIもmultipart/form-data形式として投稿しなければならないため
-  # 現状、未実装です
-  #
-  # 注4：画像投稿系のAPIは未対応です
   #
   def self.api_settings
     # method name,           path for API endpoints,             http method
@@ -117,11 +113,12 @@ class Rixi
       show_status           /2/voice/statuses/show/%s                 get
       show_favorites        /2/voice/favorites/show/%s                get
       update_status         /2/voice/statuses/update                  post
-      delete_statsu         /2/voice/statuses/destroy/%s              post
+      delete_status         /2/voice/statuses/destroy/%s              post
       create_replies        /2/voice/statuses/replies/create/%s       post
       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
+      share                 /2/share                                  post_json
       albums                /2/photo/albums/%s/@self/%o               get
       recent_album          /2/photo/albums/%s/%s                     get
       photos_in_album       /2/photo/mediaItems/%s/@self/%s/%o        get
@@ -129,14 +126,26 @@ class Rixi
       comments_album        /2/photo/comments/albums/%s/@self/%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
+      create_album          /2/photo/albums/%s/@self                  post_json
       delete_album          /2/photo/albums/%s/@self/%s               delete
-      create_comment_album  /2/photo/comments/albums/%s/@self/%s      post
+      create_comment_album  /2/photo/comments/albums/%s/@self/%s      post_json
       delete_comment_album  /2/photo/comments/albums/%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
+      delete_photo          /2/photo/mediaItems/%s/@self/%s/%s        delete
+      create_comment_photo  /2/photo/comments/mediaItems/%s/@self/%s/%s/ post_json
+      delete_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
+      spot                  /2/spots/%s                               get
+      search_spot           /2/search/spots                           get
+      spots_list            /2/spots/%s/@self                         get
+      create_myspot         /2/spots/%s/@self                         post
+      delete_myspot         /2/spots/%s/@self                         delete
+      get_checkins          /2/checkins/%s/%s                         get
+      get_checkin           /2/checkins/%s/@self/%s                   get 
+      checkin               /2/checkins/%s                            post_multipart
+      checkin_with_photo    /2/checkins/%s                            post_multipart
+      diary                 /2/diary/articles/@me/@self               post_multipart
       messages_inbox        /2/messages/%s/@inbox/%o                  get
       messages_outbox       /2/messages/%s/@outbox/%o                 get
       create_message        /2/messages/%s/@self/@outbox              post
@@ -146,7 +155,7 @@ class Rixi
       people_images         /2/people/images/%s/@self/%o              get
       create_people_image   /2/people/images/%s/@self                 post
       set_people_image      /2/people/images/%s/@self/%s              put
-      delete_people_imag    /2/people/images/%s/@self/%s              delete
+      delete_people_image   /2/people/images/%s/@self/%s              delete
     ".strip.split("\n").map {|l| l.strip.split(/\s+/)}
   end
  
@@ -163,10 +172,12 @@ class Rixi
             path.sub!("/%o","")
           end
         end
+        extend_expire()
         __send__ http_method, path % args, params
       end
     else
       define_method method_name do |params = { }|
+        extend_expire()
         __send__ http_method, path, params
       end
     end
@@ -175,36 +186,59 @@ class Rixi
   # define_methodで定義されたメソッドは最終的に
   # これらのメソッドを呼ぶ
   def get(path, params = { })
-    extend_expire()
     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のインスタンスで渡す
+  # 画像 は params[:image], タイトルは params[:title]で渡す
+  # 画像はバイナリ文字列で渡す
   def post_image(path, params = { })
-    extend_expire()
     path += "?title="+ CGI.escape(params[:title]) if params[:title]
-    parse_response(@token.post(path,
-                               {
+    parse_response(@token.post(path,{
                                  :headers => {
                                    :content_type  => "image/jpeg",
                                    :content_length => params[:image].size.to_s,
+                                 },:body   => params[:image]}))
+  end
+
+  # params[:json]はハッシュで渡して関数内でJSON化する
+  def post_json(path, params = { })
+    parse_response(@token.post(path,{
+                                 :headers => {
+                                   :content_type  => "application/json; charset=utf-8",
+                                   :content_length => params[:json].size.to_s
+                                 },:body   => params[:json]}))
+  end
+
+  # JSON形式＋写真を投稿することが可能なAPIについて
+  def post_multipart(path, params ={ })
+    if params[:image]
+      now = Time.now.strftime("%Y%m%d%H%M%S")
+      content_type = "multipart/form-data; boundary=boundary#{now}"
+      body  = application_json(now,params[:json])
+      body << attach_photos(now,params[:image])
+      body << end_boundary(now)
+    else
+      content_type = "application/json"
+      body = params[:json]
+    end
+    
+    parse_response(@token.post(path,{
+                                 :headers => {
+                                   :content_type  => content_type,                         
+                                   :content_length => body.size.to_s
                                  },
-                                 :body   => params[:image].read
-                               }))
+                                 :body => body}))                                 
   end
 
   def delete(path, params = { })
-    extend_expire()
-    parse_response(@token.delete(path, :params => params))
+    @token.delete(path, :params => params).response.env[:status].to_s
   end
 
   def put(path, params = { })
-    extend_expire()
     parse_response(@token.put(path, :params => params))
   end
 
@@ -220,14 +254,53 @@ class Rixi
     voice_statuses_update(:statsus => status)
   end
   
-  def parse_response(res)
-    res = res.response.env
+  def parse_response(response)
+    res = response.response.env
     case res[:status].to_i
     when 400...600
-      raise APIError.new("API Error", res)
+      puts "API ERROR: status_code=" + res[:status].to_s
+      JSON.parse(res[:body])
     else
       JSON.parse(res[:body])
     end
   end
+
+  # build request body
+  def application_json(time,json)
+    return <<-"EOF".force_encoding("UTF-8")
+--boundary#{time}\r
+Content-Disposition: form-data; name="request"\r
+Content-Type: application/json\r
+\r
+#{json.to_json}\r
+EOF
+  end
+
+  def attach_photos(time, imgs)
+    if imgs.instance_of?(Array)
+      count = 1
+    else
+      count = ""
+      imgs = [imgs]
+    end
+    
+    attach = ""
+    imgs.each do |img|
+      tmp = <<"IMAGE".force_encoding("UTF-8")
+--boundary#{time}\r
+Content-Disposition: form-data; name="photo#{count}"; filename="#{time+count.to_s}.jpg"\r
+Content-Type: image/jpeg\r
+\r
+#{img}\r
+IMAGE
+      count+=1 if count != ""
+      attach << tmp
+    end
+    attach
+  end
+
+  def end_boundary(time)
+    "--boundary#{time}--"
+  end
   
 end

data/rixi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rixi}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{ainame }]
-  s.date = %q{2011-08-18}
+  s.date = %q{2011-08-22}
   s.description = %q{Rixi is a simply library for mixi graph api in Ruby.}
   s.email = %q{ainame954@facebook.com}
   s.extra_rdoc_files = [

data/sample_safari.rb

@@ -64,7 +64,9 @@ config = YAML.load_file("setting.yml")
 M = Rixi.new( :consumer_key => config['consumer_key'], 
               :consumer_secret => config['consumer_secret'],
               :redirect_uri => 'http://0.0.0.0:4567/callback',
-              :scope => scope)
+              :scope => scope,
+              :connection_opts => {:proxy => ENV["https_proxy"]},
+              :raise_errors => false)
 
 browser = Watir::Safari.new
 browser.goto M.authorized_uri

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rixi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-18 00:00:00.000000000Z
+date: 2011-08-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &70222871326180 !ruby/object:Gem::Requirement
+  requirement: &70166902590920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70222871326180
+  version_requirements: *70166902590920
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70222871325260 !ruby/object:Gem::Requirement
+  requirement: &70166902589980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70222871325260
+  version_requirements: *70166902589980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70222871324500 !ruby/object:Gem::Requirement
+  requirement: &70166902589100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70222871324500
+  version_requirements: *70166902589100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70222871323880 !ruby/object:Gem::Requirement
+  requirement: &70166902588060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70222871323880
+  version_requirements: *70166902588060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70222871323340 !ruby/object:Gem::Requirement
+  requirement: &70166902587220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70222871323340
+  version_requirements: *70166902587220
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70222871322840 !ruby/object:Gem::Requirement
+  requirement: &70166902586280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70222871322840
+  version_requirements: *70166902586280
 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: 921506224466776057
+      hash: -3097028528826085841
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: