firebase-ruby 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 693b989e038daf52ac6f06a2a978614a3d0fee2b
-  data.tar.gz: 4c88d12f7167b180dc8cc5b7707a700e1e803f63
+  metadata.gz: 71129a24564dba1985fd02873accf5e6d3546d5e
+  data.tar.gz: 5e7ce2fcef94d65b4c841baaa19c4d5a504db055
 SHA512:
-  metadata.gz: 8a8319b29c0b88f9640d86604fae62bec3a323a243f40caf4a0c32b56db2f5d6914945ed0d3ed80367a5a751cf98565367679cbe55118ffe3680f54c63687b4f
-  data.tar.gz: 75677e5b82c80ebf6302abf25a995ba7126c3af2f467db9a59f6605b288bb1434fd9e325b1cd68e61ce66a64acda1fed70e879586a2c2f95f46d86a0615ee93d
+  metadata.gz: 1ef0c98f6394aaaaf885addb150fa0487c8961180288cef0938f908908797679c34ffa14a5d496e299eaf3f8ef7e3bc499c8c945b285ebb45bd4e163898ee2b8
+  data.tar.gz: ec53da00cec351a3b6b7f1ade123a1b2b22cf45712c06d6036c2cbb072e46d1ad4caa2e68ab620fb6cce8474e7f740f7c2d6a302d596fe8db60ba81f991c2f91

data/bin/fbrb

@@ -33,7 +33,7 @@ path ||= ARGV.shift
 Trollop::die :path, "is missing" if path.nil?
 
 db = Firebase::Database.new()
-db.set_auth_with_keyfile(opts[:key])
+db.set_auth_with_key(path: opts[:key])
 
 method = opts[:request].downcase.to_sym
 

data/lib/firebase-ruby/auth.rb

@@ -15,8 +15,13 @@ module Firebase
     attr_reader :access_token
     attr_reader :expires
 
-    def initialize(path)
-      load_privatekeyfile(path)
+    # Creates Firebase OAuth based auth object; one argument must be specified
+    def initialize(json: nil, path: nil)
+      if json
+        load_privatekeyjson(json)
+      elsif path
+        load_privatekeyfile(path)
+      end
     end
 
     # Return a valid access token; it will retrieve a new token if necessary
@@ -40,15 +45,21 @@ module Firebase
 
     private
 
-    # @param path [String] JSON file with private key
-    def load_privatekeyfile(path)
-      raise ArgumentError, 'private key file path missing' unless path
-      Firebase.logger.debug("Loading private key file: #{path}")
-      cred = JSON.parse(IO.read(path), {symbolize_names: true})
+    # @param json [String] JSON with private key
+    def load_privatekeyjson(json)
+      raise ArgumentError, 'private key JSON missing' unless json
+      cred = JSON.parse(json, {symbolize_names: true})
       @private_key = cred[:private_key]
       @project_id = cred[:project_id]
       @client_email = cred[:client_email]
-      Firebase.logger.info('Auth.load_privatekeyfile done.')
+      Firebase.logger.info('Private key loaded from JSON')
+    end
+
+    # @param path [String] path to JSON file with private key
+    def load_privatekeyfile(path)
+      raise ArgumentError, 'private key file path missing' unless path
+      Firebase.logger.debug("Loading private key file: #{path}")
+      load_privatekeyjson(IO.read(path))
     end
 
     # Request new token from Google

data/lib/firebase-ruby/database.rb

@@ -9,8 +9,8 @@ module Firebase
     def initialize()
     end
 
-    def set_auth_with_keyfile(filepath)
-      @auth = Auth.new(filepath)
+    def set_auth_with_key(json: nil, path: nil)
+      @auth = Auth.new(json: json, path: path)
     end
 
     def project_id=(id)

data/lib/firebase-ruby/http.rb

@@ -73,9 +73,8 @@ module Firebase
         if params
           query = URI.encode_www_form(params)
           Firebase.logger.info('Created urlencoded query from params')
-        else
-          uri.query = query
         end
+        uri.query = query
         req = METHOD_HTTP_CLASS[method].new(uri)
       when :put, :patch, :post
         uri.query = query if query

data/lib/firebase-ruby/version.rb

@@ -1,5 +1,5 @@
 module Firebase
 
-  Version = '0.0.2'
+  Version = '0.1.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firebase-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Ken J.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-08-05 00:00:00.000000000 Z
 dependencies: []
 description: Firebase REST library written in pure Ruby without external dependancy.
 email: