kw_apn 0.4.beta.4 → 0.4.beta.6

data/VERSION

@@ -1 +1 @@
-0.4.beta.4
+0.4.beta.6

data/lib/config.rb

@@ -34,11 +34,12 @@ module KwAPN
         @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
+          YAML.load(parsed_config)[env]
         rescue => e
           puts "Warning (KwAPN): Could not parse config file: #{e.message}"
           {}
         end
+        recursive_symbolize_keys!(@options)
         @options[:root] ||= root
         @options[:push_host] ||= default_push_host
         @options[:feedback_host] ||= default_feedback_host
@@ -48,12 +49,19 @@ module KwAPN
       # returns or loads the current options
       def option(opt, app_id = nil)
         @options || load_options
+        opt = opt.to_sym
+        app_id = app_id.to_sym
         if app_id && @options[app_id] && @options[app_id][opt]
           @options[app_id][opt]
         else
           @options[opt]
         end
       end
+      
+      def recursive_symbolize_keys!(hash)
+         hash.symbolize_keys!
+         hash.values.select{|v| v.is_a? Hash}.each{|h| recursive_symbolize_keys!(h)}
+       end
     end
 
       # set some default options based on the envrionment

data/lib/connection.rb

@@ -9,7 +9,7 @@ module KwAPN
       ctx = OpenSSL::SSL::SSLContext.new()
       ctx.cert = OpenSSL::X509::Certificate.new(File.read(KwAPN::Config.option(:cert_file, app_id)))
       ctx.key  = OpenSSL::PKey::RSA.new(File.read(KwAPN::Config.option(:cert_file, app_id)))
-
+      puts '-------------------------------------------- ' + host.inspect
       s = TCPSocket.new(host, port)
       ssl = OpenSSL::SSL::SSLSocket.new(s, ctx)
       ssl.connect # start SSL session

data/lib/feedback_reader.rb

@@ -5,12 +5,13 @@ module KwAPN
     def initialize(app_id = nil)
       @host = KwAPN::Config.option(:feedback_host, app_id)
       @port = KwAPN::Config.option(:feedback_port, app_id)
+      @app_id = app_id
     end
     
     def read
       records ||= []
       begin
-        @ssl = connect(@host, @port)
+        @ssl = connect(@host, @port, @app_id)
         while record = @ssl.read(38)
           feedback = record.strip.unpack('NnH*')
           records << feedback[2].scan(/.{0,8}/).join(' ').strip

data/lib/sender.rb

@@ -30,7 +30,7 @@ module KwAPN
         return [:ok, @failed_index_array.collect{|a| notifications[a].token}]
       rescue => e
         failed
-        self.class.log("(#{app_id} - #{session_id}) Exception: #{e.message}")
+        self.class.log("(#{app_id} - #{session_id}) Exception: #{e.message}\n\t#{e.backtrace.join("\n\t")}")
         return [:nok, "Exception: #{e.message}"]
       end
     end
@@ -44,7 +44,7 @@ private
     
     def start_threads(notifications, index=0)
       @last_error_index = nil
-      @ssl = connect(@host, @port)
+      @ssl = connect(@host, @port, @app_id)
       if @ssl
         @watch_thread = Thread.new do 
           perform_watch()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: kw_apn
 version: !ruby/object:Gem::Version 
-  hash: 62196347
+  hash: 62196351
   prerelease: true
   segments: 
   - 0
   - 4
   - beta
-  - 4
-  version: 0.4.beta.4
+  - 6
+  version: 0.4.beta.6
 platform: ruby
 authors: 
 - Jonathan Cichon