bravtroller 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e5a2d9ff7a5bd2ea66e36a38c24a53a03d93cd9
-  data.tar.gz: c8ee0410e7171bb40b079c6b9bdc4ebe537bddf6
+  metadata.gz: 1c2771970023d32fc31b1b5f6d886604b66de45e
+  data.tar.gz: 48223252de5d5a1159c952e12a3239d38936b0a8
 SHA512:
-  metadata.gz: bfcd5c7408e4adfe6dfb24c6bc917f5646c7830749c36498c6c8aa1b5bc2886ff64691e57476f06873dc164b4bf554d6e94741b074690e6921997d84e4814235
-  data.tar.gz: dca6881a1a3060ba680e3b888c948955e771224f3187f44084951917ea8193e307bb40793c5df2759228d954f9a4b6608cf23114e89668b8d6e9cbdb76fb7819
+  metadata.gz: 669b812f605adfa512d048a9990e76f3861d6c507ce478d4009a645f3d704e73ee0616fd743571995c520a5a4ae496841edaca1c2ecc8fdc5b6617d1e3b40ec9
+  data.tar.gz: 4637c6a8e1404b77a92a589a526f70b9642106c809a359b3293465712a916d114643471514ef20987ddb9a707b2573995a33e681ef66b8e9439219cbfd81f93e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bravtroller (0.1.0)
+    bravtroller (0.1.1)
       easy_upnp
 
 GEM

data/lib/bravtroller/remote.rb

@@ -1,3 +1,4 @@
+require 'singleton'
 require 'easy_upnp/ssdp_searcher'
 
 require_relative 'authenticator'
@@ -14,30 +15,38 @@ module Bravtroller
         version: '1.0'
     }
 
-    def self.create(bravia_client)
-      searcher = EasyUpnp::SsdpSearcher.new
-      results = searcher.search(IRCC_URN)
-      authenticator = Bravtroller::Authenticator.new(bravia_client)
-
-      if ! authenticator.authorized?
-        raise RuntimeError.new 'Not authorized yet. Please authorize Bravtroller using Bravtroller::Authenticator.'
+    class IrccClientFactory
+      def initialize(client)
+        @client = client
       end
 
-      if results.empty?
-        raise RuntimeError.new "Couldn't find any UPnP devices on the network that looks like a supported Sony device"
-      elsif results.count != 1
-        raise RuntimeError.new "Found more than one supported Sony device. Please construct Remote manually. Found devices: #{results.inspect}"
-      else
-        device = results.first
-        ircc_client = device.service(IRCC_URN, cookies: HTTPI::Cookie.new(authenticator.authorize {}))
-
-        Remote.new(ircc_client, bravia_client)
+      def create
+        if @ircc_client.nil?
+          searcher = EasyUpnp::SsdpSearcher.new
+          results = searcher.search(IRCC_URN)
+          authenticator = Bravtroller::Authenticator.new(@client)
+
+          if !authenticator.authorized?
+            raise RuntimeError.new 'Not authorized yet. Please authorize Bravtroller using Bravtroller::Authenticator.'
+          end
+
+          if results.empty?
+            raise RuntimeError.new "Couldn't find any UPnP devices on the network that looks like a supported Sony device"
+          elsif results.count != 1
+            raise RuntimeError.new "Found more than one supported Sony device. Please construct Remote manually. Found devices: #{results.inspect}"
+          else
+            device = results.first
+            @ircc_client = device.service(IRCC_URN, cookies: HTTPI::Cookie.new(authenticator.authorize {}))
+          end
+        end
+
+        @ircc_client
       end
     end
 
-    def initialize(ircc_client, bravia_client)
-      @ircc_client = ircc_client
+    def initialize(bravia_client, ircc_client_factory = IrccClientFactory.new(bravia_client))
       @bravia_client = bravia_client
+      @ircc_client_factory  = ircc_client_factory
     end
 
     def power_on
@@ -53,7 +62,7 @@ module Bravtroller
     def press_button(button_key)
       raise RuntimeError.new "Undefined button: #{button_key}" if ircc_codes[button_key].nil?
 
-      @ircc_client.X_SendIRCC IRCCCode: ircc_codes[button_key]
+      @ircc_client_factory.create.X_SendIRCC IRCCCode: ircc_codes[button_key]
     end
 
     def buttons

data/lib/bravtroller/version.rb

@@ -1,3 +1,3 @@
 module Bravtroller
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bravtroller
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Christopher Mullins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-11 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_upnp