parse-ruby-client 0.0.3 → 0.0.4

data/README.md

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

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/parse-ruby-client.rb

@@ -21,3 +21,4 @@ require 'parse/query'
 require 'parse/datatypes'
 require 'parse/util'
 require 'parse/protocol'
+require 'parse/user'

data/lib/parse/client.rb

@@ -19,6 +19,7 @@ module Parse
       @api_key        = data[:api_key]
       @session        = Patron::Session.new
       @session.timeout = 10
+      @session.connect_timeout = 10
 
       @session.base_url                 = "https://#{host}"
       @session.headers["Content-Type"]  = "application/json"

data/lib/parse/datatypes.rb

@@ -14,12 +14,16 @@ module Parse
       @parse_object_id  = data[Protocol::KEY_OBJECT_ID]
     end
 
-    def to_json(*a)
+    def as_json(*a)
       {
           Protocol::KEY_TYPE        => Protocol::TYPE_POINTER,
           Protocol::KEY_CLASS_NAME  => @class_name,
           Protocol::KEY_OBJECT_ID   => @parse_object_id
-      }.to_json(*a)
+      }
+    end
+    
+    def to_json(*a)
+        as_json.to_json(*a)
     end
 
     # Retrieve the Parse object referenced by this pointer.
@@ -44,11 +48,15 @@ module Parse
       end
     end
 
-    def to_json(*a)
+    def as_json(*a)
       {
           Protocol::KEY_TYPE => Protocol::TYPE_DATE,
           "iso"              => value.iso8601
-      }.to_json(*a)
+      }
+    end
+    
+    def to_json(*a)
+        as_json.to_json(*a)
     end
   end
 
@@ -63,11 +71,15 @@ module Parse
       @value = Base64.decode64(bytes)
     end
 
-    def to_json(*a)
+    def as_json(*a)
       {
           Protocol::KEY_TYPE => Protocol::TYPE_BYTES,
           "base64" => Base64.encode64(@value)
-      }.to_json(*a)
+      }
+    end
+    
+    def to_json(*a)
+        as_json.to_json(*a)
     end
   end
   
@@ -82,11 +94,15 @@ module Parse
       @amount = amount
     end
     
-    def to_json(*a)
+    def as_json(*a)
       {
           Protocol::KEY_OP => Protocol::KEY_INCREMENT,
           Protocol::KEY_AMOUNT => @amount
-      }.to_json(*a)
+      }
+    end
+  
+    def to_json(*a)
+        as_json.to_json(*a)
     end
   end
   
@@ -98,11 +114,15 @@ module Parse
       @amount = amount
     end
     
-    def to_json(*a)
+    def as_json(*a)
       {
           Protocol::KEY_OP => Protocol::KEY_DECREMENT,
           Protocol::KEY_AMOUNT => @amount
-      }.to_json(*a)
+      }
+    end
+    
+    def to_json(*a)
+        as_json.to_json(*a)
     end
   end
   
@@ -123,12 +143,16 @@ module Parse
       end
     end
     
-    def to_json(*a)
+    def as_json(*a)
       {
           Protocol::KEY_TYPE => Protocol::TYPE_GEOPOINT,
           "latitude" => @latitude,
           "longitude" => @longitude
-      }.to_json(*a)
+      }
+    end
+    
+    def to_json(*a)
+        as_json.to_json(*a)
     end
   end
   

data/lib/parse/object.rb

@@ -5,11 +5,12 @@ require 'parse/error'
 module Parse
 
   # Represents an individual Parse API object.
-  class Object  < Hash
+  class Object < Hash
     attr_reader :parse_object_id
     attr_reader :class_name
     attr_reader :created_at
     attr_reader :updated_at
+    alias :id :parse_object_id
 
     def initialize(class_name, data = nil)
       @class_name = class_name
@@ -45,17 +46,22 @@ module Parse
         @updated_at = DateTime.parse data[Protocol::KEY_UPDATED_AT]
       end
 
-      self.merge! data
+      data.each do |k,v|
+        if k.is_a? Symbol
+          k = k.to_s
+        end
+				#if Protocol::RESERVED_KEYS.include? k
+        self[k] = v
+				#end
+      end
+
+      self
+    end
 
-			#data.each { |k,v|
-			#	if k.is_a? Symbol
-			#		k = k.to_s
-			#	end
-			#	if !Protocol::RESERVED_KEYS.include? k
-			#		self[k] = v
-			#	end
-			#}
+    def new?
+      self["objectId"].nil?
     end
+
     private :parse
 
     # Write the current state of the local object to the API.
@@ -63,13 +69,22 @@ module Parse
     # a new object, otherwise it will update the existing stored object.
     def save
       method   = @parse_object_id ? :put : :post
+
       Protocol::RESERVED_KEYS.each { |k| self.delete(k) }
       body     = self.to_json
 
       data = Parse.client.request(self.uri, method, body)
+
       if data
         parse data
       end
+      
+      if @class_name == Parse::Protocol::CLASS_USER
+        self.delete("password")
+        self.delete(:username)
+        self.delete(:password)
+      end
+      
       self
     end
 
@@ -82,6 +97,7 @@ module Parse
           parse data
         end
       end
+      
       self
     end
 
@@ -90,7 +106,9 @@ module Parse
       if @parse_object_id
         response = Parse.client.delete self.uri
       end
-      nil
+      
+      self.clear
+      self
     end
 
     # Increment the given field by an amount, which defaults to 1.

data/lib/parse/protocol.rb

@@ -59,7 +59,7 @@ module Parse
     # increment/decrement API call.
     KEY_AMOUNT      = "amount"
 
-		RESERVED_KEYS = [ KEY_CLASS_NAME, KEY_CREATED_AT, KEY_OBJECT_ID ]
+	RESERVED_KEYS = [ KEY_CLASS_NAME, KEY_CREATED_AT, KEY_OBJECT_ID ]
 
     # Other Constants
     # ----------------------------------------
@@ -92,6 +92,9 @@ module Parse
 
     # The class name for User objects, when referenced by a Pointer.
     CLASS_USER      = "_User"
+    USER_LOGIN_URI  = "/#{VERSION}/login"
+    
+    KEY_USER_SESSION_TOKEN = "sessionToken"
 
     # URI Helpers
     # ----------------------------------------
@@ -105,6 +108,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/user.rb

@@ -0,0 +1,39 @@
+require 'parse/protocol'
+require 'parse/client'
+require 'parse/error'
+require 'parse/object'
+
+module Parse
+  class User < Parse::Object
+    
+    def self.authenticate(username, password)
+      body = {
+        "username" => username,
+        "password" => password
+      }
+
+      response = Parse.client.request(Parse::Protocol::USER_LOGIN_URI, :get, nil, body)
+      
+      new(response)
+    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
+    end
+    
+    def uri
+      Protocol.user_uri @parse_object_id
+    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.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alan deLevie", "Adam Alpern"]
-  s.date = "2012-02-20"
+  s.date = "2012-04-06"
   s.description = "A simple Ruby client for the parse.com REST API"
   s.email = "adelevie@gmail.com"
   s.extra_rdoc_files = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/parse/object.rb",
     "lib/parse/protocol.rb",
     "lib/parse/query.rb",
+    "lib/parse/user.rb",
     "lib/parse/util.rb",
     "parse-ruby-client.gemspec",
     "pkg/parse-ruby-client-0.0.1.gem",
@@ -42,7 +43,9 @@ Gem::Specification.new do |s|
     "test/test_client.rb",
     "test/test_datatypes.rb",
     "test/test_init.rb",
-    "test/test_query.rb"
+    "test/test_object.rb",
+    "test/test_query.rb",
+    "test/test_user.rb"
   ]
   s.homepage = "http://github.com/adelevie/parse-ruby-client"
   s.licenses = ["MIT"]

data/test/test_client.rb

@@ -29,4 +29,13 @@ class TestClient < Test::Unit::TestCase
     assert_equal foo["age"], 40
     assert_equal foo[Parse::Protocol::KEY_UPDATED_AT].class, String
   end
+  
+  def test_destroy
+    d = Parse::Object.new "toBeDeleted"
+    d["foo"] = "bar"
+    d.save
+    d.parse_delete
+    
+    assert_equal d.keys.length, 0
+  end
 end

data/test/test_object.rb

@@ -0,0 +1,56 @@
+require 'helper'
+
+class TestObject < Test::Unit::TestCase
+  def setup
+    Parse.init
+  end
+
+  def test_new?
+  	post = Parse::Object.new "Post"
+  	assert_equal post.new?, true
+  	post.save
+  	assert_equal post.new?, false
+  end
+
+  def test_id
+    post = Parse::Object.new "Post"
+    assert_equal post.id, nil
+    post["title"] = "hello world"
+    post.save
+    assert_equal post.id.class, String
+  end
+
+  def test_created_at
+    post = Parse::Object.new "Post"
+    assert_equal post.created_at, nil
+    post.save
+    assert_equal post.created_at.class, DateTime
+  end
+
+  def test_updated_at
+    post = Parse::Object.new "Post"
+    assert_equal post.updated_at, nil
+    post["title"] = "hello"
+    post.save
+    assert_equal post.updated_at, nil
+    post["title"] = "hello 2"
+    post.save
+    assert_equal post.updated_at.class, DateTime
+  end
+
+  def test_parse_delete
+    post = Parse::Object.new "Post"
+    post.save
+    assert_equal post.id.class, String
+
+    q = Parse.get("Post", post.id)
+    assert_equal q.id, post.id
+
+    post.parse_delete
+
+    assert_raise Parse::ParseError do
+      q = Parse.get("Post", post.id)
+    end
+  end
+
+end

data/test/test_query.rb

@@ -3,6 +3,18 @@ require 'helper'
 Parse.init
 
 class TestQuery < Test::Unit::TestCase
+
+  def test_get
+    post = Parse::Object.new "Post"
+    post["title"] = "foo"
+    post.save
+
+    q = Parse.get("Post", post.id)
+
+    assert_equal q.id, post.id
+    assert_equal q["title"], post["title"]
+  end
+
   def test_add_contraint
     # I know this method *should* be private.
     # But then it would be a PITA to test.

data/test/test_user.rb

@@ -0,0 +1,41 @@
+require 'helper'
+
+class TestUser < Test::Unit::TestCase
+  
+  def setup
+    Parse.init
+  end
+
+  def test_save
+    username = rand.to_s
+    data = {
+      :username => username,
+      :password => "topsecret"
+    }
+    user = Parse::User.new data
+    user.save
+    assert_equal user[Parse::Protocol::KEY_OBJECT_ID].class, String
+    assert_equal user[Parse::Protocol::KEY_CREATED_AT].class, String
+  end
+  
+  def test_login
+    u = "alan" + rand(10000000000000).to_s
+    data = {
+      :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
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parse-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000Z
+date: 2012-04-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patron
-  requirement: &70330439891380 !ruby/object:Gem::Requirement
+  requirement: &70183947794580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330439891380
+  version_requirements: *70183947794580
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70330439890500 !ruby/object:Gem::Requirement
+  requirement: &70183947794100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330439890500
+  version_requirements: *70183947794100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70330439889720 !ruby/object:Gem::Requirement
+  requirement: &70183947793620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70330439889720
+  version_requirements: *70183947793620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70330439889080 !ruby/object:Gem::Requirement
+  requirement: &70183947793140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70330439889080
+  version_requirements: *70183947793140
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70330439888560 !ruby/object:Gem::Requirement
+  requirement: &70183947792660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330439888560
+  version_requirements: *70183947792660
 description: A simple Ruby client for the parse.com REST API
 email: adelevie@gmail.com
 executables: []
@@ -90,6 +90,7 @@ files:
 - lib/parse/object.rb
 - lib/parse/protocol.rb
 - lib/parse/query.rb
+- lib/parse/user.rb
 - lib/parse/util.rb
 - parse-ruby-client.gemspec
 - pkg/parse-ruby-client-0.0.1.gem
@@ -100,7 +101,9 @@ files:
 - test/test_client.rb
 - test/test_datatypes.rb
 - test/test_init.rb
+- test/test_object.rb
 - test/test_query.rb
+- test/test_user.rb
 homepage: http://github.com/adelevie/parse-ruby-client
 licenses:
 - MIT
@@ -116,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4138204071645448362
+      hash: 4137621541877558226
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: