in_our_time 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de87e4265e1b9d635849b956423654b7757c1909
-  data.tar.gz: a030c2d3ad061950dab3163fe6b7875a9436538d
+  metadata.gz: 3bff39b611f74f1253f1da6118e7a345c0411948
+  data.tar.gz: ecb0cb3c1a64b4d8907088d0fa1d902c35da18f7
 SHA512:
-  metadata.gz: 7f91d8ae75f12e7ea71448b45f451063b865ad1799e3f38cb60a3bb36654d4018696056ca07ed3fc592c35be447935a2c9bd3b98f1b85df0d0070fc593ac1564
-  data.tar.gz: 4f9d01aa37e96d6416b16b37f7e5a11f4e281aee87a55646f6a4e5722d028cb9d738de4b704535fab8b673e261896f7150307a934d92d97d11cfd451cb21c345
+  metadata.gz: 457064a6748fa01c21fb0d544a17217188f644d44195abc958251c6929053fbb6dd63eaad579acbee66d6f911e13d674b9b4b574323e31cc3a5c798d1cd96e3e
+  data.tar.gz: 07091b59590287984bc3d62ec8018e6d1df762307189c5c257b5dd22897f067f1165e979a3c1ab914f652d0471994e8671d76670e906d0e7e656058e2c8938ce

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/bin/iot

@@ -1,4 +1,3 @@
 #!/usr/bin/env ruby
 
-puts Dir.pwd
 require 'in_our_time'

data/in_our_time.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 2.0.0'
-  spec.add_runtime_dependency 'nokogiri', '>= 1.6.8'
+  spec.add_runtime_dependency 'oga', '~> 2.2'
   spec.add_runtime_dependency 'colorize', '>= 0.8.1'
   spec.add_development_dependency 'version', '>= 1.0.0'
 end

data/lib/iot/iot.rb

@@ -1,4 +1,3 @@
-require 'nokogiri'
 require 'rss'
 require 'open-uri'
 require 'net/http'
@@ -6,6 +5,7 @@ require 'open-uri'
 require 'yaml'
 require 'fileutils'
 require 'colorize'
+require 'oga'
 
 class InOurTime
 
@@ -247,19 +247,17 @@ class InOurTime
 
   def parse_rss
     rss_files.each do |file|
-      @doc = Nokogiri::XML(File.open(file))
-      titles    = @doc.xpath("//item//title")
-      descs     = @doc.xpath("//item//description")
-      subtitles = @doc.xpath("//item//itunes:subtitle")
-      summarys  = @doc.xpath("//item//itunes:summary")
-      durations = @doc.xpath("//item//itunes:duration")
-      dates     = @doc.xpath("//item//pubDate")
-      links     = @doc.xpath("//item//link")
+      @doc = Oga.parse_xml(File.open(file))
+      titles    = @doc.xpath('rss/channel/item/title')
+      subtitles = @doc.xpath('rss/channel/item/itunes:subtitle')
+      summarys  = @doc.xpath('rss/channel/item/itunes:summary')
+      durations = @doc.xpath('rss/channel/item/itunes:duration')
+      dates     = @doc.xpath('rss/channel/item/pubDate')
+      links     = @doc.xpath('rss/channel/item/link')
 
       0.upto (titles.length - 1) do |idx|
         program = {}
         program[:title] = titles[idx].text
-        #    program[:description] = descs[idx]
         program[:subtitle] = subtitles[idx].text
         program[:summary]  = summarys[idx].text
         program[:duration] = durations[idx].text
@@ -284,8 +282,7 @@ class InOurTime
   def sort_titles
     @sorted_titles = []
     @sorted_titles = @programs.collect { |pr| pr[:title] }
-#    @sorted_titles = @sorted_titles.uniq{|x| x.downcase}
-    @sorted_titles = @sorted_titles.sort unless @config[:sort] == :age
+    @sorted_titles.sort! unless @config[:sort] == :age
   end
 
   def date
@@ -350,14 +347,13 @@ class InOurTime
   end
 
   def print_playing_maybe
-    iot_puts ''
     if @playing
-      iot_puts "Playing '#{@playing}'", @selection_colour
+      iot_puts "\nPlaying '#{@playing}'", @selection_colour
     elsif @started.nil?
       @started = true
-      iot_puts "? or h for instructions", @text_colour
+      iot_puts "\n? or h for instructions", @text_colour
     else
-      iot_puts ''
+      iot_puts "\n"
     end
   end
 
@@ -451,33 +447,48 @@ class InOurTime
   end
 
   def reformat info
-    info.gsub('With ', "\nWith ")
-      .gsub('With: ', "\nWith: ")
-      .gsub('Producer', "- Producer")
+    ['With','Guests',
+     'Producer','Contributors'].map do | x|
+      [' ', ':'].map do |y|
+        [x, x.upcase].map do |z|
+          info = info.gsub(z + y, "\n" + z + y)
+        end
+      end
+    end
+    info
+  end
+
+  def top_space info
+    info.length - info.lstrip.length
+  end
+
+  def bottom_space? bottom
+    bottom == ' '
+  end
+
+  def last_line? info, top
+    info[top..-1].length < @config[:page_width]
   end
 
   def justify info
     pages = [[],[]]
     page, top, bottom = 0, 0, @config[:page_width]
     loop do
-      if(bottom >= info.length)
-        pages[page] << info[top..-1].strip
-        break
-      end
-      loop do
-        break unless info[top] == ' '
-        top += 1 ; bottom += 1
-      end
+      shift = top_space info[top..bottom]
+      top, bottom = top + shift, bottom + shift
       loop do
         if idx = info[top..bottom].index("\n")
           pages[page] << info[top..top + idx]
           page,bottom,top = 1,top + idx + @config[:page_width] + 1, top + idx + 1
-          next
         else
-          break if (info[bottom] == ' ')
+          break if bottom_space? info[bottom]
           bottom -= 1
         end
       end
+      if last_line? info, top
+        pages[page] << info[top..-1].strip
+        break
+      end
       pages[page] << info[top..bottom]
       bottom, top = bottom + @config[:page_width], bottom
     end
@@ -489,8 +500,7 @@ class InOurTime
       prg = select_program @sorted_titles[@selected]
       system 'clear'
       justify(prg[:subtitle].gsub(/\s+/, ' '))[0].map{|x| iot_puts x}
-      iot_puts ''
-      iot_puts "Date Broadcast: #{prg[:date]}"
+      iot_puts "\nDate Broadcast: #{prg[:date]}"
       iot_puts "Duration:       #{prg[:duration].to_i/60} mins"
       iot_puts "Availability:   " +
                (prg[:have_locally] ? "Downloaded" : "Requires Download")
@@ -500,7 +510,7 @@ class InOurTime
       info = prg[:summary].gsub(/\s+/, ' ')
       system 'clear'
       justify(reformat(info))[0].map{|x| iot_puts x}
-      @info = 2
+      @info = justify(reformat(info))[1] == [] ? -1 : 2
     elsif @info == 2
       prg = select_program @sorted_titles[@selected]
       info = prg[:summary].gsub(/\s+/, ' ')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: in_our_time
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Martyn Jago
@@ -11,19 +11,19 @@ cert_chain: []
 date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: oga
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement