Merge ca7e40d into a6e89cd

lib/parse/client.rb

@@ -164,13 +164,7 @@ def user(data)
   # Module methods
   # ------------------------------------------------------------
   class << self
-    # A singleton client for use by methods in Object.
-    # Always use Parse.client to retrieve the client object.
-    @client = nil
-
     # Factory to create instances of Client.
-    # This should be preferred over Parse.init which uses a singleton
-    # client object for all API calls.
     def create(data = {}, &blk)
       options = defaults = {
         application_id: ENV['PARSE_APPLICATION_ID'],
@@ -181,15 +175,7 @@ def create(data = {}, &blk)
 
       Client.new(options, &blk)
     end
-
-    # DEPRECATED: Please use create instead.
-    # 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 init(data = {}, &blk)
-      warn '[DEPRECATION] `init` is deprecated.  Please use `create` instead.'
-      @@client = create(data, &blk)
-    end
+    alias :init :create
 
     # A convenience method for using global.json
     def init_from_cloud_code(path = '../config/global.json', app_name = nil)
@@ -201,17 +187,6 @@ def init_from_cloud_code(path = '../config/global.json', app_name = nil)
       create(application_id: application_id, master_key: master_key)
     end
 
-    # Used mostly for testing. Lets you delete the api key global vars.
-    def destroy
-      @@client = nil
-      self
-    end
-
-    def client
-      raise ParseError, 'API not initialized' unless @@client
-      @@client
-    end
-
     # Perform a simple retrieval of a simple object, or all objects of a
     # given class. If object_id is supplied, a single object will be
     # retrieved. If object_id is not supplied, then all objects of the

lib/parse/error.rb

@@ -1,8 +1,6 @@
 # encoding: utf-8
 module Parse
-  # Base exception class for errors thrown by the Parse
-  # client library. ParseError will be raised by any
-  # network operation if Parse.init() has not been called.
+  # Base exception class for errors thrown by the Parse client library.
   class ParseError < StandardError
   end
 

lib/parse/object.rb

@@ -18,7 +18,7 @@ def initialize(class_name, data = nil, client = nil)
       @class_name = class_name
       @op_fields = {}
       parse data if data
-      @client = client || Parse.client
+      @client = client
     end
 
     def eql?(other)

test/test_client_create.rb

@@ -197,4 +197,16 @@ def test_get_method_override
     refute client.get_method_override
     refute client.session.builder.handlers.include? Faraday::GetMethodOverride
   end
+
+  def test_no_api_keys_error
+    skip('this is skipped in the meantime because env vars override everything')
+    VCR.use_cassette('test_no_api_keys_error') do
+      assert_raises(Parse::ParseError) do
+        client = Parse.create(master_key: nil, api_key: nil)
+        fake = client.object('shouldNeverExist')
+        fake['foo'] = 'bar'
+        fake.save
+      end
+    end
+  end
 end