wax_tasks 0.0.43 → 0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 663fec6c7f6714d5820f714984802c4c8c819b35
-  data.tar.gz: 5cd9d2a76deac5d812b37d72d6b606262c1da182
+SHA256:
+  metadata.gz: 73578c3b4f1e973aba2a8711a1bb9645f6b8131e9e8a308fec30584fe24e8d7e
+  data.tar.gz: f61a4bb823051d5209bc329214786d00fa7799456f0d670fd80e97026e389f27
 SHA512:
-  metadata.gz: 780afa502819d993e5d69cec6340800018ea8e738a89f08551ab37a5b4ae2d60bcf3c4ed2820abd6f0cddb18489079b3eacefa377d8f69aee67bdc088fb89409
-  data.tar.gz: e800f98df5f37d13ef796b2fd9c24c14e427517b2851c38d6a95850ad26b5dd5a1ad7e9869e7d070de529088b7da7e4c6f96c1036f4a7005635ec0f4c0ea5578
+  metadata.gz: 2159d0aca76085381c4c919321dfa6652c976b7963a0a342011924a743fc44a5833a4a2fc5fed1842fa7ea83da1337cf9138a65bc956b0194383974308379097
+  data.tar.gz: 2ad40f5d9f8f34bdf34501d1c7e5091df3a3cfe2de909a2d59e45a44662f50e33bdfcb6895236ab98fa74a279d3ebe759401ecf3d2deecbdf7b2cfed9c085155

data/lib/tasks/ghbranch.rake

@@ -1,3 +1,4 @@
+include FileUtils
 require 'wax_tasks'
 require 'jekyll'
 
@@ -5,7 +6,7 @@ namespace :wax do
   desc 'build site with gh-baseurl and publish to gh-pages branch'
   task :ghbranch do
     config = read_config
-    FileUtils.rm_rf('_site')
+    rm_rf('_site')
 
     opts = {
       'source' => '.',

data/lib/tasks/iiif.rake

@@ -1,3 +1,4 @@
+include FileUtils
 require 'wax_tasks'
 require 'iiif_s3'
 
@@ -8,17 +9,12 @@ namespace :wax do
 
     abort "You must specify a collections after 'bundle exec rake wax:iiif'.".magenta if argv.empty?
 
-    FileUtils.mkdir './iiif'
+    mkdir_p('./iiif')
 
     all_records = []
     id_counter = 0
+    build_opts = build_options(config)
 
-    build_opts = {
-      :base_url => config['baseurl'] + '/iiif',
-      :output_dir => './iiif',
-      :tile_scale_factors => [1, 2],
-      :verbose => true
-    }
     argv.each do |a|
       id_counter += 1
       inpath = './_data/iiif/' + a
@@ -33,6 +29,14 @@ namespace :wax do
   end
 end
 
+def build_options(config)
+  {
+    :base_url => config['baseurl'] + '/iiif',
+    :output_dir => './iiif',
+    :verbose => true
+  }
+end
+
 def make_records(collection_name, inpath, paged, config)
   counter = 1
   collection_records = []

data/lib/tasks/s3branch.rake

@@ -1,3 +1,4 @@
+include FileUtils
 require 'wax_tasks'
 require 'jekyll'
 

data/lib/wax_tasks/collection.rb

@@ -14,6 +14,7 @@ class Collection
     @src    = '_data/' + collection.fetch('source')
     @layout = File.basename(collection.fetch('layout'), '.*')
     @dir    = cdir + '_' + @name
+    @order  = collection.key?('keep_order') ? collection.fetch('keep_order') : false
   end
 
   def valid_collection_config
@@ -45,15 +46,17 @@ class Collection
     perma_ext = @config['permalink'] == 'pretty' ? '/' : '.html'
     completed = 0
     skipped = 0
-    data.each do |item|
+    data.each_with_index do |item, index|
       pagename = slug(item.fetch('pid'))
       pagepath = @dir + '/' + pagename + '.md'
-      permalink = '/' + @name + '/' + pagename + perma_ext
+      item['permalink'] = '/' + @name + '/' + pagename + perma_ext
+      item['layout'] = @layout
+      item['order'] = padded_int(index, data.length) if @order
       if File.exist?(pagepath)
         puts "#{pagename}.md already exits. Skipping."
         skipped += 1
       else
-        File.open(pagepath, 'w') { |file| file.write(item.to_yaml.to_s + "permalink: #{permalink}\nlayout: #{@layout}\n---") }
+        File.open(pagepath, 'w') { |file| file.write(item.to_yaml.to_s + '---') }
         completed += 1
       end
     end

data/lib/wax_tasks/helpers.rb

@@ -32,3 +32,7 @@ def read_argv
   argv.each { |a| task a.to_sym }
   argv
 end
+
+def padded_int(index, max_idx)
+  index.to_s.rjust(Math.log10(max_idx).to_i + 1, "0")
+end

data/lib/wax_tasks/lunr.rb

@@ -23,14 +23,14 @@ class Lunr
     total_fields.uniq
   end
 
-  def page_hash(page, c_fields, c, count)
+  def page_hash(page, c_fields, collection, count)
     yaml = YAML.load_file(page)
     hash = {
       'lunr_id' => count,
       'link' => "{{'" + yaml.fetch('permalink') + "' | relative_url }}"
     }
     c_fields.each { |f| hash[f] = rm_diacritics(thing2string(yaml[f])) }
-    hash['content'] = rm_diacritics(clean(File.read(page))) if c[1]['lunr_index']['content']
+    hash['content'] = rm_diacritics(clean(File.read(page))) if collection[1]['lunr_index']['content']
     hash
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wax_tasks
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.44
 platform: ruby
 authors:
 - Marii Nyrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.53'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.53'
 description: Rake tasks for minimal iiif exhibition sites with Jekyll.
 email:
 - m.nyrop@columbia.edu
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rake tasks for minimal exhibitions.