notifiable-gcm-spacialdb 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a960038aa136a867b8e7bcd6d4b2db748a351ba
-  data.tar.gz: 0f03c20cc3f899f5efe5f2ccaefb4c61632b5286
+  metadata.gz: 901c96a483454886353b80465b75c00c25924e8e
+  data.tar.gz: c56f5305ba962aed839b344208ed8ea875f04b54
 SHA512:
-  metadata.gz: 4883d1a59c4e849eb227429c737a2e751e8deda7b4f8b3ddebebc85e49aed4adf0b2842ffe4b290ee6e4b902c01e7b29a08812a8c3a3dbfea873db3171de28c9
-  data.tar.gz: 5d2c09ab9c34d65a941a31a08a30c978177dd3ff9ae874886759f2694d1f6b02a59382eb7bf0b2487713b53fa3ca351e15ef7ea309db68d134f07f56677db0a7
+  metadata.gz: ee5bd1c85b4873462b4bfb7e5497db6cd2839d6cbf128674c0629814ceb5d56e864c02d2a079707acb6eb2f9abf9a6c663eeabd16a80cb8dfc34b4ba5b4da9df
+  data.tar.gz: '0954911ab2d633ba24d134b98d9f94e4fb2881ed90e5ddf01b16d12c75e8c21920b4848cc2ea85fedc23a92fbf5bf469ede06beea1ccdc46736bafc4c2fae313'

data/Gemfile.lock

@@ -1,127 +1,53 @@
 PATH
   remote: .
   specs:
-    notifiable-gcm-spacialdb (0.10.1)
+    notifiable-gcm-spacialdb (0.11.0)
       gcm (~> 0.1.1)
-      notifiable-rails (>= 0.26.3)
+      notifiable-core (>= 0.1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.5)
-      actionpack (= 5.1.5)
-      nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.1.5)
-      actionview (= 5.1.5)
-      activesupport (= 5.1.5)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.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)
-    activejob (5.1.5)
-      activesupport (= 5.1.5)
-      globalid (>= 0.3.6)
-    activemodel (5.1.5)
-      activesupport (= 5.1.5)
-    activerecord (5.1.5)
-      activemodel (= 5.1.5)
-      activesupport (= 5.1.5)
-      arel (~> 8.0)
-    activerecord-postgis-adapter (5.2.1)
-      activerecord (~> 5.1)
-      rgeo-activerecord (~> 6.0)
-    activesupport (5.1.5)
+    activemodel (5.2.1)
+      activesupport (= 5.2.1)
+    activerecord (5.2.1)
+      activemodel (= 5.2.1)
+      activesupport (= 5.2.1)
+      arel (>= 9.0)
+    activerecord-import (0.25.0)
+      activerecord (>= 3.2)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    arel (8.0.0)
-    builder (3.2.3)
+    arel (9.0.0)
     byebug (10.0.1)
     concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.3)
     database_cleaner (1.2.0)
     diff-lcs (1.3)
     docile (1.1.5)
-    erubi (1.7.1)
     gcm (0.1.1)
       httparty
       json
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    httparty (0.16.1)
+    httparty (0.16.2)
       multi_xml (>= 0.5.2)
-    i18n (0.9.5)
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
-    loofah (2.2.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.0)
-      mini_mime (>= 0.1.1)
-    method_source (0.9.0)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
     minitest (5.11.3)
     multi_json (1.13.1)
     multi_xml (0.6.0)
-    nio4r (2.3.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    notifiable-rails (0.26.3)
-      activerecord-postgis-adapter
-      pg
-      rails
+    notifiable-core (0.1.3)
+      activerecord
+      activerecord-import
     pg (1.0.0)
     public_suffix (3.0.2)
-    rack (2.0.4)
-    rack-test (0.8.3)
-      rack (>= 1.0, < 3)
-    rails (5.1.5)
-      actioncable (= 5.1.5)
-      actionmailer (= 5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
-      activemodel (= 5.1.5)
-      activerecord (= 5.1.5)
-      activesupport (= 5.1.5)
-      bundler (>= 1.3.0)
-      railties (= 5.1.5)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.5)
-      actionpack (= 5.1.5)
-      activesupport (= 5.1.5)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
-    rgeo (1.0.0)
-    rgeo-activerecord (6.0.0)
-      activerecord (~> 5.0)
-      rgeo (~> 1.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -143,24 +69,13 @@ GEM
     simplecov-html (0.8.0)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    thor (0.20.0)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     webmock (1.17.4)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
@@ -170,6 +85,7 @@ DEPENDENCIES
   byebug
   database_cleaner (~> 1.2.0)
   notifiable-gcm-spacialdb!
+  pg
   rake (~> 10.1.1)
   rspec (~> 3.7)
   simplecov (~> 0.8.2)

data/Rakefile

@@ -1,6 +1,9 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
+notifiable_path = Gem::Specification.find_by_name 'notifiable-core'
+load "#{notifiable_path.gem_dir}/lib/tasks/db.rake"
+
 namespace :ci do
   
   namespace :test do

data/config/database.yml

@@ -0,0 +1,12 @@
+postgres: &postgres
+  adapter: postgresql
+  host: localhost
+  port: 5432
+
+development:
+  <<: *postgres
+  database: notifiable-gcm-spacialdb-development
+
+test:
+  <<: *postgres
+  database: notifiable-gcm-spacialdb-test

data/lib/notifiable/gcm/spacialdb/batch.rb

@@ -44,7 +44,7 @@ module Notifiable
           if response[:status_code] == 200
     				process_success_response(response)
           else
-            Rails.logger.error "Sending notification id: #{notification.id} code: #{response[:status_code]} response: #{response[:response]}"
+            logger.error "Sending notification id: #{notification.id} code: #{response[:status_code]} response: #{response[:response]}"
           end         
           @batch = []
   			end

data/lib/notifiable/gcm/spacialdb/version.rb

@@ -1,7 +1,7 @@
 module Notifiable
   module Gcm
     module Spacialdb
-      VERSION = "0.10.1"
+      VERSION = "0.11.0"
     end
   end
 end

data/notifiable-gcm-spacialdb.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "notifiable-rails", ">=0.26.3"
+  spec.add_dependency "notifiable-core", ">= 0.1.3"
   spec.add_dependency "gcm", '~> 0.1.1'
  
   spec.add_development_dependency "bundler", "~> 1.3"
@@ -30,5 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "database_cleaner", "~> 1.2.0"
   spec.add_development_dependency "webmock", "~> 1.17.1"
   spec.add_development_dependency "byebug"
+  spec.add_development_dependency "pg"
   
 end

data/spec/batch_spec.rb

@@ -15,28 +15,28 @@ describe Notifiable::Gcm::Spacialdb::Batch do
     
     context 'single' do
       let(:n1) { Notifiable::Notification.create(app: a, title: 'Test title', message: 'Test message', parameters: {flag: true} ) }      
-      let(:request_body) { "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"title\":\"Test title\",\"flag\":true,\"n_id\":1}}" }
+      let(:request_body) { "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"title\":\"Test title\",\"flag\":true,\"n_id\":#{n1.id}}}" }
       let(:response_body) { '{ "multicast_id": 108, "success": 1, "failure": 0, "canonical_ids": 0, "results": [{ "message_id": "1:08" }]}' }
       it { expect(Notifiable::NotificationStatus.count).to eq 1 }
       it { expect(Notifiable::NotificationStatus.first.status).to eq 0 }
     end
     
     context 'custom attributes' do
-      let(:request_body) { "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"flag\":true,\"n_id\":1}}" }
+      let(:request_body) { "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"flag\":true,\"n_id\":#{n1.id}}}" }
       let(:response_body) { '{ "multicast_id": 108, "success": 1, "failure": 0, "canonical_ids": 0, "results": [{ "message_id": "1:08" }]}' }
       it { expect(Notifiable::NotificationStatus.count).to eq 1 }
       it { expect(Notifiable::NotificationStatus.first.status).to eq 0 }
     end
     
     context 'deletes an unregistered token' do
-      let(:request_body) { "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"flag\":true,\"n_id\":1}}" }
+      let(:request_body) { "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"flag\":true,\"n_id\":#{n1.id}}}" }
       let(:response_body) { '{ "multicast_id": 108, "success": 0, "failure": 1, "canonical_ids": 0, "results": [{ "error": "NotRegistered" }]}' }
-      it { expect(Notifiable::NotificationStatus.count).to eq 0 }
+      it { expect(Notifiable::NotificationStatus.count).to eq 1 }
       it { expect(Notifiable::DeviceToken.count).to eq 0 }
     end
     
     context 'id change' do
-      let(:request_body) { "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"flag\":true,\"n_id\":1}}" }
+      let(:request_body) { "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"flag\":true,\"n_id\":#{n1.id}}}" }
       let(:response_body) { '{ "multicast_id": 108, "success": 1, "failure": 0, "canonical_ids": 1, "results": [{ "message_id": "1:08", "registration_id": "GHJ12345" }]}' }
       it { expect(Notifiable::NotificationStatus.count).to eq 1 }
       it { expect(Notifiable::DeviceToken.count).to eq 1 }

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-ENV['RAILS_ENV'] ||= 'test'
-
 require 'simplecov'
 require 'simplecov-rcov'
 SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
@@ -9,56 +7,29 @@ end
 
 require 'active_record'
 require 'database_cleaner'
-require 'rails'
-require 'notifiable'
-require 'gcm'
+require 'notifiable/gcm/spacialdb'
 require 'webmock/rspec'
 require 'byebug'
-require File.expand_path("../../lib/notifiable/gcm/spacialdb",  __FILE__)
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-db_path = 'spec/test.sqlite3'
-DatabaseCleaner.strategy = :truncation
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-Rails.logger = Logger.new(STDOUT)
+# Setup ActiveRecord db connection
+ActiveRecord::Base.establish_connection(YAML.load_file('config/database.yml')['test'])
 
 RSpec.configure do |config|  
   config.mock_with :rspec
   config.order = "random"
   
   config.before(:all) {
-    
     Notifiable.notifier_classes[:gcm] = Notifiable::Gcm::Spacialdb::Batch    
     Notifiable::App.define_configuration_accessors(Notifiable.notifier_classes)
-    
-    # DB setup
-    ActiveRecord::Base.establish_connection(
-     { :adapter => 'sqlite3',
-       :database => db_path,
-       :pool => 5,
-       :timeout => 5000}
-    )
-    
-    ActiveRecord::Migration.verbose = false
-    notifiable_rails_path = Gem.loaded_specs['notifiable-rails'].full_gem_path
-    ActiveRecord::Migrator.migrate File.join(notifiable_rails_path, 'db', 'migrate')
-    
-    # todo start stub
   }
   
   config.before(:each) {
     DatabaseCleaner.start
-    # todo clear stub state
   }
   
   config.after(:each) {
     DatabaseCleaner.clean
   }
-  
-  config.after(:all) {
-    # todo close stub
-    
-    # drop the database
-    File.delete(db_path)
-  }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-gcm-spacialdb
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Kamil Kocemba
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: notifiable-rails
+  name: notifiable-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.26.3
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: gcm
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +165,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Plugin to use GCM with Notifiable
 email:
 - kamil@futureworkshops.com
@@ -180,6 +194,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- config/database.yml
 - lib/notifiable/gcm/spacialdb.rb
 - lib/notifiable/gcm/spacialdb/batch.rb
 - lib/notifiable/gcm/spacialdb/version.rb