wax_tasks 0.0.47 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eb86783ae6e09758e23af201aad5907f68d0f7ee0034d46bd168830264d9a74
-  data.tar.gz: a1261162881c112780ff5d342cc265389b2bffdc121952d123b1176f36dc31ac
+  metadata.gz: 5f996fd8c491dac2f46d075b4b28dc9064f6f4b4f74005e41da3a624080c7aa4
+  data.tar.gz: bd3acb6ae9045c3d89c226d4fd6600b8e8349ee931a2cd9df9232761f18eea33
 SHA512:
-  metadata.gz: c6c7e4e7874f80c9073b51865ab46f1c39d01cc3993531df218d17f87badb2d242a36aa9346a7a7e237c664ccf9bfb6b95f180fd92f0ee230486eafc7e6058d4
-  data.tar.gz: ce6b90ea4d1cbf605e162a797c62d2aee01d15eeffdc980989661f9c68f746d1fe35064abd00c3fe70649520391630d41a8ae76a90899be66bdc0e1cd40ef375
+  metadata.gz: 310e898680e1598c0e58926e0bb3faf8b6eb678fa853fd133940ad6220441fc05e9a938330fe1a9e286b8ffa347480d115e1077f9a3bc738970669623ce01406
+  data.tar.gz: 875d638a7d3cefad2fa77793ed458ecfd4392e5bb7c278de2fb6b931df81925d5ccb7041f50f0120617aea2849a559379944b8d2920dae46a0ceed55781b2388

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
 gemspec
+
+gem 'simplecov', require: false

data/lib/modules/iiif.rb

@@ -1,45 +1,35 @@
+require 'colorized_string'
 require 'json'
 require 'wax_iiif'
 
 # module for generating IIIF derivatives + json from local images
 module Iiif
-  include FileUtils
-
-  def self.ingest_collections(args, site_config)
-    mkdir_p('./iiif', :verbose => false)
-    all_records = []
-    id_counter = 0
-    build_opts = Iiif.build_options(site_config)
-    args.each do |a|
-      id_counter += 1
-      inpath = './_data/iiif/' + a
-      abort "Source path '#{inpath}' does not exist. Exiting.".magenta unless Dir.exist?(inpath)
-      collection_records = make_records(a, inpath)
-      all_records.concat collection_records
+  def self.process(name, site_config)
+    inpath = "./_data/iiif/#{name}"
+    unless Dir.exist?(inpath)
+      abort "Source path '#{inpath}' does not exist. Exiting.".magenta
     end
-    builder = IiifS3::Builder.new(build_opts)
-    builder.load(all_records)
-    builder.process_data
-  end
-
-  def self.build_options(site_config)
-    {
-      :base_url => site_config['baseurl'] + '/iiif',
-      :output_dir => './iiif',
-      :verbose => true
+    FileUtils.mkdir_p("./iiif/#{name}", verbose: false)
+    build_opts = {
+      base_url: "#{site_config['baseurl']}/iiif/#{name}",
+      output_dir: "./iiif/#{name}",
+      verbose: true,
+      variants: { med: 600, lg: 1140 }
     }
+    builder = IiifS3::Builder.new(build_opts)
+    builder.load(make_records(name, inpath))
+    builder.process_data(true)
   end
 
-  def self.make_records(arg, inpath)
+  def self.make_records(name, inpath)
     counter = 1
     records = []
-    imagefiles = Dir[inpath + '/*'].sort!
-    imagefiles.each do |imagefile|
+    Dir["#{inpath}/*"].sort!.each do |imagefile|
       basename = File.basename(imagefile, '.*').to_s
       record_opts = {
-        :id => arg + '-' + basename,
-        :path => imagefile,
-        :label => arg + ' - ' + basename
+        id: basename,
+        path: imagefile,
+        label: "#{name} #{basename}"
       }
       counter += 1
       records << IiifS3::ImageRecord.new(record_opts)

data/lib/modules/lunr.rb

@@ -1,34 +1,33 @@
-include FileUtils
+require 'colorized_string'
 require 'json'
 
 # module for generating elasticlunr index and default jquery ui
 module Lunr
-  def self.total_fields(collections)
-    total_fields = ['pid']
-    collections.each do |c|
-      total_fields = total_fields.concat(c[1]['lunr_index']['fields'])
-      total_fields << 'content' if c[1]['lunr_index']['content']
-    end
-    total_fields.uniq
+  def self.write_index(site_config)
+    index = index(site_config)
+    FileUtils.mkdir_p('js')
+    index = "---\nlayout: none\n---\n" + index
+    path = 'js/lunr-index.json'
+    File.open(path, 'w') { |file| file.write(index) }
+    puts "Writing lunr index to #{path}".cyan
   end
 
-  def self.collections(site_config)
-    site_config['collections'].find_all { |c| c[1].key?('lunr_index') && c[1]['lunr_index'].key?('fields') }
-  end
+  def self.index(site_config)
+    collections = collections_to_index(site_config)
+    collections_dir = site_config['collections_dir'].to_s
 
-  def self.index(cdir, collections)
     index = []
     count = 0
-    abort 'There are no valid collections to index.'.magenta if collections.nil?
 
-    collections.each do |c|
-      dir = cdir + '_' + c[0]
-      fields = c[1]['lunr_index']['fields'].uniq
+    collections.each do |collection|
+      dir = "_#{collection[:name]}"
+      dir.prepend("#{collections_dir}/") unless collections_dir.empty?
       pages = Dir.glob(dir + '/*.md')
-      get_content = c[1]['lunr_index']['content']
+      get_content = collection[:lunr_index].key?('content') ? collection[:lunr_index]['content'] : false
+      fields = collection[:lunr_index]['fields']
       # catch
-      abort "There are no markdown pages in directory '#{dir}'".magenta if pages.empty?
-      abort "There are no fields specified for #{c[0]}.".magenta if fields.empty?
+      abort "There are no pages in '#{dir}'".magenta if pages.empty?
+      abort "There are no fields for #{collection.name}.".magenta if fields.empty?
       puts "Loading #{pages.length} pages from #{dir}"
       # index each page in collection
       pages.each do |page|
@@ -39,55 +38,72 @@ module Lunr
     JSON.pretty_generate(index)
   end
 
-  def self.page_hash(page, fields, get_content, count)
-    yaml = YAML.load_file(page)
-    hash = {
-      'lunr_id' => count,
-      'link' => "{{'" + yaml.fetch('permalink') + "' | relative_url }}"
-    }
-    fields.each { |f| hash[f] = rm_diacritics(thing2string(yaml[f])) }
-    hash['content'] = rm_diacritics(clean(File.read(page))) if get_content
-    hash
+  def self.write_ui(site_config)
+    ui_str = ui(site_config)
+    ui = "---\nlayout: none\n---\n" + ui_str
+    path = 'js/lunr-ui.js'
+    if File.exist?(path)
+      puts "Lunr UI already exists at #{path}. Skipping".cyan
+    else
+      File.open(path, 'w') { |file| file.write(ui) }
+      puts "Writing lunr ui to #{path}".cyan
+    end
   end
 
-  def self.ui(total_fields)
+  def self.ui(site_config)
     # set up index
-    ui_string = "$.getJSON(\"{{ site.baseurl }}/js/lunr-index.json\", function(index_json) {\nwindow.index = new elasticlunr.Index;\nwindow.store = index_json;\nindex.saveDocument(false);\nindex.setRef('lunr_id');"
+    ui = "$.getJSON(\"{{ site.baseurl }}/js/lunr-index.json\", function(index_json) {\nwindow.index = new elasticlunr.Index;\nwindow.store = index_json;\nindex.saveDocument(false);\nindex.setRef('lunr_id');"
     # add fields to index
-    total_fields.each { |field| ui_string += "\nindex.addField('#{field}');" }
+    total_fields = total_fields(site_config)
+    total_fields.each { |field| ui += "\nindex.addField('#{field}');" }
     # add docs
-    ui_string += "\n// add docs\nfor (i in store){index.addDoc(store[i]);}"
+    ui += "\n// add docs\nfor (i in store){index.addDoc(store[i]);}"
     # gui
-    ui_string += "\n$('input#search').on('keyup', function() {\nvar results_div = $('#results');\nvar query = $(this).val();\nvar results = index.search(query, { boolean: 'AND', expand: true });\nresults_div.empty();\nif (results.length > 10) {\nresults_div.prepend(\"<p><small>Displaying 10 of \" + results.length + \" results.</small></p>\");\n}\nfor (var r in results.slice(0, 9)) {\nvar ref = results[r].ref;\nvar item = store[ref];"
+    ui += "\n$('input#search').on('keyup', function() {\nvar results_div = $('#results');\nvar query = $(this).val();\nvar results = index.search(query, { boolean: 'AND', expand: true });\nresults_div.empty();\nif (results.length > 10) {\nresults_div.prepend(\"<p><small>Displaying 10 of \" + results.length + \" results.</small></p>\");\n}\nfor (var r in results.slice(0, 9)) {\nvar ref = results[r].ref;\nvar item = store[ref];"
     # add fields as display vars
-    total_fields.each { |field| ui_string += "var #{field} = item.#{field};\n" }
-    ui_string += "var result = '<div class=\"result\"><b><a href=\"' + item.link + '\">' + title + '</a></b></p></div>';\nresults_div.append(result);\n}\n});\n});"
-    ui_string
+    total_fields.each { |field| ui += "var #{field} = item.#{field};\n" }
+    ui += "var result = '<div class=\"result\"><b><a href=\"' + item.link + '\">' + title + '</a></b></p></div>';\nresults_div.append(result);\n}\n});\n});"
+    ui
   end
 
-  def self.write_index(index)
-    mkdir_p('js')
-    index = "---\nlayout: none\n---\n" + index
-    path = 'js/lunr-index.json'
-    File.open(path, 'w') { |file| file.write(index) }
-    puts "Writing lunr index to #{path}".cyan
+  def self.collections_to_index(site_config)
+    to_index = site_config['collections'].find_all { |c| c[1].key?('lunr_index') }
+    to_index.map! { |c| c[0] }
+    abort 'There are no valid collections to index.'.magenta if to_index.nil?
+    collections = []
+    to_index.each do |c|
+      collections << WaxTasks.collection(c, site_config)
+    end
+    collections
   end
 
-  def self.write_ui(ui)
-    ui = "---\nlayout: none\n---\n" + ui
-    path = 'js/lunr-ui.js'
-    if File.exist?(path)
-      puts "Lunr UI already exists at #{path}. Skipping".cyan
-    else
-      File.open(path, 'w') { |file| file.write(ui) }
-      puts "Writing lunr ui to #{path}".cyan
+  def self.total_fields(site_config)
+    total_fields = ['pid']
+    site_config['collections'].each do |c|
+      if c[1].key?('lunr_index') && c[1]['lunr_index'].key?('fields')
+        total_fields = total_fields.concat(c[1]['lunr_index']['fields'])
+        total_fields << 'content' if c[1]['lunr_index']['content']
+      end
     end
+    total_fields.uniq
+  end
+
+  def self.page_hash(page, fields, get_content, count)
+    yaml = YAML.load_file(page)
+    hash = {
+      'lunr_id' => count,
+      'link' => "{{'" + yaml.fetch('permalink') + "' | relative_url }}",
+      'collection' => yaml.fetch('permalink').to_s[%r{^\/([^\/]*)\/}].tr('/', '')
+    }
+    fields.each { |f| hash[f] = rm_diacritics(thing2string(yaml[f])) }
+    hash['content'] = rm_diacritics(clean(File.read(page))) if get_content
+    hash
   end
 
   def self.clean(str)
     str.gsub!(/\A---(.|\n)*?---/, '') # remove yaml front matter
     str.gsub!(/{%(.*)%}/, '') # remove functional liquid
-    str.gsub!(/<\/?[^>]*>/, '') # remove html
+    str.gsub!(%r{<\/?[^>]*>}, '') # remove html
     str.gsub!('\\n', '') # remove newlines
     str.gsub!(/\s+/, ' ') # remove extra space
     str.tr!('"', "'") # replace double quotes with single

data/lib/modules/pagemaster.rb

@@ -1,68 +1,73 @@
+require 'colorized_string'
+require 'csv'
+require 'fileutils'
 require 'json'
 require 'yaml'
-require 'csv'
 
 # module for generating markdown collection pages from csv/json/yaml records
 module Pagemaster
-  include FileUtils
-
-  def self.valid_config(name, site_config)
-    abort "Cannot find #{name} in _config.yml. Exiting.".magenta unless site_config['collections'].key?(name)
-    collection_config = site_config['collections'][name]
-    abort "Cannot find source for '#{name}'. Exiting.".magenta unless collection_config['source']
-    abort "Cannot find layout for '#{name}'. Exiting.".magenta unless collection_config['layout']
-    abort "Cannot find the file _data/#{collection_config['source']}.".magenta unless File.file?('_data/' + collection_config['source'])
-    collection_config
-  end
-
-  def self.ingest(src)
-    src = "_data/#{src}"
-    case File.extname(src)
-    when '.csv' then data = CSV.read(src, :headers => true, :encoding => 'utf-8').map(&:to_hash)
-    when '.json' then data = JSON.parse(File.read(src))
-    when '.yml' then data = YAML.load_file(src)
-    else abort "File type for #{src} must be .csv, .json, or .yml. Please fix and rerun."
-    end
-    puts "Processing #{src}...."
-    detect_duplicates(data)
-    data
-  rescue StandardError
-    puts "Cannot load #{src}. check for typos and rebuild.".magenta
-  end
+  def self.generate(collection, site_config)
+    records = ingest(collection[:source])
+    dir = target_dir(collection[:name], site_config)
+    permalink_style = WaxTasks.permalink_style(site_config)
 
-  def self.generate_pages(data, name, layout, cdir, order, perma)
-    dir = cdir + '_' + name
-    mkdir_p(dir)
     completed = 0
     skipped = 0
-    data.each_with_index do |item, index|
+
+    records.each_with_index do |item, index|
       pagename = WaxTasks.slug(item.fetch('pid'))
       pagepath = dir + '/' + pagename + '.md'
       if File.exist?(pagepath)
         puts "#{pagename}.md already exits. Skipping."
         skipped += 1
       else
-        item['permalink'] = '/' + name + '/' + pagename + perma
-        item['layout'] = layout
-        item['order'] = padded_int(index, data.length) if order
+        item['permalink'] = '/' + collection[:name] + '/' + pagename + permalink_style
+        item['layout'] = collection[:layout]
+        item['order'] = padded_int(index, records.length) if collection[:keep_order]
         File.open(pagepath, 'w') { |f| f.write(item.to_yaml.to_s + '---') }
         completed += 1
       end
     end
+
     puts "\n#{completed} pages were generated to #{dir} directory.".cyan
     puts "\n#{skipped} pre-existing items were skipped.".cyan
-  rescue StandardError
-    abort "#{completed} pages were generated before failure, most likely a record is missing a valid 'pid' value.".magenta
+  rescue StandardError => e
+    abort "Failure after #{completed} pages, likely from missing pid.".magenta + "\n#{e}"
   end
 
-  def self.detect_duplicates(data)
-    pids = []
-    data.each { |d| pids << d['pid'] }
-    duplicates = pids.detect { |p| pids.count(p) > 1 } || []
-    abort "\nYour collection has the following duplicate pids: \n#{duplicates}".magenta unless duplicates.empty?
+  def self.ingest(source)
+    src = "_data/#{source}"
+    opts = { headers: true, encoding: 'utf-8' }
+
+    case File.extname(src)
+    when '.csv' then data = CSV.read(src, opts).map(&:to_hash)
+    when '.json' then data = JSON.parse(File.read(src))
+    when '.yml' then data = YAML.load_file(src)
+    else abort "Source #{src} must be .csv, .json, or .yml.".magenta
+    end
+
+    puts "Processing #{src}...."
+    validate(data)
+  rescue StandardError => e
+    abort "Cannot load #{src}. check for typos and rebuild.".magenta + "\n#{e}"
   end
 
   def self.padded_int(index, max_idx)
     index.to_s.rjust(Math.log10(max_idx).to_i + 1, '0')
   end
+
+  def self.validate(data)
+    pids = data.map { |d| d['pid'] }
+    duplicates = pids.detect { |p| pids.count(p) > 1 } || []
+    abort "Fix duplicate pids: \n#{duplicates}".magenta unless duplicates.empty?
+    data
+  end
+
+  def self.target_dir(collection_name, site_config)
+    collections_dir = site_config['collections_dir'].to_s
+    dir = collections_dir.empty? ? '_' : collections_dir + '/_'
+    dir += collection_name
+    FileUtils.mkdir_p(dir)
+    dir
+  end
 end

data/lib/tasks/iiif.rake

@@ -1,12 +1,11 @@
-include FileUtils
+require 'colorized_string'
 require 'wax_tasks'
-require 'wax_iiif'
 
 namespace :wax do
   task :iiif do
     args = ARGV.drop(1).each { |a| task a.to_sym }
-    site_config = WaxTasks.config
-    abort "You must specify a collections after 'bundle exec rake wax:iiif'.".magenta if args.empty?
-    WaxTasks.iiif(args, site_config)
+    abort "Please specify a collections after 'wax:iiif'".magenta if args.empty?
+    site_config = WaxTasks.site_config
+    args.each { |collection_name| WaxTasks.iiif(collection_name, site_config) }
   end
 end

data/lib/tasks/jspackage.rake

@@ -1,10 +1,12 @@
-require 'wax_tasks'
+require 'colorized_string'
 require 'json'
 
+require 'wax_tasks'
+
 namespace :wax do
   desc 'write a simple package.json'
   task :jspackage do
-    site_config = WaxTasks.config
+    site_config = WaxTasks.site_config
     package = {
       'name'          => site_config['title'],
       'version'       => '1.0.0',

data/lib/tasks/lunr.rake

@@ -3,7 +3,7 @@ require 'wax_tasks'
 namespace :wax do
   desc 'build lunr search index'
   task :lunr do
-    site_config = WaxTasks.config
+    site_config = WaxTasks.site_config
     WaxTasks.lunr(site_config)
   end
 end

data/lib/tasks/pagemaster.rake

@@ -1,14 +1,14 @@
+require 'colorized_string'
 require 'wax_tasks'
 
 namespace :wax do
   desc 'generate collection md pages from yaml or csv data source'
   task :pagemaster do
     args = ARGV.drop(1).each { |a| task a.to_sym }
-    site_config = WaxTasks.config
-    if args.empty?
-      abort "You must specify one or more collections after 'rake wax:pagemaster' to generate.".magenta
-    else
-      args.each { |a| WaxTasks.pagemaster(a, site_config) }
+    abort "Please specify a collection after 'wax:pagemaster'".magenta if args.empty?
+    args.each do |collection_name|
+      site_config = WaxTasks.site_config
+      WaxTasks.pagemaster(collection_name, site_config)
     end
   end
 end

data/lib/tasks/push_gh.rake

@@ -1,6 +1,6 @@
-include FileUtils
-require 'wax_tasks'
+require 'colorized_string'
 require 'jekyll'
+require 'wax_tasks'
 
 namespace :wax do
   namespace :push do
@@ -19,21 +19,19 @@ namespace :wax do
         COMMIT_MSG = "Site updated at #{Time.now.utc}".freeze
         puts 'Deploying to gh-pages branch from local task'
       end
-      config = read_config
-      rm_rf('_site')
-
-      baseurl = config['gh-baseurl'] || REPO_NAME.to_s
+      config = WaxTasks.site_config
+      FileUtils.rm_rf('_site')
 
       opts = {
         'source' => '.',
         'destination' => '_site',
         'config' => '_config.yml',
-        'baseurl' => baseurl
+        'baseurl' => config['gh-baseurl'] || REPO_NAME.to_s
       }
 
       Jekyll::Site.new(Jekyll.configuration(opts)).process
       Dir.mktmpdir do |tmp|
-        cp_r '_site/.', tmp
+        FileUtils.cp_r '_site/.', tmp
         Dir.chdir tmp
         system 'git init'
         system "git add . && git commit -m '#{COMMIT_MSG}'"

data/lib/tasks/{push_s3.rake → push_static.rake}

@@ -1,11 +1,15 @@
-include FileUtils
 require 'wax_tasks'
 
 namespace :wax do
   namespace :push do
     desc 'push built site to s3 branch'
-    task :s3 do
+    task :static do
       if ENV['CI']
+        puts "Build type=#{ENV['TRAVIS_EVENT_TYPE']}"
+        unless ENV['TRAVIS_BRANCH'] == 'master'
+          puts "Skipping deploy from branch #{ENV['TRAVIS_BRANCH']}"
+          next
+        end
         REPO_SLUG = ENV['TRAVIS_REPO_SLUG']
         USER = REPO_SLUG.split('/')[0]
         TOKEN = ENV['ACCESS_TOKEN']
@@ -19,7 +23,7 @@ namespace :wax do
       end
 
       Dir.mktmpdir do |tmp|
-        cp_r '_site/.', tmp
+        FileUtils.cp_r '_site/.', tmp
         Dir.chdir tmp
         system 'git init'
         system "git add . && git commit -m '#{COMMIT_MSG}'"

data/lib/tasks/test.rake

@@ -1,23 +1,19 @@
-require 'wax_tasks'
+require 'colorized_string'
 require 'html-proofer'
 
 namespace :wax do
   desc 'run htmlproofer, rspec if exists'
   task :test do
     opts = {
-      :check_external_hash => true,
-      :allow_hash_href => true,
-      :check_html => true,
-      :disable_external => true,
-      :empty_alt_ignore => true,
-      :only_4xx => true,
-      :verbose => true
+      check_external_hash: true,
+      allow_hash_href: true,
+      check_html: true,
+      disable_external: true,
+      empty_alt_ignore: true,
+      only_4xx: true,
+      verbose: true
     }
-    begin
-      HTMLProofer.check_directory('./_site', opts).run
-    rescue StandardError
-      puts('Failed to run wax:texts. Make sure you are using `bundle exec`.').magenta
-    end
+    HTMLProofer.check_directory('./_site', opts).run
     sh 'bundle exec rspec' if File.exist?('.rspec')
   end
 end

data/lib/wax_tasks.rb

@@ -1,43 +1,44 @@
+require 'yaml'
+
 require_relative 'modules/iiif'
 require_relative 'modules/lunr'
 require_relative 'modules/pagemaster'
 
-require 'yaml'
-require 'wax_iiif'
-
 # umbrella module for registering task modules
 module WaxTasks
-  def self.pagemaster(name, site_config)
-    collection_config = Pagemaster.valid_config(name, site_config)
-
-    src     = collection_config['source']
-    data    = Pagemaster.ingest(src)
-    layout  = collection_config.fetch('layout').to_s
-    perma   = config['permalink'] == 'pretty' ? '/' : '.html'
-    cdir    = site_config['collections_dir'].to_s
-    order   = collection_config.key?('keep_order') ? collection_config.fetch('keep_order') : false
-
-    Pagemaster.generate_pages(data, name, layout, cdir, order, perma)
+  def self.pagemaster(collection_name, site_config)
+    collection = collection(collection_name, site_config)
+    Pagemaster.generate(collection, site_config)
   end
 
   def self.lunr(site_config)
-    cdir          = site_config['collections_dir'].to_s
-    collections   = Lunr.collections(site_config)
-    total_fields  = Lunr.total_fields(collections)
+    Lunr.write_index(site_config)
+    Lunr.write_ui(site_config)
+  end
 
-    index         = Lunr.index(cdir, collections)
-    ui            = Lunr.ui(total_fields)
+  def self.iiif(collection_name, site_config)
+    Iiif.process(collection_name, site_config)
+  end
 
-    Lunr.write_index(index)
-    Lunr.write_ui(ui)
+  def self.site_config
+    YAML.load_file('_config.yml')
   end
 
-  def self.iiif(args, site_config)
-    Iiif.ingest_collections(args, site_config)
+  def self.permalink_style(site_config)
+    site_config['permalink'] == 'pretty' ? '/' : '.html'
   end
 
-  def self.config
-    YAML.load_file('_config.yml')
+  def self.collection(collection_name, site_config)
+    conf = site_config.fetch('collections').fetch(collection_name)
+    {
+      name: collection_name,
+      source: conf['source'],
+      layout: conf['layout'],
+      keep_order: conf.key?('keep_order') ? conf['keep_order'] : false,
+      lunr_index: conf['lunr_index']
+    }
+  rescue StandardError => e
+    abort "Collection '#{collection_name}' is not properly configured.".magenta + "\n#{e}"
   end
 
   def self.slug(str)

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
-require 'fileutils'
+require 'simplecov'
+SimpleCov.start
 
 require_relative 'fake/data'
 require_relative 'fake/site'
@@ -6,59 +7,123 @@ require_relative 'fake/site'
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'wax_tasks'
 
-Fake.site
-Fake.data
+silence_output do
+  Fake.site
+  Fake.data
+end
+
+site_config = WaxTasks.site_config
+bad_src_config = {
+  'collections' => {
+    'test' => {
+      'source' => 'test.jpg'
+    }
+  }
+}
+missing_src_config = {
+  'collections' => {
+    'test' => {
+      'source' => 'test.csv'
+    }
+  }
+}
 
 describe 'wax:pagemaster' do
-  config = WaxTasks.config
-  args = config['collections'].map { |c| c[0] }
-  system("bundle exec rake wax:pagemaster #{args.join(' ')} > /dev/null")
-  it 'generates directories' do
-    args.each { |a| expect(Dir.exist?('_' + a)) }
+  args = site_config['collections'].map { |c| c[0] }
+  args.each do |collection_name|
+    silence_output { WaxTasks.pagemaster(collection_name, site_config) }
+  end
+  it 'generates pages to the correct directories' do
+    args.each do |a|
+      dir = Pagemaster.target_dir(a, site_config)
+      pages = Dir.glob("#{dir}/*.md")
+      expect(pages.length).to be > 0
+      Fake.content(pages)
+    end
+  end
+  context 'when given a collection arg not in config' do
+    collection_name = 'not_a_collection'
+    it 'throws a configuration error' do
+      expect { silence_output { WaxTasks.pagemaster(collection_name, site_config) } }.to raise_error(SystemExit)
+    end
+  end
+  context 'when given config with bad source' do
+    collection_name = bad_src_config['collections'].first[0]
+    it 'throws ingest error' do
+      expect { silence_output { WaxTasks.pagemaster(collection_name, bad_src_config) } }.to raise_error(SystemExit)
+    end
   end
-  it 'generates pages' do
-    args.each { |a| expect(Dir.glob("_#{a}/*.md")) }
+  context 'when given config with missing source' do
+    collection_name = missing_src_config['collections'].first[0]
+    it 'throws io error' do
+      expect { silence_output { WaxTasks.pagemaster(collection_name, missing_src_config) } }.to raise_error(SystemExit)
+    end
+  end
+  context 'when trying to genrate pages that already exist' do
+    it 'skips them' do
+      expect { WaxTasks.pagemaster(args.first, site_config) }.to output(/.*Skipping.*/).to_stdout
+    end
   end
 end
 
 describe 'wax:lunr' do
-  system('bundle exec rake wax:lunr > /dev/null')
+  silence_output { WaxTasks.lunr(site_config) }
   it 'generates a lunr index' do
-    index = File.open('js/lunr-index.json', 'r').read
-    expect(index.length > 1000)
+    index = File.open('./js/lunr-index.json', 'r').read
+    expect(index.length).to be > 1000
   end
-
   it 'generates a lunr ui' do
-    ui = File.open('js/lunr-ui.js', 'r').read
-    expect(ui.length > 100)
+    ui = File.open('./js/lunr-ui.js', 'r').read
+    expect(ui.length).to be > 100
+  end
+  context 'when a ui already exists' do
+    it 'skips over it' do
+      expect { WaxTasks.lunr(site_config) }.to output(/.*Skipping.*/).to_stdout
+    end
   end
 end
 
 describe 'wax:iiif' do
-  site_config = WaxTasks.config
-  args = site_config['collections'].map { |c| c[0] }
+  collection_name = site_config['collections'].first[0]
+  images = Dir.glob('./_data/iiif/*.jpg')
+  iiif_src_dir = "./_data/iiif/#{collection_name}"
+
+  FileUtils.mkdir_p(iiif_src_dir)
+  images.each { |f| FileUtils.cp(File.expand_path(f), iiif_src_dir) }
+  silence_output { WaxTasks.iiif(collection_name, site_config) }
 
-  it 'generates iiif tiles and data' do
-    images = Dir.glob('./_data/iiif/*.jpg')
-    site_config['collections'].each do |c|
-      new_dir = './_data/iiif/' + c[0]
-      mkdir_p(new_dir)
-      images.each { |f| cp(File.expand_path(f), new_dir) }
+  it 'generates collections' do
+    expect(File.exist?("./iiif/#{collection_name}/collection/top.json")).to be true
+  end
+  it 'generates manifests' do
+    expect(File.exist?("./iiif/#{collection_name}/1/manifest.json")).to be true
+  end
+  it 'generates derivatives' do
+    expect(Dir.exist?("./iiif/#{collection_name}/images")).to be true
+  end
+  it 'generates image variants' do
+    [250, 600, 1140].each do |size|
+      expect(File.exist?("./iiif/#{collection_name}/images/1-1/full/#{size},/0/default.jpg")).to be true
+    end
+  end
+  context 'when looking for a missing dir' do
+    it 'throws an io error' do
+      collection_name = 'not_a_collection'
+      expect { silence_output { WaxTasks.iiif(collection_name, site_config) } }.to raise_error(SystemExit)
     end
-    rm_r(images)
-    system("bundle exec rake wax:iiif #{args.first} > /dev/null")
-    args.each { |a| expect(Dir.exist?('iiif/images' + a)) }
   end
 end
 
 describe 'jekyll' do
   it 'builds successfully' do
-    Bundler.with_clean_env { system('bundle exec jekyll build > /dev/null') }
+    silence_output { Bundler.with_clean_env { system('bundle exec jekyll build') } }
   end
 end
 
 describe 'wax:jspackage' do
-  system('bundle exec rake wax:jspackage > /dev/null')
+  before(:all) do
+    silence_output { system('bundle exec rake wax:jspackage') }
+  end
   it 'writes a package.json file' do
     package = File.open('package.json', 'r').read
     expect(package.length > 90)
@@ -66,5 +131,7 @@ describe 'wax:jspackage' do
 end
 
 describe 'wax:test' do
-  it 'passes html-proofer' do system('bundle exec rake wax:test > /dev/null') end
+  it 'passes html-proofer' do
+    silence_output { system('bundle exec rake wax:test') }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wax_tasks
 version: !ruby/object:Gem::Version
-  version: 0.0.47
+  version: 0.1.0
 platform: ruby
 authors:
 - Marii Nyrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -70,16 +70,16 @@ dependencies:
   name: wax_iiif
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -152,11 +152,11 @@ files:
 - lib/tasks/lunr.rake
 - lib/tasks/pagemaster.rake
 - lib/tasks/push_gh.rake
-- lib/tasks/push_s3.rake
+- lib/tasks/push_static.rake
 - lib/tasks/test.rake
 - lib/wax_tasks.rb
 - spec/spec_helper.rb
-homepage: https://github.com/mnyrop/wax_tasks
+homepage: https://github.com/minicomp/wax_tasks
 licenses:
 - MIT
 metadata: {}
@@ -174,7 +174,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- imagemagick
 rubyforge_project: 
 rubygems_version: 2.7.6
 signing_key: