parse-ruby-client 0.1.14 → 0.1.15

data/fixtures/vcr_cassettes/test_updated_at.yml

@@ -1,161 +1,121 @@
----
-http_interactions:
-- request:
+--- 
+http_interactions: 
+- request: 
     method: post
     uri: https://api.parse.com/1/classes/Post
-    body:
+    body: 
       encoding: UTF-8
-      string: ! '{"title":"hello"}'
-    headers:
-      Content-Type:
+      string: "{\"title\":\"hello\"}"
+    headers: 
+      Content-Type: 
       - application/json
-      Accept:
+      Accept: 
       - application/json
-      User-Agent:
+      User-Agent: 
       - Parse for Ruby, 0.0
-      X-Parse-Master-Key:
-      - ''
-      X-Parse-Rest-Api-Key:
-      - D3Y8jNCQk6kpkKhpRGnWLYTrFGQ7j8dtDVnWZRnZ
-      X-Parse-Application-Id:
-      - PPVk6L5M9R1R8GVk8Ye9jT8f5SQNBIeoJUDJLmkT
-      X-Parse-Session-Token:
-      - ''
-      Expect:
-      - ''
-  response:
-    status:
+      X-Parse-Master-Key: 
+      - ""
+      X-Parse-Rest-Api-Key: 
+      - <X-Parse-REST-API-Key>
+      X-Parse-Application-Id: 
+      - <X-Parse-Application-Id>
+      X-Parse-Session-Token: 
+      - ""
+      Expect: 
+      - ""
+  response: 
+    status: 
       code: 201
-      message: !binary |-
-        Q3JlYXRlZA==
-    headers:
-      !binary "QWNjZXNzLUNvbnRyb2wtQWxsb3ctT3JpZ2lu":
-      - !binary |-
-        Kg==
-      !binary "QWNjZXNzLUNvbnRyb2wtUmVxdWVzdC1NZXRob2Q=":
-      - !binary |-
-        Kg==
-      !binary "Q2FjaGUtQ29udHJvbA==":
-      - !binary |-
-        bm8tY2FjaGU=
-      !binary "Q29udGVudC1UeXBl":
-      - !binary |-
-        YXBwbGljYXRpb24vanNvbjsgY2hhcnNldD11dGYtOA==
-      !binary "RGF0ZQ==":
-      - !binary |-
-        VHVlLCAwOSBPY3QgMjAxMiAyMTo0NTozMiBHTVQ=
-      !binary "TG9jYXRpb24=":
-      - !binary |-
-        aHR0cHM6Ly9hcGkucGFyc2UuY29tLzEvY2xhc3Nlcy9Qb3N0LzNiODJoeWI2
-        UUY=
-      !binary "U2VydmVy":
-      - !binary |-
-        bmdpbngvMS4yLjI=
-      !binary "U2V0LUNvb2tpZQ==":
-      - !binary |-
-        X3BhcnNlX3Nlc3Npb249QkFoN0Jra2lEM05sYzNOcGIyNWZhV1FHT2daRlJp
-        SWxPR1ZrTVdWbFpqWmpZbU5qWVdNell6Tm1NMk5rTmpoa09UTTFZV1pqTjJZ
-        JTNELS05N2M1NmUwNDBmMWUyMGQ3MmZlNzA0MGRhOGViZjFlYWM1ZjYwMGNm
-        OyBkb21haW49LnBhcnNlLmNvbTsgcGF0aD0vOyBleHBpcmVzPVN1biwgMDkt
-        T2N0LTIwMjIgMjE6NDU6MzIgR01UOyBzZWN1cmU7IEh0dHBPbmx5
-      !binary "U3RhdHVz":
-      - !binary |-
-        MjAxIENyZWF0ZWQ=
-      !binary "WC1SdW50aW1l":
-      - !binary |-
-        MC4wMTg5OTc=
-      !binary "WC1VYS1Db21wYXRpYmxl":
-      - !binary |-
-        SUU9RWRnZSxjaHJvbWU9MQ==
-      !binary "Q29udGVudC1MZW5ndGg=":
-      - !binary |-
-        NjQ=
-      !binary "Q29ubmVjdGlvbg==":
-      - !binary |-
-        a2VlcC1hbGl2ZQ==
-    body:
+      message: Created
+    headers: 
+      Access-Control-Allow-Origin: 
+      - "*"
+      Access-Control-Request-Method: 
+      - "*"
+      Cache-Control: 
+      - no-cache
+      Content-Type: 
+      - application/json; charset=utf-8
+      Date: 
+      - Mon, 22 Apr 2013 16:03:23 GMT
+      Location: 
+      - https://api.parse.com/1/classes/Post/UzS4Cr4U3J
+      Server: 
+      - nginx/1.2.2
+      Set-Cookie: 
+      - <COOKIE-KEY>
+      Status: 
+      - 201 Created
+      X-Runtime: 
+      - "0.025069"
+      X-Ua-Compatible: 
+      - IE=Edge,chrome=1
+      Content-Length: 
+      - "64"
+      Connection: 
+      - keep-alive
+    body: 
       encoding: ASCII-8BIT
-      string: !binary |-
-        eyJjcmVhdGVkQXQiOiIyMDEyLTEwLTA5VDIxOjQ1OjMyLjQ4OFoiLCJvYmpl
-        Y3RJZCI6IjNiODJoeWI2UUYifQ==
+      string: "{\"createdAt\":\"2013-04-22T16:03:23.371Z\",\"objectId\":\"UzS4Cr4U3J\"}"
     http_version: 
-  recorded_at: Tue, 09 Oct 2012 21:45:32 GMT
-- request:
+  recorded_at: Mon, 22 Apr 2013 16:03:23 GMT
+- request: 
     method: put
-    uri: https://api.parse.com/1/classes/Post/3b82hyb6QF
-    body:
+    uri: https://api.parse.com/1/classes/Post/UzS4Cr4U3J
+    body: 
       encoding: UTF-8
-      string: ! '{"title":"hello 2"}'
-    headers:
-      Content-Type:
+      string: "{\"title\":\"hello 2\"}"
+    headers: 
+      Content-Type: 
       - application/json
-      Accept:
+      Accept: 
       - application/json
-      User-Agent:
+      User-Agent: 
       - Parse for Ruby, 0.0
-      X-Parse-Master-Key:
-      - ''
-      X-Parse-Rest-Api-Key:
-      - D3Y8jNCQk6kpkKhpRGnWLYTrFGQ7j8dtDVnWZRnZ
-      X-Parse-Application-Id:
-      - PPVk6L5M9R1R8GVk8Ye9jT8f5SQNBIeoJUDJLmkT
-      X-Parse-Session-Token:
-      - ''
-      Expect:
-      - ''
-  response:
-    status:
+      X-Parse-Master-Key: 
+      - ""
+      X-Parse-Rest-Api-Key: 
+      - <X-Parse-REST-API-Key>
+      X-Parse-Application-Id: 
+      - <X-Parse-Application-Id>
+      X-Parse-Session-Token: 
+      - ""
+      Expect: 
+      - ""
+  response: 
+    status: 
       code: 200
-      message: !binary |-
-        T0s=
-    headers:
-      !binary "QWNjZXNzLUNvbnRyb2wtQWxsb3ctT3JpZ2lu":
-      - !binary |-
-        Kg==
-      !binary "QWNjZXNzLUNvbnRyb2wtUmVxdWVzdC1NZXRob2Q=":
-      - !binary |-
-        Kg==
-      !binary "Q2FjaGUtQ29udHJvbA==":
-      - !binary |-
-        bWF4LWFnZT0wLCBwcml2YXRlLCBtdXN0LXJldmFsaWRhdGU=
-      !binary "Q29udGVudC1UeXBl":
-      - !binary |-
-        YXBwbGljYXRpb24vanNvbjsgY2hhcnNldD11dGYtOA==
-      !binary "RGF0ZQ==":
-      - !binary |-
-        VHVlLCAwOSBPY3QgMjAxMiAyMTo0NTozMiBHTVQ=
-      !binary "RXRhZw==":
-      - !binary |-
-        IjhhZTRmMTQzOGY1ZWM3M2Q1NzkyMDdjZTg5MjVmYTFjIg==
-      !binary "U2VydmVy":
-      - !binary |-
-        bmdpbngvMS4yLjI=
-      !binary "U2V0LUNvb2tpZQ==":
-      - !binary |-
-        X3BhcnNlX3Nlc3Npb249QkFoN0Jra2lEM05sYzNOcGIyNWZhV1FHT2daRlJp
-        SWxZVFJpTlRabFkyRXpaVGMyWWpCaFl6SmhaV1l6TnpsaE1XTTFaakl6WldZ
-        JTNELS1hYTJkNjdlN2FkNjZhODBlZGRmMTk5OTJjZjg4YmFiYWU1NDJiNzVm
-        OyBkb21haW49LnBhcnNlLmNvbTsgcGF0aD0vOyBleHBpcmVzPVN1biwgMDkt
-        T2N0LTIwMjIgMjE6NDU6MzIgR01UOyBzZWN1cmU7IEh0dHBPbmx5
-      !binary "U3RhdHVz":
-      - !binary |-
-        MjAwIE9L
-      !binary "WC1SdW50aW1l":
-      - !binary |-
-        MC4wMzUwODU=
-      !binary "WC1VYS1Db21wYXRpYmxl":
-      - !binary |-
-        SUU9RWRnZSxjaHJvbWU9MQ==
-      !binary "Q29udGVudC1MZW5ndGg=":
-      - !binary |-
-        NDA=
-      !binary "Q29ubmVjdGlvbg==":
-      - !binary |-
-        a2VlcC1hbGl2ZQ==
-    body:
+      message: OK
+    headers: 
+      Access-Control-Allow-Origin: 
+      - "*"
+      Access-Control-Request-Method: 
+      - "*"
+      Cache-Control: 
+      - max-age=0, private, must-revalidate
+      Content-Type: 
+      - application/json; charset=utf-8
+      Date: 
+      - Mon, 22 Apr 2013 16:03:23 GMT
+      Etag: 
+      - "\"713d90a679b7296644271208d96d7d8f\""
+      Server: 
+      - nginx/1.2.2
+      Set-Cookie: 
+      - <COOKIE-KEY>
+      Status: 
+      - 200 OK
+      X-Runtime: 
+      - "0.060774"
+      X-Ua-Compatible: 
+      - IE=Edge,chrome=1
+      Content-Length: 
+      - "40"
+      Connection: 
+      - keep-alive
+    body: 
       encoding: ASCII-8BIT
-      string: !binary |-
-        eyJ1cGRhdGVkQXQiOiIyMDEyLTEwLTA5VDIxOjQ1OjMyLjU5N1oifQ==
+      string: "{\"updatedAt\":\"2013-04-22T16:03:23.498Z\"}"
     http_version: 
-  recorded_at: Tue, 09 Oct 2012 21:45:32 GMT
-recorded_with: VCR 2.0.1
+  recorded_at: Mon, 22 Apr 2013 16:03:23 GMT
+recorded_with: VCR 2.4.0

data/fixtures/vcr_cassettes/test_user_save.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: https://api.parse.com/1/users
     body: 
       encoding: UTF-8
-      string: "{\"username\":\"0.40493766445323776\",\"password\":\"topsecret\"}"
+      string: "{\"username\":\"0.27216148534966633\",\"password\":\"topsecret\"}"
     headers: 
       Content-Type: 
       - application/json
@@ -16,9 +16,9 @@ http_interactions:
       X-Parse-Master-Key: 
       - ""
       X-Parse-Rest-Api-Key: 
-      - jYdptjS76YHikuIFfJEgHD8UMIjH6cp2rWz4fo2C
+      - <X-Parse-REST-API-Key>
       X-Parse-Application-Id: 
-      - hnJRtntbYPvWfjqcqLZsdFaOKT0F3SfNU7Kc7woN
+      - <X-Parse-Application-Id>
       X-Parse-Session-Token: 
       - ""
       Expect: 
@@ -37,17 +37,17 @@ http_interactions:
       Content-Type: 
       - application/json; charset=utf-8
       Date: 
-      - Thu, 10 Jan 2013 17:13:29 GMT
+      - Mon, 22 Apr 2013 16:03:27 GMT
       Location: 
-      - https://api.parse.com/1/users/TjN5LVdT83
+      - https://api.parse.com/1/users/j0rFtnWhJy
       Server: 
       - nginx/1.2.2
       Set-Cookie: 
-      - _parse_session=BAh7BkkiD3Nlc3Npb25faWQGOgZFRiIlNDhiYjExOGE4MzY1ZmEzNGVjN2NmYjUxMzk2YjFjNzk%3D--242cb8875ea6f8b5c353b05bf1b9dcc351e5197e; domain=.parse.com; path=/; expires=Tue, 10-Jan-2023 17:13:29 GMT; secure; HttpOnly
+      - <COOKIE-KEY>
       Status: 
       - 201 Created
       X-Runtime: 
-      - "0.312384"
+      - "0.346105"
       X-Ua-Compatible: 
       - IE=Edge,chrome=1
       Content-Length: 
@@ -56,7 +56,7 @@ http_interactions:
       - keep-alive
     body: 
       encoding: ASCII-8BIT
-      string: "{\"createdAt\":\"2013-01-10T17:13:29.400Z\",\"objectId\":\"TjN5LVdT83\",\"sessionToken\":\"ltj1s0ms3rft92u1avdnys7vn\"}"
+      string: "{\"createdAt\":\"2013-04-22T16:03:27.061Z\",\"objectId\":\"j0rFtnWhJy\",\"sessionToken\":\"rmranzh72f4mb3bptat7siph1\"}"
     http_version: 
-  recorded_at: Thu, 10 Jan 2013 17:13:29 GMT
-recorded_with: VCR 2.0.1
+  recorded_at: Mon, 22 Apr 2013 16:03:27 GMT
+recorded_with: VCR 2.4.0

data/lib/parse/client.rb

@@ -2,6 +2,8 @@ require 'parse/protocol'
 require 'parse/error'
 require 'parse/util'
 
+require 'logger'
+
 require 'iron_mq'
 
 module Parse
@@ -17,6 +19,7 @@ module Parse
     attr_accessor :session_token
     attr_accessor :session
     attr_accessor :max_retries
+    attr_accessor :logger
 
     def initialize(data = {})
       @host           = data[:host] || Protocol::HOST
@@ -25,6 +28,8 @@ module Parse
       @master_key     = data[:master_key]
       @session_token  = data[:session_token]
       @max_retries    = data[:max_retries] || 3
+      @logger         = data[:logger] || Logger.new(STDERR).tap{|l| l.level = Logger::INFO}
+
       @session        = Patron::Session.new
       @session.timeout = 30
       @session.connect_timeout = 30
@@ -78,10 +83,10 @@ module Parse
 
         if @queue
 
-          #while true 
+          #while true
           #  if @queue.reload.size >= @max_concurrent_requests
           #    sleep 1
-          #  else 
+          #  else
               # add to queue before request
               @queue.post("1")
               response = @session.request(method, uri, {}, options)
@@ -97,7 +102,8 @@ module Parse
         parsed = JSON.parse(response.body)
 
         if response.status >= 400
-          raise ParseProtocolError.new(parsed)
+          parsed ||= {}
+          raise ParseProtocolError.new({"error" => "HTTP Status #{response.status} Body #{response.body}"}.merge(parsed))
         end
 
         if content_type
@@ -105,11 +111,31 @@ module Parse
         end
 
         return parsed
-      rescue Patron::TimeoutError
-        retry if num_tries <= max_retries
+      rescue JSON::ParserError => e
+        if num_tries <= max_retries && response.status >= 500
+          log_retry(e, uri, query, body, response)
+          retry
+        end
+        raise
+      rescue Patron::TimeoutError => e
+        if num_tries <= max_retries
+          log_retry(e, uri, query, body, response)
+          retry
+        end
         raise
       rescue ParseProtocolError => e
-        retry if e.code == Protocol::ERROR_TIMEOUT && num_tries <= max_retries
+        if num_tries <= max_retries
+          if e.code
+            sleep 60 if e.code == Protocol::ERROR_EXCEEDED_BURST_LIMIT
+            if [Protocol::ERROR_INTERNAL, Protocol::ERROR_TIMEOUT, Protocol::ERROR_EXCEEDED_BURST_LIMIT].include?(e.code)
+              log_retry(e, uri, query, body, response)
+              retry
+            end
+          elsif response.status >= 500
+            log_retry(e, uri, query, body, response)
+            retry
+          end
+        end
         raise
       end
     end
@@ -130,6 +156,11 @@ module Parse
       request(uri, :delete)
     end
 
+    protected
+
+    def log_retry(e, uri, query, body, response)
+      logger.warn{"Retrying Parse Error #{e.inspect} on request #{uri} #{CGI.unescape(query.inspect)} #{body.inspect} response #{response.inspect}"}
+    end
   end
 
 
@@ -185,6 +216,12 @@ module Parse
   def Parse.get(class_name, object_id = nil)
     data = Parse.client.get( Protocol.class_uri(class_name, object_id) )
     Parse.parse_json class_name, data
+  rescue ParseProtocolError => e
+    if e.code == Protocol::ERROR_OBJECT_NOT_FOUND_FOR_GET
+      e.message += ": #{class_name}:#{object_id}"
+    end
+
+    raise
   end
 
 end

data/lib/parse/datatypes.rb

@@ -10,6 +10,13 @@ module Parse
     attr_accessor :class_name
     alias :id :parse_object_id
 
+    def self.make(class_name, object_id)
+      Pointer.new(
+        Protocol::KEY_CLASS_NAME => class_name,
+        Protocol::KEY_OBJECT_ID => object_id
+      )
+    end
+
     def initialize(data)
       @class_name       = data[Protocol::KEY_CLASS_NAME]
       @parse_object_id  = data[Protocol::KEY_OBJECT_ID]
@@ -21,15 +28,17 @@ module Parse
     end
 
     def eql?(other)
-      self.class.equal?(other.class) &&
-        class_name == other.class_name &&
-        parse_object_id == other.parse_object_id
+      Parse.object_pointer_equality?(self, other)
     end
 
     alias == eql?
 
     def hash
-      class_name.hash ^ parse_object_id.hash
+      Parse.object_pointer_hash(self)
+    end
+
+    def new?
+      false
     end
 
     def as_json(*a)
@@ -193,37 +202,6 @@ module Parse
     end
   end
 
-  class Decrement
-    # '{"score": {"__op": "Decrement", "amount": 1 } }'
-    attr_accessor :amount
-
-    def initialize(amount)
-      @amount = amount
-    end
-
-    def eql?(other)
-      self.class.equal?(other.class) &&
-        amount == other.amount
-    end
-
-    alias == eql?
-
-    def hash
-      amount.hash
-    end
-
-    def as_json(*a)
-      {
-          Protocol::KEY_OP => Protocol::KEY_DECREMENT,
-          Protocol::KEY_AMOUNT => @amount
-      }
-    end
-
-    def to_json(*a)
-        as_json.to_json(*a)
-    end
-  end
-
   class ArrayOp
     # '{"myArray": {"__op": "Add", "objects": ["something", "something else"] } }'
     attr_accessor :operation
@@ -319,6 +297,7 @@ module Parse
     def initialize(data)
       data = Hash[data.map{ |k, v| [k.to_s, v] }] # convert hash keys to strings
       @local_filename = data["local_filename"] if data["local_filename"]
+      @parse_filename = data["name"]           if data["name"]
       @parse_filename = data["parse_filename"] if data["parse_filename"]
       @content_type   = data["content_type"]   if data["content_type"]
       @url            = data["url"]            if data["url"]