apnotic 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ce6144cfd4d92ded62f555d22b37758855eb2cc
-  data.tar.gz: c239e3fad3adb4a77629d638358eee7f91552c42
+  metadata.gz: 8304b356ec75720e4a6b0a1b969f42a6478fb989
+  data.tar.gz: 5ee9a617bc2abb21e3aa98ffd119c4ada2b978be
 SHA512:
-  metadata.gz: 3fd69fe8c84117767cf19b448a3758bc309ca4d6c208e445aba50a71b3b1fb9f793e4b2bde12d2719a5c476eee2a5c5d1fe50424a2630f759c65e7eb69d63427
-  data.tar.gz: db924a220d2c2084703ca2b10c0759b6b74a8d9f38833c5247781b69ad6d631290dbfd181119e677a0403229ec2e7e9cc749498f4486df18f89d79a0713f5b8e
+  metadata.gz: cfc56210bd04357a57c7187a513610e8a3de664cf3f9a41bbc0e27320ac0e89f7121ea8e32db0a980edb9dd8099c5fd830d6ebd968a615205c343c7819d32b7a
+  data.tar.gz: b59e06b515806102cab4add4675d180f967038790d0fb7ddfc6c92b04884d3c0eca2a826e5252d14221e35858293383cd879c2c1bda88f72aa783454fa2f9b2f

data/apnotic.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "http-2", "~> 0.8.1"
+  spec.add_dependency "net-http2", "~> 0.7.2"
   spec.add_dependency "connection_pool", "~> 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/apnotic.rb

@@ -1,8 +1,8 @@
 require 'apnotic/connection'
 require 'apnotic/connection_pool'
 require 'apnotic/notification'
+require 'apnotic/request'
 require 'apnotic/response'
-require 'apnotic/stream'
 require 'apnotic/version'
 
 module Apnotic

data/lib/apnotic/connection.rb

@@ -1,7 +1,5 @@
-require 'socket'
+require 'net-http2'
 require 'openssl'
-require 'uri'
-require 'http/2'
 
 module Apnotic
 
@@ -9,128 +7,45 @@ module Apnotic
   APPLE_PRODUCTION_SERVER_URI  = "https://api.push.apple.com:443"
 
   class Connection
-    attr_reader :uri, :cert_path
+    attr_reader :url, :cert_path
 
     class << self
       def development(options={})
-        options.merge!(uri: APPLE_DEVELOPMENT_SERVER_URI)
+        options.merge!(url: APPLE_DEVELOPMENT_SERVER_URI)
         new(options)
       end
     end
 
     def initialize(options={})
-      @uri       = URI.parse(options[:uri] || APPLE_PRODUCTION_SERVER_URI)
+      @url       = options[:url] || APPLE_PRODUCTION_SERVER_URI
       @cert_path = options[:cert_path]
       @cert_pass = options[:cert_pass]
 
-      @pipe_r, @pipe_w = Socket.pair(:UNIX, :STREAM, 0)
-      @socket_thread   = nil
-      @mutex           = Mutex.new
-
-      raise "URI needs to be a HTTPS address" if uri.scheme != 'https'
       raise "Cert file not found: #{@cert_path}" unless @cert_path && File.exist?(@cert_path)
+
+      @client = NetHttp2::Client.new(@url, ssl_context: ssl_context)
     end
 
     def push(notification, options={})
-      open
-
-      new_stream.push(notification, options)
+      request  = Apnotic::Request.new(notification)
+      response = @client.post(request.path, request.body, request.headers, timeout: options[:timeout])
+      Apnotic::Response.new(headers: response.headers, body: response.body) if response
     end
 
     def close
-      exit_thread(@socket_thread)
-
-      @ssl_context   = nil
-      @h2            = nil
-      @pipe_r        = nil
-      @pipe_w        = nil
-      @socket_thread = nil
+      @client.close
     end
 
     private
 
-    def new_stream
-      Apnotic::Stream.new(uri: @uri, h2_stream: h2.new_stream)
-    end
-
-    def open
-      return if @socket_thread
-
-      @socket_thread = Thread.new do
-
-        socket = new_socket
-
-        begin
-          thread_loop(socket)
-        ensure
-          socket.close unless socket.closed?
-          @socket_thread = nil
-        end
-      end.tap { |t| t.abort_on_exception = true }
-    end
-
-    def thread_loop(socket)
-      loop do
-
-        available = socket.pending
-        if available > 0
-          data_received = socket.sysread(available)
-          h2 << data_received
-          break if socket.nil? || socket.closed?
-        end
-
-        ready = IO.select([socket, @pipe_r])
-
-        if ready[0].include?(@pipe_r)
-          data_to_send = @pipe_r.read_nonblock(1024)
-          socket.write(data_to_send)
-        end
-
-        if ready[0].include?(socket)
-          data_received = socket.read_nonblock(1024)
-          h2 << data_received
-          break if socket.nil? || socket.closed?
-        end
-      end
-    end
-
-    def new_socket
-      tcp               = TCPSocket.new(@uri.host, @uri.port)
-      socket            = OpenSSL::SSL::SSLSocket.new(tcp, ssl_context)
-      socket.sync_close = true
-      socket.hostname   = @uri.hostname
-
-      socket.connect
-
-      socket
-    end
-
     def ssl_context
       @ssl_context ||= begin
         ctx         = OpenSSL::SSL::SSLContext.new
         certificate = File.read(@cert_path)
-        passphrase  = @cert_pass
-        ctx.key     = OpenSSL::PKey::RSA.new(certificate, passphrase)
+        ctx.key     = OpenSSL::PKey::RSA.new(certificate, @cert_pass)
         ctx.cert    = OpenSSL::X509::Certificate.new(certificate)
         ctx
       end
     end
-
-    def h2
-      @h2 ||= HTTP2::Client.new.tap do |h2|
-        h2.on(:frame) do |bytes|
-          @mutex.synchronize do
-            @pipe_w.write(bytes)
-            @pipe_w.flush
-          end
-        end
-      end
-    end
-
-    def exit_thread(thread)
-      return unless thread && thread.alive?
-      thread.exit
-      thread.join
-    end
   end
 end

data/lib/apnotic/request.rb

@@ -0,0 +1,23 @@
+module Apnotic
+
+  class Request
+    attr_reader :path, :headers, :body
+
+    def initialize(notification)
+      @path    = "/3/device/#{notification.token}"
+      @headers = build_headers_for notification
+      @body    = notification.body
+    end
+
+    private
+
+    def build_headers_for(notification)
+      h = {}
+      h.merge!('apns-id' => notification.apns_id) if notification.apns_id
+      h.merge!('apns-expiration' => notification.expiration) if notification.expiration
+      h.merge!('apns-priority' => notification.priority) if notification.priority
+      h.merge!('apns-topic' => notification.topic) if notification.topic
+      h
+    end
+  end
+end

data/lib/apnotic/version.rb

@@ -1,3 +1,3 @@
 module Apnotic
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: apnotic
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Roberto Ostinelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: http-2
+  name: net-http2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -103,8 +103,8 @@ files:
 - lib/apnotic/connection.rb
 - lib/apnotic/connection_pool.rb
 - lib/apnotic/notification.rb
+- lib/apnotic/request.rb
 - lib/apnotic/response.rb
-- lib/apnotic/stream.rb
 - lib/apnotic/version.rb
 homepage: http://github.com/ostinelli/apnotic
 licenses:

data/lib/apnotic/stream.rb

@@ -1,71 +0,0 @@
-module Apnotic
-
-  class Stream
-
-    DEFAULT_TIMEOUT = 30
-
-    def initialize(options={})
-      @h2_stream = options[:h2_stream]
-      @uri       = options[:uri]
-      @headers   = {}
-      @data      = ''
-      @completed = false
-      @mutex     = Mutex.new
-      @cv        = ConditionVariable.new
-
-      @h2_stream.on(:headers) do |hs|
-        hs.each { |k, v| @headers[k] = v }
-      end
-
-      @h2_stream.on(:data) { |d| @data << d }
-      @h2_stream.on(:close) do
-        @mutex.synchronize do
-          @completed = true
-          @cv.signal
-        end
-      end
-    end
-
-    def push(notification, options={})
-      headers = build_headers_for notification
-      body    = notification.body
-
-      @h2_stream.headers(headers, end_stream: false)
-      @h2_stream.data(body, end_stream: true)
-
-      respond(options)
-    end
-
-    private
-
-    def build_headers_for(notification)
-      headers = {
-        ':scheme'        => @uri.scheme,
-        ':method'        => 'POST',
-        ':path'          => "/3/device/#{notification.token}",
-        'host'           => @uri.host,
-        'content-length' => notification.body.bytesize.to_s
-      }
-      headers.merge!('apns-id' => notification.apns_id) if notification.apns_id
-      headers.merge!('apns-expiration' => notification.expiration) if notification.expiration
-      headers.merge!('apns-priority' => notification.priority) if notification.priority
-      headers.merge!('apns-topic' => notification.topic) if notification.topic
-      headers
-    end
-
-    def respond(options={})
-      options[:timeout] ||= DEFAULT_TIMEOUT
-
-      @mutex.synchronize { @cv.wait(@mutex, options[:timeout]) }
-
-      if @completed
-        Apnotic::Response.new(
-          headers: @headers,
-          body:    @data
-        )
-      else
-        nil
-      end
-    end
-  end
-end