geo_concerns 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e210521bb24c13a1e1c0a3e6e07ea94989ca56c
-  data.tar.gz: 15ef580280239099d948ca3e262b4897389f0b25
+  metadata.gz: 855515a951ec28e268a9cd763fb7672293f3124c
+  data.tar.gz: 56188c811164b602d7192147c7080416b28ba211
 SHA512:
-  metadata.gz: 5c1ca1d6a20a1a17679352e85dcf71fd6e01eff701ff635be313adaf23b6ce0e7d224b64877cb281b91a6ed13ca2f20c925606ddef5762235a98e15ee0c577a6
-  data.tar.gz: 7d1f99d9388f2c37051d6f1730cb187e88f50ae65a5d33bdf69570a01c7b59b33a15228b0500fd73ff7892ec9f35ecdc123704ef673448707a7f32360ac8f43c
+  metadata.gz: e847ae51eb4d7b2f460f944f88d265df4bb1d2f1cc7c2d5191a8a8cbf6cad9164ddce90ebd1c0dc94feca07978144e21abc15d1c0861939af7fcaea2b2028c5b
+  data.tar.gz: d7750c9f69ce7bbff2d3303611ac3ebd73ea164a57f5b17034700e29b1a57c0c81105154d892e3355f78371bc885ebb6419c58af3a5d9e5a47fcca15ac33e22d

data/app/controllers/concerns/geo_concerns/messenger_behavior.rb

@@ -3,22 +3,22 @@ module GeoConcerns
     extend ActiveSupport::Concern
 
     def destroy
-      messenger.record_deleted(geo_concern)
+      geo_concerns_messenger.record_deleted(geo_concern)
       super
     end
 
     def after_create_response
       super
-      messenger.record_created(geo_concern)
+      geo_concerns_messenger.record_created(geo_concern)
     end
 
     def after_update_response
       super
-      messenger.record_updated(geo_concern)
+      geo_concerns_messenger.record_updated(geo_concern)
     end
 
-    def messenger
-      @messenger ||= Messaging.messenger
+    def geo_concerns_messenger
+      @geo_concerns_messenger ||= GeoConcerns::Messaging.messenger
     end
 
     def geo_concern

data/app/models/concerns/geo_concerns/file_set/derivatives.rb

@@ -5,8 +5,6 @@ module GeoConcerns
 
       def create_derivatives(filename)
         case geo_mime_type
-        when *GeoConcerns::ImageFormatService.select_options.map(&:last)
-          image_derivatives(filename)
         when *GeoConcerns::RasterFormatService.select_options.map(&:last)
           raster_derivatives(filename)
         when *GeoConcerns::VectorFormatService.select_options.map(&:last)
@@ -15,16 +13,7 @@ module GeoConcerns
         super
 
         # Once all the derivatives are created, send a derivatives created message
-        messenger.derivatives_created(self)
-      end
-
-      def image_derivatives(filename)
-        Hydra::Derivatives::ImageDerivatives
-          .create(filename, outputs: [{ label: :thumbnail,
-                                        id: id,
-                                        format: 'png',
-                                        size: '200x150>',
-                                        url: derivative_url('thumbnail') }])
+        geo_concerns_messenger.derivatives_created(self)
       end
 
       def raster_derivatives(filename)
@@ -63,8 +52,8 @@ module GeoConcerns
           GeoConcerns::DerivativePath
         end
 
-        def messenger
-          @messenger ||= Messaging.messenger
+        def geo_concerns_messenger
+          @geo_concerns_messenger ||= GeoConcerns::Messaging.messenger
         end
     end
   end

data/app/processors/geo_concerns/processors/image.rb

@@ -12,18 +12,25 @@ module GeoConcerns
         # @param out_path [String] processor output file path.
         # @param options [Hash] creation options
         # @option options [String] `:output_size` as "w h" or "wxh"
+        # rubocop:disable Metrics/MethodLength
         def self.convert(in_path, out_path, options)
-          image = MiniMagick::Image.open(in_path) # copies image
-          image.combine_options do |i|
-            size = options[:output_size].tr(' ', 'x')
-            i.resize size
-            i.background 'white'
-            i.gravity 'center'
-            i.extent size
-          end
-          image.format File.extname(out_path).gsub(/^\./, '')
-          image.write(out_path)
+          size = options[:output_size].tr(' ', 'x')
+          convert = MiniMagick::Tool::Convert.new(whiny: false)
+          convert << in_path
+          convert << "-resize"
+          convert << size
+          convert << "-extent"
+          convert << size
+          convert << "-background"
+          convert << "white"
+          convert << "-gravity"
+          convert << "center"
+          convert << out_path
+
+          # suppress stderr b/c geotiffs return 'unknown field' warnings
+          convert.call { |_stdout, _stderr| }
         end
+        # rubocop:enable Metrics/MethodLength
 
         # Trims extra whitespace.
         # @param in_path [String] file input path

data/app/services/geo_concerns/events_generator.rb

@@ -15,11 +15,11 @@ module GeoConcerns
     private
 
       def geoblacklight_event_generator
-        GeoblacklightEventGenerator.new(Messaging.geoblacklight_client)
+        GeoblacklightEventGenerator.new(GeoConcerns::Messaging.geoblacklight_client)
       end
 
       def geoserver_event_generator
-        GeoserverEventGenerator.new(Messaging.geoserver_client)
+        GeoserverEventGenerator.new(GeoConcerns::Messaging.geoserver_client)
       end
   end
 end

data/app/services/geo_concerns/rabbit_messaging_client.rb

@@ -16,12 +16,12 @@ module GeoConcerns
     end
 
     def geoblacklight
-      exchange_name = Messaging.config['events']['exchange']['geoblacklight']
+      exchange_name = GeoConcerns::Messaging.config['events']['exchange']['geoblacklight']
       @exchange ||= channel.fanout(exchange_name, durable: true)
     end
 
     def geoserver
-      exchange_name = Messaging.config['events']['exchange']['geoserver']
+      exchange_name = GeoConcerns::Messaging.config['events']['exchange']['geoserver']
       @exchange ||= channel.fanout(exchange_name, durable: true)
     end
 

data/geo_concerns.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'simpler-tiles'
   spec.add_dependency 'bunny'
   spec.add_dependency 'geoblacklight_messaging'
+  spec.add_dependency 'jquery-ui-rails', '~> 5.0.5'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'sqlite3'

data/lib/generators/geo_concerns/install_generator.rb

@@ -74,8 +74,8 @@ module GeoConcerns
     end
 
     def install_messaging_config
-      config_file_path = 'config/messaging.yml'
-      initializer_file_path = 'config/initializers/messaging_config.rb'
+      config_file_path = 'config/geo_concerns_messaging.yml'
+      initializer_file_path = 'config/initializers/geo_concerns_messaging_config.rb'
       copy_file config_file_path, config_file_path
       copy_file initializer_file_path, initializer_file_path
     end

data/lib/generators/geo_concerns/templates/config/initializers/geo_concerns_messaging_config.rb

@@ -0,0 +1,37 @@
+module GeoConcerns
+  module Messaging
+    def config
+      @config ||= config_yaml.with_indifferent_access
+    end
+
+    def messenger
+      GeoConcerns::EventsGenerator.new
+    end
+
+    def geoblacklight_client
+      local_client
+    end
+
+    def geoserver_client
+      local_client
+    end
+
+    private
+
+      def config_yaml
+        config_file = "#{Rails.root}/config/geo_concerns_messaging.yml"
+        YAML.load(ERB.new(File.read(config_file)).result)[Rails.env]
+      end
+
+      def local_client
+        GeoConcerns::LocalMessagingClient.new
+      end
+
+      def rabbit_client
+        GeoConcerns::RabbitMessagingClient.new(Messaging.config['events']['server'])
+      end
+
+      module_function :config, :config_yaml, :messenger, :local_client,
+                      :rabbit_client, :geoblacklight_client, :geoserver_client
+  end
+end

data/lib/geo_concerns/version.rb

@@ -1,3 +1,3 @@
 module GeoConcerns
-  VERSION = "0.1.1".freeze
+  VERSION = "0.2.0".freeze
 end

data/spec/controllers/file_sets_controller_spec.rb

@@ -24,7 +24,7 @@ describe CurationConcerns::FileSetsController, type: :controller do
 
     before do
       sign_in user
-      allow(Messaging).to receive(:messenger).and_return(messenger)
+      allow(GeoConcerns::Messaging).to receive(:messenger).and_return(messenger)
     end
 
     context 'after updating metadata' do

data/spec/models/concerns/geo_concerns/file_set/derivatives_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 shared_examples 'a set of raster derivatives' do
   let(:messenger) { instance_double(GeoConcerns::EventsGenerator) }
   before do
-    allow(Messaging).to receive(:messenger).and_return(messenger)
+    allow(GeoConcerns::Messaging).to receive(:messenger).and_return(messenger)
     expect(messenger).to receive(:derivatives_created).with(file_set)
   end
   it 'makes a thumbnail' do
@@ -26,7 +26,7 @@ end
 shared_examples 'a set of vector derivatives' do
   let(:messenger) { instance_double(GeoConcerns::EventsGenerator) }
   before do
-    allow(Messaging).to receive(:messenger).and_return(messenger)
+    allow(GeoConcerns::Messaging).to receive(:messenger).and_return(messenger)
     expect(messenger).to receive(:derivatives_created).with(file_set)
   end
   it 'makes a thumbnail' do
@@ -46,21 +46,6 @@ shared_examples 'a set of vector derivatives' do
   end
 end
 
-shared_examples 'a set of image derivatives' do
-  let(:messenger) { instance_double(GeoConcerns::EventsGenerator) }
-  before do
-    allow(Messaging).to receive(:messenger).and_return(messenger)
-    expect(messenger).to receive(:derivatives_created).with(file_set)
-  end
-  it 'makes a thumbnail' do
-    new_thumb = "#{Rails.root}/tmp/derivatives/#{file_set.id}/thumbnail.thumbnail"
-    expect {
-      file_set.create_derivatives(file_name)
-    }.to change { Dir[new_thumb].empty? }
-      .from(true).to(false)
-  end
-end
-
 describe CurationConcerns::FileSet do
   let(:file_set) { FileSet.create { |gf| gf.apply_depositor_metadata('geonerd@example.com') } }
 
@@ -78,14 +63,6 @@ describe CurationConcerns::FileSet do
   end
 
   describe 'geo derivatives' do
-    describe 'image processing' do
-      context 'with a jpeg' do
-        let(:geo_mime_type) { 'image/jpeg' }
-        let(:file_name) { File.join(fixture_path, 'files', 'americas.jpg') }
-        it_behaves_like 'a set of image derivatives'
-      end
-    end
-
     describe 'vector processing' do
       context 'with a shapefile' do
         let(:geo_mime_type) { 'application/zip; ogr-format="ESRI Shapefile"' }

data/spec/processors/geo_concerns/processors/image_spec.rb

@@ -11,37 +11,31 @@ describe GeoConcerns::Processors::Image do
 
   subject { TestProcessor.new }
 
-  let(:output_file_jpg) { 'output/geo.jpg' }
+  let(:shell) { double }
   let(:output_file_png) { 'output/geo.png' }
   let(:output_file) { output_file_png }
   let(:file_name) { 'files/geo.tif' }
   let(:options) { { output_size: '150 150' } }
 
   describe '#convert' do
-    let(:image) { double }
+    let(:args) {
+      [['convert', 'files/geo.tif', '-resize', '150x150', '-extent',
+        '150x150', '-background', 'white', '-gravity', 'center',
+        'output/geo.png'], { whiny: false, stderr: false }]
+    }
 
     before do
-      allow(MiniMagick::Image).to receive(:open).and_return(image)
+      allow(MiniMagick::Shell).to receive(:new).and_return(shell)
     end
 
     it 'transforms the image and saves it as a PNG' do
-      expect(image).to receive(:format).with('png')
-      expect(image).to receive(:combine_options)
-      expect(image).to receive(:write).with(output_file_png)
+      expect(shell).to receive(:run).with(*args).and_return('output message')
       subject.class.convert(file_name, output_file_png, options)
     end
-
-    it 'transforms the image and saves it as a JPG' do
-      expect(image).to receive(:format).with('jpg')
-      expect(image).to receive(:combine_options)
-      expect(image).to receive(:write).with(output_file_jpg)
-      subject.class.convert(file_name, output_file_jpg, options)
-    end
   end
 
   describe '#trim' do
-    let(:shell) { double }
-    let(:args) { [["convert", "files/geo.tif", "-trim", "output/geo.png"], { whiny: true }] }
+    let(:args) { [['convert', 'files/geo.tif', '-trim', 'output/geo.png'], { whiny: true }] }
 
     before do
       allow(MiniMagick::Shell).to receive(:new).and_return(shell)
@@ -53,7 +47,6 @@ describe GeoConcerns::Processors::Image do
   end
 
   describe '#center' do
-    let(:shell) { double }
     let(:args) {
       [['convert', '-size', '150x150', 'xc:white', 'files/geo.tif',
         '-gravity', 'center', '-composite', 'output/geo.png'],

data/spec/services/geo_concerns/rabbit_messaging_client_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe GeoConcerns::RabbitMessagingClient do
   let(:bunny_session) { instance_double(Bunny::Session, create_channel: channel) }
 
   before do
-    allow(Messaging).to receive(:config).and_return(config)
+    allow(GeoConcerns::Messaging).to receive(:config).and_return(config)
     allow(Bunny).to receive(:new).and_return(bunny_session)
     allow(bunny_session).to receive(:start)
   end

data/template.rb

@@ -1,5 +1,5 @@
 gem 'curation_concerns', '1.6.3'
-gem 'geo_concerns', '0.1.1'
+gem 'geo_concerns', '0.2.0'
 
 run 'bundle install'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_concerns
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Griffin
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curation_concerns
@@ -112,6 +112,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -518,12 +532,12 @@ files:
 - lib/generators/geo_concerns/templates/config/authorities/metadata_formats.yml
 - lib/generators/geo_concerns/templates/config/authorities/raster_formats.yml
 - lib/generators/geo_concerns/templates/config/authorities/vector_formats.yml
+- lib/generators/geo_concerns/templates/config/geo_concerns_messaging.yml
 - lib/generators/geo_concerns/templates/config/geoblacklight.yml
 - lib/generators/geo_concerns/templates/config/geoserver.yml
+- lib/generators/geo_concerns/templates/config/initializers/geo_concerns_messaging_config.rb
 - lib/generators/geo_concerns/templates/config/initializers/geoblacklight_config.rb
-- lib/generators/geo_concerns/templates/config/initializers/messaging_config.rb
 - lib/generators/geo_concerns/templates/config/initializers/simpler_tiles.rb
-- lib/generators/geo_concerns/templates/config/messaging.yml
 - lib/generators/geo_concerns/templates/config/simpler_tiles.yml
 - lib/generators/geo_concerns/templates/controllers/curation_concerns/file_sets_controller.rb
 - lib/generators/geo_concerns/templates/controllers/curation_concerns/image_works_controller.rb

data/lib/generators/geo_concerns/templates/config/initializers/messaging_config.rb

@@ -1,34 +0,0 @@
-module Messaging
-  def config
-    @config ||= config_yaml.with_indifferent_access
-  end
-
-  def messenger
-    GeoConcerns::EventsGenerator.new
-  end
-
-  def geoblacklight_client
-    local_client
-  end
-
-  def geoserver_client
-    local_client
-  end
-
-  private
-
-    def config_yaml
-      YAML.load(ERB.new(File.read("#{Rails.root}/config/messaging.yml")).result)[Rails.env]
-    end
-
-    def local_client
-      GeoConcerns::LocalMessagingClient.new
-    end
-
-    def rabbit_client
-      GeoConcerns::RabbitMessagingClient.new(Messaging.config['events']['server'])
-    end
-
-    module_function :config, :config_yaml, :messenger, :local_client,
-                    :rabbit_client, :geoblacklight_client, :geoserver_client
-end