dmap 0.1.5 → 0.1.6

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "dmap"
-    gem.version = "0.1.5"
+    gem.version = "0.1.6"
     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

@@ -106,9 +106,10 @@ module DMAP
     # TODO
     def parse_version(content)
       begin
-        @real_class = Version.new(@io.read(@io.read(4).unpack("N")[0])) # FIXME: Should be Q?
+        # FIXME: Are version numbers x.y ?
+        @real_class = Version.new(@io.read(@io.read(4).unpack("N")[0]).unpack("nn").join("."))
       rescue NoMethodError
-        @real_class = Version.new(0)
+        @real_class = Version.new(content || "1.0")
       end
     end
     
@@ -230,7 +231,7 @@ 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 1 # For when value = 0
+      @box_size = [wanted_box_size || 0,(Math.log((Math.log(@value) / 2.07944154167984).ceil)/0.693147180559945).ceil].max rescue 1 # For when value = 0
     end
     
     def to_dmap
@@ -243,8 +244,7 @@ module DMAP
     end
     
     def self.pack_code(length,signed)
-      out = {1=>"C",2=>"S",4=>"N",8=>"Q"}[length] # FIXME: Lower case N won't work!
-      out.downcase if signed
+      out = {1=>"C",-1=>"c",2=>"n",4=>"N",8=>"Q",-8=>"q"}[length * (signed ? -1 : 1)] # FIXME: pack codes for all signed cases
       return out
     end
     
@@ -257,13 +257,19 @@ module DMAP
   
   # A class to store version numbers
   class Version
-    # TODO
-    def initialize(version)
-      
+    def initialize(version = "1.0")
+      @major,@minor = (version.to_s<<".0").split(".").collect{|n| n.to_i }
+      if @major > 63 or @minor > 63
+        raise RangeError "Neither major nor minor version numbers can be above 63. Surely that's enough?"
+      end
+    end
+    
+    def to_dmap
+      "\000\000\000\004"<<[@major,@minor].pack("nn")
     end
     
     def inspect
-      "Some kinda version"
+      "v#{@major}.#{@minor}"
     end
   end
   

metadata

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