j7w1 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1caea42fda924cb30963c6eeb49ec6cd87c8d255
-  data.tar.gz: d031a3223717a6d62899b620b503b3503b482b57
+  metadata.gz: 6ad5f2775ef8894cdc1c82243f9a18a44debbcf1
+  data.tar.gz: 042ffa10065118058d0a21192365ea10b7278a6f
 SHA512:
-  metadata.gz: 969442af76e0375ebdd09693e5c9aed4d067f78f9fd85d8a659a1c9ea19ea9f740545c4ae4fe4a82277649f1f34ef8fbf2f66ce285eb3dfc14b41259ce14e2e7
-  data.tar.gz: ecdfa8cd5bca3694fab365e9fe4c520f0fd42446a426455187d5cd8972a7995e16d82085c3c9e01038d041b7638394c1acb124e3f230bc74577bb8ab48add3c2
+  metadata.gz: dc43b5e73d7e96e9de1e75baaaed54b22075aec19281bcfc8fe0c572c15fe858325fe4292766fb93cdc840a38dbaea54910e2a10514c82d8a37421a8e7bddfea
+  data.tar.gz: 866d57e0b6414dd8a42056f5721b6e5f4cc805f049db38e5d66d1a114db024cbc5857294845423ab66feba6723ad4c5174ac4bed6a65a26f124cceb7d78e9483

data/j7w1.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["condor1226@gmail.com"]
   spec.description   = %q{Mobile apps push client}
   spec.summary       = %q{Mobile apps push client}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/condor/j7w1"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files Gemfile LICENSE.txt README.md j7w1.gemspec lib spec`.split($/)
@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "activerecord", ">= 4.0"
+  spec.add_development_dependency 'simplecov'
 end

data/lib/generators/j7_w1/migration/migration_generator.rb

@@ -4,6 +4,9 @@ require 'rails/generators/migration'
 module J7W1
   class MigrationGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
+    class_option :from_11, type: :boolean, default: :false,
+      desc: 'Generates migration script from v0.0.11 or earlier.'
+
 
     def self.orm
       Rails::Generators.options[:rails][:orm]
@@ -30,7 +33,11 @@ module J7W1
     desc "This generator provides the tables which the J7W1 uses."
     def create_migration_file
       if self.class.orm_has_migration?
-        migration_template 'migration.rb', 'db/migrate/j7_w1_application_devices'
+        if options['from_11']
+          migration_template 'migration_from_11e.rb', 'db/migrate/add_j7_w1_application_devices_disabled'
+        else
+          migration_template 'migration.rb', 'db/migrate/create_j7_w1_application_devices'
+        end
       end
     end
     

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

@@ -1,4 +1,4 @@
-class J7W1ApplicationDevices < ActiveRecord::Migration
+class <%= migration_class_name %> < ActiveRecord::Migration
   def change
     create_table :j7w1_application_devices do |t|
       t.string  :owner_type,          null: false
@@ -6,6 +6,7 @@ class J7W1ApplicationDevices < ActiveRecord::Migration
       t.string  :device_identifier,   null: false
       t.string  :platform,            null: false
       t.string  :device_endpoint_arn, null: true
+      t.boolean :disabled,            null: false,  default: false
 
       t.index   [:owner_type, :owner_id]
       t.index   [:device_identifier, :platform], unique: true

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

@@ -0,0 +1,7 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def change
+    change_table :j7w1_application_devices do |t|
+      t.boolean :disabled,            null: false,  default: false
+    end
+  end
+end

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

@@ -1,8 +1,10 @@
-class J7W1ApplicationDevice < ActiveRecord::Base
+class J8W1ApplicationDevice < ActiveRecord::Base
   self.table_name = 'j7w1_application_devices'
 
   belongs_to :owner, polymorphic: true
 
+  scope :enabled, -> {where(disabled: false)}
+
 <%- if options['async_engine'] -%>
   after_create :create_device_endpoint_async
   after_destroy :destroy_device_endpoint_async
@@ -16,6 +18,14 @@ class J7W1ApplicationDevice < ActiveRecord::Base
 
   def push!(options = {})
     J7W1::PushClient.push device_endpoint_arn, platform, options
+  rescue AWS::SNS::Errors::EndpoiintDisabled
+    logger.warn{"push for Application Device ##{id} is currently disabled."}
+    begin
+      update_attributes!(disabled: true)
+    rescue
+      logger.warn { "Disabling failure: application device ##{id}" }
+      # grasp all the exception raised.
+    end
   end
 
   def create_device_endpoint

data/lib/j7w1.rb

@@ -5,6 +5,8 @@ module J7W1
   autoload :Util, 'j7w1/util'
   autoload :Version, 'j7w1/version'
   autoload :ActiveRecordExt, 'j7w1/active_record_ext'
+  autoload :MockPushClient, 'j7w1/mock_push_client'
+  autoload :SNSPushClient, 'j7w1/sns_push_client'
 
   ActiveRecord::Base.__send__(:include, ActiveRecordExt) if defined? ActiveRecord::Base
 
@@ -12,6 +14,8 @@ module J7W1
     attr_reader :current_strategy
     private :current_strategy
 
+    include Util
+
     def configure(configuration)
       raise ArgumentError,
         "J7W1 configuration values should be an instance of Hash or String, but actually it is a kind of #{configuration.class.name}" unless
@@ -19,11 +23,11 @@ module J7W1
 
       configuration = configuration_values_of(configuration)
       if configuration[:mock]
-        autoload :PushClient, 'j7w1/mock'
+        replace_concrete_push_client MockPushClient
         return
       end
 
-      autoload :PushClient, 'j7w1/push_client'
+      replace_concrete_push_client SNSPushClient
       @configuration = Configuration.new configuration
     end
 
@@ -51,12 +55,9 @@ module J7W1
       configuration
     end
 
-    def symbolize_keys_recursive(hash)
-      hash.inject({}) do |h, kv|
-        (key, value) = kv
-        h[key.to_sym] = regularize_for_symbolization(value)
-        h
-      end
+    def replace_concrete_push_client(newer)
+      remove_const :PushClient if defined? PushClient
+      const_set :PushClient, newer
     end
 
     if const_defined?(:ActiveSupport) && Hash.instance_methods.include?(:symbolize_keys) &&
@@ -88,6 +89,7 @@ module J7W1
               value
         end
       end
+
     end
   end
 end

data/lib/j7w1/active_record_ext.rb

@@ -29,7 +29,7 @@ module J7W1
       end
 
       def push!(options = {})
-        application_devices.each do |device|
+        application_devices.enabled.each do |device|
           device.push! options
         end
       end

data/lib/j7w1/configuration.rb

@@ -1,5 +1,7 @@
 module J7W1
   class Configuration
+    include J7W1::Util
+
     module IOSEndpoint
       def sandbox?
         @sandbox
@@ -22,12 +24,12 @@ module J7W1
 
     module Account
       [:access_key_id, :secret_access_key, :region].each do |attr|
-        define_method(attr){self[attr]}
+        module_eval "def #{attr};self[:#{attr}];end"
       end
     end
 
     def initialize(configuration_values)
-      @values = configuration_values
+      @values = symbolize_keys_recursive(configuration_values)
       if ios_endpoint
         ios_endpoint.extend(IOSEndpoint)
         ios_endpoint.confirm_sandbox
@@ -41,11 +43,13 @@ module J7W1
     end
 
     def ios_endpoint
+      return nil unless @values[:app_endpoint]
       @values[:app_endpoint][:ios]
     end
 
     def android_endpoint
       #TODO configの対応
+      return nil unless @values[:app_endpoint]
       @values[:app_endpoint][:android]
     end
   end

data/lib/j7w1/{mock.rb → mock_push_client.rb}

@@ -1,5 +1,5 @@
 module J7W1
-  module PushClient
+  module MockPushClient
 
     class << self
       def push_histories

data/lib/j7w1/{push_client.rb → sns_push_client.rb}

@@ -1,7 +1,7 @@
 module J7W1
-  module PushClient
+  module SNSPushClient
     def create_sns_client(configuration = J7W1.configuration)
-      AWS::SNS.new J7W1.configuration.account
+      AWS::SNS.new configuration.account
     end
 
     def create_ios_application(name, certs, private_key, options)
@@ -24,6 +24,13 @@ module J7W1
       application_endpoint[:platform_application_arn]
     end
 
+    def destroy_application_endpoint(arn, options)
+      configuration = options[:sns_configuration] || J7W1.configuration
+      client = options[:sns_client] || create_sns_client(configuration)
+
+      client.client.delete_platform_application(platform_application_arn: arn)
+    end
+
     def create_device_endpoint(device_identifier, platform, options = {})
       custom_user_data = options[:custom_user_data]
       sns_configuration = options[:sns_configuration]

data/lib/j7w1/util.rb

@@ -4,13 +4,23 @@ module J7W1
       platform = platform.to_s.downcase.to_sym unless platform.is_a? Symbol
 
       case platform
-      when :ios, :'iphone os', :'ipad os'
-        :ios
-      else
-        platform
+        when :ios, :'iphone os', :'ipad os'
+          :ios
+        else
+          # TODO Android
+          platform
       end
     end
 
-    instance_methods(false).each{|m|module_function m}
+    def symbolize_keys_recursive(hash)
+      hash.inject({}) do |h, kv|
+        (key, value) = kv
+        h[key.to_sym] =
+            value.is_a?(Hash) ? symbolize_keys_recursive(value) : value
+        h
+      end
+    end
+
+    extend self
   end
 end

data/lib/j7w1/version.rb

@@ -1,3 +1,3 @@
 module J7W1
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/spec/lib/j7w1/configuration_spec.rb

@@ -0,0 +1,100 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '../../spec_helper'))
+
+describe J7W1::Configuration  do
+  describe :ios_endpoint do
+
+
+    shared_examples_for 'sandbox_confirmation' do
+      subject {
+        J7W1::Configuration.new(
+          app_endpoint: {
+            ios: {
+              arn: arn,
+            },
+          }
+        )
+      }
+
+      specify { expect(subject.ios_endpoint.arn).to eql(arn) }
+      specify { expect(!!subject.ios_endpoint.sandbox?).to eql(sandbox) }
+    end
+
+    describe 'sandbox arn' do
+      let(:sandbox){true}
+      let(:arn){'arn:aws:sns:ap-northeast-1:1234567:app/APNS_SANDBOX/test'}
+      it_should_behave_like 'sandbox_confirmation'
+    end
+
+    describe 'production arn' do
+      let(:sandbox){false}
+      let(:arn){'arn:aws:sns:ap-northeast-1:1234567:app/APNS/test'}
+      it_should_behave_like 'sandbox_confirmation'
+    end
+  end
+
+  describe :android_endpoint do
+    subject {
+      J7W1::Configuration.new(
+        app_endpoint: {
+          android: {
+            arn: arn,
+          },
+        }
+      )
+    }
+    let(:arn){'arn:aws:sns:ap-northeast-1:1234567:app/ANDROID/test'}
+    specify 'arn should return the specified configuration value' do
+      expect(subject.android_endpoint.arn).to eql(arn)
+    end
+  end
+
+  describe :account do
+
+    shared_examples_for 'configuration extraction' do
+      let(:region){'ap-northeast-1'}
+      let(:access_key_id){'access_key_id_1'}
+      let(:secret_access_key){'secret_access_key_1'}
+
+      describe 'should return a hash with values under :account given on initialization' do
+        specify{expect(subject.account).to be_kind_of Hash}
+        specify{expect(subject.account[:region]).to eql(region)}
+        specify{expect(subject.account[:access_key_id]).to eql(access_key_id)}
+        specify{expect(subject.account[:secret_access_key]).to eql(secret_access_key)}
+      end
+
+      describe 'its accessors should return the values which are correspondent to the key' do
+        specify{expect(subject.account.region).to eql(region)}
+        specify{expect(subject.account.access_key_id).to eql(access_key_id)}
+        specify{expect(subject.account.secret_access_key).to eql(secret_access_key)}
+      end
+    end
+
+    describe 'when keys are kind of Symbol' do
+      subject {
+        J7W1::Configuration.new(
+            account: {
+                region: region,
+                access_key_id: access_key_id,
+                secret_access_key: secret_access_key,
+            }
+        )
+      }
+      it_should_behave_like 'configuration extraction'
+    end
+
+    describe 'when keys are kind of String' do
+      subject {
+        J7W1::Configuration.new(
+            'account' => {
+                'region' => region,
+                'access_key_id' =>  access_key_id,
+                'secret_access_key'=> secret_access_key,
+            }
+        )
+      }
+      it_should_behave_like 'configuration extraction'
+    end
+
+  end
+
+end

data/spec/lib/j7w1/util_spec.rb

@@ -0,0 +1,45 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '../../spec_helper'))
+
+describe J7W1::Util do
+  subject{
+    Object.new.tap{|o|o.extend J7W1::Util }
+  }
+
+  describe :symbolize_keys_recursive do
+
+    context "should return the hash whose keys are converted to symbol recursively" do
+      specify do
+        expect(subject.symbolize_keys_recursive({'aaa' => 1, :bbb => 2, '3' => 4})).to eql({aaa: 1, bbb: 2, :'3' => 4})
+      end
+
+      specify do
+        expect(subject.symbolize_keys_recursive({'aaa' => 1, :bbb => 2, '3' => {'aaa' => 5, :'bbb' => 10}})).to eql({aaa: 1, bbb: 2, :'3' => {aaa: 5, bbb: 10}})
+      end
+    end
+  end
+
+  describe :normalize_platform do
+    context 'can normalize ios-like platform symbol to :ios' do
+
+      shared_examples_for 'into ios' do
+        specify{expect(subject.normalize_platform(platform_string)).to eql(:ios)}
+      end
+
+      context '"iPad OS" is given' do
+        let(:platform_string){'iPad OS'}
+        it_behaves_like 'into ios'
+      end
+
+      context '"iPhone OS" is given' do
+        let(:platform_string){'iPhone OS'}
+        it_behaves_like 'into ios'
+      end
+
+      context '"iOS" is given' do
+        let(:platform_string){'iOS'}
+        it_behaves_like 'into ios'
+      end
+
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,13 @@
+require 'rspec'
+require 'bundler/setup'
+
+unless ENV['SKIP_COV']
+  require 'simplecov'
+  SimpleCov.start
+end
+
+require 'j7w1'
+
+RSpec.configure do |config|
+  # see https://github.com/rspec/rspec-core/blob/master/lib/rspec/core/configuration.rb for more infomation
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j7w1
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - condor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -66,6 +66,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '4.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'
 description: Mobile apps push client
 email:
 - condor1226@gmail.com
@@ -79,6 +107,7 @@ files:
 - j7w1.gemspec
 - lib/generators/j7_w1/migration/migration_generator.rb
 - lib/generators/j7_w1/migration/templates/active_record/migration.rb
+- lib/generators/j7_w1/migration/templates/active_record/migration_from_11e.rb
 - lib/generators/j7_w1/model/model_generator.rb
 - lib/generators/j7_w1/model/templates/j7_w1_application_device.rb.erb
 - lib/generators/j7_w1/model/templates/j7_w1_create_endpoint_worker.rb
@@ -86,13 +115,16 @@ files:
 - lib/j7w1.rb
 - lib/j7w1/active_record_ext.rb
 - lib/j7w1/configuration.rb
-- lib/j7w1/mock.rb
-- lib/j7w1/push_client.rb
+- lib/j7w1/mock_push_client.rb
+- lib/j7w1/sns_push_client.rb
 - lib/j7w1/util.rb
 - lib/j7w1/version.rb
 - spec/.gitignore
 - spec/config.example.yml
-homepage: ''
+- spec/lib/j7w1/configuration_spec.rb
+- spec/lib/j7w1/util_spec.rb
+- spec/spec_helper.rb
+homepage: https://github.com/condor/j7w1
 licenses:
 - MIT
 metadata: {}
@@ -112,10 +144,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Mobile apps push client
 test_files:
 - spec/.gitignore
 - spec/config.example.yml
+- spec/lib/j7w1/configuration_spec.rb
+- spec/lib/j7w1/util_spec.rb
+- spec/spec_helper.rb