kw_apn 0.3.1 → 0.4.beta.1

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.beta.1

data/lib/config.rb

@@ -1,39 +1,67 @@
 module KwAPN
   require 'erb'
-  class Config
+  class Config    
     class << self
-      def options
-        @@options ||= nil
-        unless @@options
-          p_root = if defined? Rails
-            Rails.root
-          elsif defined? RACK_ROOT
-            RACK_ROOT
-          else
-            puts "Warning (KwAPN): You need to specifiy either Rails.root or RACK_ROOT for apns to work!"
-            nil
-          end
-          
-          p_env = if defined? Rails
-            Rails.env
-          elsif defined? RACK_ENV
-            RACK_ENV
-          else
-            puts "Warning (KwAPN): You need to specifiy either Rails.env or RACK_ENV for apns to work!"
-            nil
-          end
-          
-          @@options = begin
-              raw_config = File.read(p_root.join("config", "kw_apn.yml"))
-              parsed_config = ERB.new(raw_config).result
-              YAML.load(parsed_config)[p_env].symbolize_keys
-          rescue => e
-              puts "Warning (KwAPN): Could not parse config file: #{e.message}"
-              {}
-          end
-          @@options[:root] = p_root
+      attr_accessor :default_push_host
+      attr_accessor :default_feedback_host
+      
+      # calculates the project environment (uses Rails or RACK_ENV if available)
+      def env
+        @p_env ||= if defined? Rails
+          Rails.env
+        elsif defined? RACK_ENV
+          RACK_ENV
+        else
+          puts "Warning (KwAPN): You need to specifiy either Rails.env or RACK_ENV for apns to work!"
+          'development'
         end
-        return @@options
+      end
+
+      # calculates the project root (uses Rails or RACK_ROOT if available)
+      def root
+        p_root ||= if defined? Rails
+          Rails.root
+        elsif defined? RACK_ROOT
+          RACK_ROOT
+        else
+          puts "Warning (KwAPN): You need to specifiy either Rails.root or RACK_ROOT for apns to work!"
+          nil
+        end
+      end
+      
+      # loads the options from '/config/kw_apn.yml'
+      def load_options
+        @options = begin
+          raw_config = File.read(root.join("config", "kw_apn.yml"))
+          parsed_config = ERB.new(raw_config).result
+          YAML.load(parsed_config)[env].symbolize_keys
+        rescue => e
+          puts "Warning (KwAPN): Could not parse config file: #{e.message}"
+          {}
+        end
+        @options[:root] ||= root
+        @options[:push_host] ||= default_push_host
+        @options[:feedback_host] ||= default_feedback_host
+        true
+      end
+      
+      # returns or loads the current options
+      def option(opt, app_id = nil)
+        @options || load_options
+        if app_id && @options[app_id] && @options[app_id][opt]
+          @options[app_id][opt]
+        else
+          @options[opt]
+        end
+      end
+      
+      # set some default options based on the envrionment
+      if self.env == 'production'
+        self.default_push_host = 'gateway.push.apple.com'
+        self.default_feedback_host = 'feedback.push.apple.com'
+      else
+        self.default_push_host = 'gateway.sandbox.push.apple.com'
+        self.default_feedback_host = 'feedback.sandbox.push.apple.com'
       end
     end
   end

data/lib/connection.rb

@@ -14,12 +14,12 @@ module KwAPN
       ssl = OpenSSL::SSL::SSLSocket.new(s, ctx)
       ssl.connect # start SSL session
       ssl.sync_close = true # close underlying socket on SSLSocket#close
-      ssl      
+      ssl
     end
     
     class << self
       def log(s)
-        File.open(KwAPN::Config.options[:root].join("log", "kw_apn.log"), File::WRONLY|File::APPEND|File::CREAT, 0666) do |f|
+        File.open(KwAPN::Config.option(:root).join("log", "kw_apn.log"), File::WRONLY|File::APPEND|File::CREAT, 0666) do |f|
           f.write("#{s}\n")
         end
       end

data/lib/core.rb

@@ -44,7 +44,7 @@ module KwAPN
   class Notification
 
     attr_accessor :identifier, :token
-    def initialize(token, payload, timestamp=0)
+    def initialize(token, payload, timestamp = 0)
       @token, @payload, @timestamp = token, payload, timestamp
     end
 

data/lib/feedback_reader.rb

@@ -2,9 +2,9 @@ module KwAPN
   class FeedbackReader < Connection
     
     attr_accessor :host, :port
-    def initialize(host=nil, port=nil)
-      @host = host || KwAPN::Config.options[:feedback_host]
-      @port = port || KwAPN::Config.options[:feedback_port]
+    def initialize(app_id = nil)
+      @host = KwAPN::Config.option(:feedback_host, app_id)
+      @port = KwAPN::Config.option(:feedback_port, app_id)
     end
     
     def read

data/lib/generators/kw_apn/templates/config/kw_apn.yml

@@ -7,7 +7,6 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  profile: true
 
 test:
   <<: *defaults
@@ -15,4 +14,4 @@ test:
 production:
   <<: *defaults
   push_host: 'gateway.push.apple.com'
-  feedback_host: 'feedback.push.apple.com'
+  feedback_host: 'feedback.push.apple.com'

data/lib/sender.rb

@@ -4,13 +4,16 @@ module KwAPN
   # if there is a bug on our side feel free to fix it, but for now it seems to work with the offset workaround
   ID_OFFSET = 333
   class Sender < Connection
-    attr_accessor :host, :port, :count, :fail_count, :work_thread, :watch_thread, :failed_index_array, :session_id, :last_error_index
+    attr_accessor :host, :port, :count, :fail_count, :work_thread, :watch_thread, :failed_index_array, :session_id, :last_error_index, :app_id
 
     # Creates new {Sender} object with given host and port
-    def initialize(session_id, host=nil, port=nil)
+    # @param [String] session_id - A Identifier for Login purpose
+    # @param [String] app_id - The App ID to send to (in the default configuration, there only is 1 id)
+    def initialize(session_id, app_id = nil)
       @session_id = session_id
-      @host = host || KwAPN::Config.options[:push_host] || 'gateway.sandbox.push.apple.com'
-      @port = port || KwAPN::Config.options[:push_port] || 2195
+      @app_id = app_id
+      @host = KwAPN::Config.option(:push_host, app_id)  || 'gateway.sandbox.push.apple.com'
+      @port = KwAPN::Config.option(:push_host, app_id)  || 2195
       @count = 0
       @fail_count = 0
       @failed_index_array = []
@@ -27,7 +30,7 @@ module KwAPN
         return [:ok, @failed_index_array.collect{|a| notifications[a].token}]
       rescue => e
         failed
-        self.class.log("(#{session_id}) Exception: #{e.message}")
+        self.class.log("(#{app_id} - #{session_id}) Exception: #{e.message}")
         return [:nok, "Exception: #{e.message}"]
       end
     end
@@ -80,7 +83,7 @@ private
         if @last_error_index.nil?
           # stop watchthread as the connection should be allready down
           @watch_thread.exit
-          self.class.log("(#{session_id}) Exception at index #{counter+index}: #{e.message}")
+          self.class.log("(#{app_id} - #{session_id}) Exception at index #{counter+index}: #{e.message}")
           @failed_index_array << (counter+index)
           failed
         else
@@ -134,13 +137,14 @@ private
       # convenient way of connecting with apple and pushing the notifications
       # @param [Array] notifications - An Array of Objects of Type KwAPN::Notification
       # @param [String] session_id - A Identifier for Login purpose
+      # @param [String] app_id - A Identifier for Login purpose
       #
       # @returns [Symbol, Array/String] if no Problems occured :ok and an Array of Tokens failed to push is returned. The Caller should take care of those invalid Tokens.
-      def push(notifications, session_id=nil)
-        s = self.new(session_id)
+      def push(notifications, session_id = nil, app_id = nil)
+        s = self.new(session_id, app_id)
         startdate = Time.now
         status, ret = s.push_batch(notifications)
-        log("(#{session_id}) #{startdate.to_s} SENT APN #{s.count - s.fail_count}/#{s.count} in #{Time.now.to_i - startdate.to_i} seconds")
+        log("(#{app_id} - #{session_id}) #{startdate.to_s} SENT APN #{s.count - s.fail_count}/#{s.count} in #{Time.now.to_i - startdate.to_i} seconds")
         s.close_connection
         return [status, ret]
       end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: kw_apn
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 62196337
+  prerelease: true
   segments: 
   - 0
-  - 3
+  - 4
+  - beta
   - 1
-  version: 0.3.1
+  version: 0.4.beta.1
 platform: ruby
 authors: 
 - Jonathan Cichon
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-15 00:00:00 +02:00
+date: 2010-08-26 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -65,12 +66,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: