parse-ruby-client 0.1.1 → 0.1.2

data/Gemfile

@@ -7,10 +7,12 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda", ">= 0"
+  gem "test-unit", '= 2.5.0'
+  gem "mocha", '= 0.12.0', :require => false
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
 end
 
 gem "patron"
-gem "vcr"
+gem "vcr"

data/Gemfile.lock

@@ -6,10 +6,14 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    metaclass (0.0.1)
+    mocha (0.12.0)
+      metaclass (~> 0.0.1)
     patron (0.4.17)
     rake (0.9.2.2)
     rcov (0.9.11)
     shoulda (2.11.3)
+    test-unit (2.5.0)
     vcr (2.0.1)
 
 PLATFORMS
@@ -18,7 +22,9 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
+  mocha (= 0.12.0)
   patron
   rcov
   shoulda
+  test-unit (= 2.5.0)
   vcr

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/parse/client.rb

@@ -11,12 +11,16 @@ module Parse
     attr_accessor :host
     attr_accessor :application_id
     attr_accessor :api_key
+    attr_accessor :master_key
+    attr_accessor :session_token
     attr_accessor :session
 
     def initialize(data = {})
       @host           = data[:host] || Protocol::HOST
       @application_id = data[:application_id]
       @api_key        = data[:api_key]
+      @master_key     = data[:master_key]
+      @session_token  = data[:session_token]
       @session        = Patron::Session.new
       @session.timeout = 30
       @session.connect_timeout = 30
@@ -25,8 +29,6 @@ module Parse
       @session.headers["Content-Type"]  = "application/json"
       @session.headers["Accept"]        = "application/json"
       @session.headers["User-Agent"]    = "Parse for Ruby, 0.0"
-      @session.headers[Protocol::HEADER_API_KEY]  = @api_key
-      @session.headers[Protocol::HEADER_APP_ID]   = @application_id
     end
 
     # Perform an HTTP request for the given uri and method
@@ -34,6 +36,11 @@ module Parse
     # 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)
+      @session.headers[Protocol::HEADER_MASTER_KEY]    = @master_key
+      @session.headers[Protocol::HEADER_API_KEY]  = @api_key
+      @session.headers[Protocol::HEADER_APP_ID]   = @application_id
+      @session.headers[Protocol::HEADER_SESSION_TOKEN]   = @session_token
+
       options = {}
       if body
         options[:data] = body
@@ -48,7 +55,7 @@ module Parse
       rescue Patron::TimeoutError
         num_tries += 1
         if num_tries <= max_retries
-          retry 
+          retry
         else
           raise Patron::TimeoutError
         end
@@ -92,10 +99,17 @@ module Parse
   # Initialize the singleton instance of Client which is used
   # by all API methods. Parse.init must be called before saving
   # or retrieving any objects.
-  def Parse.init(data = {:application_id => ENV["PARSE_APPLICATION_ID"], :api_key => ENV["PARSE_REST_API_KEY"]})
-    @@client = Client.new(data)
+  def Parse.init(data = {})
+    defaulted = {:application_id => ENV["PARSE_APPLICATION_ID"],
+                 :api_key => ENV["PARSE_REST_API_KEY"]}
+    defaulted.merge!(data)
+
+    # use less permissive key if both are specified
+    defaulted[:master_key] = ENV["PARSE_MASTER_API_KEY"] unless data[:master_key] || defaulted[:api_key]
+
+    @@client = Client.new(defaulted)
   end
-  
+
   # Used mostly for testing. Lets you delete the api key global vars.
   def Parse.destroy
     @@client = nil

data/lib/parse/datatypes.rb

@@ -14,6 +14,18 @@ module Parse
       @parse_object_id  = data[Protocol::KEY_OBJECT_ID]
     end
 
+    def eql?(other)
+      self.class.equal?(other.class) &&
+        class_name == other.class_name &&
+        parse_object_id == other.parse_object_id
+    end
+
+    alias == eql?
+
+    def hash
+      class_name.hash ^ parse_object_id.hash
+    end
+
     def as_json(*a)
       {
           Protocol::KEY_TYPE        => Protocol::TYPE_POINTER,
@@ -21,14 +33,14 @@ module Parse
           Protocol::KEY_OBJECT_ID   => @parse_object_id
       }
     end
-    
+
     def to_json(*a)
         as_json.to_json(*a)
     end
 
     # Retrieve the Parse object referenced by this pointer.
     def get
-      Parse.get @class_name, @parse_object_id
+      Parse.get @class_name, @parse_object_id if @parse_object_id
     end
   end
 
@@ -48,13 +60,44 @@ module Parse
       end
     end
 
+    def eql?(other)
+      self.class.equal?(other.class) &&
+        value == other.value
+    end
+
+    alias == eql?
+
+    def hash
+      value.hash
+    end
+
+    def <=>(other)
+      value <=> other.value
+    end
+
+    def to_s
+      value.to_s
+    end
+
+    def method_missing(method, *args, &block)
+      if value.respond_to?(method)
+        value.send(method, *args, &block)
+      else
+        super(method)
+      end
+    end
+
+    def respond_to?(method, include_private = false)
+      super || value.respond_to?(method, include_private)
+    end
+
     def as_json(*a)
       {
           Protocol::KEY_TYPE => Protocol::TYPE_DATE,
           "iso"              => value.iso8601
       }
     end
-    
+
     def to_json(*a)
         as_json.to_json(*a)
     end
@@ -71,78 +114,139 @@ module Parse
       @value = Base64.decode64(bytes)
     end
 
+    def eql?(other)
+      self.class.equal?(other.class) &&
+        value == other.value
+    end
+
+    alias == eql?
+
+    def hash
+      value.hash
+    end
+
+    def <=>(other)
+      value <=> other.value
+    end
+
+    def method_missing(method, *args, &block)
+      if value.respond_to?(method)
+        value.send(method, *args, &block)
+      else
+        super(method)
+      end
+    end
+
+    def respond_to?(method, include_private = false)
+      super || value.respond_to?(method, include_private)
+    end
+
     def as_json(*a)
       {
           Protocol::KEY_TYPE => Protocol::TYPE_BYTES,
           "base64" => Base64.encode64(@value)
       }
     end
-    
+
     def to_json(*a)
         as_json.to_json(*a)
     end
   end
-  
+
   # Increment and Decrement
   # ------------------------------------------------------------
-  
+
   class Increment
     # '{"score": {"__op": "Increment", "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_INCREMENT,
           Protocol::KEY_AMOUNT => @amount
       }
     end
-  
+
     def to_json(*a)
         as_json.to_json(*a)
     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
-  
+
   # GeoPoint
   # ------------------------------------------------------------
-  
+
   class GeoPoint
     # '{"location": {"__type":"GeoPoint", "latitude":40.0, "longitude":-30.0}}'
     attr_accessor :longitude, :latitude
-    
+
     def initialize(data)
       @longitude = data["longitude"]
       @latitude  = data["latitude"]
-      
+
       if !@longitude && !@latitude
         @longitude = data[:longitude]
         @latitude  = data[:latitude]
       end
     end
-    
+
+    def eql?(other)
+      self.class.equal?(other.class) &&
+        longitude == other.longitude &&
+        latitude == other.latitude
+    end
+
+    alias == eql?
+
+    def hash
+      longitude.hash ^ latitude.hash
+    end
+
     def as_json(*a)
       {
           Protocol::KEY_TYPE => Protocol::TYPE_GEOPOINT,
@@ -150,11 +254,48 @@ module Parse
           "longitude" => @longitude
       }
     end
-    
+
     def to_json(*a)
         as_json.to_json(*a)
     end
   end
-  
+
+  # File
+  # ------------------------------------------------------------
+
+  class File
+    # '{"avatar": {"__type":"File", "name":"profile.png", "url"=>"http://files.parse.com/blah/profile.png"}}'
+    attr_accessor :name
+    attr_accessor :url
+
+    def initialize(data)
+      @name = data["name"]
+      @url = data["url"]
+    end
+
+    def eql?(other)
+      self.class.equal?(other.class) &&
+        url == other.url
+    end
+
+    alias == eql?
+
+    def hash
+      url.hash
+    end
+
+    def as_json(*a)
+      {
+          Protocol::KEY_TYPE => Protocol::TYPE_FILE,
+          "name" => @name,
+          "url" => @url
+      }
+    end
+
+    def to_json(*a)
+        as_json.to_json(*a)
+    end
+  end
+
 
 end

data/lib/parse/object.rb

@@ -24,7 +24,7 @@ module Parse
     end
 
     def pointer
-      Parse::Pointer.new self.merge(Parse::Protocol::KEY_CLASS_NAME => class_name)
+      Parse::Pointer.new(self.merge(Parse::Protocol::KEY_CLASS_NAME => class_name)) unless new?
     end
 
     # Merge a hash parsed from the JSON representation into
@@ -72,8 +72,17 @@ module Parse
 
       without_reserved = self.dup
       Protocol::RESERVED_KEYS.each { |k| without_reserved.delete(k) }
-      body     = without_reserved.to_json
 
+      without_relations = without_reserved
+      without_relations.each { |k,v|
+          if v.is_a? Hash
+            if v[Protocol::KEY_TYPE] == Protocol::TYPE_RELATION
+              without_relations.delete(k)
+            end
+          end
+      }
+
+      body     = without_relations.to_json
       data = Parse.client.request(self.uri, method, body)
 
       if data
@@ -93,7 +102,7 @@ module Parse
     # values from the API.
     def refresh
       if @parse_object_id
-        data = Parse.client.get self.uri
+        data = Parse.get @class_name, @parse_object_id
         if data
           parse data
         end

data/lib/parse/protocol.rb

@@ -22,6 +22,13 @@ module Parse
     # Parse API.
     HEADER_API_KEY  = "X-Parse-REST-API-Key"
 
+    # The HTTP header used for passing your API Master key to the
+    # Parse API.
+    HEADER_MASTER_KEY  = "X-Parse-Master-Key"
+
+    # The HTTP header used for passing your authenticated session
+    HEADER_SESSION_TOKEN = "X-Parse-Session-Token"
+
     # JSON Keys
     # ----------------------------------------
 
@@ -90,11 +97,18 @@ module Parse
     # a file.
     TYPE_FILE       = "File"
 
+    # The data type name for special JSON objects representing
+    # a Relation.
+    TYPE_RELATION   = "Relation"
+
     # The class name for User objects, when referenced by a Pointer.
     CLASS_USER      = "_User"
+
+    CLASS_INSTALLATION = "_Installation"
+
     USER_LOGIN_URI  = "/#{VERSION}/login"
     PASSWORD_RESET_URI = "/#{VERSION}/requestPasswordReset"
-    
+
     KEY_USER_SESSION_TOKEN = "sessionToken"
 
     # URI Helpers
@@ -109,7 +123,7 @@ module Parse
         "/#{VERSION}/classes/#{class_name}"
       end
     end
-    
+
 
     # Construct a uri referencing a given Parse user
     # instance or the users category.

data/lib/parse/push.rb

@@ -5,6 +5,7 @@ module Parse
   class Push
     attr_accessor :channels
     attr_accessor :channel
+    attr_accessor :where
     attr_accessor :type
     attr_accessor :expiration_time_interval
     attr_accessor :expiration_time
@@ -17,18 +18,22 @@ module Parse
 
     def save
       uri   = Protocol.push_uri
-      
+
       body = { :data => @data, :channel => @channel }
-      
+
       if @channels
         body.merge!({ :channels => @channels })
         body.delete :channel
       end
-      
+
+      if @where
+        body.merge!({ :where => @where })
+      end
+
       body.merge!({ :expiration_time_interval => @expiration_time_interval }) if @expiration_time_interval
-      body.merge!({ :expiration_time => @expiration_time }) if @expiration_time 
+      body.merge!({ :expiration_time => @expiration_time }) if @expiration_time
       body.merge!({ :type => @type }) if @type
-      
+
       response = Parse.client.request uri, :post, body.to_json, nil
     end
 

data/lib/parse/query.rb

@@ -15,9 +15,11 @@ module Parse
       @class_name = cls_name
       @where = {}
       @order = :ascending
+      @ors = []
     end
 
     def add_constraint(field, constraint)
+      raise ArgumentError, "cannot add constraint to an $or query" if @ors.size > 0
       current = where[field]
       if current && current.is_a?(Hash) && constraint.is_a?(Hash)
         current.merge! constraint
@@ -27,6 +29,12 @@ module Parse
     end
     #private :add_constraint
 
+    def or(query)
+      raise ArgumentError, "you must pass an entire #{self.class} to \#or" unless query.is_a?(self.class)
+      @ors << query
+      self
+    end
+
     def eq(field, value)
       add_constraint field, value
       self
@@ -67,16 +75,34 @@ module Parse
       self
     end
 
+    def in_query(field, query)
+      query_hash = {Parse::Protocol::KEY_CLASS_NAME => query.class_name, "where" => query.where}
+      add_constraint(field, "$inQuery" => query_hash)
+    end
+
     def count
       @count = true
       self
     end
 
+    def where_as_json
+      if @ors.size > 0
+        {"$or" => [self.where] + @ors.map{|query| query.where_as_json}}
+      else
+        @where
+      end
+    end
+
     def get
       uri   = Protocol.class_uri @class_name
-      query = { "where" => CGI.escape(@where.to_json) }
+      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].each {|a| merge_attribute(a, query)}
+      [:count, :limit, :skip].each {|a| merge_attribute(a, query)}
 
       response = Parse.client.request uri, :get, nil, query
       Parse.parse_json class_name, response

data/lib/parse/util.rb

@@ -9,9 +9,6 @@ module Parse
 
     if obj.nil?
       nil
-    # String
-    elsif obj.is_a? String
-      parse_json class_name, JSON.parse(obj)
 
     # Array
     elsif obj.is_a? Array
@@ -25,10 +22,11 @@ module Parse
         parse_datatype obj
       elsif obj.size == 1 && obj.has_key?(Protocol::KEY_RESULTS) && obj[Protocol::KEY_RESULTS].is_a?(Array)
         obj[Protocol::KEY_RESULTS].collect { |o| parse_json(class_name, o) }
-      else # otherwise it must be a regular object
-        Parse::Object.new class_name, obj
+      else # otherwise it must be a regular object, so deep parse it avoiding re-JSON.parsing raw Strings
+        Parse::Object.new class_name, Hash[obj.map{|k,v| [k, parse_json(nil, v)]}]
       end
 
+    # primitive
     else
       obj
     end
@@ -44,6 +42,10 @@ module Parse
         Parse::Bytes.new obj
       when Protocol::TYPE_DATE
         Parse::Date.new obj
+      when Protocol::TYPE_GEOPOINT
+        Parse::GeoPoint.new obj
+      when Protocol::TYPE_FILE
+        Parse::File.new 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.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alan deLevie", "Adam Alpern"]
-  s.date = "2012-07-04"
+  s.date = "2012-08-31"
   s.description = "A simple Ruby client for the parse.com REST API"
   s.email = "adelevie@gmail.com"
   s.extra_rdoc_files = [
@@ -52,7 +52,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/adelevie/parse-ruby-client"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "A simple Ruby client for the parse.com REST API"
 
   if s.respond_to? :specification_version then
@@ -62,6 +62,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<patron>, [">= 0"])
       s.add_runtime_dependency(%q<vcr>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<test-unit>, ["= 2.5.0"])
+      s.add_development_dependency(%q<mocha>, ["= 0.12.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
@@ -69,6 +71,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<patron>, [">= 0"])
       s.add_dependency(%q<vcr>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<test-unit>, ["= 2.5.0"])
+      s.add_dependency(%q<mocha>, ["= 0.12.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -77,6 +81,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<patron>, [">= 0"])
     s.add_dependency(%q<vcr>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<test-unit>, ["= 2.5.0"])
+    s.add_dependency(%q<mocha>, ["= 0.12.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/test/helper.rb

@@ -9,6 +9,7 @@ rescue Bundler::BundlerError => e
 end
 require 'test/unit'
 require 'shoulda'
+require 'mocha'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_datatypes.rb

@@ -7,19 +7,21 @@ class TestDatatypes < Test::Unit::TestCase
       Parse::Protocol::KEY_OBJECT_ID => "12345abcd"
     }
     p = Parse::Pointer.new data
-    
-    assert_equal p.to_json, "{\"__type\":\"Pointer\",\"#{Parse::Protocol::KEY_CLASS_NAME}\":\"DatatypeTestClass\",\"#{Parse::Protocol::KEY_OBJECT_ID}\":\"12345abcd\"}" 
+
+    assert_equal p.to_json, "{\"__type\":\"Pointer\",\"#{Parse::Protocol::KEY_CLASS_NAME}\":\"DatatypeTestClass\",\"#{Parse::Protocol::KEY_OBJECT_ID}\":\"12345abcd\"}"
   end
-  
+
   def test_date
     date_time = DateTime.now
     data = date_time
     parse_date = Parse::Date.new data
-    
+
     assert_equal parse_date.value, date_time
     assert_equal JSON.parse(parse_date.to_json)["iso"], date_time.iso8601
+    assert_equal 0, parse_date <=> parse_date
+    assert_equal 0, Parse::Date.new(data) <=> Parse::Date.new(data)
   end
-  
+
   def test_bytes
     data = {
       "base64" => Base64.encode64("testing bytes!")
@@ -30,21 +32,21 @@ class TestDatatypes < Test::Unit::TestCase
     assert_equal JSON.parse(byte.to_json)[Parse::Protocol::KEY_TYPE], Parse::Protocol::TYPE_BYTES
     assert_equal JSON.parse(byte.to_json)["base64"], Base64.encode64("testing bytes!")
   end
-  
+
   def test_increment
     amount = 5
     increment = Parse::Increment.new amount
-    
+
     assert_equal increment.to_json, "{\"__op\":\"Increment\",\"amount\":#{amount}}"
   end
-  
+
   def test_decrement
     amount = 5
     increment = Parse::Decrement.new amount
-    
+
     assert_equal increment.to_json, "{\"__op\":\"Decrement\",\"amount\":#{amount}}"
   end
-  
+
   def test_geopoint
     # '{"location": {"__type":"GeoPoint", "latitude":40.0, "longitude":-30.0}}'
     data = {
@@ -52,9 +54,28 @@ class TestDatatypes < Test::Unit::TestCase
       "latitude" => -30.0
     }
     gp = Parse::GeoPoint.new data
-    
-    assert_equal JSON.parse(gp.to_json)["longitude"], data["longitude"] 
+
+    assert_equal JSON.parse(gp.to_json)["longitude"], data["longitude"]
     assert_equal JSON.parse(gp.to_json)["latitude"], data["latitude"]
     assert_equal JSON.parse(gp.to_json)[Parse::Protocol::KEY_TYPE], Parse::Protocol::TYPE_GEOPOINT
+
+    post = Parse::Object.new("Post")
+    post["location"] = gp
+    post.save
+    q = Parse.get("Post", post.id)
+    assert_equal gp, q["location"]
+  end
+
+  def test_file
+    data = {"name" => "blah.png"}
+    file = Parse::File.new(data)
+    assert_equal JSON.parse(file.to_json)["name"], data["name"]
+    assert_equal JSON.parse(file.to_json)[Parse::Protocol::KEY_TYPE], Parse::Protocol::TYPE_FILE
+
+    post = Parse::Object.new("Post")
+    post["avatar"] = file
+    post.save
+    q = Parse.get("Post", post.id)
+    assert_equal file.name, q["avatar"].name
   end
 end

data/test/test_object.rb

@@ -22,8 +22,7 @@ class TestObject < Test::Unit::TestCase
 
   def test_pointer
     post = Parse::Object.new "Post"
-    pointer = post.pointer
-    assert_equal pointer.class_name, post.class_name
+    assert_nil post.pointer
 
     post.save
     pointer = post.pointer
@@ -64,4 +63,16 @@ class TestObject < Test::Unit::TestCase
     end
   end
 
+  def test_deep_parse
+    other = Parse::Object.new "Post"
+    other.save
+    post = Parse::Object.new "Post"
+    post["other"] = other.pointer
+    post.save
+
+    q = Parse.get("Post", post.id)
+    assert_equal Parse::Pointer, q["other"].class
+    assert_equal other.pointer, q["other"]
+  end
+
 end

data/test/test_push.rb

@@ -1,14 +1,32 @@
 require 'helper'
 
 class TestPush < Test::Unit::TestCase
-  
+
   def setup
     Parse.init
   end
 
-  def test_send
-    # gotta mock
+  def test_save
+    data = {:foo => 'bar',
+            :alert => 'message'}
+    pf_push = Parse::Push.new(data, "some_chan")
+    pf_push.type = 'ios'
+
+    query = Parse::Query.new(Parse::Protocol::CLASS_INSTALLATION).eq('deviceToken', 'baz')
+    pf_push.where = query.where
+
+    Parse::Client.any_instance.expects(:request).with do |uri, method, body, query|
+      hash = JSON.parse(body)
+      assert_equal :post, method
+      assert has_entries('type' => 'ios', 'channel' => "some_chan").matches?([hash])
+      assert has_entries('foo' => 'bar', 'alert' => 'message').matches?([hash['data']])
+      assert has_entries('deviceToken' => 'baz').matches?([hash['where']])
+      assert_nil query
+      true
+    end.returns({}.to_json)
+
+    pf_push.save
   end
-  
+
 
 end

data/test/test_query.rb

@@ -27,7 +27,7 @@ class TestQuery < Test::Unit::TestCase
     q.add_constraint("player", { "$regex" => "regex voodoo"})
     assert_equal q.where["player"], { "$regex" => "regex voodoo"}
   end
-  
+
   def test_eq
     q = Parse::Query.new "TestQuery"
     q.eq("points", 5)
@@ -35,4 +35,46 @@ class TestQuery < Test::Unit::TestCase
     q.eq("player", "michael@jordan.com")
     assert_equal q.where, {"points" =>  5, "player" => "michael@jordan.com"}
   end
+
+  def test_limit_skip
+    q = Parse::Query.new "TestQuery"
+    q.limit = 2
+    q.skip = 3
+    query_matcher = has_entries(:limit =>  2, :skip => 3)
+    Parse::Client.any_instance.expects(:request).with(anything, :get, nil, query_matcher).returns({}.to_json)
+    q.get
+  end
+
+  def test_count
+    q = Parse::Query.new "TestQuery"
+    q.count = true
+    query_matcher = has_entries(:count => true)
+    Parse::Client.any_instance.expects(:request).with(anything, :get, nil, query_matcher).returns({}.to_json)
+    q.get
+  end
+
+  def test_or
+    foo = Parse::Object.new "Post"
+    foo["random"] = rand
+    foo.save
+    foo_query = Parse::Query.new("Post").eq("random", foo["random"])
+    assert_equal 1, foo_query.get.size
+
+    bar = Parse::Object.new "Post"
+    bar["random"] = rand
+    bar.save
+    bar_query = Parse::Query.new("Post").eq("random", bar["random"])
+    assert_equal 1, foo_query.get.size
+
+    query = foo_query.or(bar_query)
+    assert_equal 2, query.get.size
+  end
+
+  def test_in_query
+    outer_query = Parse::Query.new "Outer"
+    inner_query = Parse::Query.new "Inner"
+    inner_query.eq("foo", "bar")
+    outer_query.in_query("inner", inner_query)
+    assert_equal({"inner"=>{"$inQuery"=>{"className"=>"Inner", "where"=>{"foo"=>"bar"}}}}, outer_query.where)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parse-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patron
-  requirement: &70246977048500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246977048500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70246977027920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,21 +38,63 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70246977027920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70246977025900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.0
   type: :development
   prerelease: false
-  version_requirements: *70246977025900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70246977023480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +102,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70246977023480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70246977022580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +118,15 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70246977022580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70246977020640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +134,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70246977020640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple Ruby client for the parse.com REST API
 email: adelevie@gmail.com
 executables: []
@@ -132,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2755924312958518124
+      hash: 2354067513295992545
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple Ruby client for the parse.com REST API