parse-ruby-client 0.2.0 → 0.3.0

data/lib/parse/cloud.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Parse
   module Cloud
 
@@ -20,4 +21,4 @@ module Parse
     end
 
   end
-end
+end

data/lib/parse/datatypes.rb

@@ -1,3 +1,6 @@
+# -*- encoding : utf-8 -*-
+require 'time'
+require 'date'
 require 'base64'
 
 module Parse
@@ -71,12 +74,14 @@ module Parse
     attr_accessor :value
 
     def initialize(data)
-      if data.is_a? DateTime
+      if data.respond_to?(:iso8601)
         @value = data
       elsif data.is_a? Hash
         @value = DateTime.parse data["iso"]
       elsif data.is_a? String
         @value = DateTime.parse data
+      else
+        raise "data doesn't act like time #{data.inspect}"
       end
     end
 

data/lib/parse/error.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Parse
 
   # Base exception class for errors thrown by the Parse
@@ -17,8 +18,8 @@ module Parse
     def initialize(response)
       @response = response
       if response
-        @code = response["code"]
-        @error = response["error"]
+        @code   = response["code"]
+        @error  = response["error"]
       end
 
       super("#{@code}: #{@error}")
@@ -33,4 +34,7 @@ module Parse
     end
   end
 
-end
+  class ParseProtocolRetry < ParseProtocolError
+  end
+
+end

data/lib/parse/installation.rb

@@ -0,0 +1,18 @@
+require 'parse/protocol'
+require 'parse/client'
+require 'parse/error'
+require 'parse/object'
+
+module Parse
+  class Installation < Parse::Object
+
+    def initialize(data = nil)
+      super(Parse::Protocol::CLASS_INSTALLATION, data)
+    end
+
+    def uri
+      Protocol.installation_uri @parse_object_id
+    end
+
+  end
+end

data/lib/parse/model.rb

@@ -1,7 +1,8 @@
+# -*- encoding : utf-8 -*-
 module Parse
   class Model < Parse::Object
     def initialize
       super(self.class.to_s)
     end
   end
-end
+end

data/lib/parse/object.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'parse/protocol'
 require 'parse/client'
 require 'parse/error'
@@ -95,9 +96,14 @@ module Parse
       self.merge(Parse::Protocol::KEY_CLASS_NAME => class_name)
     end
 
+    # Handle the addition of Array#to_h in Ruby 2.1
+    def should_call_to_h?(value)
+      value.respond_to?(:to_h) && !value.kind_of?(Array)
+    end
+
     def to_h(*a)
       Hash[rest_api_hash.map do |key, value|
-        [key, value.respond_to?(:to_h) ? value.to_h : value]
+        [key, should_call_to_h?(value) ? value.to_h : value]
       end]
     end
     alias :as_json :to_h

data/lib/parse/protocol.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Parse
   # A module which encapsulates the specifics of Parse's REST API.
   module Protocol
@@ -141,6 +142,15 @@ module Parse
       end
     end
 
+    # Construct a uri referencing a given Parse installation
+    # class or instance (of object_id is non-nil).
+    def Protocol.installation_uri(object_id = nil)
+      if object_id
+        "/#{VERSION}/installations/#{object_id}"
+      else
+        "/#{VERSION}/installations"
+      end
+    end
 
     # Construct a uri referencing a given Parse user
     # instance or the users category.

data/lib/parse/push.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'cgi'
 require 'parse/error'
 
@@ -9,6 +10,7 @@ module Parse
     attr_accessor :type
     attr_accessor :expiration_time_interval
     attr_accessor :expiration_time
+    attr_accessor :push_time
     attr_accessor :data
 
     def initialize(data, channel = "")
@@ -33,6 +35,7 @@ module Parse
 
       body.merge!({ :expiration_interval => @expiration_time_interval }) if @expiration_time_interval
       body.merge!({ :expiration_time => @expiration_time }) if @expiration_time
+      body.merge!({ :push_time => @push_time }) if @push_time
       body.merge!({ :type => @type }) if @type
 
       response = Parse.client.request uri, :post, body.to_json, nil

data/lib/parse/query.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'cgi'
 
 module Parse
@@ -119,11 +120,13 @@ module Parse
       uri   = Protocol.class_uri @class_name
       if @class_name == Parse::Protocol::CLASS_USER
         uri = Protocol.user_uri
+      elsif @class_name == Parse::Protocol::CLASS_INSTALLATION
+        uri = Protocol.installation_uri
       end
-      query = { "where" => CGI.escape(where_as_json.to_json) }
+      query = { "where" => where_as_json.to_json }
       set_order(query)
       [:count, :limit, :skip, :include].each {|a| merge_attribute(a, query)}
-      Parse.client.logger.info{"Parse query for #{uri} #{CGI.unescape(query.inspect)}"}
+      Parse.client.logger.info{"Parse query for #{uri} #{query.inspect}"}
       response = Parse.client.request uri, :get, nil, query
 
       if response.is_a?(Hash) && response.has_key?(Protocol::KEY_RESULTS) && response[Protocol::KEY_RESULTS].is_a?(Array)

data/lib/parse/user.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'parse/protocol'
 require 'parse/client'
 require 'parse/error'

data/lib/parse/util.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 module Parse
 
   # Parse a JSON representation into a fully instantiated

data/parse-ruby-client.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: parse-ruby-client 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "parse-ruby-client"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Alan deLevie", "Adam Alpern"]
-  s.date = "2013-10-08"
+  s.date = "2014-07-31"
   s.description = "A simple Ruby client for the parse.com REST API"
   s.email = "adelevie@gmail.com"
   s.extra_rdoc_files = [
@@ -40,16 +42,26 @@ Gem::Specification.new do |s|
     "fixtures/vcr_cassettes/test_decrement.yml",
     "fixtures/vcr_cassettes/test_deep_parse.yml",
     "fixtures/vcr_cassettes/test_destroy.yml",
+    "fixtures/vcr_cassettes/test_empty_response.yml",
     "fixtures/vcr_cassettes/test_eq_pointerize.yml",
     "fixtures/vcr_cassettes/test_equality.yml",
     "fixtures/vcr_cassettes/test_get.yml",
     "fixtures/vcr_cassettes/test_get_missing.yml",
+    "fixtures/vcr_cassettes/test_image_file_associate_with_object.yml",
+    "fixtures/vcr_cassettes/test_image_file_save.yml",
     "fixtures/vcr_cassettes/test_include.yml",
     "fixtures/vcr_cassettes/test_new_model.yml",
     "fixtures/vcr_cassettes/test_new_object.yml",
     "fixtures/vcr_cassettes/test_nils_delete_keys.yml",
+    "fixtures/vcr_cassettes/test_object_id.yml",
     "fixtures/vcr_cassettes/test_parse_delete.yml",
     "fixtures/vcr_cassettes/test_pointer.yml",
+    "fixtures/vcr_cassettes/test_reset_password.yml",
+    "fixtures/vcr_cassettes/test_retries.yml",
+    "fixtures/vcr_cassettes/test_retries_404.yml",
+    "fixtures/vcr_cassettes/test_retries_404_correct.yml",
+    "fixtures/vcr_cassettes/test_retries_json_error.yml",
+    "fixtures/vcr_cassettes/test_retries_server_error.yml",
     "fixtures/vcr_cassettes/test_save_with_sub_objects.yml",
     "fixtures/vcr_cassettes/test_saving_boolean_values.yml",
     "fixtures/vcr_cassettes/test_saving_nested_objects.yml",
@@ -58,15 +70,19 @@ Gem::Specification.new do |s|
     "fixtures/vcr_cassettes/test_text_file_save.yml",
     "fixtures/vcr_cassettes/test_update.yml",
     "fixtures/vcr_cassettes/test_updated_at.yml",
+    "fixtures/vcr_cassettes/test_user_login.yml",
     "fixtures/vcr_cassettes/test_user_save.yml",
     "fixtures/vcr_cassettes/test_xget.yml",
+    "lib/faraday/better_retry.rb",
+    "lib/faraday/extended_parse_json.rb",
+    "lib/faraday/get_method_override.rb",
     "lib/parse-ruby-client.rb",
     "lib/parse/batch.rb",
     "lib/parse/client.rb",
     "lib/parse/cloud.rb",
     "lib/parse/datatypes.rb",
     "lib/parse/error.rb",
-    "lib/parse/http_client.rb",
+    "lib/parse/installation.rb",
     "lib/parse/model.rb",
     "lib/parse/object.rb",
     "lib/parse/protocol.rb",
@@ -78,6 +94,8 @@ Gem::Specification.new do |s|
     "test/cloud_functions/MyCloudCode/cloud/main.js",
     "test/config/global.json",
     "test/helper.rb",
+    "test/middleware/better_retry_test.rb",
+    "test/middleware/extend_parse_json_test.rb",
     "test/parsers.jpg",
     "test/test_batch.rb",
     "test/test_client.rb",
@@ -95,47 +113,49 @@ 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.24"
+  s.rubygems_version = "2.2.2"
   s.summary = "A simple Ruby client for the parse.com REST API"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<patron>, [">= 0"])
-      s.add_runtime_dependency(%q<iron_mq>, [">= 0"])
+      s.add_runtime_dependency(%q<faraday>, [">= 0"])
+      s.add_runtime_dependency(%q<faraday_middleware>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 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<jeweler>, ["~> 1.8.5"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<webmock>, [">= 0"])
+      s.add_development_dependency(%q<webmock>, ["~> 1.9.0"])
       s.add_development_dependency(%q<vcr>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
     else
-      s.add_dependency(%q<patron>, [">= 0"])
-      s.add_dependency(%q<iron_mq>, [">= 0"])
+      s.add_dependency(%q<faraday>, [">= 0"])
+      s.add_dependency(%q<faraday_middleware>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 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<jeweler>, ["~> 1.8.5"])
       s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<webmock>, [">= 0"])
+      s.add_dependency(%q<webmock>, ["~> 1.9.0"])
       s.add_dependency(%q<vcr>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
     end
   else
-    s.add_dependency(%q<patron>, [">= 0"])
-    s.add_dependency(%q<iron_mq>, [">= 0"])
+    s.add_dependency(%q<faraday>, [">= 0"])
+    s.add_dependency(%q<faraday_middleware>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 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<jeweler>, ["~> 1.8.5"])
     s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<webmock>, [">= 0"])
+    s.add_dependency(%q<webmock>, ["~> 1.9.0"])
     s.add_dependency(%q<vcr>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
   end
 end
 

data/test/helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'rubygems'
 require 'bundler'
 begin
@@ -52,4 +53,57 @@ class ParseTestCase < Test::Unit::TestCase
   def setup
     @client = Parse.init(:logger => Logger.new(STDERR).tap{|l| l.level = Logger::ERROR})
   end
-end
+end
+
+module Faraday
+  module LiveServerConfig
+    def live_server=(value)
+      @@live_server = case value
+      when /^http/
+        URI(value)
+      when /./
+        URI('http://127.0.0.1:4567')
+      end
+    end
+
+    def live_server?
+      defined? @@live_server
+    end
+
+    # Returns an object that responds to `host` and `port`.
+    def live_server
+      live_server? and @@live_server
+    end
+  end
+  class TestCase < Test::Unit::TestCase
+    extend LiveServerConfig
+    self.live_server = ENV['LIVE']
+
+    def test_default
+      assert true
+    end unless defined? ::MiniTest
+
+    def capture_warnings
+      old, $stderr = $stderr, StringIO.new
+      begin
+        yield
+        $stderr.string
+      ensure
+        $stderr = old
+      end
+    end
+
+    def self.jruby?
+      defined? RUBY_ENGINE and 'jruby' == RUBY_ENGINE
+    end
+
+    def self.rbx?
+      defined? RUBY_ENGINE and 'rbx' == RUBY_ENGINE
+    end
+
+    def self.ssl_mode?
+      ENV['SSL'] == 'yes'
+    end
+  end
+end
+

data/test/middleware/better_retry_test.rb

@@ -0,0 +1,57 @@
+# -*- encoding : utf-8 -*-
+require 'helper'
+
+module Middleware
+  class BeterRetryTest < Faraday::TestCase
+    def setup
+      @times_called = 0
+    end
+
+    def conn(retry_options = {})
+      Faraday.new do |b|
+        b.use Faraday::BetterRetry, retry_options
+        b.adapter :test do |stub|
+          stub.post('/unstable') {
+            @times_called += 1
+            @explode.call @times_called
+          }
+        end
+      end
+    end
+
+    def test_unhandled_error
+      @explode = lambda {|n| raise "boom!" }
+      assert_raise(RuntimeError) { conn.post("/unstable") }
+      assert_equal 1, @times_called
+    end
+
+    def test_handled_error
+      @explode = lambda {|n| raise Errno::ETIMEDOUT }
+      assert_raise(Errno::ETIMEDOUT) { conn.post("/unstable") }
+      assert_equal 3, @times_called
+    end
+
+    def test_new_max_retries
+      @explode = lambda {|n| raise Errno::ETIMEDOUT }
+      assert_raise(Errno::ETIMEDOUT) { conn(:max => 3).post("/unstable") }
+      assert_equal 4, @times_called
+    end
+
+    def test_interval
+      @explode = lambda {|n| raise Errno::ETIMEDOUT }
+      started  = Time.now
+      assert_raise(Errno::ETIMEDOUT) {
+        conn(:max => 2, :interval => 0.1).post("/unstable")
+      }
+      assert_in_delta 0.2, Time.now - started, 0.03
+    end
+
+    def test_custom_exceptions
+      @explode = lambda {|n| raise "boom!" }
+      assert_raise(RuntimeError) {
+        conn(:exceptions => StandardError).post("/unstable")
+      }
+      assert_equal 3, @times_called
+    end
+  end
+end

data/test/middleware/extend_parse_json_test.rb

@@ -0,0 +1,55 @@
+# -*- encoding : utf-8 -*-
+require 'helper'
+
+module Middleware
+  class ExtedParseJsonTest < Faraday::TestCase
+
+    def conn(retry_options = {})
+      Faraday.new do |b|
+        b.use Faraday::ExtendedParseJson
+        b.adapter :test do |stub|
+          stub.get('/invalid_json')     { [200, {}, 'something'] }
+          stub.get('/valid_json')       { [200, {}, {'var' => 1}.to_json] }
+          stub.get('/parse_error_code') { [403, {}, {'code' => Parse::Protocol::ERROR_INTERNAL}.to_json] }
+          stub.get('/empty_response')   { [403, {}, ''] }
+          stub.get('/404')              { [404, {}, {}.to_json] }
+          stub.get('/500')              { [500, {}, {'text' => 'Internal Server Error'}.to_json] }
+        end
+      end
+    end
+
+    def test_invalid_json
+      assert_raise(Faraday::Error::ParsingError) { conn.get("/invalid_json") }
+    end
+
+    def test_valid_json
+      resp = conn.get("/valid_json")
+      assert_equal 200, resp.status
+      assert_equal ({'var' => 1}), resp.body
+    end
+
+    def test_empty_response
+      ex = assert_raise(Parse::ParseProtocolError) { conn.get("/empty_response") }
+      assert_match /403/, ex.to_s
+      assert_equal "HTTP Status 403 Body ", ex.error
+    end
+
+    def test_parse_error_code
+      ex = assert_raise(Parse::ParseProtocolError) { conn.get("/parse_error_code") }
+      assert_match /403/, ex.to_s
+      assert_equal Parse::Protocol::ERROR_INTERNAL, ex.code
+    end
+
+    def test_404
+      ex = assert_raise(Parse::ParseProtocolError) { conn.get("/404") }
+      assert_match /404/, ex.to_s
+    end
+
+    def test_500
+      ex = assert_raise(Parse::ParseProtocolError) { conn.get("/500") }
+      assert_match /500/, ex.to_s
+      assert_match /Internal Server Error/, ex.to_s
+    end
+
+  end
+end