parse-ruby-client 0.1.5 → 0.1.6

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.4"`
+`gem "parse-ruby-client", "~> 0.1.5"`
 
 ---
 
@@ -56,6 +56,8 @@ Parse.init_from_cloud_code("path/to/global.json")
 
 The path defaults to `"../config/global.json"`. So if you create a folder inside the root of a Cloud Code directory, and in that folder is a `.rb` file, just call `Parse.init_from_cloud_code` with no arguments and you're set.
 
+With `Parse::init_from_cloud_code`, you can easily write Ruby [tests for Cloud Code functions](https://github.com/adelevie/ParseCloudTest). 
+
 ## Creating and Saving Objects
 
 Create an instance of ```Parse::Object``` with your class name supplied as a string, set some keys, and call ```save()```.

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/fixtures/vcr_cassettes/test_array_add.yml

@@ -0,0 +1,121 @@
+--- 
+http_interactions: 
+- request: 
+    method: post
+    uri: https://api.parse.com/1/classes/Post
+    body: 
+      encoding: UTF-8
+      string: "{\"chapters\":{\"__op\":\"Add\",\"objects\":[\"hello\"]}}"
+    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: 201
+      message: Created
+    headers: 
+      Access-Control-Allow-Origin: 
+      - "*"
+      Access-Control-Request-Method: 
+      - "*"
+      Cache-Control: 
+      - no-cache
+      Content-Type: 
+      - application/json; charset=utf-8
+      Date: 
+      - Mon, 15 Oct 2012 12:59:15 GMT
+      Location: 
+      - https://api.parse.com/1/classes/Post/ug80aldIcg
+      Server: 
+      - nginx/1.2.2
+      Set-Cookie: 
+      - _parse_session=BAh7BkkiD3Nlc3Npb25faWQGOgZFRiIlMWQwOTljYjU4YzdhNzU3ODc1MzI1MGI1MzQ0YjMwMTE%3D--999bcf56a783c9a250636b41fc4b09c5b3aecce2; domain=.parse.com; path=/; expires=Sat, 15-Oct-2022 12:59:15 GMT; secure; HttpOnly
+      Status: 
+      - 201 Created
+      X-Runtime: 
+      - "0.018886"
+      X-Ua-Compatible: 
+      - IE=Edge,chrome=1
+      Content-Length: 
+      - "64"
+      Connection: 
+      - keep-alive
+    body: 
+      encoding: UTF-8
+      string: "{\"createdAt\":\"2012-10-15T12:59:15.263Z\",\"objectId\":\"ug80aldIcg\"}"
+    http_version: 
+  recorded_at: Mon, 15 Oct 2012 12:59:16 GMT
+- request: 
+    method: put
+    uri: https://api.parse.com/1/classes/Post/ug80aldIcg
+    body: 
+      encoding: UTF-8
+      string: "{\"chapters\":{\"__op\":\"Add\",\"objects\":[\"goodbye\"]}}"
+    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: 
+      - Mon, 15 Oct 2012 17:47:28 GMT
+      Etag: 
+      - "\"f99c943f91a9d6fc5e32e11d86b40755\""
+      Server: 
+      - nginx/1.2.2
+      Set-Cookie: 
+      - _parse_session=BAh7BkkiD3Nlc3Npb25faWQGOgZFRiIlMjlkOGYxMGU3YjE4YzgxM2U1NzZjNGNkNmI2MDljZDY%3D--b4c3fa092802887988fae07911e78dce8d1fd453; domain=.parse.com; path=/; expires=Sat, 15-Oct-2022 17:47:28 GMT; secure; HttpOnly
+      Status: 
+      - 200 OK
+      X-Runtime: 
+      - "0.016753"
+      X-Ua-Compatible: 
+      - IE=Edge,chrome=1
+      Content-Length: 
+      - "71"
+      Connection: 
+      - keep-alive
+    body: 
+      encoding: ASCII-8BIT
+      string: "{\"chapters\":[\"hello\",\"goodbye\"],\"updatedAt\":\"2012-10-15T17:47:28.940Z\"}"
+    http_version: 
+  recorded_at: Mon, 15 Oct 2012 17:47:30 GMT
+recorded_with: VCR 2.0.1

data/lib/parse/datatypes.rb

@@ -214,6 +214,40 @@ module Parse
     end
   end
 
+  class ArrayOp
+    # '{"myArray": {"__op": "Add", "objects": ["something", "something else"] } }'
+    attr_accessor :operation
+    attr_accessor :objects
+
+    def initialize(operation, objects)
+      @operation = operation
+      @objects = objects
+    end
+
+    def eql?(other)
+      self.class.equal?(other.class) &&
+        operation == other.operation &&
+        objects == other.objects
+    end
+
+    alias == eql?
+
+    def hash
+      operation.hash ^ objects.hash
+    end
+
+    def as_json(*a)
+      {
+          Protocol::KEY_OP => operation,
+          Protocol::KEY_OBJECTS => @objects
+      }
+    end
+
+    def to_json(*a)
+        as_json.to_json(*a)
+    end
+  end
+
   # GeoPoint
   # ------------------------------------------------------------
 

data/lib/parse/object.rb

@@ -14,6 +14,7 @@ module Parse
 
     def initialize(class_name, data = nil)
       @class_name = class_name
+      @op_fields = {}
       if data
         parse data
       end
@@ -84,7 +85,13 @@ module Parse
     # If the object has never been saved before, this will create
     # a new object, otherwise it will update the existing stored object.
     def save
-      method   = @parse_object_id ? :put : :post
+      if @parse_object_id
+        method = :put
+        self.merge!(@op_fields) # use operations instead of our own view of the columns
+      else
+        method = :post
+      end
+
       body = safe_json
       data = Parse.client.request(self.uri, method, body)
 
@@ -141,7 +148,19 @@ module Parse
       self
     end
 
-    # Increment the given field by an amount, which defaults to 1.
+    def array_add(field, value)
+      array_op(field, Protocol::KEY_ADD, value)
+    end
+
+    def array_add_unique(field, value)
+      array_op(field, Protocol::KEY_ADD_UNIQUE, value)
+    end
+
+    def array_remove(field, value)
+      array_op(field, Protocol::KEY_REMOVE, value)
+    end
+
+    # Increment the given field by an amount, which defaults to 1. Saves immediately to reflect incremented
     def increment(field, amount = 1)
       #value = (self[field] || 0) + amount
       #self[field] = value
@@ -163,7 +182,7 @@ module Parse
       self
     end
 
-    # Decrement the given field by an amount, which defaults to 1.
+    # Decrement the given field by an amount, which defaults to 1. Saves immediately to reflect decremented
     # A synonym for increment(field, -amount).
     def decrement(field, amount = 1)
       #increment field, -amount
@@ -173,6 +192,28 @@ module Parse
       self
     end
 
-  end
+    private
+
+    def array_op(field, operation, value)
+      raise "field #{field} not an array" if self[field] && !self[field].is_a?(Array)
+
+      if @parse_object_id
+        @op_fields[field] ||= ArrayOp.new(operation, [])
+        raise "only one operation type allowed per array #{field}" if @op_fields[field].operation != operation
+        @op_fields[field].objects << value
+      end
 
+      # parse doesn't return column values on initial POST creation so we must maintain them ourselves
+      case operation
+      when Protocol::KEY_ADD
+        self[field] ||= []
+        self[field] << value
+      when Protocol::KEY_ADD_UNIQUE
+        self[field] ||= []
+        self[field] << value unless self[field].include?(value)
+      when Protocol::KEY_REMOVE
+        self[field].delete(value) if self[field]
+      end
+    end
+  end
 end

data/lib/parse/protocol.rb

@@ -53,13 +53,19 @@ module Parse
     RESPONSE_KEY_RESULTS = "results"
     KEY_RESULTS = RESPONSE_KEY_RESULTS
 
-    # The JSON key used to identify an operator in the increment/decrement
-    # API call.
+    # The JSON key used to identify an operator
     KEY_OP          = "__op"
+
     KEY_INCREMENT   = "Increment"
     KEY_DECREMENT   = "Decrement"
     KEY_DELETE      = "Delete"
 
+    # array ops
+    KEY_OBJECTS     = "objects"
+    KEY_ADD         = "Add"
+    KEY_ADD_UNIQUE  = "AddUnique"
+    KEY_REMOVE      = "Remove"
+
     DELETE_OP       = { KEY_OP => KEY_DELETE }
 
     # The JSON key used to identify the datatype of a special value.

data/lib/parse/query.rb

@@ -85,6 +85,17 @@ module Parse
       add_constraint(field, "$inQuery" => query_hash)
       self
     end
+    
+    def limit(num)
+      @limit = num
+      self
+    end
+    
+    def order(field, order = :ascending)
+      @order_by = field
+      @order = order
+      self
+    end
 
     def count
       @count = true

data/lib/parse/user.rb

@@ -19,21 +19,13 @@ module Parse
 
     def self.reset_password(email)
       body = {"email" => email}
-      Parse.client.post(Parse::Protocol::PASSWORD_RESET_URI, body)
+      Parse.client.post(Parse::Protocol::PASSWORD_RESET_URI, body.to_json)
     end
 
     def initialize(data = nil)
-      @class_name = Parse::Protocol::CLASS_USER
-      
-      #stringify symbol keys
       data["username"] = data[:username] if data[:username]
       data["password"] = data[:password] if data[:password]
-      
-      if data
-        parse data
-      end
-    
-      self
+      super(Parse::Protocol::CLASS_USER, data)
     end
     
     def uri
@@ -41,4 +33,4 @@ module Parse
     end
     
   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.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alan deLevie", "Adam Alpern"]
-  s.date = "2012-10-14"
+  s.date = "2013-01-05"
   s.description = "A simple Ruby client for the parse.com REST API"
   s.email = "adelevie@gmail.com"
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "example.rb",
+    "fixtures/vcr_cassettes/test_array_add.yml",
     "fixtures/vcr_cassettes/test_cloud_function.yml",
     "fixtures/vcr_cassettes/test_created_at.yml",
     "fixtures/vcr_cassettes/test_deep_parse.yml",
@@ -52,10 +53,6 @@ Gem::Specification.new do |s|
     "lib/parse/user.rb",
     "lib/parse/util.rb",
     "parse-ruby-client.gemspec",
-    "pkg/parse-ruby-client-0.0.1.gem",
-    "pkg/parse-ruby-client-0.0.2.gem",
-    "pkg/parse-ruby-client-1-0.0.1.gem",
-    "pkg/parse-ruby-client.gem",
     "test/cloud_functions/MyCloudCode/cloud/main.js",
     "test/config/global.json",
     "test/helper.rb",

data/test/test_object.rb

@@ -107,4 +107,19 @@ class TestObject < Test::Unit::TestCase
       assert_false post.refresh.keys.include?("title")
     end
   end
+
+  def test_array_add
+    VCR.use_cassette('test_array_add', :record => :new_episodes) do
+      post = Parse::Object.new "Post"
+      post.array_add("chapters", "hello")
+      assert_equal ["hello"], post["chapters"]
+      post.save
+      assert_equal ["hello"], post["chapters"]
+
+      post.array_add("chapters", "goodbye")
+      assert_equal ["hello", "goodbye"], post["chapters"]
+      post.save
+      assert_equal ["hello", "goodbye"], post["chapters"]
+    end
+  end
 end

data/test/test_user.rb

@@ -42,4 +42,20 @@ class TestUser < Test::Unit::TestCase
     #end
   end
 
+  def test_reset_password
+      u =  "alan" + rand(10000000000000).to_s + "@gmail.com" 
+      data = {
+        :username => u, 
+        :password => "secret"
+      }
+
+      user = Parse::User.new(data)
+
+      user.save
+      
+      reset_password = Parse::User.reset_password(u)
+      
+      assert true
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parse-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patron
@@ -172,6 +172,7 @@ files:
 - Rakefile
 - VERSION
 - example.rb
+- fixtures/vcr_cassettes/test_array_add.yml
 - fixtures/vcr_cassettes/test_cloud_function.yml
 - fixtures/vcr_cassettes/test_created_at.yml
 - fixtures/vcr_cassettes/test_deep_parse.yml
@@ -199,10 +200,6 @@ files:
 - lib/parse/user.rb
 - lib/parse/util.rb
 - parse-ruby-client.gemspec
-- pkg/parse-ruby-client-0.0.1.gem
-- pkg/parse-ruby-client-0.0.2.gem
-- pkg/parse-ruby-client-1-0.0.1.gem
-- pkg/parse-ruby-client.gem
 - test/cloud_functions/MyCloudCode/cloud/main.js
 - test/config/global.json
 - test/helper.rb
@@ -230,7 +227,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2994353426493104333
+      hash: 456778675129303408
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: