parse-ruby-client 0.1.9 → 0.1.10

data/README.md

@@ -19,7 +19,7 @@ This currently depends on the gems 'json' and 'patron' for JSON support and HTTP
 
 ## Installation
 
-`gem "parse-ruby-client", "~> 0.1.9"`
+`gem "parse-ruby-client", "~> 0.1.10"`
 
 ---
 

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/fixtures/vcr_cassettes/test_user_save.yml

@@ -1,83 +1,62 @@
----
-http_interactions:
-- request:
+--- 
+http_interactions: 
+- request: 
     method: post
     uri: https://api.parse.com/1/users
-    body:
+    body: 
       encoding: UTF-8
-      string: ! '{"username":"0.71975770632902","password":"topsecret"}'
-    headers:
-      Content-Type:
+      string: "{\"username\":\"0.40493766445323776\",\"password\":\"topsecret\"}"
+    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: 
+      - jYdptjS76YHikuIFfJEgHD8UMIjH6cp2rWz4fo2C
+      X-Parse-Application-Id: 
+      - hnJRtntbYPvWfjqcqLZsdFaOKT0F3SfNU7Kc7woN
+      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 |-
-        VHVlLCAwOSBPY3QgMjAxMiAyMTo0NTozNCBHTVQ=
-      !binary "TG9jYXRpb24=":
-      - !binary |-
-        aHR0cHM6Ly9hcGkucGFyc2UuY29tLzEvdXNlcnMvTDlnWm1FVkZFSA==
-      !binary "U2VydmVy":
-      - !binary |-
-        bmdpbngvMS4yLjI=
-      !binary "U2V0LUNvb2tpZQ==":
-      - !binary |-
-        X3BhcnNlX3Nlc3Npb249QkFoN0Jra2lEM05sYzNOcGIyNWZhV1FHT2daRlJp
-        SWxORE5pWXpWaFpUSTRNVE00TWprd016YzBPRFk0TXpSaFpHSTRZamsxTXpr
-        JTNELS00MWE4YTBmMzNjZGQ3NjU5MDIyNmNhZWNiMjY0Y2FlNjFlOTM4N2Zj
-        OyBkb21haW49LnBhcnNlLmNvbTsgcGF0aD0vOyBleHBpcmVzPVN1biwgMDkt
-        T2N0LTIwMjIgMjE6NDU6MzQgR01UOyBzZWN1cmU7IEh0dHBPbmx5
-      !binary "U3RhdHVz":
-      - !binary |-
-        MjAxIENyZWF0ZWQ=
-      !binary "WC1SdW50aW1l":
-      - !binary |-
-        MC4yNDczNTA=
-      !binary "WC1VYS1Db21wYXRpYmxl":
-      - !binary |-
-        SUU9RWRnZSxjaHJvbWU9MQ==
-      !binary "Q29udGVudC1MZW5ndGg=":
-      - !binary |-
-        MTA3
-      !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: 
+      - Thu, 10 Jan 2013 17:13:29 GMT
+      Location: 
+      - https://api.parse.com/1/users/TjN5LVdT83
+      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
+      Status: 
+      - 201 Created
+      X-Runtime: 
+      - "0.312384"
+      X-Ua-Compatible: 
+      - IE=Edge,chrome=1
+      Content-Length: 
+      - "107"
+      Connection: 
+      - keep-alive
+    body: 
       encoding: ASCII-8BIT
-      string: !binary |-
-        eyJjcmVhdGVkQXQiOiIyMDEyLTEwLTA5VDIxOjQ1OjM0LjI4N1oiLCJvYmpl
-        Y3RJZCI6Ikw5Z1ptRVZGRUgiLCJzZXNzaW9uVG9rZW4iOiJjejU0YmtmMm8w
-        eXg4dDF5cnpvMndjMHE4In0=
+      string: "{\"createdAt\":\"2013-01-10T17:13:29.400Z\",\"objectId\":\"TjN5LVdT83\",\"sessionToken\":\"ltj1s0ms3rft92u1avdnys7vn\"}"
     http_version: 
-  recorded_at: Tue, 09 Oct 2012 21:45:34 GMT
+  recorded_at: Thu, 10 Jan 2013 17:13:29 GMT
 recorded_with: VCR 2.0.1

data/lib/parse/client.rb

@@ -8,14 +8,13 @@ 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
     attr_accessor :master_key
     attr_accessor :session_token
     attr_accessor :session
+    attr_accessor :max_retries
 
     def initialize(data = {})
       @host           = data[:host] || Protocol::HOST
@@ -23,6 +22,7 @@ module Parse
       @api_key        = data[:api_key]
       @master_key     = data[:master_key]
       @session_token  = data[:session_token]
+      @max_retries    = data[:max_retries] || 3
       @session        = Patron::Session.new
       @session.timeout = 30
       @session.connect_timeout = 30
@@ -37,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 = DEFAULT_RETRIES)
+    def request(uri, method = :get, body = nil, query = nil)
       @session.headers[Protocol::HEADER_MASTER_KEY]    = @master_key
       @session.headers[Protocol::HEADER_API_KEY]  = @api_key
       @session.headers[Protocol::HEADER_APP_ID]   = @application_id

data/lib/parse/protocol.rb

@@ -48,6 +48,8 @@ module Parse
     # of Parse objects in their JSON representation.
     KEY_UPDATED_AT  = "updatedAt"
 
+    KEY_USER_SESSION_TOKEN = "sessionToken"
+
     # The JSON key used in the top-level response object
     # to indicate that the response contains an array of objects.
     RESPONSE_KEY_RESULTS = "results"
@@ -71,11 +73,13 @@ module Parse
     # The JSON key used to identify the datatype of a special value.
     KEY_TYPE        = "__type"
 
+    TYPE_OBJECT     = "Object"
+
     # The JSON key used to specify the numerical value in the
     # increment/decrement API call.
     KEY_AMOUNT      = "amount"
 
-  RESERVED_KEYS = [ KEY_CLASS_NAME, KEY_CREATED_AT, KEY_OBJECT_ID, KEY_UPDATED_AT]
+    RESERVED_KEYS = [ KEY_CLASS_NAME, KEY_CREATED_AT, KEY_OBJECT_ID, KEY_UPDATED_AT, KEY_USER_SESSION_TOKEN]
 
     # Other Constants
     # ----------------------------------------
@@ -118,8 +122,6 @@ module Parse
     USER_LOGIN_URI  = "/#{VERSION}/login"
     PASSWORD_RESET_URI = "/#{VERSION}/requestPasswordReset"
 
-    KEY_USER_SESSION_TOKEN = "sessionToken"
-
     CLOUD_FUNCTIONS_PATH = "functions"
 
     BATCH_REQUEST_URI = "batch"

data/lib/parse/query.rb

@@ -10,6 +10,7 @@ module Parse
     attr_accessor :limit
     attr_accessor :skip
     attr_accessor :count
+    attr_accessor :include
 
     def initialize(cls_name)
       @class_name = cls_name
@@ -29,6 +30,11 @@ module Parse
     end
     #private :add_constraint
 
+    def includes(class_name)
+      @includes = class_name
+      self
+    end
+
     def or(query)
       raise ArgumentError, "you must pass an entire #{self.class} to \#or" unless query.is_a?(self.class)
       @ors << query
@@ -85,22 +91,11 @@ module Parse
       self
     end
 
-    def in_query(field, query)
+    def in_query(field, query=nil)
       query_hash = {Parse::Protocol::KEY_CLASS_NAME => query.class_name, "where" => query.where}
       add_constraint(field, "$inQuery" => query_hash)
       self
     end
-    
-    def set_limit(num)
-      @limit = num
-      self
-    end
-    
-    def set_order(field, order = :ascending)
-      @order_by = field
-      @order = order
-      self
-    end
 
     def count
       @count = true
@@ -120,12 +115,9 @@ module Parse
       if @class_name == Parse::Protocol::CLASS_USER
         uri = Protocol.user_uri
       end
-
-
       query = { "where" => CGI.escape(where_as_json.to_json) }
       set_order(query)
-      [:count, :limit, :skip].each {|a| merge_attribute(a, query)}
-
+      [:count, :limit, :skip, :include].each {|a| merge_attribute(a, query)}
       response = Parse.client.request uri, :get, nil, query
       Parse.parse_json class_name, response
     end

data/lib/parse/user.rb

@@ -5,7 +5,7 @@ require 'parse/object'
 
 module Parse
   class User < Parse::Object
-    
+
     def self.authenticate(username, password)
       body = {
         "username" => username,
@@ -13,7 +13,8 @@ module Parse
       }
 
       response = Parse.client.request(Parse::Protocol::USER_LOGIN_URI, :get, nil, body)
-      
+      Parse.client.session_token = response[Parse::Protocol::KEY_USER_SESSION_TOKEN]
+
       new(response)
     end
 
@@ -27,10 +28,10 @@ module Parse
       data["password"] = data[:password] if data[:password]
       super(Parse::Protocol::CLASS_USER, data)
     end
-    
+
     def uri
       Protocol.user_uri @parse_object_id
     end
-    
+
   end
 end

data/lib/parse/util.rb

@@ -1,3 +1,4 @@
+require 'pp'
 module Parse
 
   # Parse a JSON representation into a fully instantiated
@@ -46,6 +47,8 @@ module Parse
         Parse::GeoPoint.new obj
       when Protocol::TYPE_FILE
         Parse::File.new obj
+      when Protocol::TYPE_OBJECT # used for relation queries, e.g. "?include=post"
+        Parse::Object.new(obj[Parse::Protocol::KEY_CLASS_NAME], obj)
     end
   end
 end

data/parse-ruby-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "parse-ruby-client"
-  s.version = "0.1.9"
+  s.version = "0.1.10"
 
   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-10"
+  s.date = "2013-01-12"
   s.description = "A simple Ruby client for the parse.com REST API"
   s.email = "adelevie@gmail.com"
   s.extra_rdoc_files = [

data/test/test_client.rb

@@ -10,7 +10,7 @@ class TestClient < Test::Unit::TestCase
       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)
+      @client.session.expects(:request).times(@client.max_retries + 1).returns(response)
       assert_raise do
        @client.request(nil)
       end

data/test/test_user.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 class TestUser < Test::Unit::TestCase
-  
+
   def setup
     Parse.init
   end
@@ -19,42 +19,45 @@ class TestUser < Test::Unit::TestCase
       assert_equal user[Parse::Protocol::KEY_CREATED_AT].class, String
     end
   end
-  
+
   def test_user_login
     #VCR.use_cassette('test_user_login', :record => :new_episodes) do
       u = "alan" + rand(10000000000000).to_s
       data = {
-        :username => u, 
+        :username => u,
         :password => "secret"
       }
 
       user = Parse::User.new(data)
 
       user.save
-      
+
       assert_equal user["username"], u
       assert_equal user[Parse::Protocol::KEY_USER_SESSION_TOKEN].class, String
-      
+
       login = Parse::User.authenticate(u, "secret")
-      
+
       assert_equal login["username"], user["username"]
       assert_equal login["sessionToken"].class, String
+
+      user = user.pointer.get
+      user.save
     #end
   end
 
   def test_reset_password
-      u =  "alan" + rand(10000000000000).to_s + "@gmail.com" 
+      u =  "alan" + rand(10000000000000).to_s + "@gmail.com"
       data = {
-        :username => u, 
+        :username => u,
         :password => "secret"
       }
 
       user = Parse::User.new(data)
 
       user.save
-      
+
       reset_password = Parse::User.reset_password(u)
-      
+
       assert true
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parse-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patron
@@ -237,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4088256364268233622
+      hash: 1980852008607816263
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: