playlist 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbc27126439999045463cfa6de6ba50f75eb1864
-  data.tar.gz: 03110b81cb035d0b4b2685a64bc1fd41c8d4f414
+  metadata.gz: ab6e547a9828f6e2039b5341e7f5dd44b82ffb88
+  data.tar.gz: c702f580f913a2907dcb14a81721f05e3a657f2d
 SHA512:
-  metadata.gz: 56fe2477c106da8550f666694fc90185c496ad74eb42ff2ab03f695e4f8063b150ae31c8019fc1f11bdee0b192fbbbcbadd555137037df74c47c38399260c09a
-  data.tar.gz: 77d78fb8dd7f5d802407ed1058f54de4264c18549278d7c91b426981319b6f6b63a06ea2f83dff37f34b13bde2d51c8f4ea123b3ca754797e23a56b76b1fef61
+  metadata.gz: 0eb2e0c87173ed061c0ae69ed9d9dead42d72fcb0f2bffa037aafa35ea18d44d58d1ae1dd2d37a8a051a5802cf27b0d161f64d22b0aa424a3ed0b1069711f982
+  data.tar.gz: 3097b9ebc71bbae24aa26701558617fd7cf429f45427e03fbd3da90ac0d3cccd262e54a5bdf95e0d4ee04eadab9a474b31285a54ce1735505097b673b8c922c1

data/Rakefile

@@ -5,6 +5,9 @@ require 'yard'
 
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
-YARD::Rake::YardocTask.new
+YARD::Rake::YardocTask.new do |t|
+  t.files   = ['lib/**/*.rb']
+  t.options = ['--exclude', 'lib/playlist/ext']
+end
 
 task :default => [:spec, :rubocop, :yard]

data/lib/playlist/ext/content_at.rb

@@ -0,0 +1,7 @@
+# Monkey patch to add a #content_at method
+class Nokogiri::XML::Node
+  def content_at(*args)
+    node = at(*args)
+    node.content unless node.nil?
+  end
+end

data/lib/playlist/format/xspf.rb

@@ -1,5 +1,9 @@
 require 'nokogiri'
 
+unless Nokogiri::XML::Node.respond_to?(:content_at)
+  require 'playlist/ext/content_at.rb'
+end
+
 # Module to parse and generate XSPF playlists
 module Playlist::Format::XSPF
   class << self
@@ -9,7 +13,7 @@ module Playlist::Format::XSPF
     def parse(input)
       Playlist.new do |playlist|
         doc = Nokogiri::XML(input)
-        playlist.title = inner_text_or_nil(doc, '/xmlns:playlist/xmlns:title')
+        playlist.title = doc.content_at('/xmlns:playlist/xmlns:title')
         doc.xpath('/xmlns:playlist/xmlns:trackList/xmlns:track').each do |track|
           playlist.tracks << parse_track(track)
         end
@@ -35,10 +39,10 @@ module Playlist::Format::XSPF
 
     def parse_track(doc)
       Playlist::Track.new do |track|
-        track.creator = inner_text_or_nil(doc, 'xmlns:creator')
-        track.title = inner_text_or_nil(doc, 'xmlns:title')
-        track.location = inner_text_or_nil(doc, 'xmlns:location')
-        if (duration = inner_text_or_nil(doc, 'xmlns:duration'))
+        track.creator = doc.content_at('./xmlns:creator')
+        track.title = doc.content_at('./xmlns:title')
+        track.location = doc.content_at('./xmlns:location')
+        if (duration = doc.content_at('./xmlns:duration'))
           track.duration = duration.to_f / 1000
         end
       end
@@ -52,11 +56,5 @@ module Playlist::Format::XSPF
         xml.duration((track.duration * 1000).to_i) unless track.duration.nil?
       end
     end
-
-    ## FIXME: how to do this better?
-    def inner_text_or_nil(doc, path)
-      element = doc.at_xpath(path)
-      element.inner_text unless element.nil?
-    end
   end
 end

data/lib/playlist/version.rb

@@ -1,4 +1,4 @@
 class Playlist
   # The version number of the Playlist Ruby gem
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/playlist.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'nokogiri', '~> 1.8.4'
+
   spec.add_development_dependency 'bundler',        '> 1.13'
   spec.add_development_dependency 'equivalent-xml', '~> 0.6.0'
   spec.add_development_dependency 'rake',           '~> 10.2.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playlist
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nicholas Humfrey
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +138,7 @@ files:
 - Rakefile
 - lib/playlist.rb
 - lib/playlist/contributor.rb
+- lib/playlist/ext/content_at.rb
 - lib/playlist/format.rb
 - lib/playlist/format/m3u.rb
 - lib/playlist/format/simple_text.rb