ttml 0.0.2 → 0.0.3

data/lib/ttml.rb

@@ -15,11 +15,15 @@ module Ttml
   #   => [Subtitles from beginning to 100 seconds]
   class Document
 
-    attr_reader :doc
+    attr_reader :doc, :namespaces
 
     def initialize file_or_stream
       stream = file_or_stream.is_a?(IO) ? file_or_stream : File.open(file_or_stream)
       @doc = Nokogiri::XML(stream)
+      @namespaces = @doc.collect_namespaces
+      # puts "Ho namespaces? #{ @namespaces.inspect }"
+      @subs_ns = @namespaces.invert["http://www.w3.org/2006/10/ttaf1"]
+      @meta_ns = @namespaces.invert["http://www.w3.org/2006/10/ttaf1#metadata"].sub(/^xmlns:/,'')
     end
 
     # Returns subtitles from "from" to "to" (inclusive) as an array
@@ -27,7 +31,7 @@ module Ttml
     # I tried using xpath functions, without success,
     # as in xmlns:div/xmlns:p[number(@begin)=>746.63] - any ideas?
     def subtitle_stream from = 0.0, to = 99999999.0
-      doc.xpath("/xmlns:tt/xmlns:body/xmlns:div/xmlns:p").select {|n|
+      doc.xpath("/#{ @subs_ns }:tt/#{ @subs_ns }:body/#{ @subs_ns }:div/#{ @subs_ns }:p").select {|n|
         # puts "Vedo se #{ n['begin'].to_f } >= #{ from } e se #{ n['end'].to_f } <= #{ to }"
         (n['begin'].to_f >= from) && (n['end'].to_f <= to)
       }
@@ -35,17 +39,17 @@ module Ttml
 
     # Returns document title
     def title
-      doc.xpath("//ns2:title")[0].children[0].content
+      doc.xpath("//#{ @meta_ns }:title")[0].children[0].content
     end
 
     # Returns document description
     def description
-      doc.xpath("//ns2:description")[0].children[0].content
+      doc.xpath("//#{ @meta_ns }:description")[0].children[0].content
     end
 
     # Returns document copyright
     def copyright
-      doc.xpath("//ns2:copyright")[0].children[0].content
+      doc.xpath("//#{ @meta_ns }:copyright")[0].children[0].content
     end
 
   end

data/lib/ttml/version.rb

@@ -1,3 +1,3 @@
 module Ttml
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/sample_2.xml

@@ -0,0 +1,17 @@
+<?xml version='1.0'?><ns2:tt xmlns:ns4="http://www.w3.org/2006/10/ttaf1#parameter" xmlns:ns3="http://www.w3.org/2006/10/ttaf1#style" xmlns:ns2="http://www.w3.org/2006/10/ttaf1" xmlns:ns1="http://www.w3.org/2006/10/ttaf1#metadata" xml:lang="it"><ns2:head><ns1:title>Timed Text DFPX</ns1:title>
+<ns1:copyright>2010 (c) PerVoice S.p.A.</ns1:copyright>
+<ns2:styling><ns2:style xml:id="s1" ns3:textAlign="left" ns3:fontSize="22px" ns3:fontFamily="proportionalSansSerif" ns3:color="yellow"/>
+<ns2:style xml:id="s2" ns3:color="yellow" style="s1"/>
+<ns2:style xml:id="s1Right" ns3:textAlign="end" style="s1"/>
+<ns2:style xml:id="s2Left" ns3:textAlign="start" style="s2"/>
+</ns2:styling>
+<ns2:layout><ns2:region ns3:padding="5px 3px" ns3:extent="560px 62px" ns3:displayAlign="after" ns3:backgroundColor="black" style="s1" xml:id="subtitleArea"/>
+</ns2:layout>
+</ns2:head>
+<ns2:body region="subtitleArea"><ns2:div><ns2:p end="104.34s" begin="104.34s"><![CDATA[<p align="left" ><font color="#ffa500">Sono</font></p>]]></ns2:p>
+<ns2:p end="107.76s" begin="104.34s"><![CDATA[<p align="left" ><font color="#ffa500"></font></p>]]></ns2:p>
+<ns2:p end="117.8s" begin="107.76s"><![CDATA[<p align="left" ><font color="#ffa500">presenti 25</font></p>]]></ns2:p>
+<ns2:p end="117.8s" begin="117.8s"><![CDATA[<p align="left" ><font color="#ffa500">Consiglieri,</font></p>]]></ns2:p>
+</ns2:div>
+</ns2:body>
+</ns2:tt>

data/test/test_ttml.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'test/unit'
 require 'ttml'
 
@@ -20,7 +21,7 @@ class TtmlTest < Test::Unit::TestCase
   end
 
   def test_subs_no_param
-    assert @doc.subtitle_stream.is_a?(Array), "Not a NodeSet!"
+    assert @doc.subtitle_stream.is_a?(Array)
   end
 
   def test_subs_start_param
@@ -33,5 +34,11 @@ class TtmlTest < Test::Unit::TestCase
     assert_equal 1, @doc.subtitle_stream(746.63, 749.38).size
   end
 
+  def test_other_file
+    # (with different namespaces)
+    doc = Ttml::Document.new(File.join(File.dirname(__FILE__), 'sample_2.xml'))
+    assert_equal 'Timed Text DFPX', doc.title
+    assert @doc.subtitle_stream.is_a?(Array)
+  end
 
 end

data/ttml.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["loop23@gmail.com"]
   gem.description   = %q{Parse a ttml file}
   gem.summary       = %q{Minimal parsing for timed text markup language (http://www.w3.org/TR/ttaf1-dfxp/)}
-  gem.homepage      = ""
+  gem.homepage      = "http://github.com/loop23/ttml"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ttml
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -42,9 +42,10 @@ files:
 - lib/ttml.rb
 - lib/ttml/version.rb
 - test/sample.xml
+- test/sample_2.xml
 - test/test_ttml.rb
 - ttml.gemspec
-homepage: ''
+homepage: http://github.com/loop23/ttml
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -70,4 +71,5 @@ specification_version: 3
 summary: Minimal parsing for timed text markup language (http://www.w3.org/TR/ttaf1-dfxp/)
 test_files:
 - test/sample.xml
+- test/sample_2.xml
 - test/test_ttml.rb