parse-stack 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0267822a7e96425e847f7218ad98a11115b511b4'
-  data.tar.gz: 5f942b6458ba0f0de2f5e9657fe9e135ea46fcc7
+  metadata.gz: 9eafb62ac7cb6896948ce8f820df6972b054a901
+  data.tar.gz: 1ed13fb80a1efb0ccece5f3dc905aec0af11244e
 SHA512:
-  metadata.gz: 7978c0a43c5f46217e7fcc3f0ff600c548571f9094f91b7716bf8ce8881e47edd49bc579d803853213c2890ee3e1f8aec6b23453f9f396b17bedfae7b173f9fa
-  data.tar.gz: 3a29aac5e5c251424023426498cd4e98a6751189e752a932f011becfb3f1f1806e1988088c97e4f21b7d1b2bd235d32e5bd912478da45919928439b20dd33c0e
+  metadata.gz: e7c98a274cba051812c56d61fa260fee596021f9386819745a05a9d7b3f55ee64e6445c53d8b23ad0c7f26664d27193febb1b46c4511212224db4e0d2408c170
+  data.tar.gz: ef6bbde1f02b58e2e48a56fbd6fb73b332822f5b69c019c27351a50343a1d563ac7cd2671558da707881e59850edd59f27edfc43be23728fe6ad52ccaa3504fc

data/Changes.md

@@ -1,5 +1,10 @@
 ## Parse-Stack Changelog
 
+### 1.7.3
+- CHANGED: Moved to using preferred ENV variable names based on parse-server cli.
+- CHANGED: Default url is now http://localhost:1337/parse
+- NEW: Added method `hyperdrive_config!` to apply remote ENV from remote JSON url.
+
 ### 1.7.2
 - NEW: `Parse::Model.autosave_on_create` has been removed in favor of `first_or_create!`.
 - NEW: Webhook Triggers and Functions now have a `wlog` method, similar to `puts`, but allows easier tracing of

data/Gemfile

@@ -12,7 +12,7 @@ group :test, :development do
   gem 'pry'
   gem 'pry-stack_explorer'
   gem 'pry-nav'
-  gem 'yard'
+  gem 'yard', '>= 0.9.11'
   gem 'redcarpet'
   gem 'thin' # for yard server
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parse-stack (1.7.2)
+    parse-stack (1.7.3)
       active_model_serializers (>= 0.9, < 1)
       activemodel (>= 4.2.1, < 6)
       activesupport (>= 4.2.1, < 6)
@@ -14,60 +14,63 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.1.2)
-      actionview (= 5.1.2)
-      activesupport (= 5.1.2)
+    actionpack (5.1.5)
+      actionview (= 5.1.5)
+      activesupport (= 5.1.5)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.2)
-      activesupport (= 5.1.2)
+    actionview (5.1.5)
+      activesupport (= 5.1.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.10.6)
+    active_model_serializers (0.10.7)
       actionpack (>= 4.1, < 6)
       activemodel (>= 4.1, < 6)
       case_transform (>= 0.2)
-      jsonapi-renderer (>= 0.1.1.beta1, < 0.2)
-    activemodel (5.1.2)
-      activesupport (= 5.1.2)
-    activesupport (5.1.2)
+      jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
+    activemodel (5.1.5)
+      activesupport (= 5.1.5)
+    activesupport (5.1.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (9.0.6)
+    byebug (10.0.0)
     case_transform (0.2)
       activesupport
-    coderay (1.1.1)
+    coderay (1.1.2)
     concurrent-ruby (1.0.5)
-    daemons (1.2.4)
+    crass (1.0.3)
+    daemons (1.2.6)
     debug_inspector (0.0.3)
     dotenv (2.2.1)
-    erubi (1.6.1)
-    eventmachine (1.2.3)
-    faraday (0.12.1)
+    erubi (1.7.0)
+    eventmachine (1.2.5)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.11.0.1)
+    faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    i18n (0.8.6)
-    jsonapi-renderer (0.1.3)
-    loofah (2.0.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jsonapi-renderer (0.2.0)
+    loofah (2.2.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (0.8.2)
-    mini_portile2 (2.2.0)
-    minitest (5.10.2)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
     moneta (1.0.0)
     multipart-post (2.0.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    parallel (1.11.2)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    parallel (1.12.1)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -77,26 +80,26 @@ GEM
     pry-stack_explorer (0.4.9.2)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
+    rack (2.0.4)
+    rack-test (0.8.3)
+      rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rake (12.0.0)
+    rake (12.3.0)
     redcarpet (3.4.0)
-    redis (3.3.3)
+    redis (4.0.1)
     slop (3.6.0)
-    thin (1.7.1)
+    thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    yard (0.9.9)
+    yard (0.9.12)
 
 PLATFORMS
   ruby
@@ -113,7 +116,7 @@ DEPENDENCIES
   redcarpet
   redis
   thin
-  yard
+  yard (>= 0.9.11)
 
 BUNDLED WITH
-   1.15.1
+   1.16.1

data/README.md

@@ -299,7 +299,7 @@ To connect to a Parse server, you will need a minimum of an `application_id`, an
   Parse.setup app_id: "YOUR_APP_ID",
               api_key: "YOUR_API_KEY",
               master_key: "YOUR_MASTER_KEY", # optional
-              server_url: 'https://api.parse.com/1/' #default
+              server_url: 'https://localhost:1337/parse' #default
 ```
 
 If you wish to add additional connection middleware to the stack, you may do so by utilizing passing a block to the setup method.
@@ -324,16 +324,16 @@ Calling `setup` will create the default `Parse::Client` session object that will
 There are additional connection options that you may pass the setup method when creating a `Parse::Client`.
 
 #### `:server_url`
-The server url of your Parse Server if you are not using the hosted Parse service. By default it will use `PARSE_SERVER_URL` environment variable available or fall back to `https://api.parse.com/1/` if not specified.
+The server url of your Parse Server if you are not using the hosted Parse service. By default it will use `PARSE_SERVER_URL` environment variable available or fall back to `https://localhost:1337/parse` if not specified.
 
 #### `:app_id`
-The Parse application id. By default it will use `PARSE_APP_ID` environment variable if not specified.
+The Parse application id. By default it will use `PARSE_SERVER_APPLICATION_ID` environment variable if not specified.
 
 #### `:api_key`
-The Parse REST API Key. By default it will use `PARSE_API_KEY` environment variable if not specified.
+The Parse REST API Key. By default it will use `PARSE_SERVER_REST_API_KEY` environment variable if not specified.
 
 #### `:master_key` _(optional)_
-The Parse application master key. If this key is set, it will be sent on every request sent by the client and your models. By default it will use `PARSE_MASTER_KEY` environment variable if not specified.
+The Parse application master key. If this key is set, it will be sent on every request sent by the client and your models. By default it will use `PARSE_SERVER_MASTER_KEY` environment variable if not specified.
 
 #### `:logging`
 A true or false value. It provides you additional logging information of requests and responses. If set to the special symbol of `:debug`, it will provide additional payload data in the log messages.
@@ -2384,7 +2384,7 @@ curl -X POST \
   -H "X-Parse-REST-API-Key: ${REST_API_KEY}" \
   -H "Content-Type: application/json" \
   -d '{}' \
-  https://api.parse.com/1/functions/helloWorld
+  https://localhost:1337/parse/functions/helloWorld
 ```
 
 If you are creating `Parse::Object` subclasses, you may also register them there to keep common code and functionality centralized.

data/bin/parse-console

@@ -79,9 +79,9 @@ opt_parser = OptionParser.new do |o|
       raise "Contents not a JSON hash." unless json.is_a?(Hash)
       json.each { |k,v| ENV[k.upcase] = v }
       opts[:server_url] ||= ENV['PARSE_SERVER_URL']
-      opts[:app_id] ||= ENV['PARSE_APP_ID'] || ENV['PARSE_APPLICATION_ID']
-      opts[:api_key] ||= ENV['PARSE_REST_API_KEY'] || ENV['PARSE_API_KEY']
-      opts[:master_key] ||= ENV['PARSE_MASTER_KEY']
+      opts[:app_id]     ||= ENV['PARSE_SERVER_APPLICATION_ID'] || ENV['PARSE_APP_ID']
+      opts[:api_key]    ||= ENV['PARSE_SERVER_REST_API_KEY']   || ENV['PARSE_API_KEY']
+      opts[:master_key] ||= ENV['PARSE_SERVER_MASTER_KEY']     || ENV['PARSE_MASTER_KEY']
     rescue Exception => e
       $stderr.puts "Error: Invalid JSON format for #{url} (#{e})"
       exit 1

data/lib/parse/client.rb

@@ -185,7 +185,7 @@ module Parse
       #   Parse.setup app_id: "YOUR_APP_ID",
       #               api_key: "YOUR_REST_API_KEY",
       #               master_key: "YOUR_MASTER_KEY", # optional
-      #               server_url: 'https://api.parse.com/1/' #default
+      #               server_url: 'https://localhost:1337/parse' #default
       # @param opts (see Parse::Client#initialize)
       # @option opts (see Parse::Client#initialize)
       # @yield the block for additional configuration with Faraday middleware.
@@ -206,11 +206,11 @@ module Parse
     #   are not using the hosted Parse service. By default it will use
     #   ENV["PARSE_SERVER_URL"] if available, otherwise fallback to {Parse::Protocol::SERVER_URL}.
     # @option opts [String] :app_id The Parse application id. Defaults to
-    #    ENV['PARSE_APP_ID'] or ENV['PARSE_APPLICATION_ID'].
-    # @option opts [String] :api_key Your Parse REST API Key. Defaults to ENV['PARSE_REST_API_KEY'].
+    #    ENV['PARSE_SERVER_APPLICATION_ID'].
+    # @option opts [String] :api_key Your Parse REST API Key. Defaults to ENV['PARSE_SERVER_REST_API_KEY'].
     # @option opts [String] :master_key The Parse application master key (optional).
     #    If this key is set, it will be sent on every request sent by the client
-    #    and your models. Defaults to ENV['PARSE_MASTER_KEY'].
+    #    and your models. Defaults to ENV['PARSE_SERVER_MASTER_KEY'].
     # @option opts [Boolean] :logging It provides you additional logging information
     #    of requests and responses. If set to the special symbol of *:debug*, it
     #    will provide additional payload data in the log messages. This option affects
@@ -242,9 +242,9 @@ module Parse
     # @see Parse::Protocol
     def initialize(opts = {})
       @server_url     = opts[:server_url] || ENV["PARSE_SERVER_URL"] || Parse::Protocol::SERVER_URL
-      @application_id = opts[:application_id] || opts[:app_id] || ENV["PARSE_APP_ID"] || ENV['PARSE_APPLICATION_ID']
-      @api_key        = opts[:api_key] || opts[:rest_api_key]  || ENV["PARSE_REST_API_KEY"] || ENV["PARSE_API_KEY"]
-      @master_key     = opts[:master_key] || ENV["PARSE_MASTER_KEY"]
+      @application_id = opts[:application_id] || opts[:app_id] || ENV["PARSE_SERVER_APPLICATION_ID"] || ENV['PARSE_APP_ID']
+      @api_key        = opts[:api_key] || opts[:rest_api_key]  || ENV["PARSE_SERVER_REST_API_KEY"] || ENV["PARSE_API_KEY"]
+      @master_key     = opts[:master_key] || ENV['PARSE_SERVER_MASTER_KEY'] || ENV["PARSE_MASTER_KEY"]
       opts[:adapter] ||= Faraday.default_adapter
       opts[:expires] ||= 3
       if @server_url.nil? || @application_id.nil? || ( @api_key.nil? && @master_key.nil? )

data/lib/parse/stack.rb

@@ -11,7 +11,29 @@ require_relative 'webhooks'
 module Parse
   class Error < StandardError; end;
   module Stack
-
+    # Applies a remote JSON hash containing the ENV keys and values from a remote
+    # URL. Values from the JSON hash are only applied to the current ENV hash ONLY if
+    # it does not already have a value. Therefore local ENV values will take precedence
+    # over remote ones. By default, it uses the url in environment value in 'CONFIG_URL' or 'HYPERDRIVE_URL'.
+    # @param url [String] the remote url that responds with the JSON body.
+    # @return [Boolean] true if the JSON hash was found and applied successfully.
+    def self.hyperdrive_config!(url = nil)
+      url ||= ENV["HYPERDRIVE_URL"] || ENV['CONFIG_URL']
+      if url.present?
+        begin
+          remote_config = JSON.load open( url )
+          remote_config.each do |key,value|
+            k = key.upcase
+            next unless ENV[k].nil?
+            ENV[k] ||= value.to_s
+          end
+          return true
+        rescue => e
+          warn "[Parse::Stack] Error loading config: #{url} (#{e})"
+        end
+      end
+      false
+    end
   end
 end
 

data/lib/parse/stack/generators/templates/parse.rb

@@ -2,10 +2,10 @@ require 'parse/stack'
 
 # Set your specific Parse keys in your ENV. For all connection options, see
 # https://github.com/modernistik/parse-stack#connection-setup
-Parse.setup app_id: ENV['PARSE_APP_ID'],
-           api_key: ENV['PARSE_API_KEY'],
-        master_key: ENV['PARSE_MASTER_KEY'],
-        server_url: 'https://api.parse.com/1/'
+Parse.setup app_id: ENV['PARSE_SERVER_APPLICATION_ID'],
+           api_key: ENV['PARSE_SERVER_REST_API_KEY'],
+        master_key: ENV['PARSE_SERVER_MASTER_KEY'], # optional
+        server_url: 'https://localhost:1337/parse'
         # optional
         #    logging: false,
         #      cache: Moneta.new(:File, dir: 'tmp/cache'),

data/lib/parse/stack/version.rb

@@ -6,6 +6,6 @@ module Parse
   # The Parse Server SDK for Ruby
   module Stack
     # The current version.
-    VERSION = "1.7.2"
+    VERSION = "1.7.3"
   end
 end

data/lib/parse/webhooks.rb

@@ -216,11 +216,11 @@ module Parse
 
       # @!attribute key
       # Returns the configured webhook key if available. By default it will use
-      # the value of ENV['PARSE_WEBHOOK_KEY'] if not configured.
+      # the value of ENV['PARSE_SERVER_WEBHOOK_KEY'] if not configured.
       # @return [String]
       attr_accessor :key
       def key
-        @key ||= ENV['PARSE_WEBHOOK_KEY']
+        @key ||= ENV['PARSE_SERVER_WEBHOOK_KEY'] || ENV['PARSE_WEBHOOK_KEY']
       end
 
       # Standard Rack call method. This method processes an incoming cloud code

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parse-stack
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Anthony Persaud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Parse Server Ruby Client SDK