dmapparser 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68b7396a6898eeefafa26e430022b49d3b281115
-  data.tar.gz: d0188b16664b041ca72ba713dafa45aafbf919d5
+  metadata.gz: 9295540a235dae90cedac55ab52c2ff9a8f56749
+  data.tar.gz: 68afb3fefbd990cad9b67ea302aba4c9173e12ef
 SHA512:
-  metadata.gz: 7a339caec989bebaecb8792e3b3ddd09fca8305822a32690bb5da872af5efc68e5362f94781a51279dd8cd3064b88b85a4f8f123ebfa5350c984c5a9a4b2491e
-  data.tar.gz: d09b9ba744cee11dbe7ea60c49607905aef822d9c61bb23e5352b2c337813a675517e655a54d3673bd2d8de222aadb61053f5aed4bbc935cb2dc2857674c1d20
+  metadata.gz: 4e0254abb6b650dfb25234c7ab1d056966896048854e33b65dc1235c422ea3322cabef7ea87d6f5d196b75ce3ecd75c02912837b56fa96ee79f669720993366d
+  data.tar.gz: 6506a46b2cf6425876364f32950584baf07b879c180542d5b38d15043f6dc767bc325f38bfbc5d51450a301f33ff80dfddcc2d3e4abf5fb946d0239e477054d9

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Metrics/LineLength:
+  Max: 90

data/Gemfile

@@ -4,8 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'minitest', '~> 5.3.1'
+  gem 'minitest', '~> 5.4.0'
   gem 'coveralls', require: false
-  gem 'rubocop', '~> 0.20.0'
+  gem 'rubocop', '~> 0.27.1'
   gem 'simplecov', require: false
 end

data/Rakefile

@@ -13,9 +13,9 @@ end
 task test: :rubocop
 
 task :rubocop do
-  puts "Running Rubocop #{Rubocop::Version::STRING}"
+  puts "Running RuboCop #{RuboCop::Version::STRING}"
   args = FileList['**/*.rb', 'Rakefile', 'dmapparser.gemspec', 'Gemfile']
-  cli = Rubocop::CLI.new
+  cli = RuboCop::CLI.new
   cli.run(args)
 end
 

data/dmapparser.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = DMAPParser::VERSION
   spec.authors       = ['Jurriaan Pruis']
   spec.email         = ['email@jurriaanpruis.nl']
-  spec.summary       = %q(Parses DMAP data)
+  spec.summary       = 'Parses DMAP data'
   spec.homepage      = 'https://github.com/jurriaan/dmapparser'
   spec.license       = 'MIT'
   spec.platform      = Gem::Platform::RUBY
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.extra_rdoc_files = ['README.md', 'LICENSE']
 
-  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'rake'
 

data/lib/dmapparser/converter.rb

@@ -59,7 +59,7 @@ module DMAPParser
       end
 
       def version_to_bin(data)
-        data.split('.').map { |part| part.to_i }.pack 'nCC'
+        data.split('.').map(&:to_i).pack 'nCC'
       end
 
       def hex_to_bin(data)

data/lib/dmapparser/parser.rb

@@ -18,8 +18,7 @@ module DMAPParser
     end
 
     def parse
-      return nil if @response.nil? || @response.size == 0
-      fail ParseError if @response.size < 8
+      fail ParseError if @response.nil? || @response.size < 8
       ret = TagContainer.new(read_key)
       fail ParseError if ret.type && !ret.type.container?
       ret.value = parse_container(read_length)
@@ -37,9 +36,7 @@ module DMAPParser
     end
 
     def read_bytes(length)
-      unless bytes_available?(length)
-        fail ParseError, 'Not enough data available'
-      end
+      fail ParseError, 'Not enough data available' unless bytes_available?(length)
       @response.read(length)
     end
 

data/lib/dmapparser/tag.rb

@@ -4,7 +4,7 @@ module DMAPParser
     def initialize(type, value)
       unless type.is_a? TagDefinition
         type = TagDefinition[type] ||
-              TagDefinition.new(type, :unknown, "unknown (#{length})")
+               TagDefinition.new(type, :unknown, "unknown (#{length})")
       end
       super
     end

data/lib/dmapparser/tag_container.rb

@@ -29,7 +29,7 @@ module DMAPParser
       !get_tag(key).nil?
     end
 
-    def method_missing(method, *arguments, &block)
+    def method_missing(method, *_arguments, &_block)
       if method =~ /(.*)\?$/
         has?(Regexp.last_match[1])
       elsif has?(method)

data/lib/dmapparser/tag_definitions.rb

@@ -38,6 +38,9 @@ module DMAPParser
     tag 'cmgt', :container, 'dmcp.getpropertyresponse'
     tag 'cmst', :container, 'dmcp.status'
     tag 'agal', :container, 'daap.albumgrouping'
+    tag 'agar', :container, 'daap.artistgrouping'
+    tag 'agac', :uint32, 'daap.groupalbumcount'
+    tag 'asri', :uint32, 'daap.songartistid'
     tag 'minm', :string, 'dmap.itemname'
     tag 'msts', :string, 'dmap.statusstring'
     tag 'mcna', :string, 'dmap.contentcodesname'

data/lib/dmapparser/version.rb

@@ -1,4 +1,4 @@
 # DMAPParser handles the parsing of DMAP data
 module DMAPParser
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/test/.rubocop.yml

@@ -1,3 +1,5 @@
+inherit_from: ../.rubocop.yml
+
 # Do not introduce global variables.
 GlobalVars:
-  Enabled: false
+  Enabled: false

data/test/lib/dmapparser/converter_test.rb

@@ -3,36 +3,36 @@ require_relative '../../test_helper'
 describe DMAPParser::Converter do
   it 'should return the original output again' do
     time = Time.now
-    klass = DMAPParser::Converter
-    klass.bin_to_date(klass.date_to_bin(time)).to_i.must_equal time.to_i
-    klass.bin_to_bool(klass.bool_to_bin(true)).must_equal true
-    klass.bin_to_int(klass.int_to_bin(90000)).must_equal 90000
-    klass.bin_to_byte(klass.byte_to_bin(190)).must_equal 190
-    klass.bin_to_long(klass.long_to_bin(3**25)).must_equal 3**25
-    klass.bin_to_version(klass.version_to_bin('1322.200.3')).must_equal '1322.200.3'
-    klass.bin_to_short(klass.short_to_bin(19007)).must_equal 19007
+    con = DMAPParser::Converter
+    con.bin_to_date(con.date_to_bin(time)).to_i.must_equal time.to_i
+    con.bin_to_bool(con.bool_to_bin(true)).must_equal true
+    con.bin_to_int(con.int_to_bin(90_000)).must_equal 90_000
+    con.bin_to_byte(con.byte_to_bin(190)).must_equal 190
+    con.bin_to_long(con.long_to_bin(3**25)).must_equal 3**25
+    con.bin_to_version(con.version_to_bin('932.200.3')).must_equal '932.200.3'
+    con.bin_to_short(con.short_to_bin(19_007)).must_equal 19_007
   end
-  
+
   it 'should automatically convert numerics' do
-    klass = DMAPParser::Converter
-    byte = klass.byte_to_bin(244)
-    short = klass.short_to_bin(244)
-    int = klass.int_to_bin(244)
-    long =  klass.long_to_bin(244)
-    klass.data_to_numeric(byte).must_equal(244)
-    klass.data_to_numeric(short).must_equal(244)
-    klass.data_to_numeric(int).must_equal(244)
-    klass.data_to_numeric(long).must_equal(244)
+    con = DMAPParser::Converter
+    byte = con.byte_to_bin(244)
+    short = con.short_to_bin(244)
+    int = con.int_to_bin(244)
+    long =  con.long_to_bin(244)
+    con.data_to_numeric(byte).must_equal(244)
+    con.data_to_numeric(short).must_equal(244)
+    con.data_to_numeric(int).must_equal(244)
+    con.data_to_numeric(long).must_equal(244)
   end
-  
+
   it 'should decode unknown types' do
-    klass = DMAPParser::Converter
-    byte = klass.byte_to_bin(244)
-    klass.decode(:ZZZZ, byte).must_equal 244
+    con = DMAPParser::Converter
+    byte = con.byte_to_bin(244)
+    con.decode(:ZZZZ, byte).must_equal 244
   end
-  
+
   it 'should encode unknown strings' do
-    klass = DMAPParser::Converter
-    klass.encode(:ZZZZ, 'aaa').must_equal 'aaa'
+    con = DMAPParser::Converter
+    con.encode(:ZZZZ, 'aaa').must_equal 'aaa'
   end
 end

data/test/lib/dmapparser/parser_test.rb

@@ -4,7 +4,7 @@ describe DMAPParser::Parser do
   it 'should raise a ParserError when given invalid data' do
     invalid = []
     20.times do
-      invalid << (0..255).map { |c| c.chr }.join # random data
+      invalid << (0..255).map(&:chr).join # random data
     end
     invalid << "rand\x00\x00\x00\x01" # non correct size
     invalid << "mcon\x00\x00\x00\x05rand\x09" # wrong tag size
@@ -18,7 +18,7 @@ describe DMAPParser::Parser do
   end
 
   it 'should return nil if the string is empty' do
-    DMAPParser::Parser.parse('').must_equal nil
+    -> { DMAPParser::Parser.parse('') }.must_raise DMAPParser::Parser::ParseError
   end
 
   it 'should ignore padding' do

data/test/lib/dmapparser/tag_test.rb

@@ -6,7 +6,7 @@ describe DMAPParser::Tag do
     subject.value.must_equal 'Test thing'
     subject.type.must_equal DMAPParser::TagDefinition[:minm]
   end
-  
+
   it 'should be recognizable as a tag' do
     subject = DMAPParser::Tag.new(:minm, 'Test thing')
     subject.to_s.must_equal('#<DMAPParser::Tag minm (dmap.itemname: string)>')

data/test/test_helper.rb

@@ -2,8 +2,8 @@ require 'simplecov'
 require 'coveralls'
 Coveralls.wear!
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    SimpleCov::Formatter::HTMLFormatter,
-    Coveralls::SimpleCov::Formatter
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
 ]
 SimpleCov.start
 gem 'minitest'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dmapparser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jurriaan Pruis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Parses DMAP data