dropcaster 0.0.4 → 0.0.5.rc1

data/test/unit/test_app.rb

@@ -1,99 +1,129 @@
-require 'helper'
-require 'test_channel_xml'
-require 'open3'
-require 'uri'
-require 'json'
-
-#
-# End-to-end test
-#
-# Same as TestChannelXML, but with the XML generated by calling the bin script
-#
-class TestApp < TestChannelXML
-  include DropcasterTest
-  APP_SCRIPT = 'ruby bin/dropcaster'
-
-  def channel_rss
-    %x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3}]
-  end
-
-  def test_overwrite_title
-    test_title = 'Alice and Bob in Wonderland'
-    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --title '#{test_title}'])
-    assert_equal(test_title, channel.find('title').first.content)
-  end
-
-  def test_overwrite_link
-    test_link = 'http://www.example.com/foo/bar'
-    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --url '#{test_link}'])
-    assert_equal(test_link, channel.find('link').first.content)
-  end
-
-  def test_dir_only
-    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURES_DIR}])
-    assert_equal(1, channel.find('item').size)
-  end
-
-  def test_overwrite_enclosures_url
-    test_enclosures_url = 'http://www.example.com/foo/bar/episodes/'
-    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --enclosures '#{test_enclosures_url}'])
-    item = channel.find("item").first
-    assert(item)
-    enclosure = item.find('enclosure').first
-    assert(enclosure)
-    assert_equal(URI.join(test_enclosures_url, FIXTURE_ITUNES_MP3).to_s, enclosure['url'])
-  end
-
-  def test_overwrite_image_url_channel
-    test_image_url = 'http://www.example.com/foo/bar/override.gif'
-    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --image '#{test_image_url}'])
-    assert_equal(test_image_url, channel.find('itunes:image').first['href'])
-  end
-
-  def test_overwrite_image_url_enclosure
-    # TODO Implement test
-  end
-
-  def test_overwrite_description
-    test_description = 'Testing commandline apps is not that hard.'
-    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --description '#{test_description}'])
-    assert_equal(test_description, channel.find('description').first.content)
-    assert_equal(test_description, channel.find('itunes:summary', NS_ITUNES).first.content)
-  end
-
-  def test_no_channel_file
-    Open3.popen3(APP_SCRIPT){|stdin, stdout, stderr|
-      assert_match(/ERROR: No channel file found/, stderr.read)
-    } unless Kernel.is_windows?
-  end
-
-  def test_overwrite_all
-    test_title = 'Bob and Alice in Wonderland'
-    test_link = 'http://www.example.com/bar/foot'
-    test_description = 'Testing commandline apps is really not that hard.'
-
-    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --title '#{test_title}' --url '#{test_link}' --description '#{test_description}'])
-
-    assert_equal(test_title, channel.find('title').first.content)
-    assert_equal(test_link, channel.find('link').first.content)
-    assert_equal(test_description, channel.find('description').first.content)
-    assert_equal(test_description, channel.find('itunes:summary', NS_ITUNES).first.content)
-  end
-
-  def test_channel_template_not_found
-    Open3.popen3("#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --channel-template foo/bar/42"){|stdin, stdout, stderr|
-      assert_match(/Unable to load template file/, stderr.read)
-    } unless Kernel.is_windows?
-  end
-
-  #
-  # We supply an alternative channel template that produces JSON, parse it back and make some basic assertions on the results
-  #
-  def test_overwrite_channel_template
-    channel_template = File.join(FIXTURES_DIR, 'test_template.json.erb')
-    channel = JSON.parse(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --channel-template #{channel_template}])
-    assert_equal("All About Everything", channel['channel']['title'])
-  end
-
-  # TODO --channel
-end
+require 'helper'
+require 'open3'
+require 'uri'
+require 'json'
+require_relative 'test_channel_xml'
+
+#
+# End-to-end test
+#
+# Same as TestChannelXML, but with the XML generated by calling the bin script
+#
+class TestApp < TestChannelXML
+  include DropcasterTest
+  APP_SCRIPT = 'ruby bin/dropcaster'
+
+  def channel_rss
+    %x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3}]
+  end
+
+  def test_overwrite_title
+    test_title = 'Alice and Bob in Wonderland'
+    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --title '#{test_title}'])
+    assert_equal(test_title, channel.find('title').first.content)
+  end
+
+  def test_overwrite_subtitle
+    test_subtitle = 'Tales from another world that is upside down'
+    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --subtitle '#{test_subtitle}'])
+    assert_equal(test_subtitle, channel.find('itunes:subtitle').first.content)
+  end
+
+  def test_overwrite_link
+    test_link = 'http://www.example.com/foo/bar'
+    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --url '#{test_link}'])
+    assert_equal(test_link, channel.find('link').first.content)
+  end
+
+  def test_overwrite_link_without_ending_slash
+    test_link_base = 'http://www.dropbox.com/foo/bar/'
+    test_link_file = 'index.html'
+    test_link = "#{test_link_base}#{test_link_file}"
+    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --url '#{test_link}'])
+    assert_equal(test_link, channel.find('link').first.content)
+
+    options = YAML.load_file(File.join(FIXTURES_DIR, Dropcaster::CHANNEL_YML))
+    assert_equal(URI.join(test_link_base, options[:image_url]).to_s, channel.find('itunes:image').first['href'])
+
+    # check that the item URLs are correct, too
+    item = channel.find("item").first
+    assert(item)
+
+    # enclosure
+    enclosure = item.find('enclosure').first
+    assert(enclosure)
+    assert_equal(URI.join(test_link_base, 'test/fixtures/iTunes.mp3').to_s, enclosure['url'])
+
+    # item image
+    assert_equal(URI.join(test_link_base, options[:image_url]).to_s, item.find('itunes:image').first['href'])
+  end
+
+  def test_dir_only
+    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURES_DIR}])
+    assert_equal(1, channel.find('item').size)
+  end
+
+  def test_overwrite_enclosures_url
+    test_enclosures_url = 'http://www.example.com/foo/bar/episodes/'
+    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --enclosures '#{test_enclosures_url}'])
+    item = channel.find("item").first
+    assert(item)
+    enclosure = item.find('enclosure').first
+    assert(enclosure)
+    assert_equal(URI.join(test_enclosures_url,'test/fixtures/iTunes.mp3').to_s, enclosure['url'])
+  end
+
+  def test_overwrite_image_url
+    test_image_url = 'http://www.example.com/foo/bar/override.gif'
+    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --image '#{test_image_url}'])
+    assert_equal(test_image_url, channel.find('itunes:image').first['href'])
+
+    # Make sure the items pick up this URL, too
+    item = channel.find("item").first
+    assert(item)
+    assert_equal(test_image_url, item.find('itunes:image').first['href'])
+  end
+
+  def test_overwrite_description
+    test_description = 'Testing commandline apps is not that hard.'
+    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --description '#{test_description}'])
+    assert_equal(test_description, channel.find('description').first.content)
+    assert_equal(test_description, channel.find('itunes:summary', NS_ITUNES).first.content)
+  end
+
+  def test_no_channel_file
+    Open3.popen3(APP_SCRIPT){|stdin, stdout, stderr|
+      assert_match(/ERROR: No channel file found/, stderr.read)
+    } unless Kernel.is_windows?
+  end
+
+  def test_overwrite_all
+    test_title = 'Bob and Alice in Wonderland'
+    test_link = 'http://www.example.com/bar/foot'
+    test_description = 'Testing commandline apps is really not that hard.'
+
+    channel = channel_node(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --title '#{test_title}' --url '#{test_link}' --description '#{test_description}'])
+
+    assert_equal(test_title, channel.find('title').first.content)
+    assert_equal(test_link, channel.find('link').first.content)
+    assert_equal(test_description, channel.find('description').first.content)
+    assert_equal(test_description, channel.find('itunes:summary', NS_ITUNES).first.content)
+  end
+
+  def test_channel_template_not_found
+    Open3.popen3("#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --channel-template foo/bar/42"){|stdin, stdout, stderr|
+      assert_match(/Unable to load template file/, stderr.read)
+    } unless Kernel.is_windows?
+  end
+
+  #
+  # We supply an alternative channel template that produces JSON, parse it back and make some basic assertions on the results
+  #
+  def test_overwrite_channel_template
+    channel_template = File.join(FIXTURES_DIR, 'test_template.json.erb')
+    channel = JSON.parse(%x[#{APP_SCRIPT} #{FIXTURE_ITUNES_MP3} --channel-template #{channel_template}])
+    assert_equal("All About Everything", channel['channel']['title'])
+  end
+
+  # TODO --channel
+end

data/test/unit/test_channel.rb

@@ -1,73 +1,80 @@
-require 'helper'
-
-class TestChannel < Test::Unit::TestCase
-  include DropcasterTest
-
-  def setup
-    @options = YAML.load_file(File.join(FIXTURES_DIR, Dropcaster::CHANNEL_YML))
-    @channel = Dropcaster::Channel.new(FIXTURES_DIR, @options)
-  end
-
-  def test_item_count
-    assert_equal(1, @channel.items.size)
-  end
-
-  def test_channel
-    assert_equal(@options[:title], @channel.title)
-    assert_equal(@options[:url], @channel.url)
-    assert_equal(@options[:description], @channel.description)
-    assert_equal(@options[:subtitle], @channel.subtitle)
-    assert_equal(@options[:language], @channel.language)
-    assert_equal(@options[:copyright], @channel.copyright)
-    assert_equal(@options[:author], @channel.author)
-
-    owner = @channel.owner
-    assert_equal(@options[:owner][:name], owner[:name])
-    assert_equal(@options[:owner][:email], owner[:email])
-
-    assert_equal(URI.join(@options[:url], @options[:image_url]).to_s, @channel.image_url)
-    
-    categories = @channel.categories
-    assert_equal(@options[:categories], categories)
-  end
-  
-  def test_channel_explicit_yes
-    assert_channel_explicit('Yes', true)
-  end
-  
-  def test_channel_explicit_no
-    assert_channel_explicit('No', false)
-  end
-  
-  def test_channel_explicit_nil
-    assert_channel_explicit(nil, nil)
-  end
-  
-  def test_channel_explicit_clean
-    assert_channel_explicit('Clean', 'Clean')
-  end
-  
-  def assert_channel_explicit(expected, value)
-    @options[:explicit] = value
-    channel = Dropcaster::Channel.new(FIXTURES_DIR, @options)
-    assert_equal(expected, channel.explicit)
-  end
-
-  def test_raise_on_missing_title
-    assert_raises Dropcaster::MissingAttributeError do
-      Dropcaster::Channel.new(FIXTURES_DIR, {:url => 'bar', :description => 'foobar'})
-    end
-  end
-
-  def test_raise_on_missing_url
-    assert_raises Dropcaster::MissingAttributeError do
-      Dropcaster::Channel.new(FIXTURES_DIR, {:title => 'foo', :description => 'foobar'})
-    end
-  end
-
-  def test_raise_on_missing_description
-    assert_raises Dropcaster::MissingAttributeError do
-      Dropcaster::Channel.new(FIXTURES_DIR, {:title => 'foo', :url => 'bar'})
-    end
-  end
-end
+require 'helper'
+
+class TestChannel < MiniTest::Test
+  include DropcasterTest
+
+  def setup
+    @options = YAML.load_file(File.join(FIXTURES_DIR, Dropcaster::CHANNEL_YML))
+    @channel = Dropcaster::Channel.new(FIXTURES_DIR, @options)
+  end
+
+  def test_item_count
+    assert_equal(1, @channel.items.size)
+  end
+
+  def test_channel
+    assert_equal(@options[:title], @channel.title)
+    assert_equal(@options[:url], @channel.url)
+    assert_equal(@options[:description], @channel.description)
+    assert_equal(@options[:subtitle], @channel.subtitle)
+    assert_equal(@options[:language], @channel.language)
+    assert_equal(@options[:copyright], @channel.copyright)
+    assert_equal(@options[:author], @channel.author)
+    assert_equal(@options[:keywords], @channel.keywords)
+
+    owner = @channel.owner
+    assert_equal(@options[:owner][:name], owner[:name])
+    assert_equal(@options[:owner][:email], owner[:email])
+
+    assert_equal(URI.join(@options[:url], @options[:image_url]).to_s, @channel.image_url)
+
+    categories = @channel.categories
+    assert_equal(@options[:categories], categories)
+  end
+
+  def test_channel_url_without_slash
+    @options[:url] << 'index.html'
+    @channel = Dropcaster::Channel.new(FIXTURES_DIR, @options)
+    assert_equal(@options[:url], @channel.url)
+  end
+
+  def test_channel_explicit_yes
+    assert_channel_explicit('Yes', true)
+  end
+
+  def test_channel_explicit_no
+    assert_channel_explicit('No', false)
+  end
+
+  def test_channel_explicit_nil
+    assert_channel_explicit(nil, nil)
+  end
+
+  def test_channel_explicit_clean
+    assert_channel_explicit('Clean', 'Clean')
+  end
+
+  def assert_channel_explicit(expected, value)
+    @options[:explicit] = value
+    channel = Dropcaster::Channel.new(FIXTURES_DIR, @options)
+    assert_equal(expected, channel.explicit)
+  end
+
+  def test_raise_on_missing_title
+    assert_raises Dropcaster::MissingAttributeError do
+      Dropcaster::Channel.new(FIXTURES_DIR, {:url => 'bar', :description => 'foobar'})
+    end
+  end
+
+  def test_raise_on_missing_url
+    assert_raises Dropcaster::MissingAttributeError do
+      Dropcaster::Channel.new(FIXTURES_DIR, {:title => 'foo', :description => 'foobar'})
+    end
+  end
+
+  def test_raise_on_missing_description
+    assert_raises Dropcaster::MissingAttributeError do
+      Dropcaster::Channel.new(FIXTURES_DIR, {:title => 'foo', :url => 'bar'})
+    end
+  end
+end

data/test/unit/test_channel_locator.rb

@@ -1,93 +1,76 @@
-require 'helper'
-require 'tmpdir'
-
-class TestChannelLocator < Test::Unit::TestCase
-  include DropcasterTest
-
-  class << self
-    attr_reader :temp_dir
-
-    def startup
-      @temp_dir = Dir.mktmpdir
-    end
-
-    def shutdown
-      FileUtils.remove_entry_secure(@temp_dir)
-    end
-
-    def suite
-      # from http://stackoverflow.com/questions/255969#778701
-      _suite = super
-
-      def _suite.run(*args)
-        TestChannelLocator.startup()
-        super
-        TestChannelLocator.shutdown()
-      end
-
-      _suite
-    end
-  end
-
-  def test_single_file
-    sources = File.join(TestChannelLocator.temp_dir, 'single_file.mp3')
-    assert_location(sources)
-  end
-
-  def test_current_directory
-    sources = File.join(TestChannelLocator.temp_dir, '.')
-    assert_location(Pathname.new(sources).cleanpath) # Cleanup path before we compare
-  end
-
-  def test_single_directory
-    source_dir = File.join(TestChannelLocator.temp_dir, 'single_dir')
-    Dir.mkdir(source_dir)
-    expected = File.join(TestChannelLocator.temp_dir, 'single_dir', Dropcaster::CHANNEL_YML)
-    assert_equal(expected, Dropcaster::ChannelFileLocator.locate(source_dir))
-  end
-
-  def test_array_of_files_same_dir
-    sources = Array.new
-    sources << File.join(TestChannelLocator.temp_dir, 'file1.mp3')
-    sources << File.join(TestChannelLocator.temp_dir, 'file2.mp3')
-    sources << File.join(TestChannelLocator.temp_dir, 'file3.mp3')
-
-    assert_location(sources)
-  end
-
-  def test_array_of_files_different_dir
-    sources = Array.new
-    sources << File.join(TestChannelLocator.temp_dir, 'foo', 'file1.mp3')
-    sources << File.join(TestChannelLocator.temp_dir, 'bar', 'file1.mp3')
-    sources << File.join(TestChannelLocator.temp_dir, 'baz', 'file1.mp3')
-
-    assert_raises Dropcaster::AmbiguousSourcesError do
-      Dropcaster::ChannelFileLocator.locate(sources)
-    end
-  end
-
-  def test_array_with_one_directory
-    assert_location(File.join(TestChannelLocator.temp_dir, ['single_dir']))
-  end
-
-  def test_array_with_more_than_a_single_directory
-    Dir.mktmpdir{|tmp_dir1|
-      Dir.mktmpdir{|tmp_dir2|
-        sources = Array.new
-        sources << File.join(tmp_dir1, 'another_dir')
-        sources << File.join(tmp_dir2, 'another_dir')
-
-        assert_raises Dropcaster::AmbiguousSourcesError do
-          Dropcaster::ChannelFileLocator.locate(sources)
-        end
-      }
-    }
-  end
-
-  private
-
-  def assert_location(sources)
-    channel_file = Dropcaster::ChannelFileLocator.locate(sources)
-    assert_equal(File.join(TestChannelLocator.temp_dir, Dropcaster::CHANNEL_YML), channel_file)
-  end
-end
+require 'helper'
+require 'tmpdir'
+require 'pry'
+
+class TestChannelLocator < MiniTest::Test
+  include DropcasterTest
+
+  def setup
+    @temp_dir = Dir.mktmpdir
+  end
+  def teardown
+    FileUtils.remove_entry_secure(@temp_dir)
+  end
+
+  def test_single_file
+    sources = File.join(@temp_dir, 'single_file.mp3')
+    assert_location(sources)
+  end
+
+  def test_current_directory
+    sources = File.join(@temp_dir, '.')
+    assert_location(Pathname.new(sources).cleanpath) # Cleanup path before we compare
+  end
+
+  def test_single_directory
+    source_dir = File.join(@temp_dir, 'single_dir')
+    Dir.mkdir(source_dir)
+    expected = File.join(@temp_dir, 'single_dir', Dropcaster::CHANNEL_YML)
+    assert_equal(expected, Dropcaster::ChannelFileLocator.locate(source_dir))
+  end
+
+  def test_array_of_files_same_dir
+    sources = Array.new
+    sources << File.join(@temp_dir, 'file1.mp3')
+    sources << File.join(@temp_dir, 'file2.mp3')
+    sources << File.join(@temp_dir, 'file3.mp3')
+
+    assert_location(sources)
+  end
+
+  def test_array_of_files_different_dir
+    sources = Array.new
+    sources << File.join(@temp_dir, 'foo', 'file1.mp3')
+    sources << File.join(@temp_dir, 'bar', 'file1.mp3')
+    sources << File.join(@temp_dir, 'baz', 'file1.mp3')
+
+    assert_raises Dropcaster::AmbiguousSourcesError do
+      Dropcaster::ChannelFileLocator.locate(sources)
+    end
+  end
+
+  def test_array_with_one_directory
+    assert_location(File.join(@temp_dir, ['single_dir']))
+  end
+
+  def test_array_with_more_than_a_single_directory
+    Dir.mktmpdir{|tmp_dir1|
+      Dir.mktmpdir{|tmp_dir2|
+        sources = Array.new
+        sources << File.join(tmp_dir1, 'another_dir')
+        sources << File.join(tmp_dir2, 'another_dir')
+
+        assert_raises Dropcaster::AmbiguousSourcesError do
+          Dropcaster::ChannelFileLocator.locate(sources)
+        end
+      }
+    }
+  end
+
+  private
+
+  def assert_location(sources)
+    channel_file = Dropcaster::ChannelFileLocator.locate(sources)
+    assert_equal(File.join(@temp_dir, Dropcaster::CHANNEL_YML), channel_file)
+  end
+end