parse-ruby-client 0.1.8 → 0.1.9

data/fixtures/vcr_cassettes/test_request_batch.yml

@@ -0,0 +1,62 @@
+--- 
+http_interactions: 
+- request: 
+    method: post
+    uri: https://api.parse.com/1/batch
+    body: 
+      encoding: UTF-8
+      string: "{\"requests\":[{\"method\":\"POST\",\"path\":\"/1/classes/GameScore\",\"body\":{\"gameScore\":42}}]}"
+    headers: 
+      Content-Type: 
+      - application/json
+      Accept: 
+      - application/json
+      User-Agent: 
+      - Parse for Ruby, 0.0
+      X-Parse-Master-Key: 
+      - ""
+      X-Parse-Rest-Api-Key: 
+      - jYdptjS76YHikuIFfJEgHD8UMIjH6cp2rWz4fo2C
+      X-Parse-Application-Id: 
+      - hnJRtntbYPvWfjqcqLZsdFaOKT0F3SfNU7Kc7woN
+      X-Parse-Session-Token: 
+      - ""
+      Expect: 
+      - ""
+  response: 
+    status: 
+      code: 200
+      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: 
+      - Tue, 08 Jan 2013 15:12:42 GMT
+      Etag: 
+      - "\"98e77897bd1902cdc3885b7f63ba4765\""
+      Server: 
+      - nginx/1.2.2
+      Set-Cookie: 
+      - _parse_session=BAh7BkkiD3Nlc3Npb25faWQGOgZFRiIlYmZjMTc1NWY3MzhkMzY4ZTFlNzA2OTJhNWVmODAxY2I%3D--c18a9b64bbafbd180ba894073d8e6452ee909d69; domain=.parse.com; path=/; expires=Sun, 08-Jan-2023 15:12:42 GMT; secure; HttpOnly
+      Status: 
+      - 200 OK
+      X-Runtime: 
+      - "18.138760"
+      X-Ua-Compatible: 
+      - IE=Edge,chrome=1
+      Content-Length: 
+      - "78"
+      Connection: 
+      - keep-alive
+    body: 
+      encoding: ASCII-8BIT
+      string: "[{\"success\":{\"createdAt\":\"2013-01-08T15:12:26.671Z\",\"objectId\":\"YwUiZtIHgm\"}}]"
+    http_version: 
+  recorded_at: Tue, 08 Jan 2013 15:12:44 GMT
+recorded_with: VCR 2.0.1

data/lib/parse/batch.rb

@@ -12,10 +12,42 @@ module Parse
       @requests << request
     end
 
+    def create_object(object)
+      method = "POST"
+      path = Parse::Protocol.class_uri(object.class_name)
+      body = object.safe_hash
+      add_request({
+        "method" => method,
+        "path" => path,
+        "body" => body
+      })
+    end
+
+    def update_object(object)
+      method = "PUT"
+      path = Parse::Protocol.class_uri(object.class_name, object.id)
+      body = object.safe_hash
+      add_request({
+        "method" => method,
+        "path" => path,
+        "body" => body
+      })
+    end
+
+    def delete_object(object)
+      add_request({
+        "method" => "DELETE",
+        "path" => Parse::Protocol.class_uri(object.class_name, object.id)
+      })
+    end
+
     def run!
       uri = Parse::Protocol.batch_request_uri
       body = {:requests => @requests}.to_json
       Parse.client.request(uri, :post, body)
     end
+
+
   end
+
 end

data/lib/parse/client.rb

@@ -8,6 +8,8 @@ module Parse
   # API server. Currently uses the Patron library for low-level HTTP
   # communication.
   class Client
+    DEFAULT_RETRIES = 2
+
     attr_accessor :host
     attr_accessor :application_id
     attr_accessor :api_key
@@ -35,7 +37,7 @@ module Parse
     # with common basic response handling. Will raise a
     # ParseProtocolError 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, max_retries = 2)
+    def request(uri, method = :get, body = nil, query = nil, max_retries = DEFAULT_RETRIES)
       @session.headers[Protocol::HEADER_MASTER_KEY]    = @master_key
       @session.headers[Protocol::HEADER_API_KEY]  = @api_key
       @session.headers[Protocol::HEADER_APP_ID]   = @application_id
@@ -51,22 +53,21 @@ module Parse
 
       num_tries = 0
       begin
-        response = @session.request(method, uri, {}, options)
-      rescue Patron::TimeoutError
         num_tries += 1
-        if num_tries <= max_retries
-          retry
-        else
-          raise Patron::TimeoutError
-        end
-      end
+        response = @session.request(method, uri, {}, options)
+        parsed = JSON.parse(response.body)
 
-      if response.status >= 400
-        raise ParseError, "#{JSON.parse(response.body)['code']}: #{JSON.parse(response.body)['error']}"
-      else
-        if response
-          return JSON.parse response.body
+        if response.status >= 400
+          raise ParseProtocolError.new(parsed)
         end
+
+        return parsed
+      rescue Patron::TimeoutError
+        retry if num_tries <= max_retries
+        raise
+      rescue ParseProtocolError => e
+        retry if e.code == Protocol::ERROR_TIMEOUT && num_tries <= max_retries
+        raise
       end
     end
 

data/lib/parse/datatypes.rb

@@ -8,12 +8,18 @@ module Parse
   class Pointer
     attr_accessor :parse_object_id
     attr_accessor :class_name
+    alias :id :parse_object_id
 
     def initialize(data)
       @class_name       = data[Protocol::KEY_CLASS_NAME]
       @parse_object_id  = data[Protocol::KEY_OBJECT_ID]
     end
 
+    # make it easier to deal with the ambiguity of whether you're passed a pointer or object
+    def pointer
+      self
+    end
+
     def eql?(other)
       self.class.equal?(other.class) &&
         class_name == other.class_name &&

data/lib/parse/error.rb

@@ -15,15 +15,12 @@ module Parse
     attr_accessor :response
 
     def initialize(response)
-      #@response = response
-      #if response.body
-      #  data = JSON.parse response.body
-      #  @code = data["code"]
-      #  @message = data["error"]
-      #end
-      
-      #{}"#{@code}: #{@message}"
+      @response = response
+      @code = response["code"]
+      @error = response["error"]
+
+      super("#{@code}: #{@error}")
     end
   end
-  
+
 end

data/lib/parse/object.rb

@@ -28,6 +28,11 @@ module Parse
       Parse::Pointer.new(self.merge(Parse::Protocol::KEY_CLASS_NAME => class_name)) unless new?
     end
 
+    # make it easier to deal with the ambiguity of whether you're passed a pointer or object
+    def get
+      self
+    end
+
     # Merge a hash parsed from the JSON representation into
     # this instance. This will extract the reserved fields,
     # merge the hash keys, and then ensure that the reserved
@@ -63,7 +68,7 @@ module Parse
       self["objectId"].nil?
     end
 
-    def safe_json
+    def safe_hash
       without_reserved = self.dup
       Protocol::RESERVED_KEYS.each { |k| without_reserved.delete(k) }
 
@@ -76,7 +81,11 @@ module Parse
           end
       }
 
-      without_relations.to_json
+      without_relations
+    end
+
+    def safe_json
+      safe_hash.to_json
     end
 
     private :parse

data/lib/parse/protocol.rb

@@ -124,6 +124,8 @@ module Parse
 
     BATCH_REQUEST_URI = "batch"
 
+    ERROR_TIMEOUT = 124
+
     # URI Helpers
     # ----------------------------------------
 

data/lib/parse/query.rb

@@ -39,7 +39,7 @@ module Parse
       add_constraint field, value
       self
     end
-    
+
     def not_eq(field, value)
       add_constraint field, { "$ne" => value }
       self
@@ -75,6 +75,11 @@ module Parse
       self
     end
 
+    def value_not_in(field, values)
+      add_constraint field, { "$nin" => values }
+      self
+    end
+
     def exists(field, value = true)
       add_constraint field, { "$exists" => value }
       self
@@ -86,12 +91,12 @@ module Parse
       self
     end
     
-    def limit(num)
+    def set_limit(num)
       @limit = num
       self
     end
     
-    def order(field, order = :ascending)
+    def set_order(field, order = :ascending)
       @order_by = field
       @order = order
       self

data/parse-ruby-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "parse-ruby-client"
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alan deLevie", "Adam Alpern"]
-  s.date = "2013-01-05"
+  s.date = "2013-01-10"
   s.description = "A simple Ruby client for the parse.com REST API"
   s.email = "adelevie@gmail.com"
   s.extra_rdoc_files = [
@@ -26,7 +26,10 @@ Gem::Specification.new do |s|
     "VERSION",
     "example.rb",
     "fixtures/vcr_cassettes/test_array_add.yml",
+    "fixtures/vcr_cassettes/test_batch_create_object.yml",
+    "fixtures/vcr_cassettes/test_batch_delete_object.yml",
     "fixtures/vcr_cassettes/test_batch_run.yml",
+    "fixtures/vcr_cassettes/test_batch_update_object.yml",
     "fixtures/vcr_cassettes/test_cloud_function.yml",
     "fixtures/vcr_cassettes/test_created_at.yml",
     "fixtures/vcr_cassettes/test_deep_parse.yml",
@@ -38,6 +41,7 @@ Gem::Specification.new do |s|
     "fixtures/vcr_cassettes/test_object_id.yml",
     "fixtures/vcr_cassettes/test_parse_delete.yml",
     "fixtures/vcr_cassettes/test_pointer.yml",
+    "fixtures/vcr_cassettes/test_request_batch.yml",
     "fixtures/vcr_cassettes/test_server_update.yml",
     "fixtures/vcr_cassettes/test_simple_save.yml",
     "fixtures/vcr_cassettes/test_update.yml",

data/test/test_batch.rb

@@ -56,4 +56,60 @@ class TestBatch < Test::Unit::TestCase
     end
   end
 
+  def test_create_object
+    VCR.use_cassette('test_batch_create_object', :record => :new_episodes) do
+      objects = [1, 2, 3, 4, 5].map do |i|
+        p = Parse::Object.new("BatchTestObject")
+        p["foo"] = "#{i}"
+        p
+      end
+      batch = Parse::Batch.new
+      objects.each do |obj|
+        batch.create_object(obj)
+      end
+      resp = batch.run!
+      assert_equal Array, resp.class
+      assert_equal resp.first["success"]["objectId"].class, String
+    end
+  end
+
+  def test_update_object
+    VCR.use_cassette('test_batch_update_object', :record => :new_episodes) do
+      objects = [1, 2, 3, 4, 5].map do |i|
+        p = Parse::Object.new("BatchTestObject")
+        p["foo"] = "#{i}"
+        p.save
+        p
+      end
+      objects.map do |obj|
+        obj["foo"] = "updated"
+      end
+      batch = Parse::Batch.new
+      objects.each do |obj|
+        batch.update_object(obj)
+      end
+      resp = batch.run!
+      assert_equal Array, resp.class
+      assert_equal resp.first["success"]["updatedAt"].class, String
+    end
+  end
+
+  def test_delete_object
+    VCR.use_cassette('test_batch_delete_object', :record => :new_episodes) do
+      objects = [1, 2, 3, 4, 5].map do |i|
+        p = Parse::Object.new("BatchTestObject")
+        p["foo"] = "#{i}"
+        p.save
+        p
+      end
+      batch = Parse::Batch.new
+      objects.each do |obj|
+        batch.delete_object(obj)
+      end
+      resp = batch.run!
+      assert_equal Array, resp.class
+      assert_equal resp.first["success"], true
+    end
+  end
+
 end

data/test/test_client.rb

@@ -2,7 +2,19 @@ require 'helper'
 
 class TestClient < Test::Unit::TestCase
   def setup
-    Parse.init
+    @client = Parse.init
+  end
+
+  def test_request
+    VCR.use_cassette('test_request', :record => :new_episodes) do
+      response = mock()
+      response.stubs(:body).returns({'code' => Parse::Protocol::ERROR_TIMEOUT}.to_json)
+      response.stubs(:status).returns(400)
+      @client.session.expects(:request).times(Parse::Client::DEFAULT_RETRIES + 1).returns(response)
+      assert_raise do
+       @client.request(nil)
+      end
+    end
   end
 
   def test_simple_save

data/test/test_object.rb

@@ -69,7 +69,7 @@ class TestObject < Test::Unit::TestCase
 
       post.parse_delete
 
-      assert_raise Parse::ParseError do
+      assert_raise Parse::ParseProtocolError do
         q = Parse.get("Post", post.id)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parse-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patron
@@ -173,7 +173,10 @@ files:
 - VERSION
 - example.rb
 - fixtures/vcr_cassettes/test_array_add.yml
+- fixtures/vcr_cassettes/test_batch_create_object.yml
+- fixtures/vcr_cassettes/test_batch_delete_object.yml
 - fixtures/vcr_cassettes/test_batch_run.yml
+- fixtures/vcr_cassettes/test_batch_update_object.yml
 - fixtures/vcr_cassettes/test_cloud_function.yml
 - fixtures/vcr_cassettes/test_created_at.yml
 - fixtures/vcr_cassettes/test_deep_parse.yml
@@ -185,6 +188,7 @@ files:
 - fixtures/vcr_cassettes/test_object_id.yml
 - fixtures/vcr_cassettes/test_parse_delete.yml
 - fixtures/vcr_cassettes/test_pointer.yml
+- fixtures/vcr_cassettes/test_request_batch.yml
 - fixtures/vcr_cassettes/test_server_update.yml
 - fixtures/vcr_cassettes/test_simple_save.yml
 - fixtures/vcr_cassettes/test_update.yml
@@ -233,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3206718523214024845
+      hash: -4088256364268233622
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: