easy_upnp 0.2.5 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 664553443adb7bbc4003b3fe22d361fc6cee121a
-  data.tar.gz: cc018adaff76a026018bb087779ca166098e30fc
+  metadata.gz: 09a7cd37e19fa3000aba9c64319d21705c2baec4
+  data.tar.gz: 4bd49da3316961699db45017841c6ec125c07114
 SHA512:
-  metadata.gz: cb5c3136247b07d5b2ebcb0203b95712e4a808ad51d63b0cf1edef837f9c70595459de0fe104a2aedcffb3fd747024b0cc08a58172e6d6e1901fd68104df8700
-  data.tar.gz: cdcee4ca55bdfe97d4c9fee3d3a8086ec2e31dff7c33d985187b75e61b6d489476c205646cef772fa552315d9ef0f8802a7c2f80bc6884ce209ad8f33b34b699
+  metadata.gz: f8727fe45dbd3888450c601afff69901ab18493d839afd49a4f6e1a460c1b29ad292ab0d4dba86d4ba7fea1f2fb03dbc033389032a7a713ff6f02aedd5c455d2
+  data.tar.gz: c1a7e693d5ce5b119e793a29f5f8cc1f1835d1430509fbb2a7e3000e121385d3b49c745289b8e6b452a20df01e1d24a3ac908f4591968a4084c98ad051eccf13

data/README.md

@@ -72,3 +72,15 @@ client = EasyUpnp::DeviceControlPoint.from_params(params)
 client.GetSystemUpdateID
 => {:Id=>"258"}
 ```
+
+## Logging
+
+By default, logs will be printed to `$stdout` at the `:info` level. To change this behavior, you can use the following:
+
+```ruby
+# Disable logging
+EasyUpnp::Log.enabled = false
+
+# Change log level (only has an effect if logging is enabled)
+EasyUpnp::Log.level = :debug
+```

data/lib/easy_upnp/device_control_point.rb

@@ -8,11 +8,36 @@ module EasyUpnp
   class DeviceControlPoint
     attr_reader :service_methods, :service_endpoint
 
-    def initialize(urn, service_endpoint, definition, options)
+    class Options
+      DEFAULTS = {
+        advanced_typecasting: true
+      }
+
+      attr_reader :options
+
+      def initialize(o = {}, &block)
+        @options = o.merge(DEFAULTS)
+
+        @options.map do |k, v|
+          define_singleton_method(k) do
+            @options[k]
+          end
+
+          define_singleton_method("#{k}=") do |v|
+            @options[k] = v
+          end
+        end
+
+        block.call(self) unless block.nil?
+      end
+    end
+
+    def initialize(urn, service_endpoint, definition, call_options, &block)
       @urn = urn
       @service_endpoint = service_endpoint
-      @options = options
+      @call_options = call_options
       @definition = definition
+      @options = Options.new(&block)
 
       @client = Savon.client(log: EasyUpnp::Log.enabled?, log_level: EasyUpnp::Log.level) do |c|
         c.endpoint service_endpoint
@@ -44,7 +69,8 @@ module EasyUpnp
         urn: @urn,
         service_endpoint: @service_endpoint,
         definition: @definition,
-        options: @options
+        call_options: @call_options,
+        options: @options.options
       }
     end
 
@@ -53,11 +79,13 @@ module EasyUpnp
           params[:urn],
           params[:service_endpoint],
           params[:definition],
-          params[:options]
-      )
+          params[:call_options]
+      ) { |c|
+        params[:options].map { |k, v| c.options[k] = v }
+      }
     end
 
-    def self.from_service_definition(definition, options = {})
+    def self.from_service_definition(definition, call_options = {}, &block)
       urn = definition[:st]
       root_uri = definition[:location]
 
@@ -77,7 +105,8 @@ module EasyUpnp
             urn,
             URI.join(root_uri, service.xpath('service/controlURL').text).to_s,
             service_definition,
-            options
+            call_options,
+            &block
         )
       end
     end
@@ -114,9 +143,10 @@ module EasyUpnp
             attributes: {
                 :'xmlns:u' => @urn
             },
-        }.merge(@options)
+        }.merge(@call_options)
 
         response = @client.call action['name'], attrs do
+          advanced_typecasting @options.advanced_typecasting
           message(args_hash)
         end
 

data/lib/easy_upnp/upnp_device.rb

@@ -53,11 +53,11 @@ module EasyUpnp
       !service_definition(urn).nil?
     end
 
-    def service(urn, options = {})
+    def service(urn, options = {}, &block)
       definition = service_definition(urn)
 
       if !definition.nil?
-        DeviceControlPoint.from_service_definition(definition, options)
+        DeviceControlPoint.from_service_definition(definition, options, &block)
       end
     end
 

data/lib/easy_upnp/version.rb

@@ -1,3 +1,3 @@
 module EasyUpnp
-  VERSION = '0.2.5'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_upnp
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.1
 platform: ruby
 authors:
 - Christopher Mullins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake