lib/ncmb/client.rb in ncmb-ruby-client-0.0.8 vs lib/ncmb/client.rb in ncmb-ruby-client-0.0.9

@@ -9,10 +9,12 @@
   DOMAIN = 'mb.api.cloud.nifty.com'
   API_VERSION = '2013-09-01'
   @application_key = nil
   @client_key = nil
   @@client = nil
+  @@current_user = nil
+  @@last_error = nil
   
   class Client
     include NCMB
     attr_accessor :application_key, :client_key, :domain, :api_version
     def initialize(params = {})
@@ -20,24 +22,24 @@
       @api_version     = NCMB::API_VERSION
       @application_key = params[:application_key]
       @client_key      = params[:client_key]
     end
     
-    def get(path, params)
-      request :get, path, params
+    def get(path, params = {}, session_key = nil)
+      request :get, path, params, session_key
     end
     
-    def post(path, params)
-      request :post, path, params
+    def post(path, params = {}, session_key = nil)
+      request :post, path, params, session_key
     end
 
-    def put(path, params)
-      request :put, path, params
+    def put(path, params = {}, session_key = nil)
+      request :put, path, params, session_key
     end
     
-    def delete(path, params)
-      request :delete, path
+    def delete(path, params = {}, session_key = nil)
+      request :delete, path, params, session_key
     end
     
     def array2hash(ary)
       new_v = {}
       ary.each do |hash|
@@ -97,54 +99,90 @@
         "X-NCMB-Application-Key" => @application_key
       }
       params = method == :get ? params_base.merge(encode_query(queries)) : params_base
       now ||= Time.now.utc.iso8601
       params = params.merge "X-NCMB-Timestamp" => now
-      params = params.sort_by{|a, b| a.to_s}.to_h
+      if [].respond_to?("to_h") # Array#to_h inpremented over ruby 2.1
+        params = params.sort_by{|a, b| a.to_s}.to_h
+      else
+        sorted_params = {}
+        params = params.sort_by{|a, b| a.to_s}.each {|kv|
+          sorted_params[kv[0]] = kv[1]
+        }
+        params = sorted_params
+      end
       signature_base = []
       signature_base << method.upcase
       signature_base << @domain
       signature_base << path
       signature_base << params.collect{|k,v| "#{k}=#{v}"}.join("&")
       signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha256'), @client_key, signature_base.join("\n"))).strip()
     end
     
-    def request(method, path, queries = {})
+    def request(method, path, queries = {}, session_key = nil)
       now = Time.now.utc.iso8601
       signature = generate_signature(method, path, now, queries)
       http = Net::HTTP.new(@domain, 443)
       http.use_ssl=true
       headers = {
         "X-NCMB-Application-Key" => @application_key,
         "X-NCMB-Signature" => signature,
         "X-NCMB-Timestamp" => now,
         "Content-Type" => 'application/json'
       }
+      if session_key
+        headers['X-NCMB-Apps-Session-Token'] = session_key
+      end
       # queries = hash2query(queries)
-      case method
-      when :get
-        query = encode_query(queries).map do |key, value|
-          "#{key}=#{value}"
-        end.join("&")
-        path = path + (query == '' ? "" : "?"+query)
-        return JSON.parse(http.get(path, headers).body, symbolize_names: true)
-      when :post
-        queries = change_query(queries)
-        return JSON.parse(http.post(path, queries.to_json, headers).body, symbolize_names: true)
-      when :put
-        return JSON.parse(http.put(path, queries.to_json, headers).body, symbolize_names: true)
-      when :delete
-        http.delete(path, headers)
-        return {}
+      json = nil
+      begin
+        case method
+        when :get
+          query = encode_query(queries).map do |key, value|
+            "#{key}=#{value}"
+          end.join("&")
+          path = path + (query == '' ? "" : "?"+query)
+          json = JSON.parse(http.get(path, headers).body, symbolize_names: true)
+        when :post
+          queries = change_query(queries)
+          json =  JSON.parse(http.post(path, queries.to_json, headers).body, symbolize_names: true)
+        when :put
+          json = JSON.parse(http.put(path, queries.to_json, headers).body, symbolize_names: true)
+        when :delete
+          response = http.delete(path, headers).body
+          return true if response == ""
+          json = JSON.parse(response, symbolize_names: true)
+        end
+      rescue => e
+        @@last_error =  e
+        raise NCMB::APIError.new(e.to_s)
       end
+      if json[:error] != nil
+        raise NCMB::APIError.new(json[:error])
+      end
+      json
     end
   end
   
   def NCMB.initialize(params = {})
     defaulted = {
       application_key: ENV["NCMB_APPLICATION_KEY"],
       client_key:      ENV["NCMB_CLIENT_KEY"]
     }
     defaulted.merge!(params)
     @@client = Client.new(defaulted)
+  end
+  
+  def NCMB.CurrentUser
+    @@current_user
+  end
+  
+  class APIError < StandardError
+    def initialize(msg)
+      @message = msg
+    end
+    
+    def message
+      @message
+    end
   end
 end