parse-stack 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51e6999d35378d6ca78b0fa9dee414a514399bcf
-  data.tar.gz: 69d850f4bcc6dd881ddefe78046b9e28f029eb01
+  metadata.gz: 7b2f443ea3100a01208cc85a71fdc0b6ec2724c0
+  data.tar.gz: 253a1845c48fe6a9ffbdd728660efbab38bea5a1
 SHA512:
-  metadata.gz: 73838aeea4e18427b0d8ba59dec9dd540f1a2c1f21b12fa53d44902a2027d1d83d79fde141752cb3a41f3fc29d8f713b92d2b2f2f3ef5a1ceca658b095e79a56
-  data.tar.gz: c54006ff84b0caaea0c6a31732d666cb52a93de78fc6d5ceb9800cc9f0d0ee9c8edaf5b8c94f80483e0b6b893cec03e53eb0740d60cf4a5310f6b890e9e279b3
+  metadata.gz: e083d6466f4dc40f2d207c192966027f6a0adf8e928183f129c6be81d569c6ed51a9eb4b5ff4e909ba46465d74fa818bd24025a52ef756c1b14e0235986d40d5
+  data.tar.gz: cfc551f79913f5fe87f29e642fcf22bdd51652b2b15db71650cd3727b0e62103e767e29e128b246dea5b5b4febd9eb28cff4e3ff639ec7e2441ae25928b936c9

data/Changes.md

@@ -1,5 +1,11 @@
 # Parse-Stack Changes
 
+1.0.4
+-----------
+- Fixes minor issue when storing and retrieving objects from the cache.
+- Support for providing :server_url as a connection option for those migrating hosting
+  their own parse-server.
+  
 1.0.3
 -----------
 - Fixes minor issue when passing `nil` to the class `find` method.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parse-stack (1.0.3)
+    parse-stack (1.0.4)
       active_model_serializers (>= 0.9, < 1)
       activemodel (>= 4, < 5)
       activesupport (>= 4, < 5)

data/README.md

@@ -86,6 +86,7 @@ Parse::Stack is a full stack framework that utilizes several ideas behind [DataM
 require 'parse/stack'
 
 Parse.setup application_id: APP_ID, api_key: REST_API_KEY
+# you may pass `server_url` as an option. Defaults to `https://api.parse.com/1/`
 
 # Object Mapper
 class Song < Parse::Object
@@ -99,9 +100,6 @@ class Song < Parse::Object
   has_many :likes, as: :user, through: :relation
 end
 
-# Optional schema updates (requires master key)
-Song.auto_upgrade!
-
 artist = Artist.first(:name.like => /Sinatra/, :genres.in => ['swing'])
 
 song = Song.new name: "Fly Me to the Moon"

data/lib/parse/api/analytics.rb

@@ -7,7 +7,7 @@ module Parse
     module Analytics
 
       def send_analytics(event_name, data = {})
-        request :post, "/1/events/#{event_name}", body: data
+        request :post, "events/#{event_name}", body: data
       end
 
     end

data/lib/parse/api/apps.rb

@@ -9,25 +9,25 @@ module Parse
       def fetch_app_keys(appid, email, password)
         headers = {}
         headers.merge!( { 'X-Parse-Email' => email, 'X-Parse-Password' => password } )
-        request :get, "/1/apps/#{appid}", headers: headers
+        request :get, "apps/#{appid}", headers: headers
       end
 
       def fetch_apps(email, password)
         headers = {}
         headers.merge!( { 'X-Parse-Email' => email, 'X-Parse-Password' => password } )
-        request :get, "/1/apps", headers: headers
+        request :get, "apps", headers: headers
       end
 
       def create_app(opts, email, password)
         headers = {}
         headers.merge!( { 'X-Parse-Email' => email, 'X-Parse-Password' => password } )
-        request :post, "/1/apps", body: opts, headers: headers
+        request :post, "apps", body: opts, headers: headers
       end
 
       def update_app(appid, opts, email, password)
         headers = {}
         headers.merge!( { 'X-Parse-Email' => email, 'X-Parse-Password' => password } )
-        request :put, "/1/apps/#{appid}", body: opts, headers: headers
+        request :put, "apps/#{appid}", body: opts, headers: headers
       end
 
 

data/lib/parse/api/batch.rb

@@ -47,7 +47,7 @@ module Parse
   end
 
   class BatchOperation
-    MAX_REQ_SEC = 30
+    MAX_REQ_SEC = 40
 
     attr_accessor :requests, :responses
     include Enumerable
@@ -139,7 +139,7 @@ module Parse
         unless batch_operations.is_a?(Parse::BatchOperation)
           batch_operations = Parse::BatchOperation.new batch_operations
         end
-        response = request(:post, "/1/batch", body: batch_operations.as_json)
+        response = request(:post, "batch", body: batch_operations.as_json)
         response.success? && response.batch? ? response.batch_responses : response
       end
 

data/lib/parse/api/cloud_functions.rb

@@ -5,11 +5,11 @@ module Parse
     module CloudFunctions
 
       def call_function(name, body = {})
-        request :post, "/1/functions/#{name}", body: body
+        request :post, "functions/#{name}", body: body
       end
 
       def trigger_job(name, body = {})
-        request :post, "/1/jobs/#{name}", body: body
+        request :post, "jobs/#{name}", body: body
       end
 
     end

data/lib/parse/api/config.rb

@@ -8,7 +8,7 @@ module Parse
 
       def config
         if @config.nil?
-          response = request :get, "/1/config".freeze
+          response = request :get, "config"
           unless response.error?
             @config = response.result["params"]
           end

data/lib/parse/api/files.rb

@@ -9,7 +9,7 @@ module Parse
       def create_file(fileName, data = {}, content_type = nil)
         headers = {}
         headers.merge!( { Parse::Protocol::CONTENT_TYPE => content_type.to_s } ) if content_type.present?
-        response = request :post, "/1/files/#{fileName}", body: data, headers: headers
+        response = request :post, "files/#{fileName}", body: data, headers: headers
         response.parse_class = "_File".freeze
         response
       end

data/lib/parse/api/hooks.rb

@@ -6,7 +6,7 @@ module Parse
 
   module API
     module Hooks
-      HOOKS_PREFIX = "/1/hooks/".freeze
+      HOOKS_PREFIX = "hooks/".freeze
       TRIGGER_NAMES = [:beforeSave, :afterSave, :beforeDelete, :afterDelete].freeze
       def _verify_trigger(triggerName)
         triggerName = triggerName.to_s.camelize(:lower).to_sym

data/lib/parse/api/objects.rb

@@ -5,7 +5,7 @@ module Parse
     #object fetch methods
     module Objects
 
-      CLASS_PATH_PREFIX = "/1/classes/".freeze
+      CLASS_PATH_PREFIX = "classes/".freeze
       PREFIX_MAP = { installation: "installations", _installation: "installations",
         user: "users", _user: "users",
         role: "roles", _role: "roles",
@@ -25,7 +25,7 @@ module Parse
           uri = "#{CLASS_PATH_PREFIX}#{className}"
           class_prefix = className.downcase.to_sym
           if PREFIX_MAP.has_key?(class_prefix)
-            uri = "/1/#{PREFIX_MAP[class_prefix]}/"
+            uri = "#{PREFIX_MAP[class_prefix]}/"
           end
           id.present? ? "#{uri}/#{id}" : uri
         end

data/lib/parse/api/push.rb

@@ -6,7 +6,7 @@ module Parse
     module Push
 
       def push(payload = {})
-        request :post, "/1/push".freeze, body: payload.as_json
+        request :post, "push".freeze, body: payload.as_json
       end
 
     end

data/lib/parse/api/schemas.rb

@@ -5,7 +5,7 @@ module Parse
   module API
     #object fetch methods
     module Schema
-      SCHEMA_PREFIX = "/1/schemas/".freeze
+      SCHEMA_PREFIX = "schemas/".freeze
       def schema(className)
         request :get, "#{SCHEMA_PREFIX}#{className}"
       end

data/lib/parse/api/users.rb

@@ -6,7 +6,7 @@ module Parse
     module Users
       # Note that Parse::Objects mainly use the objects.rb API since we can
       # detect class names to proper URI handlers
-      USER_PATH_PREFIX = "/1/users".freeze
+      USER_PATH_PREFIX = "users".freeze
       USER_CLASS = "_User".freeze
       def fetch_user(id)
         request :get, "#{USER_PATH_PREFIX}/#{id}"

data/lib/parse/client.rb

@@ -26,7 +26,7 @@ module Parse
     include Parse::API::Schema
 
     attr_accessor :session, :cache
-    attr_reader :application_id, :api_key, :master_key, :version, :host
+    attr_reader :application_id, :api_key, :master_key, :server_url
     # The client can support multiple sessions. The first session created, will be placed
     # under the default session tag. The :default session will be the default client to be used
     # by the other classes including Parse::Query and Parse::Objects
@@ -59,10 +59,9 @@ module Parse
     # :cache - Moneta::Transformer - if set, it should be a Moneta store instance
     # :expires - Integer - if set, it should be a Moneta store instance
     # :adapter - the HTTP adapter to use with Faraday, defaults to Faraday.default_adapter
-    # :host - defaults to Parse::Protocol::Host (api.parse.com)
+    # :host - defaults to Parse::Protocol::SERVER_URL (https://api.parse.com/1/)
     def initialize(opts = {})
-      @host           = Parse::Protocol::HOST
-      @version        = 1
+      @server_url     = opts[:server_url] || ENV["PARSE_SERVER_URL"] || Parse::Protocol::SERVER_URL
       @application_id = opts[:application_id] || ENV["PARSE_APP_ID"]
       @api_key        = opts[:api_key] || ENV["PARSE_API_KEY"]
       @master_key     = opts[:master_key] || ENV["PARSE_MASTER_KEY"]
@@ -71,9 +70,11 @@ module Parse
       if @application_id.nil? || ( @api_key.nil? && @master_key.nil? )
         raise "Please call Parse.setup(application_id:, api_key:) to setup a session"
       end
-      @version_prefix = "/1/".freeze
+      @server_url += '/' unless @server_url.ends_with?('/')
       #Configure Faraday
-      @session = Faraday.new("https://#{@host}", opts[:faraday]) do |conn|
+      opts[:faraday] ||= {}
+      opts[:faraday].merge!(:url => @server_url)
+      @session = Faraday.new(opts[:faraday]) do |conn|
         #conn.request :json
 
         conn.response :logger if opts[:logging]
@@ -138,11 +139,10 @@ module Parse
       # http method
       method = method.downcase.to_sym
       # set the User-Agent
-      headers["User-Agent".freeze] = "Parse-Ruby-Mapper v#{Parse::Stack::VERSION}".freeze
+      headers["User-Agent"] = "Parse-Ruby-Client v#{Parse::Stack::VERSION}"
       #if it is a :get request, then use query params, otherwise body.
       params = (method == :get ? query : body) || {}
       # if the path does not start with the '/1/' prefix, then add it to be nice.
-      uri.replace(@version_prefix + uri) unless uri.start_with?(@version_prefix)
       # actually send the request and return the body
       @session.send(method, uri, params, headers).body
     rescue Faraday::Error::ClientError => e

data/lib/parse/client/caching.rb

@@ -64,7 +64,8 @@ module Parse
           if method == :get && url.present? && @store.key?(url)
             puts("[Parse::Cache] >>> #{url}") if self.class.logging.present?
             response = Faraday::Response.new
-            body = @store[url].body
+            res_env = @store[url] # previous cached response
+            body = res_env.respond_to?(:body) ? res_env.body : nil
             if body.present?
               response.finish({status: 200, response_headers: {}, body: body })
               return response
@@ -77,12 +78,12 @@ module Parse
             # request for the same '/1/classes/Artist/<objectId>' where objectId are equivalent
             @store.delete url
           end
-        rescue Exception => e
+        rescue Errno::EINVAL, Redis::CannotConnectError => e
           # if the cache store fails to connect, catch the exception but proceed
           # with the regular request, but turn off caching for this request. It is possible
           # that the cache connection resumes at a later point, so this is temporary.
           cache_enabled = false
-          warn "[Parse::Cache Error] Cache store connection failed. #{e}"
+          warn "[Parse::Cache Error] #{e}"
         end
 
 

data/lib/parse/client/protocol.rb

@@ -4,6 +4,7 @@ module Parse
 
   module Protocol
       HOST          = "api.parse.com".freeze
+      SERVER_URL    = "https://api.parse.com/1/".freeze
       APP_ID        = 'X-Parse-Application-Id'.freeze
       API_KEY       = 'X-Parse-REST-API-Key'.freeze
       MASTER_KEY    = 'X-Parse-Master-Key'.freeze

data/lib/parse/stack/version.rb

@@ -1,5 +1,5 @@
 module Parse
   module Stack
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parse-stack
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Anthony Persaud
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel