j7w1 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9adf83a271284f4f0ca44b19897b7c629bf4d31d
-  data.tar.gz: 442cc5dfb07aaa825da7c06c67fa46a7dfe90b2d
+  metadata.gz: d0cf48d1191d9ea076ac76338c26de358d983ef9
+  data.tar.gz: 477e962ffc5869f21d3d97f8579c937ad2ef3daa
 SHA512:
-  metadata.gz: 51d691f1bf60ba463490702fede28b6c67681e0073da21cc5165f141db8437cc57c612d246b96cd7daa76a6951118613df1121d326afe791c886ce7020f1b980
-  data.tar.gz: 31b66b45aeef3a5f9700b829cabea23a2bce5cb1161509fb33c2b7dca67d948c3f441111e9c4ab8cb54e2dcc6013e6ecd024d41f70a0f148010ac1e7c908e053
+  metadata.gz: 860d85c72a4594c02a7f02bc1248232445c8ea24305dbf45c379c4d83da9b083d08a7c5d1a504c245facc5ff3a156f8f58d23c9e5eb9c7ffd9f39446306fa63c
+  data.tar.gz: ef4f6c8c0df6bbf2dadb76071a2735f1db05e355ad1a4cf9997fcb63865e78edbb79dd9a0d8353276bd765df7b5522c06afd9a4cbcd87fc84c36305467cebb61

data/lib/generators/j7_w1/migration/templates/active_record/migration.rb

@@ -6,6 +6,9 @@ class J7W1ApplicationDevices < ActiveRecord::Migration
       t.string  :device_identifier,   null: false
       t.string  :platform,            null: false
       t.string  :device_endpoint_arn, null: true
+
+      t.index   [:owner_type, :owner_id]
+      t.index   [:device_identifier, :platform], unique: true
     end
   end
 end

data/lib/generators/j7_w1/model/templates/j7_w1_application_device.rb.erb

@@ -11,6 +11,9 @@ class J7W1ApplicationDevice < ActiveRecord::Base
   after_destroy :destroy_device_endpoint
 <%- end -%>
 
+  scope :identified, -> identifier { where(device_identifier: identifier}
+  scope :on_platform, -> platform { where(platform: J7W1::Util.normalize_platform(platform)) }
+
   def push!(options = {})
     J7W1::PushClient.push device_endpoint_arn, platform, *options
   end
@@ -24,9 +27,10 @@ class J7W1ApplicationDevice < ActiveRecord::Base
   def destroy_device_endpoint
     J7W1::PushClient.destroy_endpoint device_arn
   end
-<%- if options['async_engine'] == 'delayed_job' -%>
 
   private
+<%- if options['async_engine'] == 'delayed_job' -%>
+
   def create_device_endpoint_async
     delay.create_device_endpoint
   end
@@ -36,7 +40,6 @@ class J7W1ApplicationDevice < ActiveRecord::Base
   end
 <%- elsif options['async_engine'] == 'sidekiq' -%>
 
-  private
   def create_device_endpoint_async
     J7W1Worker.perform_async id
   end

data/lib/j7_w1/active_record_ext.rb

@@ -16,9 +16,10 @@ module J7W1
     module InstanceMethods
       def add_device(device_identifier, platform)
         device =
-          devices.where(device_identifier: device_identifier, platform: platform).
-          find_or_initialize
+          J7W1ApplicationDevice.identified(device_identifier).on_platform(J7W1::Util.normalize_platform(platform)).
+          first_or_initialize
         device.endpoint_arn = nil
+        device.owner = self
         device.save!
       end
 

data/lib/j7_w1/util.rb

@@ -0,0 +1,16 @@
+module J7W1
+  module Util
+    def normalize_platform(platform)
+      platform = platform.to_s.downcase.to_sym unless platform.is_a? Symbol
+
+      case platform
+      when :ios, :'iPhone OS', :'iPad OS'
+        :ios
+      else
+        platform
+      end
+    end
+
+    instance_methods(false).each{|m|module_function m}
+  end
+end

data/lib/j7_w1/version.rb

@@ -1,3 +1,3 @@
 module J7W1
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/j7w1.rb

@@ -2,6 +2,7 @@ require 'yaml'
 
 module J7W1
   autoload :Configuration, 'j7_w1/configuration'
+  autoload :Util, 'j7_w1/util'
 
   class << self
     attr_reader :current_strategy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j7w1
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - condor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -88,6 +88,7 @@ files:
 - lib/j7_w1/configuration.rb
 - lib/j7_w1/mock.rb
 - lib/j7_w1/push_client.rb
+- lib/j7_w1/util.rb
 - lib/j7_w1/version.rb
 - lib/j7w1.rb
 - spec/.gitignore