maia 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 07e9b4e9e339d8ea7471b6c9e8aaebdfbdd548c8
-  data.tar.gz: 6fd7307ccb07daa05743742be5170bf47a418b60
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDNmY2UwNzgxMGIzMWY4MTU1MTg2OGUyMDMxYWYyNjc3NmFjZjllYw==
+  data.tar.gz: !binary |-
+    NzIzMzg4Njg2MGJjYTk5MjQ0ODU4ODhlMjU1OWI0NDliYTFkYzIxOA==
 SHA512:
-  metadata.gz: d6199c40dcabcd6ac6ea904f0e1e304236b923ef9a3fc71e10d6f9475f2bdca93663bee40573d7a6415bacb52362c8830a1fd74e067921eaf79a18b6bcbcc604
-  data.tar.gz: ca3419fe349c23fa6c292b2d9d4961a563b4089f1fdbb764ae11527d3cd91bc168259537e8df9ebc2960d342f79c7092d519ed9c0e7700040a84720c025b044a
+  metadata.gz: !binary |-
+    YmYwMDYxMzFkODg1ZWEwOTg1MjYyOTY2ZGQ0YTg2YzE2NzQ4ZDk1N2JiNmEw
+    MGEzMmNkODg2ZWM4YjIwOGJiYWM4OGE5MmM3OTcwN2U4ZDg4OTA4MDFkOGYy
+    YjZlMzQ2ZWU2MzA4MDIzMjcxNGMwNGZhYmRiMTQyZDNjYWJlMDg=
+  data.tar.gz: !binary |-
+    ZTM2YzkxMjNkOWNmYjU1MmFiNjI4OGIxY2Q5NDBhNWQ2NGE0NzM4M2M1ZTFl
+    MjNjOGE3OTI5OTA4MGVkZjk0Yjc0NjUxODljNGI0MmIwMmE4MGU1MmM1YzVi
+    YTc0ZmY4NjI2NmE1MjcxZDNiOTUxMmQ0MGY2ZjFmZDE4ZGViMDQ=

data/app/controllers/concerns/maia/controller.rb

@@ -3,16 +3,22 @@ module Maia
     extend ActiveSupport::Concern
 
     def create
-      if @device = existing_device
+      if device_exists?
+        @device = find_device
         update_token_expiration @device
       else
         @device = create_device_token
+        send_dry_run_to current_user
       end
       respond_with @device
     end
 
     private
-      def existing_device
+      def device_exists?
+        current_user.devices.exists? token: params[:device][:token]
+      end
+
+      def find_device
         current_user.devices.find_by token: params[:device][:token]
       end
 
@@ -25,6 +31,10 @@ module Maia
         current_user.devices.create permitted_params
       end
 
+      def send_dry_run_to(user)
+        Maia::DryRun.new.send_to user
+      end
+
       def permitted_params
         params.require(:device).permit :token
       end

data/lib/maia.rb

@@ -3,6 +3,7 @@ require 'maia/engine'
 require 'maia/message'
 require 'maia/messenger'
 require 'maia/poke'
+require 'maia/dry_run'
 require 'maia/error'
 
 module Maia

data/lib/maia/dry_run.rb

@@ -0,0 +1,11 @@
+module Maia
+  class DryRun < Message
+    def alert
+      ''
+    end
+
+    def dry_run?
+      true
+    end
+  end
+end

data/lib/maia/message.rb

@@ -42,10 +42,13 @@ module Maia
       false
     end
 
+    def dry_run?
+      false
+    end
+
     def to_h
-      {
+      hash = {
         data: other,
-        content_available: content_available?,
         notification: {
           title: alert,
           body: alert,
@@ -53,6 +56,10 @@ module Maia
           badge: badge
         }.compact
       }
+
+      hash.merge!(dry_run: true) if dry_run?
+      hash.merge!(content_available: true) if content_available?
+      hash
     end
   end
 end

data/lib/maia/messenger.rb

@@ -37,7 +37,11 @@ module Maia
       def update_devices_to_use_canonical_ids(results)
         results.each do |result|
           device = Maia::Device.find_by token: result.token
-          device.update token: result.canonical_id
+          if user_already_has_token_registered?(device.pushable, result.canonical_id)
+            device.destroy
+          else
+            device.update token: result.canonical_id
+          end
         end
       end
 
@@ -48,5 +52,9 @@ module Maia
       def connection
         nil # use the default
       end
+
+      def user_already_has_token_registered?(user, token)
+        user.devices.exists? token: token
+      end
   end
 end

data/lib/maia/version.rb

@@ -1,3 +1,3 @@
 module Maia
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: maia
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Logan Serman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mercurius
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.9
 - !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: rspec-rails
   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: capybara
   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: capybara-webkit
   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: launchy
   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: webmock
   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: Manage device tokens and push messaging with Rails and Mercurius.
@@ -167,6 +167,7 @@ files:
 - config/routes.rb
 - db/migrate/20150302191320_create_maia_devices.rb
 - lib/maia.rb
+- lib/maia/dry_run.rb
 - lib/maia/engine.rb
 - lib/maia/error.rb
 - lib/maia/message.rb
@@ -183,17 +184,17 @@ 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.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Manage device tokens and push messaging with Rails and Mercurius.