fcm 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48d3208b5ed6d6f6428d43cc5fbe2d9181e84c1c4a8b28a6947657308bac989d
-  data.tar.gz: d808e663adaf6b963db7eadffab53ff3f9421af9a25aa5de652677b4259d7610
+  metadata.gz: 4dec8402da3cac0b69ca604ad13a371e4c57616cf4ce7fe9d501e08ff93a3322
+  data.tar.gz: d21ace2c8431e769b463cfc0d9c4995751e2fce9cdb73548b0160a558e5dacb1
 SHA512:
-  metadata.gz: 8cdd5cb73c5740dfddb78aef4e1c432121e44908cf09d5c285b13ab10ab79f6a653ca0f09eaa85ff43a532cc3f3e678cd8fa14fb6c327b5a7b32217ff61d45ce
-  data.tar.gz: af7a744e9e9c02a0ba64075788bcb71da12689007ee9fcdaa7d0d0c42968ea0b0f22e972f562b5b11f30d77a3b200d4e0d1ede3ca48b40325a4032e84abb3e26
+  metadata.gz: cacba1ce61e62b1d535f1f765fb2491eae84af3fac7a579949939c4f40e3a0572aec29956c21f0194ce409283e2ddd87dff7fd483a01116cd8636579133b8197
+  data.tar.gz: 78353f02fbdb092e01bc634e7371c57341b168ff65363382b2c6948596aedcf2fa6a39dc82ba06f853357671f10d0578f49af0d0f0158c760da06ee10d806f33

data/.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: Tests
+
+on:
+  pull_request:
+    branches:
+      - '*'
+  push:
+    branches:
+      - master
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.7', '3.0', '3.1']
+
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: default
+          bundler-cache: true
+
+      - name: Run tests
+        run: |
+          bundle exec rspec

data/README.md

@@ -1,6 +1,6 @@
 # Firebase Cloud Messaging (FCM) for Android and iOS
 
-[![Gem Version](https://badge.fury.io/rb/fcm.svg)](http://badge.fury.io/rb/fcm) [![Build Status](https://secure.travis-ci.org/decision-labs/fcm.svg?branch=master)](http://travis-ci.org/decision-labs/fcm)
+[![Gem Version](https://badge.fury.io/rb/fcm.svg)](http://badge.fury.io/rb/fcm) [![Build Status](https://github.com/decision-labs/fcm/workflows/Tests/badge.svg)](https://github.com/decision-labs/fcm/actions)
 
 The FCM gem lets your ruby backend send notifications to Android and iOS devices via [
 Firebase Cloud Messaging](https://firebase.google.com/docs/cloud-messaging/).
@@ -210,9 +210,17 @@ The guide to set up an iOS app to get notifications is here: [Setting up a FCM C
 
 ## ChangeLog
 
+### 1.0.7
+
+- Fix passing `DEFAULT_TIMEOUT` to `faraday` [#96](https://github.com/decision-labs/fcm/pull/96)
+- Fix issue with `get_instance_id_info` option params [#98](https://github.com/decision-labs/fcm/pull/98)
+- Accept any IO object for credentials [#95](https://github.com/decision-labs/fcm/pull/94)
+
+Huge thanks to @excid3 @jsparling @jensljungblad
+
 ### 1.0.3
 
-- Fix overly strict faraday depenecy
+- Fix overly strict faraday dependency
 
 ### 1.0.2
 
@@ -232,6 +240,7 @@ The guide to set up an iOS app to get notifications is here: [Setting up a FCM C
 - Fixed group messaging url.
 - Added API to `recover_notification_key`.
 
+
 ### 0.0.1
 
 - Initial version.
@@ -250,7 +259,7 @@ Update version in `fcm.gemspec` with `VERSION` and update `README.md` `## Change
 
 ```bash
 # set the version
-# VERSION="1.0.4"
+# VERSION="1.0.7"
 gem build fcm.gemspec
 git tag -a v${VERSION} -m "Releasing version v${VERSION}"
 git push origin --tags

data/fcm.gemspec

@@ -3,11 +3,11 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fcm"
-  s.version     = "1.0.6"
+  s.version     = "1.0.7"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Kashif Rasul", "Shoaib Burq"]
   s.email       = ["kashif@decision-labs.com", "shoaib@decision-labs.com"]
-  s.homepage    = "https://github.com/spacialdb/fcm"
+  s.homepage    = "https://github.com/decision-labs/fcm"
   s.summary     = %q{Reliably deliver messages and notifications via FCM}
   s.description = %q{fcm provides ruby bindings to Firebase Cloud Messaging (FCM) a cross-platform messaging solution that lets you reliably deliver messages and notifications at no cost to Android, iOS or Web browsers.}
   s.license     = "MIT"

data/lib/fcm.rb

@@ -188,9 +188,7 @@ class FCM
   end
 
   def get_instance_id_info(iid_token, options = {})
-    params = {
-      query: options,
-    }
+    params = options
 
     for_uri(INSTANCE_ID_API) do |connection|
       response = connection.get("/iid/info/" + iid_token, params)
@@ -224,7 +222,10 @@ class FCM
   private
 
   def for_uri(uri, extra_headers = {})
-    connection = ::Faraday.new(:url => uri) do |faraday|
+    connection = ::Faraday.new(
+      url: uri,
+      request: { timeout: DEFAULT_TIMEOUT }
+    ) do |faraday|
       faraday.adapter Faraday.default_adapter
       faraday.headers["Content-Type"] = "application/json"
       faraday.headers["Authorization"] = "key=#{api_key}"
@@ -320,10 +321,18 @@ class FCM
   def jwt_token
     scope = "https://www.googleapis.com/auth/firebase.messaging"
     authorizer = Google::Auth::ServiceAccountCredentials.make_creds(
-      json_key_io: File.open(@json_key_path),
+      json_key_io: json_key,
       scope: scope,
     )
     token = authorizer.fetch_access_token!
     token["access_token"]
   end
+
+  def json_key
+    @json_key ||= if @json_key_path.respond_to?(:read)
+                    @json_key_path
+                  else
+                    File.open(@json_key_path)
+                  end
+  end
 end

data/spec/fcm_spec.rb

@@ -498,4 +498,50 @@ describe FCM do
   describe "subscribing to a topic" do
     # TODO
   end
+
+  describe 'getting instance info' do
+    subject(:get_info) { client.get_instance_id_info(registration_id, options) }
+
+    let(:options) { nil }
+    let(:client) { FCM.new('TEST_SERVER_KEY') }
+    let(:base_uri) { "#{FCM::INSTANCE_ID_API}/iid/info" }
+    let(:uri) { "#{base_uri}/#{registration_id}" }
+    let(:mock_request_attributes) do
+      { headers: {
+        'Authorization' => 'key=TEST_SERVER_KEY',
+        'Content-Type' => 'application/json'
+      } }
+    end
+
+    context 'without options' do
+      it 'calls info endpoint' do
+        endpoint = stub_request(:get, uri).with(mock_request_attributes)
+        get_info
+        expect(endpoint).to have_been_requested
+      end
+    end
+
+    context 'with detail option' do
+      let(:uri) { "#{base_uri}/#{registration_id}?details=true" }
+      let(:options) { { details: true } }
+
+      it 'calls info endpoint' do
+        endpoint = stub_request(:get, uri).with(mock_request_attributes)
+        get_info
+        expect(endpoint).to have_been_requested
+      end
+    end
+  end
+
+  describe "credentials path" do
+    it "can be a path to a file" do
+      fcm = FCM.new("test", "README.md")
+      expect(fcm.__send__(:json_key).class).to eq(File)
+    end
+
+    it "can be an IO object" do
+      fcm = FCM.new("test", StringIO.new("hey"))
+      expect(fcm.__send__(:json_key).class).to eq(StringIO)
+    end
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fcm
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Kashif Rasul
 - Shoaib Burq
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -49,9 +49,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -60,11 +60,11 @@ files:
 - lib/fcm.rb
 - spec/fcm_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/spacialdb/fcm
+homepage: https://github.com/decision-labs/fcm
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -79,8 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Reliably deliver messages and notifications via FCM
 test_files:

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-rvm:
-  - 2.4.0
-  - 2.4.5
-  - 2.5.3
-  - 2.6.1
-  - 2.7.0