dacpclient 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98de2006393ea258320fc611a9d344d83d0feb58
-  data.tar.gz: 841fb499caf9bc84be3c8475c178af7a4537ad80
+  metadata.gz: cf81a474e862f6f8c2bde6e929bc29a693b701df
+  data.tar.gz: dfaa5045aded28a3ab95474c938759c1e371af78
 SHA512:
-  metadata.gz: 63854bcdbf6ee860bccf7844c8b054d5ef9e948cbdad86b843c9028b613a236b9645210f149ea073f028fc48cba1d2a9af1fb1e3328b4af283f70cf46c8cf5c2
-  data.tar.gz: ab1071e5f4518088e9bbc52f90f1f654826c23f0dbf846f808c732b3cf6c268419e4a3a02daa6d636f13aa8ab25dc2f379f45d90763202885100b0fbfc2d5e6e
+  metadata.gz: af0b53555a31b9ad99cc4e3b334607520fa3a9225bd0da7c155abd9b919ba0fcea4cf43bc2949bf056b5969c77595eb14d8ca79ca9df557e3ffe2c998cce0cf8
+  data.tar.gz: a16eb079d959501146eeb3aadb8607c1233ff6f9fa1e94df2455995a09796da1d1fd1a146372deed65047e158a076e44936fa47489b7244477e1043f4c786f62

data/.rubocop.yml

@@ -8,5 +8,5 @@ ClassVars:
 ClassLength:
   Enabled: false
 AllCops:
-  Excludes:
-    - flatter_params_encoder.rb
+  Exclude:
+    - lib/dacpclient/faraday/*

data/Gemfile

@@ -1,3 +1,6 @@
 gemspec
 
-source 'https://rubygems.org'
+source 'https://rubygems.org'
+
+gem 'minitest', '~> 5.3.1'
+gem 'rubocop', '~> 0.20.0'

data/Rakefile

@@ -1,23 +1,16 @@
 require 'bundler/gem_tasks'
-require 'rake/testtask'
+require 'rubocop/rake_task'
 require 'rubocop'
 require 'yard'
-require 'rubocop/rake_task'
-YARD::Rake::YardocTask.new
 
-# Rake::TestTask.new do |t|
-#   t.libs << 'lib/docparser'
-#   t.test_files = FileList['test/lib/**/*_test.rb']
-#   t.verbose = true
-# end
+YARD::Rake::YardocTask.new
 
 task test: :rubocop do
 end
 
 Rubocop::RakeTask.new(:rubocop) do |task|
   task.patterns = ['**/*.rb', 'Rakefile', 'dacpclient.gemspec', 'bin/*']
-  # don't abort rake on failure
-  task.options = ['-c', '.rubocop.yml']
+  task.options = ['-a']
   task.fail_on_error = true
 end
 

data/bin/dacpclient

@@ -156,6 +156,15 @@ class CLIClient < Thor
     show_status
   end
 
+  desc :volume, 'Get or set volume'
+  def volume(vol = nil)
+    login
+
+    @client.volume = vol.to_i unless vol.nil?
+    puts "Volume: #{@client.volume}"
+    show_status
+  end
+
   # rubocop:disable Debugger
   desc :debug, 'Debuggin\''
   def debug

data/dacpclient.gemspec

@@ -22,14 +22,12 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'faraday', '~> 0.9.0'
   spec.add_runtime_dependency 'dnssd', '~> 2.0'
   spec.add_runtime_dependency 'plist', '~> 3.1.0'
-  spec.add_runtime_dependency 'dmapparser', '~> 0.0.2'
+  spec.add_runtime_dependency 'dmapparser', '~> 0.1.0'
   spec.add_runtime_dependency 'thor', '~> 0.19.1'
 
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'redcarpet'
   spec.add_development_dependency 'github-markup'
-  spec.add_development_dependency 'minitest', '~> 5.3.1'
-  spec.add_development_dependency 'rubocop', '~> 0.19.1'
   spec.add_development_dependency 'rake'
 
   spec.required_ruby_version = '>= 2.0.0'

data/lib/dacpclient/client.rb

@@ -4,6 +4,7 @@ require 'plist'
 require 'dmapparser'
 require 'faraday'
 require 'dacpclient/faraday/flatter_params_encoder'
+require 'dacpclient/faraday/gzip'
 require 'dacpclient/pairingserver'
 require 'dacpclient/browser'
 require 'dacpclient/version'
@@ -22,12 +23,12 @@ module DACPClient
     attr_writer :guid
     attr_reader :name, :host, :port, :session_id
 
-    HOME_SHARING_HOST = 'https://homesharing.itunes.apple.com'
-    HOME_SHARING_PATH = '/WebObjects/MZHomeSharing.woa/wa/getShareIdentifiers'
+    HOME_SHARING_HOST = 'https://homesharing.itunes.apple.com'.freeze
+    HOME_SHARING_PATH = '/WebObjects/MZHomeSharing.woa/wa/getShareIdentifiers'.freeze
 
     DEFAULT_HEADERS = {
       'Viewer-Only-Client' => '1',
-      # 'Accept-Encoding' => 'gzip',
+      'Accept-Encoding' => 'gzip',
       'Connection' => 'keep-alive',
       'User-Agent' => 'RubyDACPClient/' + VERSION
     }.freeze
@@ -122,7 +123,7 @@ module DACPClient
     end
 
     def seek(ms)
-      do_action(:setproperty, 'dacp.playingtime' => ms)
+      set_property('dacp.playingtime', ms)
     end
 
     def position
@@ -152,7 +153,7 @@ module DACPClient
     end
 
     def volume=(volume)
-      do_action(:setproperty, :'dmcp.volume' => volume)
+      set_property('dmcp.volume', volume)
     end
 
     def repeat
@@ -161,7 +162,7 @@ module DACPClient
     end
 
     def repeat=(repeatstate)
-      do_action(:setproperty, 'dacp.repeatstate' => repeatstate)
+      set_property('dacp.repeatstate', repeatstate)
     end
 
     def shuffle
@@ -170,7 +171,7 @@ module DACPClient
     end
 
     def shuffle=(shufflestate)
-      do_action(:setproperty, 'dmcp.shufflestate' => shufflestate)
+      set_property('dmcp.shufflestate', shufflestate)
     end
 
     def ctrl_int
@@ -261,6 +262,11 @@ module DACPClient
       @uri = URI::HTTP.build(host: @host, port: @port)
       Faraday::Utils.default_params_encoder = Faraday::FlatterParamsEncoder
       @client = Faraday.new(@uri.to_s)
+      @client.use FaradayMiddleware::Gzip
+    end
+
+    def set_property(property, value)
+      do_action(:setproperty, property => value)
     end
 
     def do_action(action, clean_url: false, model: nil, **params)

data/lib/dacpclient/faraday/gzip.rb

@@ -0,0 +1,45 @@
+# Copied from github.com/lostisland/faraday_middleware
+require 'zlib'
+module FaradayMiddleware
+  # A middleware that ensures that the client requests are sent with the
+  # headers that encourage servers to send compressed data, and then
+  # uncompresses it.
+  # The Content-Length will reflect the actual body length.
+  class Gzip < Faraday::Middleware
+    ACCEPT_ENCODING = 'Accept-Encoding'.freeze
+    ENCODINGS = 'gzip,deflate'.freeze
+
+    def initialize(app, options = nil)
+      @app = app
+    end
+
+    def call(curenv)
+      (curenv[:request_headers] ||= {})[ACCEPT_ENCODING] = ENCODINGS
+      @app.call(curenv).on_complete do |env|
+        encoding = env[:response_headers]['content-encoding'].to_s.downcase
+        if %w(gzip deflate).include?(encoding)
+          case encoding
+          when 'gzip'
+            env[:body] = uncompress_gzip(env[:body])
+          when 'deflate'
+            env[:body] = Zlib::Inflate.inflate(env[:body])
+          end
+          env[:response_headers].delete('content-encoding')
+          env[:response_headers]['content-length'] = env[:body].length
+        end
+      end
+    end
+
+    private
+
+    def uncompress_gzip(body)
+      io = StringIO.new(body)
+      gzip_reader = if '1.9'.respond_to?(:force_encoding)
+                      Zlib::GzipReader.new(io, encoding: 'ASCII-8BIT')
+                    else
+                      Zlib::GzipReader.new(io)
+                    end
+      gzip_reader.read
+    end
+  end
+end

data/lib/dacpclient/version.rb

@@ -1,4 +1,4 @@
 # The DACPClient module
 module DACPClient
-  VERSION = '0.2.10'
+  VERSION = '0.2.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dacpclient
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Jurriaan Pruis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -122,34 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.3.1
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.19.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +158,7 @@ files:
 - lib/dacpclient/browser.rb
 - lib/dacpclient/client.rb
 - lib/dacpclient/faraday/flatter_params_encoder.rb
+- lib/dacpclient/faraday/gzip.rb
 - lib/dacpclient/model.rb
 - lib/dacpclient/models/pair_info.rb
 - lib/dacpclient/models/play_queue.rb