notifiable-apns-grocer 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a06d78cc911ead79cb82a82ac8d300356103c61
-  data.tar.gz: a8ab71412ce38e6243ae014a01967033f76c0f99
+  metadata.gz: d50ae95d68648f0740d8a4ffb19f080f106c423b
+  data.tar.gz: 874fa74a2c4ce892d38fd48c1a4727a61e56f737
 SHA512:
-  metadata.gz: 2b58e61ad194010c7893140834ec7a87b1e90a227943cdf9211bf95af62646b25703a18d3316b919169585fbd68dfa7686d7a8fb2155779fbbd24a98af872e28
-  data.tar.gz: 1ca98ff7c33c18737dca7a9b7b957685c526d9c9da339baae973fc9757a5c989e2f409527bd69d29e2610f16340fd5300978d8ae6beb45509928a0bf5fc1a9ea
+  metadata.gz: e740ef4e3559dd85c1a4d7b75e0bf0ae3ddc54e0a6ee11dc9ecb0d215556761d028fbc49151b199733326afa78fbe4b8c7237fb027d2c6005122444e2364c54b
+  data.tar.gz: f4f51cdc7842c60f7c17afcfb38905609c805588aa73ff09906ccd73f6d0dfc672e9a2adf0d30f363d3c151b5f9bbe8c657c4ceab6a431dc735e9336dff5b29a

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p247
+2.1.0

data/README.md

@@ -1,3 +1,29 @@
 # Notifiable::Apns::Grocer
 
-Please refer to the [notifiable-rails](https://github.com/FutureWorkshops/notifiable-rails) Readme for further information.
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'notifiable-apns-grocer'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install notifiable-apns-grocer
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

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

@@ -16,12 +16,12 @@ module Notifiable
         end
       
   			protected      
-    			def enqueue(device_token)        				
+    			def enqueue(device_token, localized_notification)        				
           
             grocer_notification = ::Grocer::Notification.new(
               device_token: device_token.token, 
-              alert: notification.message, 
-              custom: notification.send_params
+              alert: localized_notification.message, 
+              custom: localized_notification.send_params
             )
           
             pusher_pool.with do |pusher|
@@ -59,7 +59,7 @@ module Notifiable
             {
               certificate: self.certificate,
               passphrase:  self.passphrase,
-              gateway:     self.test_env? ? "localhost" : self.sandbox? ? "gateway.sandbox.push.apple.com" : "gateway.push.apple.com",
+              gateway:     self.test_env? ? "localhost" : sandbox? ? "gateway.sandbox.push.apple.com" : "gateway.push.apple.com",
               port:        2195,
               retries:     3
             }
@@ -98,4 +98,4 @@ module Notifiable
   		end
     end
 	end
-end
+end

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

@@ -1,7 +1,7 @@
 module Notifiable
   module Apns
     module Grocer
-      VERSION = "0.10.0"
+      VERSION = "0.11.0"
     end
   end
 end

data/notifiable-apns-grocer.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.19.0"
+  spec.add_dependency "notifiable-rails", ">=0.21.0"
   spec.add_dependency "grocer", '~> 0.5.0'
   spec.add_dependency "connection_pool", '~> 2.0.0'
  

data/spec/stream_spec.rb

@@ -3,11 +3,12 @@ require 'spec_helper'
 describe Notifiable::Apns::Grocer::Stream do
 
   let(:a) { Notifiable::App.create }  
-  let(:n1) { Notifiable::Notification.create(:message => "Test message", :app => a) }
-  let(:n1_with_params) { Notifiable::Notification.create(:message => "Test message", :app => a, :params => {:flag => true}) }
-  let(:d) { Notifiable::DeviceToken.create(:token => "ABC123", :provider => :apns, :app => a) }
+  let(:n1) { Notifiable::Notification.create(:app => a) }
+  let!(:ln) { Notifiable::LocalizedNotification.create(:message => "Test message", :params => {:flag => true}, :notification => n1, :locale => :en) }
+  let(:d) { Notifiable::DeviceToken.create(:token => "ABC123", :provider => :apns, :app => a, :locale => :en) }
   
   it "sends a single notification" do
+    
     n1.batch do |n| 
       n.add_device_token(d)
     end
@@ -18,12 +19,12 @@ describe Notifiable::Apns::Grocer::Stream do
     Timeout.timeout(2) {
       notification = @grocer.notifications.pop
       notification.alert.should eql "Test message"
-      notification.custom[:notification_id].should == n1.id
+      notification.custom[:localized_notification_id].should == ln.id
     }
   end 
   
   it "supports custom properties" do    
-    n1_with_params.batch do |n| 
+    n1.batch do |n| 
       n.add_device_token(d)
     end
 
@@ -32,7 +33,7 @@ describe Notifiable::Apns::Grocer::Stream do
     
     Timeout.timeout(2) {
       notification = @grocer.notifications.pop
-      notification.custom[:notification_id].should == n1_with_params.id
+      notification.custom[:localized_notification_id].should == ln.id
       notification.custom[:flag].should == true
     }
   end
@@ -42,7 +43,8 @@ describe Notifiable::Apns::Grocer::Stream do
     a.configuration = {:apns => {:sandbox => "0"}} # This is how production is configured
     a.configure(:apns, g)
     
-    expect(g.send(:sandbox?)).to be_falsey
+    expect(g.send(:sandbox?)).to eq false
+    
   end
 
   it "has default connection pool size" do

data/spec/support/db/migrate/{20131228225139_create_notifiable_device_tokens.rb → 20131210115649_create_notifiable_device_tokens.rb}

@@ -4,6 +4,7 @@ class CreateNotifiableDeviceTokens < ActiveRecord::Migration
     create_table :notifiable_device_tokens do |t|
       t.string :token
     	t.string :provider
+      t.string :locale
       t.boolean :is_valid, :default => true
       t.integer :user_id
       t.references :app
@@ -11,7 +12,7 @@ class CreateNotifiableDeviceTokens < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :notifiable_device_tokens, :token 
+    add_index :notifiable_device_tokens, :token, :unique => true      
     add_index :notifiable_device_tokens, :user_id
   end
 

data/spec/support/db/migrate/{20131228225140_create_notifiable_notifications.rb → 20131210115650_create_notifiable_notifications.rb}

@@ -2,8 +2,6 @@ class CreateNotifiableNotifications < ActiveRecord::Migration
   
   def change
     create_table :notifiable_notifications do |t|
-      t.text :message
-      t.text :params
       t.references :app
       
       #stats
@@ -11,14 +9,6 @@ class CreateNotifiableNotifications < ActiveRecord::Migration
       t.integer :gateway_accepted_count, :default => 0
       t.integer :opened_count, :default => 0
       
-      # APNS - Optional
-      #t.integer :badge
-      #t.text :sound
-      #t.datetime :expiry
-      
-      # MPNS - Optional
-      #t.text :title
-      
       t.timestamps
     end
   end

data/spec/support/db/migrate/20131210115651_create_notifiable_localized_notifications.rb

@@ -0,0 +1,22 @@
+class CreateNotifiableLocalizedNotifications < ActiveRecord::Migration
+  
+  def change
+    create_table :notifiable_localized_notifications do |t|
+      t.text :message
+      t.text :params
+      t.string :locale
+      t.references :notification
+      
+      # APNS - Optional
+      #t.integer :badge
+      #t.text :sound
+      #t.datetime :expiry
+      
+      # MPNS - Optional
+      #t.text :title
+      
+      t.timestamps
+    end
+  end
+
+end

data/spec/support/db/migrate/{20131229104039_create_notifiable_statuses.rb → 20131210115652_create_notifiable_statuses.rb}

@@ -2,7 +2,7 @@ class CreateNotifiableStatuses < ActiveRecord::Migration
   
   def change
     create_table :notifiable_statuses do |t|
-      t.references :notification
+      t.references :localized_notification
       t.references :device_token
       t.integer :status
       t.datetime :created_at

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-apns-grocer
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Kamil Kocemba
@@ -9,160 +9,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-07 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: notifiable-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: grocer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: simplecov
   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'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   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'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   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'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   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 Grocer for APNS with Notifiable-Rails
@@ -173,9 +173,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE
 - LICENSE.txt
@@ -188,10 +188,11 @@ files:
 - notifiable-apns-grocer.gemspec
 - spec/spec_helper.rb
 - spec/stream_spec.rb
-- spec/support/db/migrate/20131228225138_create_notifiable_apps.rb
-- spec/support/db/migrate/20131228225139_create_notifiable_device_tokens.rb
-- spec/support/db/migrate/20131228225140_create_notifiable_notifications.rb
-- spec/support/db/migrate/20131229104039_create_notifiable_statuses.rb
+- spec/support/db/migrate/20131210115648_create_notifiable_apps.rb
+- spec/support/db/migrate/20131210115649_create_notifiable_device_tokens.rb
+- spec/support/db/migrate/20131210115650_create_notifiable_notifications.rb
+- spec/support/db/migrate/20131210115651_create_notifiable_localized_notifications.rb
+- spec/support/db/migrate/20131210115652_create_notifiable_statuses.rb
 homepage: http://www.futureworkshops.com
 licenses:
 - Apache 2.0
@@ -202,24 +203,25 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Plugin to use Grocer for APNS with Notifiable-Rails
 test_files:
 - spec/spec_helper.rb
 - spec/stream_spec.rb
-- spec/support/db/migrate/20131228225138_create_notifiable_apps.rb
-- spec/support/db/migrate/20131228225139_create_notifiable_device_tokens.rb
-- spec/support/db/migrate/20131228225140_create_notifiable_notifications.rb
-- spec/support/db/migrate/20131229104039_create_notifiable_statuses.rb
+- spec/support/db/migrate/20131210115648_create_notifiable_apps.rb
+- spec/support/db/migrate/20131210115649_create_notifiable_device_tokens.rb
+- spec/support/db/migrate/20131210115650_create_notifiable_notifications.rb
+- spec/support/db/migrate/20131210115651_create_notifiable_localized_notifications.rb
+- spec/support/db/migrate/20131210115652_create_notifiable_statuses.rb