notifiable-apns-grocer 0.17.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 092d24d5d356507f6b78ffaf6464b69de6e01bbc
-  data.tar.gz: 991306f3b76de20b7ff294354b1bf34cfde9359b
+  metadata.gz: 6c45cb3080a04382bc2a8fb265af958756eab87a
+  data.tar.gz: 214ca5c37c8b8a8e60bd221c12df1fa98c6a94ae
 SHA512:
-  metadata.gz: 98554d939c83904fbd99d9d6ec5d8904723c196c3d33a7719ba4d880dc391385519f5111d79beba69de89d7b6fd506709f6a75d3dc8d5616dea175c44705d8da
-  data.tar.gz: 294fbd0b57474a8b9604fdd714416ac4e63252e157bb1b0c8572b13e5081d3edb8e3b64c080a1df8598591d99b33318d9f552a5d45210a2202f83d7777cc1b9b
+  metadata.gz: fb8060be2c718b39ff1b4d7f379bb3e3e9109c1e1a5e0c97fb7b77849a04fbc2583ff1bbe0c6bfc328b79de9b84d262be4c863c0d6b051473174f10f8b102877
+  data.tar.gz: 6fa533bb624e78feaff4561763d358b6455e2f49f5d557b5007da0abef9975b1547c307d4d7bfacc3e1628b1623d66ac3d3c66348badf29e3d48f532158efc76

data/Rakefile

@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
-Dir[File.join(File.dirname(__FILE__), 'lib/tasks/**/*.rake')].each {|f| load f }
+
+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-apns-grocer-development
+
+test:
+  <<: *postgres
+  database: notifiable-apns-grocer-test

data/lib/notifiable/apns/grocer/stream.rb

@@ -115,7 +115,7 @@ module Notifiable
     					device_token = DeviceToken.find_by_token(token)
     					if device_token
     						device_token.destroy if device_token.updated_at < attempt.timestamp
-    						Rails.logger.info("Device #{token} removed at #{attempt.timestamp}")
+    						logger.info("Device #{token} removed at #{attempt.timestamp}")
     					end
     				end
           end

data/lib/notifiable/apns/grocer/version.rb

@@ -1,7 +1,7 @@
 module Notifiable
   module Apns
     module Grocer
-      VERSION = "0.17.1"
+      VERSION = "0.18.0"
     end
   end
 end

data/notifiable-apns-grocer.gemspec

@@ -6,8 +6,8 @@ require 'notifiable/apns/grocer/version'
 Gem::Specification.new do |spec|
   spec.name          = "notifiable-apns-grocer"
   spec.version       = Notifiable::Apns::Grocer::VERSION
-  spec.authors       = ["Kamil Kocemba", "Matt Brooke-Smith"]
-  spec.email         = ["kamil@futureworkshops.com", "matt@futureworkshops.com"]
+  spec.authors       = ["Matt Brooke-Smith"]
+  spec.email         = ["matt@futureworkshops.com"]
   spec.homepage      = "http://www.futureworkshops.com"
   spec.description   = "Notifiable APNS plugin for Grocer"
   spec.summary       = "Notifiable APNS plugin for Grocer"
@@ -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.29.0"
+  spec.add_dependency "notifiable-core", ">= 0.1.2"
   spec.add_dependency "grocer", '~> 0.7.2'
   spec.add_dependency "connection_pool", '~> 2.0.0'
  
@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov-rcov"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "database_cleaner"
-  spec.add_development_dependency 'byebug'
+  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "pg"
   
 end

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-ENV['RAILS_ENV'] ||= 'test'
-
 require 'simplecov'
 require 'simplecov-rcov'
 SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
@@ -10,39 +8,24 @@ end
 require 'timeout'
 require 'database_cleaner'
 require 'active_record'
-require 'rails'
 require 'notifiable'
+require 'notifiable/apns/grocer'
 require 'grocer'
-require File.expand_path("../../lib/notifiable/apns/grocer",  __FILE__)
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-db_path = 'spec/test.sqlite3'
-DatabaseCleaner.strategy = :truncation
+require 'byebug'
 
-Rails.logger = Logger.new(STDOUT)
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-require 'byebug'
+# 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) {
+    DatabaseCleaner.strategy = :truncation
     Notifiable.notifier_classes[:apns] = Notifiable::Apns::Grocer::Stream
     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::MigrationContext.new(File.join(notifiable_rails_path, 'db', 'migrate')).migrate
         
     @grocer = Grocer.server(port: 2195)
     @grocer.accept
@@ -59,8 +42,5 @@ RSpec.configure do |config|
   
   config.after(:all) {
     @grocer.close
-    
-    # drop the database
-    File.delete(db_path)
   }
 end

data/spec/stream_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Notifiable::Apns::Grocer::Stream do
 
-  subject { Notifiable::Apns::Grocer::Stream.new(Rails.env, n1) }
+  subject { Notifiable::Apns::Grocer::Stream.new(n1) }
   let(:a1) { Notifiable::App.create! name: "Drum Cussac" }
   let(:n1) { Notifiable::Notification.create! app: a1 }
   

metadata

@@ -1,30 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-apns-grocer
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
 platform: ruby
 authors:
-- Kamil Kocemba
 - Matt Brooke-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-24 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.29.0
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: grocer
   requirement: !ruby/object:Gem::Requirement
@@ -165,9 +164,22 @@ 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: Notifiable APNS plugin for Grocer
 email:
-- kamil@futureworkshops.com
 - matt@futureworkshops.com
 executables: []
 extensions: []
@@ -180,6 +192,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- config/database.yml
 - lib/notifiable/apns/grocer.rb
 - lib/notifiable/apns/grocer/grocer_ssl_connection.rb
 - lib/notifiable/apns/grocer/stream.rb