leancloud-ruby-client 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/example.rb

@@ -1,13 +1,13 @@
 # -*- encoding : utf-8 -*-
-AV.init :application_id  => "your_application_id",
+LC.init :application_id  => "your_application_id",
            :api_key         => "your_REST_API_Key"
 
-profile = AV::Object.new "Profile"
+profile = LC::Object.new "Profile"
 profile["first_name"]    = "John"
 profile["last_name"]     = "Doe"
 profile["username"]      = "jdoe"
 profile["email_address"] = "jdoe@fubar.com"
-profile["birthday"]      = AV::Date.new "1980-12-25"
+profile["birthday"]      = LC::Date.new "1980-12-25"
 profile.save
 
 profile.increment "login_count"
@@ -15,21 +15,21 @@ profile.increment "login_count"
 # Queries
 cls = "GameScore"
 (1..100).each { |i|
-  score = AV::Object.new cls
+  score = LC::Object.new cls
   score["score"] = i
   score.save
 }
 
-AV::Query.new(cls)       \
+LC::Query.new(cls)       \
   .greater_eq("score", 10)  \
   .less_eq("score", 20)     \
   .get
 
-AV::Query.new(cls)                   \
+LC::Query.new(cls)                   \
   .value_in("score", [10, 20, 30, 40])  \
   .get
 
 # Pushes
-push = AV::Push.new({ "alert"=> "I'm sending this push to all my app users!" })
+push = LC::Push.new({ "alert"=> "I'm sending this push to all my app users!" })
 push.save
 

data/leancloud-ruby-client.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "leancloud-ruby-client"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alan deLevie", "Adam Alpern", "Dennis Zhuang"]
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".travis.yml",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
@@ -163,4 +162,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<pry>, [">= 0"])
   end
 end
-

data/lib/faraday/extended_parse_json.rb

@@ -11,18 +11,18 @@ module Faraday
         data = parse(env[:body]) || {} rescue {}
 
         array_codes = [
-          AV::Protocol::ERROR_INTERNAL,
-          AV::Protocol::ERROR_TIMEOUT,
-          AV::Protocol::ERROR_EXCEEDED_BURST_LIMIT
+          LC::Protocol::ERROR_INTERNAL,
+          LC::Protocol::ERROR_TIMEOUT,
+          LC::Protocol::ERROR_EXCEEDED_BURST_LIMIT
         ]
         error_hash = { "error" => "HTTP Status #{env[:status]} Body #{env[:body]}", "http_status_code" => env[:status] }.merge(data)
         if data['code'] && array_codes.include?(data['code'])
-          sleep 60 if data['code'] == AV::Protocol::ERROR_EXCEEDED_BURST_LIMIT
+          sleep 60 if data['code'] == LC::Protocol::ERROR_EXCEEDED_BURST_LIMIT
           raise exception(env).new(error_hash.merge(data))
         elsif env[:status] >= 500
           raise exception(env).new(error_hash.merge(data))
         end
-        raise AV::AVProtocolError.new(error_hash)
+        raise LC::LCProtocolError.new(error_hash)
       else
         data = parse(env[:body]) || {}
 
@@ -32,7 +32,7 @@ module Faraday
 
     def exception env
       # decide to retry or not
-      (env[:retries].to_i.zero? ? AV::AVProtocolError : AV::AVProtocolRetry)
+      (env[:retries].to_i.zero? ? LC::LCProtocolError : LC::LCProtocolRetry)
     end
 
   end

data/lib/leancloud-ruby-client.rb

@@ -11,24 +11,24 @@ require 'bundler/setup'
 
 require 'faraday'
 require 'faraday_middleware'
-require 'faraday/better_retry'
-require 'faraday/extended_parse_json'
-require 'faraday/get_method_override'
+require_relative 'faraday/better_retry'
+require_relative 'faraday/extended_parse_json'
+require_relative 'faraday/get_method_override'
 require 'date'
 require 'cgi'
 
 cwd = Pathname(__FILE__).dirname
 $:.unshift(cwd.to_s) unless $:.include?(cwd.to_s) || $:.include?(cwd.expand_path.to_s)
 
-require 'leancloud/object'
-require 'leancloud/query'
-require 'leancloud/datatypes'
-require 'leancloud/util'
-require 'leancloud/protocol'
-require 'leancloud/user'
-require "leancloud/installation"
-require 'leancloud/push'
-require 'leancloud/cloud'
-require 'leancloud/model'
-require 'leancloud/batch'
-require 'leancloud/application'
+require_relative 'leancloud/object'
+require_relative 'leancloud/query'
+require_relative 'leancloud/datatypes'
+require_relative 'leancloud/util'
+require_relative 'leancloud/protocol'
+require_relative 'leancloud/user'
+require_relative "leancloud/installation"
+require_relative 'leancloud/push'
+require_relative 'leancloud/cloud'
+require_relative 'leancloud/model'
+require_relative 'leancloud/batch'
+require_relative 'leancloud/application'

data/lib/leancloud/application.rb

@@ -1,7 +1,7 @@
-module AV
+module LC
   class Application
     def self.config
-      AV.client.request(AV::Protocol.config_uri)['params']
+      LC.client.request(LC::Protocol.config_uri)['params']
     end
   end
 end

data/lib/leancloud/batch.rb

@@ -1,10 +1,10 @@
 # -*- encoding : utf-8 -*-
-module AV
+module LC
   class Batch
     attr_reader :requests
     attr_reader :client
 
-    def initialize(client = AV.client)
+    def initialize(client = LC.client)
       @client = client
       @requests ||= []
     end
@@ -15,7 +15,7 @@ module AV
 
     def create_object(object)
       method = "POST"
-      path = AV::Protocol.class_uri(object.class_name)
+      path = LC::Protocol.class_uri(object.class_name)
       body = object.safe_hash
       add_request({
         "method" => method,
@@ -26,7 +26,7 @@ module AV
 
     def update_object(object)
       method = "PUT"
-      path = AV::Protocol.class_uri(object.class_name, object.id)
+      path = LC::Protocol.class_uri(object.class_name, object.id)
       body = object.safe_hash
       add_request({
         "method" => method,
@@ -38,12 +38,12 @@ module AV
     def delete_object(object)
       add_request({
         "method" => "DELETE",
-        "path" => AV::Protocol.class_uri(object.class_name, object.id)
+        "path" => LC::Protocol.class_uri(object.class_name, object.id)
       })
     end
 
     def run!
-      uri = AV::Protocol.batch_request_uri
+      uri = LC::Protocol.batch_request_uri
       body = {:requests => @requests}.to_json
       @client.request(uri, :post, body)
     end

data/lib/leancloud/client.rb

@@ -4,7 +4,7 @@ require 'leancloud/error'
 require 'leancloud/util'
 
 require 'logger'
-module AV
+module LC
 
   # A class which encapsulates the HTTPS communication with the Parse
   # API server.
@@ -40,7 +40,7 @@ module AV
           max: @max_retries,
           logger: @logger,
           interval: 0.5,
-          exceptions: ['Faraday::Error::TimeoutError', 'Faraday::Error::ParsingError', 'AV::AVProtocolRetry']
+          exceptions: ['Faraday::Error::TimeoutError', 'Faraday::Error::ParsingError', 'LC::LCProtocolRetry']
         c.use Faraday::ExtendedParseJson
 
         c.response :logger, @logger unless @quiet
@@ -49,21 +49,46 @@ module AV
         yield(c) if block_given?
       end
     end
-
+    def get_sign(time = Time.now)
+      m = !!@master_key
+      if m
+        m = ",master"
+      else
+        m = ""
+      end
+      k = @master_key || @api_key
+      t = (time.to_f * 1000).to_i.to_s
+      md5 = Digest::MD5.hexdigest t+k
+      sign = "#{md5},#{t}#{m}"
+    end
     # Perform an HTTP request for the given uri and method
     # with common basic response handling. Will raise a
-    # AVProtocolError if the response has an error status code,
+    # LCProtocolError if the response has an error status code,
     # and will return the parsed JSON body on success, if there is one.
-    def request(uri, method = :get, body = nil, query = nil, content_type = nil)
+    def request(uri, method = :get, body = nil, query = nil, content_type = nil, session_token = nil)
+      headers = {}
+      {
+        "Content-Type"                  => content_type || 'application/json',
+        "User-Agent"                    => 'leancloud-ruby-client, 0.0',
+        Protocol::HEADER_APP_ID         => @application_id,
+        Protocol::HEADER_API_KEY        => get_sign,
+        Protocol::HEADER_SESSION_TOKEN  => session_token || @session_token,
+      }.each do |key, value|
+        headers[key] = value if value
+      end
+
+      @session.send(method, uri, query || body || {}, headers).body
+    end
+    def _request(uri: "", method: :get, body: nil, query: nil, content_type: nil, session_token: nil)
+      raise ArgumentError, "wrong number of arguments (given 0, expected 1..6)" if !(uri && uri != "")
       headers = {}
 
       {
         "Content-Type"                  => content_type || 'application/json',
-        "User-Agent"                    => 'Parse for Ruby, 0.0',
-        Protocol::HEADER_MASTER_KEY     => @master_key,
+        "User-Agent"                    => 'leancloud-ruby-client, 0.0',
         Protocol::HEADER_APP_ID         => @application_id,
-        Protocol::HEADER_API_KEY        => @api_key,
-        Protocol::HEADER_SESSION_TOKEN  => @session_token,
+        Protocol::HEADER_API_KEY        => get_sign,
+        Protocol::HEADER_SESSION_TOKEN  => session_token || @session_token,
       }.each do |key, value|
         headers[key] = value if value
       end
@@ -94,11 +119,11 @@ module AV
   # ------------------------------------------------------------
   class << self
     # A singleton client for use by methods in Object.
-    # Always use AV.client to retrieve the client object.
+    # Always use LC.client to retrieve the client object.
     @client = nil
 
     # Initialize the singleton instance of Client which is used
-    # by all API methods. AV.init must be called before saving
+    # by all API methods. LC.init must be called before saving
     # or retrieving any objects.
     def init(data = {}, &blk)
       defaults = {:application_id => ENV["LC_APPLICATION_ID"], :api_key => ENV["LC_APPLICATION_KEY"]}
@@ -111,7 +136,7 @@ module AV
 
     # A convenience method for using global.json
     def init_from_cloud_code(path = "../config/global.json")
-      # warning: toplevel constant File referenced by AV::Object::File
+      # warning: toplevel constant File referenced by LC::Object::File
       global = JSON.parse(Object::File.open(path).read)
       application_name  = global["applications"]["_default"]["link"]
       application_id    = global["applications"][application_name]["applicationId"]
@@ -126,7 +151,7 @@ module AV
     end
 
     def client
-      raise AVError, "API not initialized" if !@@client
+      raise LCError, "API not initialized" if !@@client
       @@client
     end
 
@@ -137,7 +162,7 @@ module AV
     def get(class_name, object_id = nil)
       data = self.client.get( Protocol.class_uri(class_name, object_id) )
       self.parse_json class_name, data
-    rescue AVProtocolError => e
+    rescue LCProtocolError => e
       if e.code == Protocol::ERROR_OBJECT_NOT_FOUND_FOR_GET
         e.message += ": #{class_name}:#{object_id}"
       end

data/lib/leancloud/cloud.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-module AV
+module LC
   module Cloud
 
     class Function
@@ -14,19 +14,19 @@ module AV
       end
 
       def call(params={})
-        response = AV.client.post(self.uri, params.to_json)
+        response = LC.client.post(self.uri, params.to_json)
         result = response["result"]
         result
       end
     end
 
     def self.request_sms(params)
-      AV.client.post("/#{Protocol::VERSION}/requestSmsCode", params.to_json)
+      LC.client.post("/#{Protocol::VERSION}/requestSmsCode", params.to_json)
     end
 
     def self.verify_sms_code(phone, code)
       params = { mobilePhoneNumber: phone}
-      AV.client.post("/#{Protocol::VERSION}/verifySmsCode/#{code}", params.to_json)
+      LC.client.post("/#{Protocol::VERSION}/verifySmsCode/#{code}", params.to_json)
     end
   end
 end

data/lib/leancloud/datatypes.rb

@@ -3,7 +3,7 @@ require 'time'
 require 'date'
 require 'base64'
 
-module AV
+module LC
 
   # Pointer
   # ------------------------------------------------------------
@@ -31,13 +31,13 @@ module AV
     end
 
     def eql?(other)
-      AV.object_pointer_equality?(self, other)
+      LC.object_pointer_equality?(self, other)
     end
 
     alias == eql?
 
     def hash
-      AV.object_pointer_hash(self)
+      LC.object_pointer_hash(self)
     end
 
     def new?
@@ -59,7 +59,7 @@ module AV
 
     # Retrieve the Parse object referenced by this pointer.
     def get
-      AV.get @class_name, @parse_object_id if @parse_object_id
+      LC.get @class_name, @parse_object_id if @parse_object_id
     end
 
     def to_s
@@ -295,7 +295,7 @@ module AV
 
   # File
   # ------------------------------------------------------------
-  # tf = AV::File.new(:body => "Hello World!", :local_filename => "hello.txt")
+  # tf = LC::File.new(:body => "Hello World!", :local_filename => "hello.txt")
   # tf.save
   class File
     # '{"avatar": {"__type":"File", "name":"profile.png", "url"=>"http://files.parse.com/blah/profile.png"}}'
@@ -329,8 +329,8 @@ module AV
     end
 
     def save
-      uri = AV::Protocol.file_uri(@local_filename)
-      resp = AV.client.request(uri, :post, @body, nil, @content_type)
+      uri = LC::Protocol.file_uri(@local_filename)
+      resp = LC.client.request(uri, :post, @body, nil, @content_type)
       @parse_filename = resp["name"]
       @url = resp["url"]
       @id = resp["id"]

data/lib/leancloud/error.rb

@@ -1,16 +1,16 @@
 # -*- encoding : utf-8 -*-
-module AV
+module LC
 
   # Base exception class for errors thrown by the Parse
-  # client library. AVError will be raised by any
-  # network operation if AV.init() has not been called.
-  class AVError < StandardError #Exception ... why? A:http://www.skorks.com/2009/09/ruby-exceptions-and-exception-handling/
+  # client library. LCError will be raised by any
+  # network operation if LC.init() has not been called.
+  class LCError < StandardError #Exception ... why? A:http://www.skorks.com/2009/09/ruby-exceptions-and-exception-handling/
   end
 
   # An exception class raised when the REST API returns an error.
   # The error code and message will be parsed out of the HTTP response,
   # which is also included in the response attribute.
-  class AVProtocolError < AVError
+  class LCProtocolError < LCError
     attr_accessor :code
     attr_accessor :error
     attr_accessor :response
@@ -36,7 +36,7 @@ module AV
     end
   end
 
-  class AVProtocolRetry < AVProtocolError
+  class LCProtocolRetry < LCProtocolError
   end
 
 end

data/lib/leancloud/installation.rb

@@ -3,8 +3,8 @@ require 'leancloud/client'
 require 'leancloud/error'
 require 'leancloud/object'
 
-module AV
-  class Installation < AV::Object
+module LC
+  class Installation < LC::Object
     UPDATABLE_FIELDS = {
       badge: 'badge',
       channels: 'channels',
@@ -26,8 +26,8 @@ module AV
     end
 
     def get
-      if response = AV.client.request(uri, :get, nil, nil)
-        parse AV.parse_json(nil, response)
+      if response = LC.client.request(uri, :get, nil, nil)
+        parse LC.parse_json(nil, response)
       end
     end
 
@@ -42,7 +42,7 @@ module AV
     end
 
     def save
-      AV.client.request uri, method, self.to_json, nil
+      LC.client.request uri, method, self.to_json, nil
     end
 
     def rest_api_hash