sindex 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbc43040a3a6eebb9f7d7e82d35f31692b8cd800
-  data.tar.gz: 6fd7ee91bfcecbd424b8a847d21583762d3e759d
+  metadata.gz: c6080918a70331ea28e8896016f662886530f354
+  data.tar.gz: 48980a04a5b95b9d215faa3496eacfb9e1f7542c
 SHA512:
-  metadata.gz: 2320984dfc8e448c07c75bdb59100de737899bfd979939dac4fc88f32d65601763e304beddb2c83721a44e74dfd48398d725d3a439a8abfcd84565719b9a4583
-  data.tar.gz: 291d7c433a459d9ac88fdd59ac4b36c15a75e641169bc3c3201169480dba17074d534bb48710f8ad1faac7270cd800420a087ebe46bcf74504844d530c960c60
+  metadata.gz: afecd8d833ca83bdee4d21a3a16a5e150ec6b836c8c5752f6cfcf0198264d6405ffcfca734ba34ee41b0fd1ff2dba2e217d2872082b3f47b13aa75b7da3d148c
+  data.tar.gz: eb976345d9a3e6e0ef97139655b308a264cdbdf3acaadffca0a8f4a91f96ef09f0a5d8ec221280d92ec370f5f6c1377212084def31f04f3aef6e9e1166e45b46

data/lib/sindex/series_index.rb

@@ -18,8 +18,6 @@ module Sindex
       @series_data = {}
       @series_aliases = {}
 
-      @dtd_path = File.expand_path(
-        File.join(File.dirname(__FILE__), '../../res/seriesindex.dtd'))
 
       if @index_file and File.file? @index_file
         parse_file(@index_file)
@@ -243,8 +241,6 @@ module Sindex
     def build_up_xml_tree_from_index
 
       builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
-        xml.doc.create_internal_subset("seriesindex", nil, @dtd_path)
-
         xml.seriesindex {
           @series_data.sort.map do |seriesname, data|
             attrs = {:name => seriesname}
@@ -363,12 +359,12 @@ module Sindex
     #
     # returns Nokogiri XML Document
     def open_xml_file(file)
-      fix_broken_dtd_path(file)
+      xml_content = add_dtd_reference(File.read(file).lines)
 
       options = Nokogiri::XML::ParseOptions::DEFAULT_XML |
                   Nokogiri::XML::ParseOptions::DTDLOAD
 
-      doc = Nokogiri::XML::Document.parse(File.read(file), nil, nil, options)
+      doc = Nokogiri::XML::Document.parse(xml_content, nil, nil, options)
       doc.external_subset || raise(XmlDTDError, "DTD could not be processed")
 
       errors = doc.external_subset.validate(doc)
@@ -383,14 +379,14 @@ module Sindex
     end
 
     # Internal: fixes the path that points to the dtd file in the seriesindex
-    def fix_broken_dtd_path(file)
-      new_doctype = '<!DOCTYPE seriesindex SYSTEM "' + @dtd_path +'">'
+    def add_dtd_reference(content)
+      dtd_path = File.expand_path(
+        File.join(File.dirname(__FILE__), '../../res/seriesindex.dtd'))
 
-      lines = File.open(file).read
-      lines.gsub!(/^.*DOCTYPE.*SYSTEM.*$/, new_doctype)
+      content.delete_if {|line| line.match(/^.*DOCTYPE/) }
+      content.insert(1, '<!DOCTYPE seriesindex SYSTEM "' + dtd_path +'">')
 
-      File.open(file, 'w') {|f| f.write(lines) }
+      content.join("\n")
     end
-
   end
 end

data/lib/sindex/version.rb

@@ -1,3 +1,3 @@
 module Sindex
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/test/seriesindex_new_format.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<seriesindex>
+  <series name="Community">
+    <episodes>
+      <episode name="S01E01 - Zurück aufs College.avi"></episode>
+      <episode name="S01E02 - Grundkurs Spanisch.avi"></episode>
+      <episode name="S01E03 - Carpe Diem.avi"></episode>
+      <episode name="S01E04 - Bitte warten.avi"></episode>
+      <episode name="S01E05 - Prozess im Schwimmbad.avi"></episode>
+      <episode name="S01E06 - Toiletten Talk.avi"></episode>
+      <episode name="S01E07 - Mexanisches Halloween.avi"></episode>
+      <episode name="S01E08 - Picknick unter Sternen.avi"></episode>
+      <episode name="S01E09 - Der Mensch ist gut.avi"></episode>
+      <episode name="S01E10 - Green Day für Arme.avi"></episode>
+      <episode name="S01E11 - Das P Wort.avi"></episode>
+      <episode name="S01E12 - Die Weihnachtsschlacht.avi"></episode>
+      <episode name="S01E13 - Zweite Wahl.avi"></episode>
+      <episode name="S01E14 - Echte Männer tanzen nicht.avi"></episode>
+      <episode name="S01E15 - Jeder mit jedem.avi"></episode>
+      <episode name="S01E16 - Trunken am Telefon.avi"></episode>
+      <episode name="S01E17 - Billard ohne.mkv"></episode>
+      <episode name="S01E18 - Familientag.mkv"></episode>
+      <episode name="S01E19 - Die Parkplatzsegler.mkv"></episode>
+      <episode name="S01E20 - Die Spassbremse.mkv"></episode>
+    </episodes>
+    <alias to="Comm"></alias>
+    <alias to="unity"></alias>
+  </series>
+  <series name="Shameless US">
+    <episodes lang="de">
+      <episode name="S01E01 - Pilot.avi"></episode>
+      <episode name="S01E02 - Frank The Plank.avi"></episode>
+      <episode name="S01E03 - Der Scheck heiligt die Mittel.avi"></episode>
+      <episode name="S01E04 - Nur mal Spielen.avi"></episode>
+      <episode name="S01E05 - Drei Freunde.avi"></episode>
+      <episode name="S01E06 - Killer Carl.avi"></episode>
+      <episode name="S01E07 - Frank Gallagher Loving Husband Devoted Father.avi"></episode>
+      <episode name="S01E08 - Katerstimmung.avi"></episode>
+    </episodes>
+    <episodes lang="en">
+      <episode name="S01E01 - Pilot.avi"></episode>
+      <episode name="S01E02 - Frank The Plank.avi"></episode>
+      <episode name="S01E03 - Der Scheck heiligt die Mittel.avi"></episode>
+      <episode name="S01E04 - Nur mal Spielen.avi"></episode>
+      <episode name="S01E05 - Drei Freunde.avi"></episode>
+      <episode name="S01E06 - Killer Carl.avi"></episode>
+      <episode name="S01E07 - Frank Gallagher Loving Husband Devoted Father.avi"></episode>
+      <episode name="S01E08 - Katerstimmung.avi"></episode>
+      <episode name="S01E09 - But At Last Came A Knock.avi"></episode>
+      <episode name="S01E10 - Auf Oma ist verlass.avi"></episode>
+      <episode name="S01E11 - Daddys Girl.avi"></episode>
+      <episode name="S01E12 - Vater Frank voller Gnade.avi"></episode>
+      <episode name="S02E01 - Summertime.avi"></episode>
+      <episode name="S02E02 - Summer Loving.avi"></episode>
+      <episode name="S02E03 - Ill Light A Candle For You Every Day.avi"></episode>
+      <episode name="S02E04 - A Beautiful Mess.avi"></episode>
+      <episode name="S02E05 - Fathers Day.avi"></episode>
+      <episode name="S02E06 - Can I Have A Mother.avi"></episode>
+      <episode name="S02E07 - A Bottle of Jean Nate.avi"></episode>
+      <episode name="S02E08 - Parenthood.avi"></episode>
+      <episode name="S02E09 - Hurricane Monica.avi"></episode>
+      <episode name="S02E10 - A Great Cause.mkv"></episode>
+      <episode name="S02E11 - Just Like The Pilgrims Intended.mkv"></episode>
+    </episodes>
+  </series>
+  <series name="Prison Break">
+    <episodes>
+      <episode name="S01E01 - Zurück aufs College.avi"></episode>
+      <episode name="S01E02 - Grundkurs Spanisch.avi"></episode>
+      <episode name="S01E03 - Carpe Diem.avi"></episode>
+      <episode name="S01E04 - Bitte warten.avi"></episode>
+    </episodes>
+  </series>
+  <series name="The Big Bang Theory">
+    <episodes>
+      <episode name="S06E01 - do not change.avi" all_before="true"></episode>
+      <episode name="S06E02 - Grundkurs Spanisch.avi"></episode>
+      <episode name="S06E03 - Carpe Diem.avi"></episode>
+      <episode name="S06E04 - Bitte warten.avi"></episode>
+    </episodes>
+  </series>
+</seriesindex>

data/test/test_series_index.rb

@@ -7,15 +7,10 @@ require 'tempfile'
 class TestIndex < Test::Unit::TestCase
 
   STANDARD_SINDEX_PATH = File.dirname(__FILE__) + '/seriesindex_example.xml'
-  STANDARD_SINDEX_CONTENT = File.open(STANDARD_SINDEX_PATH).read
+  NEW_FORMAT_SINDEX_PATH = File.dirname(__FILE__) + '/seriesindex_new_format.xml'
 
   def setup
-
-    @tempfile = Tempfile.new('seriesindex')
-    @tempfile.puts(STANDARD_SINDEX_CONTENT)
-    @tempfile.flush
-
-    @series_index = Sindex::SeriesIndex.new(index_file: @tempfile.path)
+    @series_index = Sindex::SeriesIndex.new(index_file: STANDARD_SINDEX_PATH)
   end
 
   def test_instantiating
@@ -26,11 +21,6 @@ class TestIndex < Test::Unit::TestCase
     assert_equal index.empty?, true
   end
 
-  def test_that_the_path_of_DTD_file_has_been_updated
-    content = File.open(@tempfile.path).read
-    assert_equal content.match(/^.*DOCTYPE.*\"res\/seriesindex.xml\".*$/), nil
-  end
-
   def test_parsing_a_valid_series_index
     assert_not_nil @series_index.series_data['Community']
 
@@ -44,6 +34,13 @@ class TestIndex < Test::Unit::TestCase
     assert_equal series.has_episodes_in_language?(:en), true
   end
 
+  def test_parsing_index_in_new_format
+    assert_nothing_raised do
+      index = Sindex::SeriesIndex.new(index_file: NEW_FORMAT_SINDEX_PATH)
+      assert_equal index.is_series_in_index?("shameless uS", true), true
+    end
+  end
+
   def test_that_series_aliases_take_place
     assert_equal @series_index.is_series_in_index?("Comm", true), true
     assert_equal @series_index.is_series_in_index?("unity", true), true

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: sindex
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Philipp Böhm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: hashconfig
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: serienrenamer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.16
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.13
 description: Tool and library that manages the episodes you have seen in different
@@ -75,9 +75,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .autotest
-- .gitignore
-- .travis.yml
+- ".autotest"
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -91,6 +91,7 @@ files:
 - res/seriesindex.dtd
 - sindex.gemspec
 - test/seriesindex_example.xml
+- test/seriesindex_new_format.xml
 - test/test_helper.rb
 - test/test_series_index.rb
 - test/test_testdata.rb
@@ -103,22 +104,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Series-Index that manages your watched episodes
 test_files:
 - test/seriesindex_example.xml
+- test/seriesindex_new_format.xml
 - test/test_helper.rb
 - test/test_series_index.rb
 - test/test_testdata.rb