dmapparser 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4f0392efe8fbb5cb490326f252de2ba2ad14320
-  data.tar.gz: 83521f2817e52ffa041ae04097e41106fc23920d
+  metadata.gz: 8f70493e234f76cac85f3a07af469d45eefe839c
+  data.tar.gz: 4a3ae53c0f24a30d0fbd7552c4b2a1abfa6d0cec
 SHA512:
-  metadata.gz: 4e6d311c7458783399f658271061e26e3fb7716bf9487159148f6c39d49b911ee14fc62cf676f3d91920587618d59f741bd0b84efa1b12c4da732206891243c7
-  data.tar.gz: 538395db0d8f903ee3f141e9bfeb53f3e4829ab313551060e6a2f291b55a3558a48a1921bbe0235b834efa24cfa41c35ee0fec2fcf2708c2781af2e9cb69bad4
+  metadata.gz: 46c2fc9701f4b715acf4f9a168c713834d249a37a270ecaceb556a5ba5c18a57dfcc041c03eb5e5e32a2861c4c61111b4548c6f2a21ff1ea2584456c1c44091e
+  data.tar.gz: 79ed8bd31dd10179e8d912ab83a02c85a59fa47d739a0474c70b2d273152ca624eafaa7ee3357e11b0da5553db01c963b455fccd48b3daf659a3710ed346be1f

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+    - 2.0.0
+    - 2.1.0
+    - ruby-head
+    - jruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head

data/README.md

@@ -1,8 +1,8 @@
 # DMAPParser
 
-[![Gem Version](https://badge.fury.io/rb/dmapparser.png)](http://badge.fury.io/rb/dmapparser) [![Dependency Status](https://gemnasium.com/jurriaan/dmapparser.png)](https://gemnasium.com/jurriaan/dmapparser)
+[![Gem Version](https://badge.fury.io/rb/dmapparser.png)](http://badge.fury.io/rb/dmapparser) [![Dependency Status](https://gemnasium.com/jurriaan/dmapparser.png)](https://gemnasium.com/jurriaan/dmapparser) [![Coverage Status](https://coveralls.io/repos/jurriaan/dmapparser/badge.png)](https://coveralls.io/r/jurriaan/dmapparser) [![Build Status](https://travis-ci.org/jurriaan/docparser.png?branch=master)](https://travis-ci.org/jurriaan/dmapparser)
 
-Parses DMAP data
+Parses DMAP data.
 
 ## Installation
 

data/bin/dmapparser

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
 
 require 'dmapparser'
-puts DMAPParser::Parser.parse(ARGF.to_io).inspect
+if ARGV.size > 0
+  puts DMAPParser::Parser.parse(ARGF.to_io).inspect
+else
+  puts "Usage: #{$PROGRAM_NAME} filename"
+end

data/dmapparser.gemspec

@@ -9,15 +9,19 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Jurriaan Pruis']
   spec.email         = ['email@jurriaanpruis.nl']
   spec.summary       = %q{Parses DMAP data}
-  spec.homepage      = ''
+  spec.homepage      = 'https://github.com/jurriaan/dmapparser'
   spec.license       = 'MIT'
+  spec.platform      = Gem::Platform::RUBY
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
+  spec.extra_rdoc_files = ['README.md', 'LICENSE']
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'rake'
+
+  spec.required_ruby_version = '>= 2.0.0'
 end

data/lib/dmapparser/converter.rb

@@ -87,9 +87,12 @@ module DMAPParser
       end
 
       def bin_to_string(data)
-        data.force_encoding('utf-8')
+        data.force_encoding(Encoding::UTF_8)
+      end
+
+      def string_to_bin(data)
+        data.force_encoding(Encoding::BINARY)
       end
-      alias_method :string_to_bin, :bin_to_string
 
       alias_method :uint16_to_bin, :short_to_bin
       alias_method :uint32_to_bin, :int_to_bin

data/lib/dmapparser/parser.rb

@@ -14,7 +14,7 @@ module DMAPParser
     def initialize(response)
       @response = response
       @response = StringIO.new(response) unless @response.is_a? IO
-      @response.set_encoding(Encoding::UTF_8) # Use unicode
+      @response.set_encoding(Encoding::BINARY) # Use unicode
     end
 
     def parse

data/lib/dmapparser/tag.rb

@@ -12,7 +12,7 @@ module DMAPParser
     def to_dmap
       value = convert_value(self.value)
       length = [value.length].pack('N')
-      (type.tag.to_s + length + value).force_encoding('utf-8')
+      (type.tag.to_s + length + value).force_encoding(Encoding::BINARY)
     end
 
     private

data/lib/dmapparser/tag_container.rb

@@ -13,7 +13,6 @@ module DMAPParser
 
     def get_value(key)
       return value[key] if key.is_a? Fixnum
-
       tag = get_tag(key)
 
       if tag.type.container?

data/lib/dmapparser/version.rb

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

data/test/lib/dmapparser/builder_test.rb

@@ -3,7 +3,7 @@ require_relative '../../test_helper'
 describe DMAPParser::Builder do
   before do
     @pair_data = DMAPParser::Builder.cmpa do
-      cmpg 'AABBCCDDEE'
+      cmpg '4E0573EF9BB80682'
       cmnm 'Name'
       cmty 'iPod'
     end
@@ -18,7 +18,7 @@ describe DMAPParser::Builder do
   it 'should raise an exception if tags are put inside non-containers' do
     lambda do
       DMAPParser::Builder.cmnm do
-        cmpg 'AABBCCDDEE'
+        cmpg '4E0573EF9BB80682'
         cmty 'iPod'
       end
     end.must_raise RuntimeError
@@ -29,7 +29,7 @@ describe DMAPParser::Builder do
   end
 
   it 'should store the correct values' do
-    @pair_data.cmpg.must_equal 'AABBCCDDEE'
+    @pair_data.cmpg.must_equal '4E0573EF9BB80682'
     @pair_data.cmnm.must_equal 'Name'
     @pair_data.cmty.must_equal 'iPod'
   end
@@ -67,4 +67,18 @@ describe DMAPParser::Builder do
     dmap = nested.to_dmap
     DMAPParser::Parser.parse(dmap).to_dmap.must_equal(dmap)
   end
+
+  it 'should correctly encode hexadecimal strings' do
+    dmap = DMAPParser::Builder.cmpa do
+      cmpg '4E0573EF9BB80682'
+    end.to_dmap
+    byte_string = [78, 5, 115, 239, 155, 184, 6, 130]
+    dmap.bytes[-8..-1].must_equal(byte_string)
+    dmap_reparsed = DMAPParser::Parser.parse(dmap).to_dmap
+    dmap_reparsed.bytes[-8..-1].must_equal(byte_string)
+  end
+
+  it 'should output binary strings' do
+    @pair_data.to_dmap.encoding.must_equal(Encoding::BINARY)
+  end
 end

data/test/lib/dmapparser/parser_test.rb

@@ -20,6 +20,7 @@ describe DMAPParser::Parser do
 
   it 'should ignore padding' do
     dmap = support_file('simple.dmap').read
+    dmap.force_encoding(Encoding::BINARY)
     padded = DMAPParser::Parser.parse(dmap + 'I AM PADDING!!11!!')
     padded.to_dmap.must_equal dmap
   end
@@ -58,4 +59,10 @@ describe DMAPParser::Parser do
     data.jurp.must_equal 0x1337
   end
 
+  it 'should parse strings as UTF-8' do
+    dmap = DMAPParser::Builder.cmpa do
+      cmnm '4E0573EF9BB80682'
+    end.to_dmap
+    DMAPParser::Parser.parse(dmap).cmnm.encoding.must_equal(Encoding::UTF_8)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dmapparser
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jurriaan Pruis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,10 +58,14 @@ email:
 executables:
 - dmapparser
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
+- LICENSE
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -85,7 +89,7 @@ files:
 - test/support/content_codes.dmap
 - test/support/simple.dmap
 - test/test_helper.rb
-homepage: ''
+homepage: https://github.com/jurriaan/dmapparser
 licenses:
 - MIT
 metadata: {}
@@ -97,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -105,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Parses DMAP data