dmap 0.1.3 → 0.1.4

data/README.rdoc

@@ -24,11 +24,12 @@ We all love examples, so here's an example of how to use this module:
     # => <MSRV: [<MINM: "I'm a string!">]>
 
     # Or write out what you want in code:
-	d = DMAP::Element.new("msrv",[DMAP::Element.new('minm',"I'm a string!")])
-	p d
+    d = DMAP::Element.new("msrv",[DMAP::Element.new('minm',"I'm a string!")])
+    p d
     # => <MSRV: [<MINM: "I'm a string!">]>
 	
-    # All DMAP elements act like their Ruby counterparts:
+    # All DMAP elements act like their Ruby counterparts
+    # (I've ballsed this up a little, functions taking blocks are playing up):
     d.push(DMAP::Element.new('asdm'))
 
     # They can also be pre-populated with data of an appropriate type

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "dmap"
-    gem.version = "0.1.3"
+    gem.version = "0.1.4"
     gem.summary = %Q{Parses Apple's DMAP strings (4-byte serialization method)}
     gem.description = %Q{Apple uses a system of serialization (I think its called dmap…) where a 4-byte string tells of the information following, both its type and what it represents. Its used in the DAAP (Protocol), QuickTime mov structure and doubtless many other places.}
     gem.email = "jphastings@gmail.com"

data/lib/dmap.rb

@@ -9,8 +9,7 @@ module DMAP
   # Represents any DMAP tag and its content.
   # Will have methods appropriate to the dmap specified
   class Element
-    attr_reader :unparsed_content
-    attr_reader :name
+    attr_reader :tag
     attr_reader :real_class
     
     # Accepts a string or an IO. The first four bytes (in either case) should be the
@@ -25,7 +24,6 @@ module DMAP
       # Assume we have an IO object, if this fails then we probably have a string instead
       begin
         @tag = tag_or_dmap.read(4).upcase
-        @unparsed_content = true
         @io = tag_or_dmap if new_content.nil?
       rescue NoMethodError
         @tag = tag_or_dmap[0..3].upcase
@@ -144,7 +142,7 @@ module DMAP
       original_new
       begin
         # Lets assume its an io
-        @dmap_length = array_or_io.read(4).unpack("N")[0] # FIXME: Should be Q? but that's not working?
+        @dmap_length = array_or_io.read(4).unpack("N")[0]
         @dmap_io     = array_or_io
         @dmap_start  = @dmap_io.tell
         @unparsed_data = true
@@ -152,7 +150,11 @@ module DMAP
       rescue NoMethodError
         begin
           array_or_io.each do |element|
-            self.push element
+            if element.is_a? DMAP::Element
+              self.push element
+            else
+              raise "Thisneeds to be a DMAP::Element. #{element.inspect}"
+            end
           end
         rescue NoMethodError
         end
@@ -208,6 +210,8 @@ module DMAP
   end
   
   # Allows people to specify a integer and the size of the binary representation required
+  #
+  # If you create one with a wanted_box_size that's not 1,2,4,8 you'll run into trouble elsewhere (most likely)
   class MeasuredInteger
     attr_reader :value
     attr_accessor :box_size, :binary, :signed
@@ -223,22 +227,20 @@ module DMAP
     # current value.
     def box_size=(wanted_box_size)
       # Find the smallest number of bytes needed to express this number
-      @box_size = [wanted_box_size || 0,(Math.log(@value) / 2.07944154167984).ceil].max rescue 0 # For when value = 0
+      @box_size = [wanted_box_size || 0,(Math.log(@value) / 2.07944154167984).ceil].max rescue 1 # For when value = 0
     end
     
     def to_dmap
       case @box_size
-      when 1,2,4
+      when 1,2,4,8
         [@box_size,@value].pack("N"<<MeasuredInteger.pack_code(@box_size,@signed))
-      when 8
-        [@box_size,@value / 65536,@value % 65536].pack((@signed) ? "Nll" : "NNN") # FIXME: How do you do signed version :S
       else
         raise "I don't know how to unpack an integer #{@box_size} bytes long"
       end
     end
     
     def self.pack_code(length,signed)
-      out = {1=>"C",2=>"S",4=>"N"}[length]
+      out = {1=>"C",2=>"S",4=>"N",8=>"Q"}[length] # FIXME: Lower case N won't work!
       out.downcase if signed
       return out
     end
@@ -426,13 +428,4 @@ module DMAP
   CEJS = [:signed, 'com.apple.itunes.jukebox-score']
   ASDM = [:time,   'daap.songdatemodified']
   AESF = [:number, 'com.apple.itunes.itms-storefrontid']
-end
-
-  d = DMAP::Element.new("msrv",[DMAP::Element.new('minm',"I'm a string!")])
-  p d
-  # All DMAP elements act like their Ruby counterparts:
-  d.push(DMAP::Element.new('asdm'))
-  # They can also be pre-populated with data of an appropriate type
-  d.push(DMAP::Element.new('astm',123))
-  p d
-  # => <MSRV: [<MINM: "I'm a string!">, <ASDM: Fri Nov 06 11:18:29 +0000 2009>, <ASTM: 123>]>
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dmap
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - JP Hastings-Spital