remote_partial 0.6.0 → 0.7.0

data/README.rdoc

@@ -1,7 +1,7 @@
 {<img src="https://codeclimate.com/github/warwickshire/remote_partial.png" />}[https://codeclimate.com/github/warwickshire/remote_partial]
 = RemotePartial
 
-This rails engine allows partials to be created from remote content.
+Remote Partial allows partials to be created from remote content.
 
 == Installation
 
@@ -9,9 +9,47 @@ Add this to your Gemfile:
 
     gem 'remote_partial'
 
+== Configuration
+
+Prior to version 0.7.0, RemotePartial depended upon Rails to determine some
+of the configuration options. This dependency has now been removed, and therefore
+some paths will have to be defined when RemotePartial is run outside of Rails
+(Standalone mode).
+
+=== Standalone
+
+The root location needs to be defined. For example:
+
+    RemotePartial.root = 'some/path'
+
+With this defined:
+
+    some/path/db/remote_partial --> location for yaml file storing state information
+    some/path/remote_partials   --> output path, where partials will be created
+
+=== Within a Rails environment
+
+The root is defined as Rails.root, and partials will be placed in the app/views
+folder. Paths relative to Rails.root will then be:
+
+    db/remote_partial --> location for yaml file storing state information
+    app/views/remote_partials   --> output path, where partials will be created
+
+=== Logging
+
+In a Rails environment, the Rails logger will be used, otherwise the default
+logging is STDOUT.
+
+Logging output to a specific file can be configured like this:
+
+    RemotePartial.logger_file = 'log/remote_partial.log'
+
+Note that the location will be relative to RemotePartial.root, and the 'log'
+folder will need to exist.
+
 == Defining a remote partial
 
-Define the remote partials in an initializer (config/initializers/remote_partial.rb)
+Running this command:
 
     RemotePartial.define(
       url: 'http://www.ruby-lang.org/en/',
@@ -20,14 +58,20 @@ Define the remote partials in an initializer (config/initializers/remote_partial
       minimum_life: 3.hours
     )
 
-This will create a partial at:
+will create a partial at:
 
-    app/veiws/remote_partials/_ruby.html.erb
+    app/views/remote_partials/_ruby.html.erb
 
 The content of this partial will be grabbed from the page at the url, and will
 comprise the content defined by '#intro' (that is, the content of the tag with
 an id='intro'). This content will not be updated for at least 3 hours.
 
+=== In Rails
+
+If you define the remote partials in an initializer (for example
+config/initializers/remote_partial.rb), the remote partial will be updated
+each time the Rails app is started.
+
 == Criteria
 
 Nokogiri is used to extract content from within the target page. Criteria are
@@ -58,12 +102,17 @@ For example, to change all instances of 'foo' to 'bar' in the partial:
 
 To output the content of the remote partial 'ruby' to a rails view add this:
 
-    <%= render_remote_partial 'ruby' %>
+    <%= render 'remote_partials/ruby' %>
+
+Alternatively, the content of the remote partial can be accessed via:
+
+    partial = RemotePartial::Partial.find('ruby')
+    File.read(partial.output_file_name)
 
 == Updating the content
 
-The content update process is run each time the host app is loaded. An update can
-also be triggered by running the follow rake task:
+An update of the existing remote partials, can be triggered by running the
+following rake task:
 
     rake remote_partial:update
 
@@ -73,7 +122,7 @@ If an update process is run before the stale_at time, that partial will not be
 updated.
 
 So once the 'ruby' remote partial has been updated, it will be at least three
-hours before it will be updated again.
+hours before it will be updated again (unless forced).
 
 These is also a rake task that will force all partials to update irrespective
 of the stale_at time:
@@ -85,16 +134,10 @@ of the stale_at time:
 If remote partial is unable to retrieve remote content, the problem will be
 logged, and a retrieval will be tried again at the next update.
 
-== The partial view folder
-
-Remote partials are held in:
-
-    Rails.root + '/app/views/remote_partials'
-
 == Persistence
 
 The current state of each defined remote partial is stored in a YAML file:
 
-    db/remote_partial/partials.yml
+    db/remote_partial/partial.yml
 
 This project wobbles and uses MIT-LICENSE.

data/Rakefile

@@ -1,16 +1,8 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+require 'rubygems'
+require 'rake'
+require 'rake/clean'
+require 'rdoc/task'
+require 'rake/testtask'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -20,14 +12,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
@@ -36,5 +20,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task :default => :test

data/{app/models → lib}/remote_partial/builder.rb

@@ -16,7 +16,7 @@ module RemotePartial
       create_or_update_partial
       partial.update_stale_file
     rescue RemotePartialRetrivalError => error
-      Rails.logger.warn error.message
+      RemotePartial.logger.warn error.message
     end
 
     def create_or_update_partial

data/{app/models → lib}/remote_partial/partial.rb

@@ -4,6 +4,11 @@ module RemotePartial
 
     attr_accessor :stale_at, :repeat_period
 
+    def self.create(hash)
+      super
+
+    end
+
     def output_file_name
       [partial_folder, file_name].join("/")
     end
@@ -18,7 +23,7 @@ module RemotePartial
     end
 
     def criteria
-      super if super.present? # ensure criteria doesn't return empty string
+      super if present?(super)
     end
 
     def resource_manager
@@ -26,11 +31,11 @@ module RemotePartial
     end
     
     def repeat_period
-      @repeat_period ||= default_repeat_period
+      @repeat_period ||= determine_repeat_period.to_f
     end
 
     def default_repeat_period
-      1.minute
+      TimeCalc.minutes(1)
     end
 
     def update_stale_at
@@ -47,7 +52,7 @@ module RemotePartial
     end
 
     def stale?
-      stale_at.blank? or stale_at < Time.now
+      stale_at_blank? or stale_at < Time.now
     end
 
     def to_hash
@@ -67,5 +72,21 @@ module RemotePartial
       output_modifier? ? instance_eval("lambda #{output_modifier}") : nil
     end
 
+    def stale_at_blank?
+      return true unless stale_at
+      !stale_at.kind_of? Time
+    end
+
+    def present?(item)
+      item and item.to_s !~ empty_string_pattern
+    end
+
+    def empty_string_pattern
+      /\A\s*\Z/
+    end
+
+    def determine_repeat_period
+      self[:repeat_period] || self['repeat_period'] || default_repeat_period
+    end
   end
 end

data/lib/remote_partial/railtie.rb

@@ -0,0 +1,9 @@
+module RemotePartial
+  class Railtie < Rails::Railtie
+    railtie_name :remote_partial
+
+    rake_tasks do
+      load "tasks/remote_partial_tasks.rake"
+    end
+  end
+end

data/lib/remote_partial/time_calc.rb

@@ -0,0 +1,45 @@
+
+module TimeCalc
+
+  def self.days(number)
+    hours(number) * hours_in_a_day
+  end
+
+  def self.hours(number)
+    minutes(number) * minutes_in_an_hour
+  end
+
+  # returns seconds in number of minutes
+  def self.minutes(number)
+    number * seconds_in_a_minute
+  end
+
+  def self.ago(seconds)
+    Time.now - seconds
+  end
+
+  def self.minutes_ago(number)
+    ago(minutes(number))
+  end
+
+  def self.hours_ago(number)
+    ago(hours(number))
+  end
+
+  def self.days_ago(number)
+    ago(days(number))
+  end
+
+  def self.seconds_in_a_minute
+    60
+  end
+
+  def self.minutes_in_an_hour
+    60
+  end
+
+  def self.hours_in_a_day
+    24
+  end
+
+end

data/lib/remote_partial/version.rb

@@ -1,10 +1,17 @@
 module RemotePartial
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end
 
 # History
 # =======
 #
+# 0.7.0 Removes dependency on Rails
+# ---------------------------------
+# The rails dependency was only required to determine a couple of paths,
+# and to generate a helper that I don't think was actually that useful.
+# RemotePartial will stills work with Rails to determine default output
+# paths, but is no longer dependant on it.
+#
 # 0.6.0 Fixes failure to load content from https sites
 # ----------------------------------------------------
 # Whoops. This should have been there from the start.

data/{app/models → lib}/remote_partial/yaml_store.rb

@@ -33,12 +33,12 @@ module RemotePartial
     end
 
     def self.file
-      @file ||= File.expand_path("#{name.tableize}.yml", root)
+      @file ||= File.expand_path("#{underscore(name)}.yml", root)
     end
 
     def self.root
-      location = Rails.env == 'test' ? 'test/db' : 'db'
-      File.expand_path(location, Rails.root)
+      location = 'db'
+      File.expand_path(location, RemotePartial.root)
     end
 
     def self.dir
@@ -76,6 +76,16 @@ module RemotePartial
       end
     end
 
+    def self.underscore(camel_cased_word)
+      word = camel_cased_word.to_s.dup
+      word.gsub!('::', '/')
+      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word.tr!("-", "_")
+      word.downcase!
+      word
+    end
+
     def update_time_stamps
       self.created_at = Time.now unless created_at?
       self.updated_at = Time.now

data/lib/remote_partial.rb

@@ -1,5 +1,6 @@
-require "remote_partial/engine"
-require_relative '../app/models/remote_partial/exceptions'
+required_items = [:exceptions, :time_calc, :yaml_store, :partial, :resource_manager, :builder]
+required_items.each{|item| require_relative "remote_partial/#{item}"}
+require_relative('remote_partial/railtie') if defined? Rails
 
 module RemotePartial
 
@@ -8,7 +9,49 @@ module RemotePartial
   end
 
   def self.partial_location
-    File.expand_path('app/views/remote_partials', Rails.root)
+    if defined?(Rails)
+      File.expand_path('app/views/remote_partials', Rails.root)
+    else
+      File.expand_path('remote_partials', root)
+    end
+  end
+
+  def self.root
+    @root || default_root
+  end
+
+  def self.root=(path)
+    @root = path
+  end
+
+  def self.default_root
+    if defined? Rails
+      Rails.root
+    else
+      raise("You must define a root via: RemotePartial.root = 'some/path' ")
+    end
+  end
+
+  def self.logger
+    if defined? Rails
+      Rails.logger
+    else
+      require 'logger'
+      @logger ||= ruby_logger
+    end
+  end
+
+  def self.ruby_logger
+    require 'logger'
+    Logger.new(logger_file)
+  end
+
+  def self.logger_file
+    @logger_file || STDOUT
+  end
+
+  def self.logger_file=(path)
+    @logger_file = File.expand_path(path, root)
   end
 
 end

data/lib/tasks/remote_partial_tasks.rake

@@ -2,15 +2,14 @@ namespace :remote_partial do
 
   desc "Updates remote partials"
   task :update => :environment do
-    # Don't need to do anything more than reload the environment, as remote
-    # partials are reloaded on application start.
-    Rails.logger.info "Updated remote partials at #{Time.now.to_s(:db)}"
+    RemotePartial::Partial.all.each{|partial| puts partial.name if partial.update_stale_file }
+    RemotePartial.logger.info "Updated remote partials at #{Time.now.to_s(:db)}"
   end
 
   desc "Force update of all remote partials"
   task :force_update => :environment do
     RemotePartial::Partial.all.each{|partial| puts partial.name if partial.update_file }
-    Rails.logger.info "Forced update of remote partials at #{Time.now.to_s(:db)}"
+    RemotePartial.logger.info "Forced update of remote partials at #{Time.now.to_s(:db)}"
   end
   
 end

data/test/log/test.log

@@ -0,0 +1,71 @@
+# Logfile created on 2013-08-27 12:15:14 +0100 by logger.rb/31641
+W, [2013-08-27T12:15:14.265154 #4124]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+W, [2013-08-27T12:15:14.359792 #4124]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:22:34.914264 #4152]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:22:34.931198 #4152]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:22:34.997206 #4152]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:22:35.003639 #4152]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:23:35.450015 #4158]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:23:35.466803 #4158]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:23:35.553864 #4158]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:23:35.561805 #4158]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:24:16.551530 #4164]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:24:16.572608 #4164]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+W, [2013-08-27T12:24:16.577606 #4164]  WARN -- : Something
+I, [2013-08-27T12:24:16.669041 #4164]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:24:16.678542 #4164]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+W, [2013-08-27T12:24:16.678898 #4164]  WARN -- : Something
+I, [2013-08-27T12:25:04.174618 #4170]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:25:04.183392 #4170]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+W, [2013-08-27T12:25:04.183934 #4170]  WARN -- : Something
+I, [2013-08-27T12:25:04.239296 #4170]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:25:04.248463 #4170]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+W, [2013-08-27T12:25:04.248969 #4170]  WARN -- : Something
+I, [2013-08-27T12:25:41.486448 #4176]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:25:41.495794 #4176]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:25:41.576469 #4176]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:25:41.582383 #4176]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:30:16.660423 #4193]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:30:16.670642 #4193]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:30:16.681108 #4193]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:30:16.689568 #4193]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:33:49.541983 #4208]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:33:49.559204 #4208]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:33:49.628574 #4208]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:33:49.633089 #4208]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:36:55.514639 #4220]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:36:55.522597 #4220]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:36:55.573305 #4220]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:36:55.581054 #4220]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:39:49.212560 #4245]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:39:49.221175 #4245]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:39:49.276287 #4245]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:39:49.282917 #4245]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:41:32.989079 #4261]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:41:32.998436 #4261]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:41:33.001913 #4261]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:41:33.006315 #4261]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:42:17.797802 #4267]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:42:17.811087 #4267]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T12:42:17.862230 #4267]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T12:42:17.869433 #4267]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T13:23:37.373208 #4359]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T13:23:37.379581 #4359]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T13:23:37.414101 #4359]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T13:23:37.420912 #4359]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T13:38:35.893444 #4547]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T13:38:35.911561 #4547]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T13:38:36.019684 #4547]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T13:38:36.029552 #4547]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T13:38:40.715087 #4557]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T13:38:40.720867 #4557]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T13:38:40.787452 #4557]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T13:38:40.795165 #4557]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T13:38:44.050174 #4563]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T13:38:44.059219 #4563]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T13:38:44.128763 #4563]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T13:38:44.133836 #4563]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T14:59:07.213269 #5477]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T14:59:07.222037 #5477]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>
+I, [2013-08-27T14:59:07.238897 #5477]  INFO -- : Preparing to test logging via assert_log_entry_added
+W, [2013-08-27T14:59:07.244542 #5477]  WARN -- : Unable to retrieve remote partial at http://www.warwickshire.gov.uk: #<Net::HTTPBadRequest 400  readbody=true>

data/test/test_helper.rb

@@ -1,23 +1,13 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
+require 'minitest/unit'
 require 'webmock'
 require 'webmock/minitest'
 require 'webmock/test_unit'
+require_relative '../lib/remote_partial'
 
-Rails.backtrace_cleaner.remove_silencers!
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+RemotePartial.root = File.expand_path('..', __FILE__)
+RemotePartial.logger_file = 'log/test.log'
 
-# Load fixtures from the engine
-if ActiveSupport::TestCase.method_defined?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-end
-
-class ActiveSupport::TestCase
+class MiniTest::Unit::TestCase
 
   def enable_mock(url, body = '<body><h1>Something</h1><p>Else</p></body>')
     stub_request(:get, url).
@@ -67,6 +57,37 @@ class ActiveSupport::TestCase
     assert_file_does_not_exist @partial.output_file_name
   end
 
+  def assert_difference(expression, difference = 1, message = nil, &block)
+    expressions = Array(expression)
+
+    exps = expressions.map { |e|
+      e.respond_to?(:call) ? e : lambda { eval(e, block.binding) }
+    }
+    before = exps.map { |e| e.call }
+
+    yield
+
+    expressions.zip(exps).each_with_index do |(code, e), i|
+      error  = "#{code.inspect} didn't change by #{difference}"
+      error  = "#{message}.\n#{error}" if message
+      assert_equal(before[i] + difference, e.call, error)
+    end
+  end
+
+  def assert_no_difference(expression, message = nil, &block)
+    assert_difference expression, 0, message, &block
+  end
+
+  def assert_log_entry_added(text, &block)
+    RemotePartial.logger.info 'Preparing to test logging via assert_log_entry_added'
+    before = File.size(RemotePartial.logger_file)
+    block.call
+    assert(before < File.size(RemotePartial.logger_file), "#{RemotePartial.logger_file} should have increased in size")
+    last_entry = File.readlines(RemotePartial.logger_file).last
+    assert_match text, last_entry, "Logger output should contain #{text}"
+
+  end
+
   def remove_output_file
     remove_file @partial.output_file_name
   end

data/test/unit/remote_partial/builder_test.rb

@@ -1,14 +1,14 @@
 require 'test_helper'
 
 module RemotePartial
-  class BuilderTest < ActiveSupport::TestCase
+  class BuilderTest < MiniTest::Unit::TestCase
 
     def setup
       @partial = Partial.create(
         name: 'simple',
         url: 'http://www.warwickshire.gov.uk',
         criteria: 'p:first-child',
-        repeat_period:  10.minutes
+        repeat_period:  TimeCalc.minutes(10)
       )
       @name = 'foo'
       @url = @partial.url
@@ -76,12 +76,14 @@ module RemotePartial
 
     def test_build_with_http_error
       enable_mock_connection_failure @url
-      assert_output_file_not_updated do
-        assert_no_difference 'RemotePartial::Partial.count' do
-          Builder.build(
-            url: @partial.url,
-            name: @partial.name
-          )
+      assert_log_entry_added('HTTPBadRequest') do
+        assert_output_file_not_updated do
+          assert_no_difference 'RemotePartial::Partial.count' do
+            Builder.build(
+              url: @partial.url,
+              name: @partial.name
+            )
+          end
         end
       end
     end
@@ -98,12 +100,13 @@ module RemotePartial
       assert_difference 'RemotePartial::Partial.count' do
         Builder.build(
           url: @partial.url,
-          name: 'partial_with_mod',
+          name: name,
           output_modifier: output_modifier
         )
       end
       partial = Partial.find(name)
       assert_equal(output_modifier, partial.output_modifier)
+      remove_file(partial.output_file_name)
     end
 
     def assert_expected_file_created(&test)

data/test/unit/remote_partial/exception_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module RemotePartial
-  class ExceptionTest < ActiveSupport::TestCase
+  class ExceptionTest < MiniTest::Unit::TestCase
     def test_remote_partial_retrival_error
       inner_message = 'Whoops'
       catch_exception { raise RemotePartialRetrivalError.new(inner_message, Array)}