crusade_rails 0.0.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 667a327626f4b01ed39136f2f80d48d9adb43ee2
-  data.tar.gz: ee77ad2e8b097a26761baeb8b44cf9b93ba5f9b1
+  metadata.gz: 1758a05336f3d5d9c4b170811ddb6ab87a12cccf
+  data.tar.gz: 3a303c0367f99bf7ec1ced5188f7022b9fc1d171
 SHA512:
-  metadata.gz: 3a05c52203dd4d1ddafbb7d8ecc04482deff5cae6eae91ae155f4214afcee1f8da5685418c86672b0967766c41d993500edabf940bcd5e851419d265187cdea7
-  data.tar.gz: 16f7b9c8411de096b05af79de79931e45edfe50b36a665d444e56f243fa121029ec4027f3735091f4007091f7514b1674dfa1f8a0cc23990cc82febd1726058a
+  metadata.gz: c69c513d634b54a466de60fb9a4afbc5a9a21ff8f4debca5e3d0c662786dc4ef1f7fc5789daa87dd39697bba6157c9f7af61b883cc29c98837acc7ccf84fd639
+  data.tar.gz: f1f7fbf9ab9aa59fede370fb27537c5c82f31edd606b38e58b9bcef04f7b8143c7912ca44cd922500fa5a63c7aa62064fccd39113f8e409fdceb312bba017ce0

data/app/assets/javascripts/crusade_rails/configuration.js.coffee.erb

@@ -1,4 +1,4 @@
 
 window.crusade =
-  pushId:        '<%= Rails.application.config.crusade.push_id %>'
-  webserviceUrl: '<%= Rails.application.config.crusade.webservice_url %>'
+  pushId:        '<%= Rails.application.config.crusade.apns.push_id %>'
+  webserviceUrl: '<%= Rails.application.config.crusade.apns.webservice_url %>'

data/app/controllers/crusade_rails/apns/v1/push_package_controller.rb

@@ -5,7 +5,7 @@ module CrusadeRails
         skip_before_action :verify_authenticity_token
 
         def create
-          generator = Crusade::APNS::PushPackageGenerator.new Rails.application.config.crusade
+          generator = Crusade::APNS::PushPackageGenerator.new Rails.application.config.crusade.apns
           user_id = json['user']
 
           Rails.logger.debug "requesting push package for user #{user_id}"

data/app/services/crusade_rails/notification_service.rb

@@ -30,7 +30,7 @@ module CrusadeRails
     end
 
     def default_push_notification
-      Crusade::APNS::PushNotification.new(Rails.application.config.crusade)
+      Crusade::APNS::PushNotification.new(Rails.application.config.crusade.apns)
     end
   end
 end

data/config/routes.rb

@@ -1,15 +1,18 @@
 CrusadeRails::Engine.routes.draw do
-  namespace "apns" do
-    namespace "v1" do
-      post "pushPackages/#{Rails.application.config.crusade.push_id}", 
-            to: "push_package#create", as: "apns_push_package"
+  if Rails.application.config.respond_to?(:crusade) && 
+     Rails.application.config.crusade.respond_to?(:apns)
+    namespace "apns" do
+      namespace "v1" do
+        post "pushPackages/#{Rails.application.config.crusade.apns.push_id}", 
+              to: "push_package#create", as: "apns_push_package"
 
-      post   "/devices/:device_token/registrations/#{Rails.application.config.crusade.push_id}",
-              to: "subscription#create", as: "apns_push_registration"
-      delete "/devices/:device_token/registrations/#{Rails.application.config.crusade.push_id}",
-              to: "subscription#delete", as: "apns_push_unregistration"
+        post   "/devices/:device_token/registrations/#{Rails.application.config.crusade.apns.push_id}",
+                to: "subscription#create", as: "apns_push_registration"
+        delete "/devices/:device_token/registrations/#{Rails.application.config.crusade.apns.push_id}",
+                to: "subscription#delete", as: "apns_push_unregistration"
 
-      post "log", to: "log#create", as: "apns_log"
+        post "log", to: "log#create", as: "apns_log"
+      end
     end
   end
 end

data/lib/crusade_rails/engine.rb

@@ -1,9 +1,8 @@
+require 'crusade'
 require 'crusade/apns'
 
 module CrusadeRails
   class Engine < ::Rails::Engine
     isolate_namespace CrusadeRails
   end
-end
-
-require 'crusade_rails/configuration_loader'
+end

data/lib/crusade_rails/version.rb

@@ -1,3 +1,3 @@
 module CrusadeRails
-  VERSION = "0.0.1"
+  VERSION = "0.8.0"
 end

data/lib/generators/crusade/install/install_generator.rb

@@ -8,7 +8,7 @@ class Crusade::InstallGenerator < Rails::Generators::Base
   end
 
   def copy_configuration_file
-    template "configuration.yml", File.join(destination_root, "config", "crusade.yml")
+    template "configuration-apns.yml", File.join(destination_root, "config", "crusade-apns.yml")
   end
 
   def update_routes

data/lib/generators/crusade/install/templates/initializer.rb

@@ -1,2 +1,6 @@
+Crusade.config do |config|
+  config.env = Rails.env
+  config.plugins = { apns: "#{Rails.root}/config/crusade-apns.yml" }
 
-CrusadeRails.load_configuration!
+  Rails.application.config.crusade = config
+end

data/test/dummy/config/{crusade.yml → crusade-apns.yml}

@@ -1,8 +1,8 @@
 default: &default
   site_name: Apns config fixture
   push_id: web.com.example.push.id
-  iconset_dir: lib/icon.iconset
-  certificate: config/certificate.p12
+  iconset_dir: test/dummy/lib/icon.iconset
+  certificate: test/dummy/config/certificate.p12
   certificate_password: test
 
 development:
@@ -20,4 +20,4 @@ test:
   allowed_domains:
     - http://localhost
     - https://localhost
-  certificate_password:
+  certificate_password: test

data/test/dummy/config/initializers/crusade.rb

@@ -1,2 +1,6 @@
+Crusade.config do |config|
+  config.env = Rails.env
+  config.plugins = { apns: "#{Rails.root}/config/crusade-apns.yml" }
 
-CrusadeRails.load_configuration!
+  Rails.application.config.crusade = config
+end

data/test/dummy/db/schema.rb

@@ -11,16 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20130921092524) do
-
-  create_table "crusade_rails_engine_user_subscriptions", force: true do |t|
-    t.integer  "user_id"
-    t.string   "user_token"
-    t.string   "device_token"
-    t.boolean  "active"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
+ActiveRecord::Schema.define(version: 20130922190000) do
 
   create_table "crusade_rails_user_subscriptions", force: true do |t|
     t.integer  "user_id"