notifiable-gcm-spacialdb 0.1.1 → 0.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +20 -9
  3. data/README.md +3 -2
  4. data/Rakefile +14 -0
  5. data/lib/notifiable/gcm/spacialdb/batch.rb +10 -2
  6. data/lib/notifiable/gcm/spacialdb/version.rb +1 -1
  7. data/notifiable-gcm-spacialdb.gemspec +8 -6
  8. data/spec/batch_spec.rb +22 -7
  9. data/spec/spec_helper.rb +3 -1
  10. metadata +54 -26
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 755e4da2a259bf32995820a1eef5769beb88cde9
4
- data.tar.gz: a9a72065e9c7936035bc4cb481866176d3463a97
3
+ metadata.gz: 321eec872b672eeabdae29174f48d355ed8d1dc3
4
+ data.tar.gz: f09d3babfdbea46a0e0cec0896134281d8f84192
5
5
  SHA512:
6
- metadata.gz: d3c2fac52a6ecd2e52622bb5e35863eb7a9c279606b5c238cf4ca0e4f6afc6f1ef74d6872e3f9b6606bd32b2415633e6ee0274e42c3268c50c2e9c57774ffa58
7
- data.tar.gz: 5719dc40fb7f2a8de78d914def4f2fc17b63b6e6f12407f61f7bde49fa06a8e75a23a799b77760986c8422b28ae0cac3fa76bb1312afdd90922a8799386ec6a9
6
+ metadata.gz: f0a8ef8ddc93615e7b4ef7a79afa96a201a2b64879869f443eccfed7a12e364c5b8ee75593504c059fca4205114deed5b7c4d3de5347dcf94c24a4ff8846e3a8
7
+ data.tar.gz: b9c6fcea9b8b34596842cf544dc9f59c5aadc1c7e78510fa38969a3aaac866d6da79c51f03e5feb96fc7c30909317b4a84413280c4837b35788bdaeade7d200c
data/Gemfile.lock CHANGED
@@ -1,8 +1,8 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- notifiable-gcm-spacialdb (0.1.1)
5
- gcm
4
+ notifiable-gcm-spacialdb (0.1.3)
5
+ gcm (~> 0.0.6)
6
6
  notifiable-rails
7
7
 
8
8
  GEM
@@ -32,14 +32,17 @@ GEM
32
32
  multi_json (~> 1.3)
33
33
  thread_safe (~> 0.1)
34
34
  tzinfo (~> 0.3.37)
35
+ addressable (2.3.5)
35
36
  arel (4.0.1)
36
37
  atomic (1.1.14)
37
38
  builder (3.1.4)
39
+ crack (0.4.1)
40
+ safe_yaml (~> 0.9.0)
38
41
  database_cleaner (1.2.0)
39
42
  diff-lcs (1.2.5)
40
43
  docile (1.1.2)
41
44
  erubis (2.7.0)
42
- gcm (0.0.5)
45
+ gcm (0.0.6)
43
46
  httparty
44
47
  json
45
48
  hike (1.2.3)
@@ -55,7 +58,7 @@ GEM
55
58
  minitest (4.7.5)
56
59
  multi_json (1.8.4)
57
60
  multi_xml (0.5.5)
58
- notifiable-rails (0.1.1)
61
+ notifiable-rails (0.2.0)
59
62
  rails (~> 4.0.0)
60
63
  polyglot (0.3.3)
61
64
  rack (1.5.2)
@@ -83,11 +86,14 @@ GEM
83
86
  rspec-expectations (2.14.4)
84
87
  diff-lcs (>= 1.1.3, < 2.0)
85
88
  rspec-mocks (2.14.4)
89
+ safe_yaml (0.9.7)
86
90
  simplecov (0.8.2)
87
91
  docile (~> 1.1.0)
88
92
  multi_json
89
93
  simplecov-html (~> 0.8.0)
90
94
  simplecov-html (0.8.0)
95
+ simplecov-rcov (0.2.3)
96
+ simplecov (>= 0.4.1)
91
97
  sprockets (2.10.1)
92
98
  hike (~> 1.2)
93
99
  multi_json (~> 1.0)
@@ -106,15 +112,20 @@ GEM
106
112
  polyglot
107
113
  polyglot (>= 0.3.1)
108
114
  tzinfo (0.3.38)
115
+ webmock (1.17.1)
116
+ addressable (>= 2.2.7)
117
+ crack (>= 0.3.2)
109
118
 
110
119
  PLATFORMS
111
120
  ruby
112
121
 
113
122
  DEPENDENCIES
114
123
  bundler (~> 1.3)
115
- database_cleaner
124
+ database_cleaner (~> 1.2.0)
116
125
  notifiable-gcm-spacialdb!
117
- rake
118
- rspec
119
- simplecov
120
- sqlite3
126
+ rake (~> 10.1.1)
127
+ rspec (~> 2.14.1)
128
+ simplecov (~> 0.8.2)
129
+ simplecov-rcov (~> 0.2.3)
130
+ sqlite3 (~> 1.3.8)
131
+ webmock (~> 1.17.1)
data/README.md CHANGED
@@ -1,2 +1,3 @@
1
- notifiable-gcm-spacialdb
2
- ========================
1
+ # Notifiable::Gcm::Spacialdb
2
+
3
+ Please refer to the [notifiable-rails](https://github.com/FutureWorkshops/notifiable-rails) Readme for further information.
data/Rakefile CHANGED
@@ -1 +1,15 @@
1
1
  require "bundler/gem_tasks"
2
+ require 'rspec/core/rake_task'
3
+
4
+ namespace :ci do
5
+
6
+ namespace :test do
7
+ desc "Run all specs in spec directory (excluding plugin specs)"
8
+ RSpec::Core::RakeTask.new(:spec)
9
+ end
10
+
11
+ task :prepare
12
+
13
+ desc "Run all CI tests"
14
+ task :test => ['ci:test:spec']
15
+ end
data/lib/notifiable/gcm/spacialdb/batch.rb CHANGED
@@ -28,7 +28,7 @@ module Notifiable
28
28
 
29
29
  private
30
30
  def send_batch(notification, device_tokens)
31
- if Notifiable.delivery_method == :test || Notifiable.env == 'test'
31
+ if Notifiable.delivery_method == :test
32
32
  device_tokens.each {|d| processed(notification, d)}
33
33
  else
34
34
  gcm = ::GCM.new(Notifiable.gcm_api_key)
@@ -36,9 +36,17 @@ module Notifiable
36
36
  body = JSON.parse(response.fetch(:body, "{}"))
37
37
  results = body.fetch("results", [])
38
38
  results.each_with_index do |result, idx|
39
- if result["error"]
39
+ # Remove the token if it is marked NotRegistered (user deleted the App for example)
40
+ if result["error"].eql? "NotRegistered"
40
41
  device_tokens[idx].update_attribute('is_valid', false)
41
42
  else
43
+
44
+ # Update the token if a canonical ID is returned
45
+ if result["registration_id"]
46
+ device_tokens[idx].update_attribute('token', result["registration_id"])
47
+ end
48
+
49
+ # Mark as processed
42
50
  processed(notification, device_tokens[idx])
43
51
  end
44
52
  end
data/lib/notifiable/gcm/spacialdb/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Notifiable
2
2
  module Gcm
3
3
  module Spacialdb
4
- VERSION = "0.1.1"
4
+ VERSION = "0.1.3"
5
5
  end
6
6
  end
7
7
  end
data/notifiable-gcm-spacialdb.gemspec CHANGED
@@ -19,13 +19,15 @@ Gem::Specification.new do |spec|
19
19
  spec.require_paths = ["lib"]
20
20
 
21
21
  spec.add_dependency "notifiable-rails"
22
- spec.add_dependency "gcm"
22
+ spec.add_dependency "gcm", "~> 0.0.6"
23
23
 
24
24
  spec.add_development_dependency "bundler", "~> 1.3"
25
- spec.add_development_dependency "rake"
26
- spec.add_development_dependency "rspec"
27
- spec.add_development_dependency "simplecov"
28
- spec.add_development_dependency "sqlite3"
29
- spec.add_development_dependency "database_cleaner"
25
+ spec.add_development_dependency "rake", "~> 10.1.1"
26
+ spec.add_development_dependency "rspec", "~> 2.14.1"
27
+ spec.add_development_dependency "simplecov", "~> 0.8.2"
28
+ spec.add_development_dependency "simplecov-rcov", "~> 0.2.3"
29
+ spec.add_development_dependency "sqlite3", "~> 1.3.8"
30
+ spec.add_development_dependency "database_cleaner", "~> 1.2.0"
31
+ spec.add_development_dependency "webmock", "~> 1.17.1"
30
32
 
31
33
  end
data/spec/batch_spec.rb CHANGED
@@ -8,23 +8,38 @@ describe Notifiable::Gcm::Spacialdb::Batch do
8
8
  let(:u) { User.new(d) }
9
9
 
10
10
  it "sends a single gcm notification" do
11
-
11
+ stub_request(:post, "https://android.googleapis.com/gcm/send").to_return(:body => '{ "multicast_id": 108, "success": 1, "failure": 0, "canonical_ids": 0, "results": [{ "message_id": "1:08" }]}')
12
12
 
13
13
  g.send_notification(n, d)
14
14
  g.close
15
- Notifiable::NotificationDeviceToken.count.should == 1
16
- # todo check stub
17
15
 
16
+ Notifiable::NotificationDeviceToken.count.should == 1
18
17
  end
19
18
 
20
19
  it "sends a single gcm notification in a batch" do
20
+ stub_request(:post, "https://android.googleapis.com/gcm/send").to_return(:body => '{ "multicast_id": 108, "success": 1, "failure": 0, "canonical_ids": 0, "results": [{ "message_id": "1:08" }]}')
21
+
22
+ Notifiable.batch {|b| b.add(n, u)}
21
23
 
22
- Notifiable.batch do |b|
23
- b.add(n, u)
24
- end
25
24
  Notifiable::NotificationDeviceToken.count.should == 1
25
+ end
26
+
27
+ it "invalidates a token" do
28
+ stub_request(:post, "https://android.googleapis.com/gcm/send").to_return(:body => '{ "multicast_id": 108, "success": 0, "failure": 1, "canonical_ids": 0, "results": [{ "error": "NotRegistered" }]}')
29
+
30
+ Notifiable.batch {|b| b.add(n, u)}
26
31
 
27
- # todo check stub
32
+ Notifiable::NotificationDeviceToken.count.should == 0
33
+ d.is_valid.should == false
34
+ end
35
+
36
+ it "updates a token to the canonical ID" do
37
+ stub_request(:post, "https://android.googleapis.com/gcm/send").to_return(:body => '{ "multicast_id": 108, "success": 1, "failure": 0, "canonical_ids": 1, "results": [{ "message_id": "1:08", "registration_id": "GHJ12345" }]}')
38
+
39
+ Notifiable.batch {|b| b.add(n, u)}
40
+
41
+ Notifiable::NotificationDeviceToken.count.should == 1
42
+ d.token.should eql "GHJ12345"
28
43
  end
29
44
 
30
45
  end
data/spec/spec_helper.rb CHANGED
@@ -1,8 +1,9 @@
1
1
  ENV['RAILS_ENV'] ||= 'test'
2
2
 
3
3
  require 'simplecov'
4
+ require 'simplecov-rcov'
5
+ SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
4
6
  SimpleCov.start do
5
- minimum_coverage 80
6
7
  add_filter "/spec/"
7
8
  end
8
9
 
@@ -11,6 +12,7 @@ require 'database_cleaner'
11
12
  require 'rails'
12
13
  require 'notifiable'
13
14
  require 'gcm'
15
+ require 'webmock/rspec'
14
16
  require File.expand_path("../../lib/notifiable/gcm/spacialdb", __FILE__)
15
17
  Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
16
18
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: notifiable-gcm-spacialdb
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kamil Kocemba
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-01-20 00:00:00.000000000 Z
12
+ date: 2014-02-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: notifiable-rails
@@ -29,16 +29,16 @@ dependencies:
29
29
  name: gcm
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - '>='
32
+ - - ~>
33
33
  - !ruby/object:Gem::Version
34
- version: '0'
34
+ version: 0.0.6
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - '>='
39
+ - - ~>
40
40
  - !ruby/object:Gem::Version
41
- version: '0'
41
+ version: 0.0.6
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: bundler
44
44
  requirement: !ruby/object:Gem::Requirement
@@ -57,72 +57,100 @@ dependencies:
57
57
  name: rake
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
- - - '>='
60
+ - - ~>
61
61
  - !ruby/object:Gem::Version
62
- version: '0'
62
+ version: 10.1.1
63
63
  type: :development
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
- - - '>='
67
+ - - ~>
68
68
  - !ruby/object:Gem::Version
69
- version: '0'
69
+ version: 10.1.1
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: rspec
72
72
  requirement: !ruby/object:Gem::Requirement
73
73
  requirements:
74
- - - '>='
74
+ - - ~>
75
75
  - !ruby/object:Gem::Version
76
- version: '0'
76
+ version: 2.14.1
77
77
  type: :development
78
78
  prerelease: false
79
79
  version_requirements: !ruby/object:Gem::Requirement
80
80
  requirements:
81
- - - '>='
81
+ - - ~>
82
82
  - !ruby/object:Gem::Version
83
- version: '0'
83
+ version: 2.14.1
84
84
  - !ruby/object:Gem::Dependency
85
85
  name: simplecov
86
86
  requirement: !ruby/object:Gem::Requirement
87
87
  requirements:
88
- - - '>='
88
+ - - ~>
89
89
  - !ruby/object:Gem::Version
90
- version: '0'
90
+ version: 0.8.2
91
91
  type: :development
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
- - - '>='
95
+ - - ~>
96
96
  - !ruby/object:Gem::Version
97
- version: '0'
97
+ version: 0.8.2
98
+ - !ruby/object:Gem::Dependency
99
+ name: simplecov-rcov
100
+ requirement: !ruby/object:Gem::Requirement
101
+ requirements:
102
+ - - ~>
103
+ - !ruby/object:Gem::Version
104
+ version: 0.2.3
105
+ type: :development
106
+ prerelease: false
107
+ version_requirements: !ruby/object:Gem::Requirement
108
+ requirements:
109
+ - - ~>
110
+ - !ruby/object:Gem::Version
111
+ version: 0.2.3
98
112
  - !ruby/object:Gem::Dependency
99
113
  name: sqlite3
100
114
  requirement: !ruby/object:Gem::Requirement
101
115
  requirements:
102
- - - '>='
116
+ - - ~>
103
117
  - !ruby/object:Gem::Version
104
- version: '0'
118
+ version: 1.3.8
105
119
  type: :development
106
120
  prerelease: false
107
121
  version_requirements: !ruby/object:Gem::Requirement
108
122
  requirements:
109
- - - '>='
123
+ - - ~>
110
124
  - !ruby/object:Gem::Version
111
- version: '0'
125
+ version: 1.3.8
112
126
  - !ruby/object:Gem::Dependency
113
127
  name: database_cleaner
114
128
  requirement: !ruby/object:Gem::Requirement
115
129
  requirements:
116
- - - '>='
130
+ - - ~>
117
131
  - !ruby/object:Gem::Version
118
- version: '0'
132
+ version: 1.2.0
119
133
  type: :development
120
134
  prerelease: false
121
135
  version_requirements: !ruby/object:Gem::Requirement
122
136
  requirements:
123
- - - '>='
137
+ - - ~>
124
138
  - !ruby/object:Gem::Version
125
- version: '0'
139
+ version: 1.2.0
140
+ - !ruby/object:Gem::Dependency
141
+ name: webmock
142
+ requirement: !ruby/object:Gem::Requirement
143
+ requirements:
144
+ - - ~>
145
+ - !ruby/object:Gem::Version
146
+ version: 1.17.1
147
+ type: :development
148
+ prerelease: false
149
+ version_requirements: !ruby/object:Gem::Requirement
150
+ requirements:
151
+ - - ~>
152
+ - !ruby/object:Gem::Version
153
+ version: 1.17.1
126
154
  description: Plugin to use GCM with Notifiable-Rails
127
155
  email:
128
156
  - kamil@futureworkshops.com