dmapparser 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f70493e234f76cac85f3a07af469d45eefe839c
-  data.tar.gz: 4a3ae53c0f24a30d0fbd7552c4b2a1abfa6d0cec
+  metadata.gz: 68b7396a6898eeefafa26e430022b49d3b281115
+  data.tar.gz: d0188b16664b041ca72ba713dafa45aafbf919d5
 SHA512:
-  metadata.gz: 46c2fc9701f4b715acf4f9a168c713834d249a37a270ecaceb556a5ba5c18a57dfcc041c03eb5e5e32a2861c4c61111b4548c6f2a21ff1ea2584456c1c44091e
-  data.tar.gz: 79ed8bd31dd10179e8d912ab83a02c85a59fa47d739a0474c70b2d273152ca624eafaa7ee3357e11b0da5553db01c963b455fccd48b3daf659a3710ed346be1f
+  metadata.gz: 7a339caec989bebaecb8792e3b3ddd09fca8305822a32690bb5da872af5efc68e5362f94781a51279dd8cd3064b88b85a4f8f123ebfa5350c984c5a9a4b2491e
+  data.tar.gz: d09b9ba744cee11dbe7ea60c49607905aef822d9c61bb23e5352b2c337813a675517e655a54d3673bd2d8de222aadb61053f5aed4bbc935cb2dc2857674c1d20

data/Gemfile

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

data/Rakefile

@@ -16,7 +16,7 @@ task :rubocop do
   puts "Running Rubocop #{Rubocop::Version::STRING}"
   args = FileList['**/*.rb', 'Rakefile', 'dmapparser.gemspec', 'Gemfile']
   cli = Rubocop::CLI.new
-  fail unless cli.run(['-a'] + args) == 0
+  cli.run(args)
 end
 
 task default: :test

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       = %q(Parses DMAP data)
   spec.homepage      = 'https://github.com/jurriaan/dmapparser'
   spec.license       = 'MIT'
   spec.platform      = Gem::Platform::RUBY

data/lib/dmapparser/builder.rb

@@ -16,7 +16,7 @@ module DMAPParser
       tag = TagDefinition[method]
       return super if tag.nil?
 
-      if block_given?
+      if block_given? || tag.container?
         fail "Tag #{tag} is not a container type" unless tag.container?
         build_container(tag, &block)
       else
@@ -35,7 +35,7 @@ module DMAPParser
       end
     end
 
-    def build_container(tag , &block)
+    def build_container(tag, &block)
       @dmap_stack << TagContainer.new(tag)
       instance_exec(&block)
       if @dmap_stack.length > 1

data/lib/dmapparser/converter.rb

@@ -3,7 +3,7 @@ module DMAPParser
   class Converter
     class << self
       def date_to_bin(data)
-        int_to_bin(value.to_i)
+        int_to_bin(data.to_i)
       end
 
       def bin_to_byte(data)
@@ -11,7 +11,7 @@ module DMAPParser
       end
 
       def bin_to_long(data)
-        (bin_to_int(data[0..3]) << 32) + bin_to_int(data[4..7])
+        (bin_to_int(data[0..3]) << 32) | bin_to_int(data[4..7])
       end
 
       def bin_to_int(data)
@@ -31,7 +31,7 @@ module DMAPParser
       end
 
       def bin_to_hex(data)
-        data.bytes.reduce('') { |a, e| a + sprintf('%02X', e) }
+        data.bytes.reduce('') { |a, e| a + format('%02X', e) }
       end
 
       def bin_to_date(data)
@@ -51,7 +51,7 @@ module DMAPParser
       end
 
       def long_to_bin(data)
-        [data >> 32, data & 0xfffffff].pack 'NN'
+        [data >> 32, data & 0xFFFFFFFF].pack 'NN'
       end
 
       def short_to_bin(data)
@@ -59,7 +59,7 @@ module DMAPParser
       end
 
       def version_to_bin(data)
-        data.split('.').pack 'nCC'
+        data.split('.').map { |part| part.to_i }.pack 'nCC'
       end
 
       def hex_to_bin(data)
@@ -108,7 +108,6 @@ module DMAPParser
         if respond_to? decode_method
           send(decode_method, data)
         else
-          warn "Decoder: Unknown type #{type}"
           decode_unknown(data)
         end
       end
@@ -118,8 +117,7 @@ module DMAPParser
         if respond_to? encode_method
           send(encode_method, data)
         else
-          warn "Encoder: Unknown type #{type}"
-          data
+          data # This only works for strings..
         end
       end
     end

data/lib/dmapparser/parser.rb

@@ -14,14 +14,13 @@ module DMAPParser
     def initialize(response)
       @response = response
       @response = StringIO.new(response) unless @response.is_a? IO
-      @response.set_encoding(Encoding::BINARY) # Use unicode
+      @response.set_encoding(Encoding::BINARY)
     end
 
     def parse
       return nil if @response.nil? || @response.size == 0
       fail ParseError if @response.size < 8
-      ret = TagContainer.new
-      ret.type = TagDefinition[read_key]
+      ret = TagContainer.new(read_key)
       fail ParseError if ret.type && !ret.type.container?
       ret.value = parse_container(read_length)
       ret

data/lib/dmapparser/tag.rb

@@ -1,6 +1,14 @@
 module DMAPParser
   # The Tag class
   class Tag < Struct.new(:type, :value)
+    def initialize(type, value)
+      unless type.is_a? TagDefinition
+        type = TagDefinition[type] ||
+              TagDefinition.new(type, :unknown, "unknown (#{length})")
+      end
+      super
+    end
+
     def to_s
       "#<#{self.class.name} #{type}>"
     end

data/lib/dmapparser/tag_container.rb

@@ -1,8 +1,8 @@
 module DMAPParser
   # The TagContainer class is a Tag which contains other Tags
   class TagContainer < Tag
-    def initialize(type = nil, value = [])
-      super type, value
+    def initialize(type, value = [])
+      super
     end
 
     def inspect(level = 0)
@@ -14,12 +14,8 @@ module DMAPParser
     def get_value(key)
       return value[key] if key.is_a? Fixnum
       tag = get_tag(key)
-
-      if tag.type.container?
-        tag
-      elsif !tag.nil?
-        tag.value
-      end
+      return unless tag
+      tag.type.container? ? tag : tag.value
     end
 
     def get_tag(key)
@@ -39,7 +35,7 @@ module DMAPParser
       elsif has?(method)
         get_value(method)
       else
-        super
+        nil
       end
     end
 

data/lib/dmapparser/version.rb

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

data/test/lib/dmapparser/converter_test.rb

@@ -0,0 +1,38 @@
+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
+  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)
+  end
+  
+  it 'should decode unknown types' do
+    klass = DMAPParser::Converter
+    byte = klass.byte_to_bin(244)
+    klass.decode(:ZZZZ, byte).must_equal 244
+  end
+  
+  it 'should encode unknown strings' do
+    klass = DMAPParser::Converter
+    klass.encode(:ZZZZ, 'aaa').must_equal 'aaa'
+  end
+end

data/test/lib/dmapparser/parser_test.rb

@@ -3,8 +3,11 @@ require_relative '../../test_helper'
 describe DMAPParser::Parser do
   it 'should raise a ParserError when given invalid data' do
     invalid = []
-    invalid << (0..255).map { |c| c.chr }.join # random data
+    20.times do
+      invalid << (0..255).map { |c| c.chr }.join # random data
+    end
     invalid << "rand\x00\x00\x00\x01" # non correct size
+    invalid << "mcon\x00\x00\x00\x05rand\x09" # wrong tag size
     invalid << "msup\x00\x00\x00\x01\x01" # not a container!
     invalid << "rand\x00\x00\x00\x01\x01" # not a container!
     invalid.each do |data|

data/test/lib/dmapparser/tag_container_test.rb

@@ -0,0 +1,14 @@
+require_relative '../../test_helper'
+
+describe DMAPParser::TagContainer do
+  it 'should respond to known tags' do
+    subject = DMAPParser::TagContainer.new(:mcon,
+                                           [DMAPParser::Tag.new(:minm, 1337)])
+    subject.respond_to?(:unknown).must_equal false
+    subject.respond_to?(:minm).must_equal true
+    subject.minm.must_equal 1337
+    subject.unknown.must_equal nil
+    subject.inspect.must_include('minm')
+    subject.inspect.must_include('1337')
+  end
+end

data/test/lib/dmapparser/tag_test.rb

@@ -0,0 +1,14 @@
+require_relative '../../test_helper'
+
+describe DMAPParser::Tag do
+  it 'should return the correct value' do
+    subject = DMAPParser::Tag.new(:minm, 'Test thing')
+    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)>')
+  end
+end

data/test/test_helper.rb

@@ -1,12 +1,11 @@
 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 do
-  # add_filter '/test/'
-end
+SimpleCov.start
 gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/hell'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dmapparser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Jurriaan Pruis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,7 @@ files:
 - lib/dmapparser/version.rb
 - test/.rubocop.yml
 - test/lib/dmapparser/builder_test.rb
+- test/lib/dmapparser/converter_test.rb
 - test/lib/dmapparser/parser_test.rb
 - test/lib/dmapparser/tag_container_test.rb
 - test/lib/dmapparser/tag_test.rb
@@ -116,6 +117,7 @@ summary: Parses DMAP data
 test_files:
 - test/.rubocop.yml
 - test/lib/dmapparser/builder_test.rb
+- test/lib/dmapparser/converter_test.rb
 - test/lib/dmapparser/parser_test.rb
 - test/lib/dmapparser/tag_container_test.rb
 - test/lib/dmapparser/tag_test.rb