wax_iiif 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5447f4cbf62b6a01b55188e0367155d78d1e4a7b101fd70972fe0d3c7d712ee6
-  data.tar.gz: 58c2e247be993f1eb00bbfda4b13c14fd42aff61b67e5a91a0a50c07fdbdfc88
+  metadata.gz: b13d4ff2abd3af952990aacf338ff5d9842fa9947699e5fc1844bbc09e43f625
+  data.tar.gz: 531615c4d2380c96916370b798cf22ed945ea53e79906bc6f757da3c6101ce64
 SHA512:
-  metadata.gz: 7a0572e37b2f2a389308d2ce6b4b99f0fdae78ea5188a5c793b733c6a6e36011cb04f74e6ac4f95de41871bca8d4f3ef5b85462e6f37ec7ce5c2347d302ea17c
-  data.tar.gz: da76f5a70b0f62c0cf662670cbfa483e7bc089b6e5c83bcf957c3252550a8d78831b8c6f88428e5088a98a5b9e247487be8f291a9afabbb438199fb0b8a21e63
+  metadata.gz: 9b1f984f67dae9f129339d2b62f9fd7dbe7382e2be43b8111e3733ac286bd6d063239bb75b59b0bb5484ea88f43c5baa3429eafc78390a593f0f3668ff913d35
+  data.tar.gz: 3b2350315e8945edf5bc2ae9102d806c2df2de9a60f130b818bd937a67e3aa818e325a29bea8df00bfed11289e7a68959917ce0d9c4d391be263c1dabc189d20

data/lib/wax_iiif/builder.rb

@@ -2,7 +2,6 @@ require_relative 'utilities'
 
 require 'pathname'
 require 'progress_bar'
-require 'progress_bar/core_ext/enumerable_with_progress'
 
 module WaxIiif
   # Builder class
@@ -61,35 +60,20 @@ module WaxIiif
     #
     # Take the loaded data and generate all the files.
     #
-    # @param [Boolean] force_image_generation Generate images even if they already exist
-    #
     # @return [Void]
     #
-    def process_data(force_image_generation = false)
+    def process_data
       return nil if @data.nil? # do nothing without data.
 
       @manifests = []
-      @data.group_by(&:manifest_id).each_with_progress do |key, value|
-        resources     = {}
+
+      data = @data.group_by(&:manifest_id)
+      bar = ProgressBar.new(data.length)
+
+      data.each do |key, value|
         manifest_id   = key
         image_records = value
-
-        # genrate the images
-        image_records.each do |image_record|
-          # It attempts to load the info files and skip generation - not currently working.
-          info_file = image_info_file_name(image_record)
-          if File.exist?(info_file) && !force_image_generation
-            puts "skipping #{info_file}" if @config.verbose?
-            image_record.variants = load_variants(info_file)
-          else
-            image_record.variants = generate_variants(image_record, @config)
-            generate_tiles(image_record, @config)
-            generate_image_json(image_record, @config)
-          end
-          # Save the image info for the manifest
-          resources[image_record.id] ||= []
-          resources[image_record.id].push image_record
-        end
+        resources     = process_image_records(image_records)
 
         # Generate the manifest
         if manifest_id.to_s.empty?
@@ -99,6 +83,9 @@ module WaxIiif
         else
           manifests.push generate_manifest(image_records, @config)
         end
+
+        bar.increment!
+        bar.write
       end
 
       generate_collection
@@ -251,5 +238,28 @@ module WaxIiif
       end
       obj
     end
+
+    def process_image_records(image_records)
+      resources = {}
+
+      # genrate the images
+      image_records.each do |image_record|
+        # It attempts to load the info files and skip generation - not currently working.
+        info_file = image_info_file_name(image_record)
+        if File.exist?(info_file)
+          puts "skipping #{info_file}" if @config.verbose?
+          image_record.variants = load_variants(info_file)
+        else
+          image_record.variants = generate_variants(image_record, @config)
+          generate_tiles(image_record, @config)
+          generate_image_json(image_record, @config)
+        end
+        # Save the image info for the manifest
+        resources[image_record.id] ||= []
+        resources[image_record.id].push image_record
+      end
+
+      resources
+    end
   end
 end

data/wax_iiif.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'wax_iiif'
-  spec.version       = '0.1.1'
+  spec.version       = '0.1.2'
   spec.authors       = ['Marii Nyrop', 'David Newbury']
   spec.email         = ['m.nyrop@columbia.edu']
   spec.summary       = 'Minimal IIIF level 0 generator'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wax_iiif
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Marii Nyrop
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv