geoblacklight_sidecar_images 0.1.0 → 0.5.0

data/spec/jobs/store_image_job_spec.rb

@@ -0,0 +1,16 @@
+require "rails_helper"
+
+describe StoreImageJob, type: :job do
+  let(:document) { SolrDocument.new(document_attributes) }
+
+  describe "#perform_later" do
+    let(:document_attributes) { json_data('umn_iiif_jpg') }
+
+    it "stores an image" do
+      ActiveJob::Base.queue_adapter = :test
+      expect {
+        StoreImageJob.perform_later(document.id)
+      }.to have_enqueued_job
+    end
+  end
+end

data/spec/services/image_service_spec.rb

@@ -10,6 +10,8 @@ describe ImageService do
   let(:thumb_document) { SolrDocument.new(json_data('umn_solr_thumb')) }
   let(:thumb_imgsvc) { ImageService.new(thumb_document) }
 
+  # @TODO: bdcbcd3e-f6db-4ee4-b7b7-d75fe35f1d92 - Michigan State - thumbnail_path_ss
+
   describe '#store' do
     it 'should respond to store' do
       expect(iiif_imgsvc).to respond_to(:store)
@@ -32,14 +34,9 @@ describe ImageService do
         expect(iiif_imgsvc.send(:image_url)).to be_kind_of String
         expect(URI(iiif_imgsvc.send(:image_url))).to be_kind_of URI
       end
-
-      it 'should determine :remote_content_type' do
-        expect(iiif_imgsvc.send(:remote_content_type)).to eq 'image/jpeg'
-      end
-
-      it 'should determine :image_extension' do
-        expect(iiif_imgsvc.send(:image_extension)).to eq '.jpeg'
-      end
     end
   end
+
+  # Minnesota-urn-0f7ae38b-4bf2-4e03-a32b-e87f245ccb03
+  # => attachable? should be false
 end

data/template.rb

@@ -1,8 +1,9 @@
-# $ rails _5.1.4_ new app-name -m https://raw.githubusercontent.com/ewlarson/geoblacklight_sidecar_images/master/template.rb
+# $ rails _5.2.1_ new app-name -m https://raw.githubusercontent.com/ewlarson/geoblacklight_sidecar_images/master/template.rb
 
 gem 'blacklight', '>= 6.3'
 gem 'geoblacklight', '>= 1.4'
-gem 'geoblacklight_sidecar_images'
+gem 'statesman', '>= 3.4'
+gem 'geoblacklight_sidecar_images', :git => "git://github.com/ewlarson/geoblacklight_sidecar_images.git", :branch => "master"
 
 run 'bundle install'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight_sidecar_images
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Eric Larson
@@ -9,57 +9,85 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: geoblacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: geoblacklight
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: image_processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: statesman
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: mimemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -69,7 +97,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -241,25 +269,21 @@ files:
 - app/views/layouts/geoblacklight_sidecar_images/application.html.erb
 - config/routes.rb
 - db/migrate/20180118203155_create_solr_document_sidecars.rb
+- db/migrate/20180118203519_create_sidecar_image_transitions.rb
 - geoblacklight_sidecar_images.gemspec
-- lib/generators/geoblacklight_sidecar_images/assets_generator.rb
+- lib/generators/geoblacklight_sidecar_images/config_generator.rb
 - lib/generators/geoblacklight_sidecar_images/example_docs_generator.rb
 - lib/generators/geoblacklight_sidecar_images/install_generator.rb
 - lib/generators/geoblacklight_sidecar_images/jobs_generator.rb
 - lib/generators/geoblacklight_sidecar_images/models_generator.rb
 - lib/generators/geoblacklight_sidecar_images/services_generator.rb
-- lib/generators/geoblacklight_sidecar_images/templates/assets/images/thumbnail-image.png
-- lib/generators/geoblacklight_sidecar_images/templates/assets/images/thumbnail-line.png
-- lib/generators/geoblacklight_sidecar_images/templates/assets/images/thumbnail-mixed.png
-- lib/generators/geoblacklight_sidecar_images/templates/assets/images/thumbnail-multipoint.png
-- lib/generators/geoblacklight_sidecar_images/templates/assets/images/thumbnail-paper-map.png
-- lib/generators/geoblacklight_sidecar_images/templates/assets/images/thumbnail-point.png
-- lib/generators/geoblacklight_sidecar_images/templates/assets/images/thumbnail-polygon.png
-- lib/generators/geoblacklight_sidecar_images/templates/assets/images/thumbnail-raster.png
 - lib/generators/geoblacklight_sidecar_images/templates/assets/javascripts/geoblacklight.js
 - lib/generators/geoblacklight_sidecar_images/templates/assets/stylesheets/geoblacklight.scss
+- lib/generators/geoblacklight_sidecar_images/templates/config/initializers/statesman.rb
 - lib/generators/geoblacklight_sidecar_images/templates/jobs/store_image_job.rb
 - lib/generators/geoblacklight_sidecar_images/templates/models/concerns/wms_rewrite_concern.rb
+- lib/generators/geoblacklight_sidecar_images/templates/models/sidecar_image_state_machine.rb
+- lib/generators/geoblacklight_sidecar_images/templates/models/sidecar_image_transition.rb
 - lib/generators/geoblacklight_sidecar_images/templates/models/solr_document_sidecar.rb
 - lib/generators/geoblacklight_sidecar_images/templates/services/image_service.rb
 - lib/generators/geoblacklight_sidecar_images/templates/services/image_service/dynamic_map_layer.rb
@@ -267,9 +291,7 @@ files:
 - lib/generators/geoblacklight_sidecar_images/templates/services/image_service/image_map_layer.rb
 - lib/generators/geoblacklight_sidecar_images/templates/services/image_service/tiled_map_layer.rb
 - lib/generators/geoblacklight_sidecar_images/templates/services/image_service/wms.rb
-- lib/generators/geoblacklight_sidecar_images/templates/uploaders/image_uploader.rb
 - lib/generators/geoblacklight_sidecar_images/templates/views/catalog/_index_split_default.html.erb
-- lib/generators/geoblacklight_sidecar_images/uploaders_generator.rb
 - lib/generators/geoblacklight_sidecar_images/views_generator.rb
 - lib/geoblacklight_sidecar_images.rb
 - lib/geoblacklight_sidecar_images/engine.rb
@@ -318,6 +340,7 @@ files:
 - spec/fixtures/files/umn_solr_thumb.json
 - spec/fixtures/files/umn_state_result1.json
 - spec/fixtures/files/umn_state_result2.json
+- spec/jobs/store_image_job_spec.rb
 - spec/models/solr_document_sidecar_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/rails_helper.rb
@@ -376,6 +399,7 @@ test_files:
 - spec/fixtures/files/umn_solr_thumb.json
 - spec/fixtures/files/umn_state_result1.json
 - spec/fixtures/files/umn_state_result2.json
+- spec/jobs/store_image_job_spec.rb
 - spec/models/solr_document_sidecar_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/rails_helper.rb

data/lib/generators/geoblacklight_sidecar_images/assets_generator.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails/generators'
-
-module GeoblacklightSidecarImages
-  class AssetsGenerator < Rails::Generators::Base
-    source_root File.expand_path('templates', __dir__)
-
-    desc <<-DESCRIPTION
-      This generator makes the following changes to your application:
-       1. Copies asset image files to host app/assets/images
-    DESCRIPTION
-
-    def create_images_assets
-      thumbs = [
-        'thumbnail-image.png',
-        'thumbnail-line.png',
-        'thumbnail-mixed.png',
-        'thumbnail-multipoint.png',
-        'thumbnail-paper-map.png',
-        'thumbnail-point.png',
-        'thumbnail-polygon.png',
-        'thumbnail-raster.png'
-      ]
-
-      thumbs.each do |tbnl|
-        copy_file("assets/images/#{tbnl}", "app/assets/images/#{tbnl}")
-      end
-    end
-  end
-end

data/lib/generators/geoblacklight_sidecar_images/templates/uploaders/image_uploader.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-class ImageUploader < CarrierWave::Uploader::Base
-  # Include RMagick or MiniMagick support:
-  # include CarrierWave::RMagick
-  include CarrierWave::MiniMagick
-
-  # Choose what kind of storage to use for this uploader:
-  storage :file
-  # storage :fog
-
-  # Override the directory where uploaded files will be stored.
-  # This is a sensible default for uploaders that are meant to be mounted:
-  def store_dir
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
-  end
-
-  # Provide a default URL as a default if there hasn't been a file uploaded:
-  # def default_url(*args)
-  #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # ActionController::Base.helpers.asset_path(
-  #       "fallback/" + [version_name, "default.png"].compact.join('_')
-  #   # )
-  #
-  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-  # end
-
-  # Process files as they are uploaded:
-  # process scale: [200, 300]
-  #
-  # def scale(width, height)
-  #   # do something
-  # end
-
-  # Create different versions of your uploaded files:
-  version :thumb do
-    process resize_to_fill: [300, 300]
-  end
-
-  version :square, from_version: :thumb do
-    process resize_to_fill: [100, 100]
-  end
-
-  # Add a white list of extensions which are allowed to be uploaded.
-  # For images you might use something like this:
-  def extension_whitelist
-    %w[jpg jpeg gif png]
-  end
-
-  # Override the filename of the uploaded files:
-  # Avoid using model.id or version_name here, see uploader/store.rb for details.
-  # def filename
-  #   "something.jpg" if original_filename
-  # end
-end