geo_concerns 0.0.10 → 0.1.0

data/app/services/geo_concerns/events_generator.rb

@@ -0,0 +1,25 @@
+module GeoConcerns
+  class EventsGenerator
+    delegate :record_created, to: :generators
+    delegate :record_deleted, to: :generators
+    delegate :record_updated, to: :generators
+    delegate :derivatives_created, to: :generators
+
+    def generators
+      @generators ||= CompositeGenerator.new(
+        geoblacklight_event_generator,
+        geoserver_event_generator
+      )
+    end
+
+    private
+
+      def geoblacklight_event_generator
+        GeoblacklightEventGenerator.new(Messaging.geoblacklight_client)
+      end
+
+      def geoserver_event_generator
+        GeoserverEventGenerator.new(Messaging.geoserver_client)
+      end
+  end
+end

data/app/services/geo_concerns/events_generator/base_events_generator.rb

@@ -0,0 +1,22 @@
+module GeoConcerns
+  class EventsGenerator
+    class BaseEventsGenerator
+      def initialize(messaging_client)
+        @messaging_client = messaging_client
+      end
+
+      private
+
+        def base_message(type, record)
+          {
+            "id" => record.id,
+            "event" => type
+          }
+        end
+
+        def publish_message(message)
+          @messaging_client.publish(message.to_json)
+        end
+    end
+  end
+end

data/app/services/geo_concerns/events_generator/composite_generator.rb

@@ -0,0 +1,18 @@
+module GeoConcerns
+  class EventsGenerator
+    class CompositeGenerator
+      attr_reader :generators
+
+      def initialize(*generators)
+        @generators = generators.compact
+      end
+
+      def method_missing(m, *args)
+        generators.each do |generator|
+          next unless generator.respond_to? m
+          generator.send(m, args.first)
+        end
+      end
+    end
+  end
+end

data/app/services/geo_concerns/events_generator/geoblacklight_event_generator.rb

@@ -0,0 +1,44 @@
+module GeoConcerns
+  class EventsGenerator
+    class GeoblacklightEventGenerator < BaseEventsGenerator
+      def record_created(record)
+        publish_message(
+          message("CREATED", record)
+        )
+      end
+
+      def record_deleted(record)
+        publish_message(
+          delete_message("DELETED", record)
+        )
+      end
+
+      def record_updated(record)
+        publish_message(
+          message("UPDATED", record)
+        )
+      end
+
+      def message(type, record)
+        base_message(type, record).merge("exchange" => :geoblacklight,
+                                         "doc" => generate_document(record))
+      end
+
+      def delete_message(type, record)
+        base_message(type, record).merge("exchange" => :geoblacklight,
+                                         "id" => slug(record))
+      end
+
+      private
+
+        def generate_document(record)
+          Discovery::DocumentBuilder.new(record, Discovery::GeoblacklightDocument.new)
+        end
+
+        def slug(record)
+          return record.id unless record.respond_to?(:provenance)
+          "#{record.provenance.parameterize}-#{record.id}"
+        end
+    end
+  end
+end

data/app/services/geo_concerns/events_generator/geoserver_event_generator.rb

@@ -0,0 +1,30 @@
+module GeoConcerns
+  class EventsGenerator
+    class GeoserverEventGenerator < BaseEventsGenerator
+      def derivatives_created(record)
+        return unless geo_file?(record)
+        publish_message(
+          message("CREATED", record)
+        )
+      end
+
+      # Message that file set has update.
+      def record_updated(record)
+        return unless geo_file?(record)
+        publish_message(
+          message("UPDATED", record)
+        )
+      end
+
+      def message(type, record)
+        base_message(type, record).merge("exchange" => :geoserver)
+      end
+
+      private
+
+        def geo_file?(record)
+          record.respond_to?(:geo_file_format?) && record.geo_file_format?
+        end
+    end
+  end
+end

data/app/services/geo_concerns/local_messaging_client.rb

@@ -0,0 +1,18 @@
+module GeoConcerns
+  class LocalMessagingClient
+    def publish(message)
+      processor = JSON.parse(message)['exchange']
+      send(processor, JSON.parse(message))
+    rescue
+      Rails.logger.warn "Unable to publish message with the local message client"
+    end
+
+    def geoblacklight(message)
+      GeoblacklightJob.perform_later(message)
+    end
+
+    def geoserver(message)
+      DeliveryJob.perform_later(message)
+    end
+  end
+end

data/app/services/geo_concerns/rabbit_messaging_client.rb

@@ -0,0 +1,38 @@
+require 'bunny'
+
+module GeoConcerns
+  class RabbitMessagingClient
+    attr_reader :amqp_url
+    def initialize(amqp_url)
+      @amqp_url = amqp_url
+    end
+
+    def publish(message)
+      exchange_type = JSON.parse(message)['exchange']
+      send(exchange_type)
+      @exchange.publish(message, persistent: true)
+    rescue
+      Rails.logger.warn "Unable to publish message to #{amqp_url}"
+    end
+
+    def geoblacklight
+      exchange_name = Messaging.config['events']['exchange']['geoblacklight']
+      @exchange ||= channel.fanout(exchange_name, durable: true)
+    end
+
+    def geoserver
+      exchange_name = Messaging.config['events']['exchange']['geoserver']
+      @exchange ||= channel.fanout(exchange_name, durable: true)
+    end
+
+    private
+
+      def bunny_client
+        @bunny_client ||= Bunny.new(amqp_url).tap(&:start)
+      end
+
+      def channel
+        @channel ||= bunny_client.create_channel
+      end
+  end
+end

data/app/values/geo_concerns/time_period.rb

@@ -2,15 +2,14 @@ module GeoConcerns
   class TimePeriod
     attr_accessor :doc, :initial_value
     def initialize(initial_value, doc)
-      @initial_value = initial_value
+      @initial_value = initial_value || []
       @doc = doc
-      append_caldate
-      append_begdate
-      initial_value.uniq!
     end
 
     def value
-      return nil unless initial_value.present?
+      append_caldate
+      append_begdate
+      initial_value.uniq!
       initial_value
     end
 

data/app/views/geo_concerns/_attribute_rows.html.erb

@@ -9,3 +9,4 @@
 <%= presenter.attribute_to_html(:issued) %>
 <%= presenter.attribute_to_html(:coverage) %>
 <%= presenter.attribute_to_html(:provenance) %>
+<%= presenter.attribute_to_html(:identifier) %>

data/app/views/geo_concerns/_form_additional_information.html.erb

@@ -1,5 +1,6 @@
 <fieldset class="optional prompt">
   <legend>Additional Information</legend>
+  <%= f.input :identifier, as: :multi_value, input_html: { class: 'form-control' } %>
   <%= f.input :contributor, as: :multi_value, input_html: { class: 'form-control' } %>
   <%= f.input :subject,     as: :multi_value, input_html: { class: 'form-control' } %>
   <%= f.input :publisher,   as: :multi_value, input_html: { class: 'form-control' } %>

data/app/views/geo_concerns/file_sets/actions/_default_actions.html.erb

@@ -12,5 +12,5 @@
 <% end %>
 <% if can?(:read, file_set.id) %>
   <%= link_to 'Download', main_app.download_path(file_set),
-    class: 'btn btn-default', title: "Download #{file_set.to_s.inspect}", target: "_blank" %>
+    class: 'btn btn-default', title: "Download #{file_set.to_s.inspect}", target: "_blank", data: { turbolinks: false }%>
 <% end %>

data/app/views/geo_concerns/file_sets/actions/_image_actions.html.erb

@@ -15,7 +15,7 @@
     <button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown" href="#">   Download <span class="caret"></span></button>
     <ul class="dropdown-menu">
       <li>
-        <%= link_to "File", main_app.download_path(file_set), target: '_blank' %>
+        <%= link_to "File", main_app.download_path(file_set), target: '_blank', data: { turbolinks: false } %>
       </li>
     </ul>
   </div>

data/app/views/geo_concerns/file_sets/actions/_metadata_actions.html.erb

@@ -12,5 +12,5 @@
 <% end %>
 <% if can?(:read, file_set.id) %>
   <%= link_to 'Download', main_app.download_path(file_set),
-    class: 'btn btn-default', title: "Download #{file_set.to_s.inspect}", target: "_blank" %>
+    class: 'btn btn-default', title: "Download #{file_set.to_s.inspect}", target: "_blank", data: { turbolinks: false } %>
 <% end %>

data/app/views/geo_concerns/file_sets/actions/_raster_actions.html.erb

@@ -15,10 +15,10 @@
     <button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown" href="#">   Download <span class="caret"></span></button>
     <ul class="dropdown-menu">
       <li>
-        <%= link_to "File", main_app.download_path(file_set), target: '_blank' %>
+        <%= link_to "File", main_app.download_path(file_set), target: '_blank', data: { turbolinks: false } %>
       </li>
       <li>
-        <%= link_to "Display Raster", main_app.download_path(file_set, file: 'display_raster'), target: '_blank' %>
+        <%= link_to "Display Raster", main_app.download_path(file_set, file: 'display_raster'), target: '_blank', data: { turbolinks: false } %>
       </li>
     </ul>
   </div>

data/app/views/geo_concerns/file_sets/actions/_vector_actions.html.erb

@@ -15,10 +15,10 @@
     <button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown" href="#">   Download <span class="caret"></span></button>
     <ul class="dropdown-menu">
       <li>
-        <%= link_to "File", main_app.download_path(file_set), target: '_blank' %>
+        <%= link_to "File", main_app.download_path(file_set), target: '_blank', data: { turbolinks: false } %>
       </li>
       <li>
-        <%= link_to "Display Vector",main_app.download_path(file_set, file: 'display_vector'), target: '_blank' %>
+        <%= link_to "Display Vector",main_app.download_path(file_set, file: 'display_vector'), target: '_blank', data: { turbolinks: false } %>
       </li>
     </ul>
   </div>

data/app/views/geo_concerns/file_sets/media_display/_geo.html.erb

@@ -6,7 +6,8 @@
                     alt: "",
                     role: "presentation" %>
       <%= link_to main_app.download_path(file_set),
-                  target: "_new",
+                  target: "_blank",
+                  data: { turbolinks: false },
                   class: "btn btn-default" do %>
           <%= 'Download data' %>
       <% end %>

data/docker-compose-full.yml

@@ -0,0 +1,30 @@
+version: '2'
+services:
+  redis:
+    image: redis:3.2.4-alpine
+    ports:
+      - "6379:6379"
+  geoserver:
+    image: geoconcerns/geoserver
+    ports:
+      - "8181:8080"
+  geoblacklight:
+    image: geoconcerns/geoblacklight
+    ports:
+      - "3001:3000"
+    links:
+      - gblsolr:solr
+      - rabbitmq
+    environment:
+      RABBIT_SERVER: amqp://rabbitmq:5672
+  gblsolr:
+    image: geoconcerns/geoblacklight-solr
+    expose:
+      - "8983"
+    ports:
+      - "9983:8983"
+  rabbitmq:
+    image: rabbitmq:3.6.5-management
+    ports:
+      - "5672:5672"
+      - "15672:15672"

data/docker-compose.yml

@@ -1,10 +1,9 @@
 version: '2'
+# More services can be found in docker-compose-full.yml 
 services:
-  rabbitmq:
-    image: rabbitmq
-    ports:
-      - "8081:8080"
   geoserver:
-    image: thinkwhere/geoserver
+    image: geoconcerns/geoserver
     ports:
       - "8181:8080"
+    volumes:
+      - ./.internal_test_app/tmp/derivatives:/opt/geoserver/data_dir/derivatives

data/geo_concerns.gemspec

@@ -20,18 +20,19 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.2' # same as Rails 5
 
-  spec.add_dependency 'curation_concerns', '1.6.0'
+  spec.add_dependency 'curation_concerns', '>= 1.6'
   spec.add_dependency 'leaflet-rails', '~> 0.7'
-  spec.add_dependency 'simple_mapnik', '0.1.2'
   spec.add_dependency 'json-schema', '>= 2.6.2'
   spec.add_dependency 'rgeoserver', '>= 0.10.0'
-
+  spec.add_dependency 'simpler-tiles'
+  spec.add_dependency 'bunny'
+  spec.add_dependency 'geoblacklight_messaging'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'devise', '>= 3.0', '< 5'
   spec.add_development_dependency 'rspec-rails', '>= 3.5.2'
-  spec.add_development_dependency 'engine_cart', '~> 1.0', '>= 1.0.0'
+  spec.add_development_dependency 'engine_cart', '~> 1.0', '>= 1.0.1'
   spec.add_development_dependency 'solr_wrapper', '~> 0.18', '>= 0.18.0'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.6', '>= 0.6.0'
   spec.add_development_dependency 'pry-byebug'

data/lib/generators/geo_concerns/install_generator.rb

@@ -9,24 +9,6 @@ module GeoConcerns
       inject_into_file 'config/routes.rb', after: /curation_concerns_embargo_management\s*\n/ do
         "  mount GeoConcerns::Engine => '/'\n"\
       end
-
-      inject_into_file 'config/routes.rb', after: /root 'welcome#index'\s*\n/ do
-        "  default_url_options Rails.application.config.action_mailer.default_url_options\n"\
-      end
-    end
-
-    def install_default_url
-      inject_into_file 'config/environments/development.rb', after: /Rails.application.configure do\s*\n/ do
-        "  config.action_mailer.default_url_options = { host: 'localhost:3000' }\n"\
-      end
-
-      inject_into_file 'config/environments/test.rb', after: /Rails.application.configure do\s*\n/ do
-        "  config.action_mailer.default_url_options = { host: 'localhost:3000' }\n"\
-      end
-
-      inject_into_file 'config/environments/production.rb', after: /Rails.application.configure do\s*\n/ do
-        "  config.action_mailer.default_url_options = { host: 'geo.example.com', protocol: 'https' }\n"\
-      end
     end
 
     def install_ability
@@ -79,9 +61,11 @@ module GeoConcerns
       end
     end
 
-    def install_mapnik_config
-      file_path = 'config/mapnik.yml'
-      copy_file file_path, file_path
+    def install_simpler_tiles_config
+      initializer_path = 'config/initializers/simpler_tiles.rb'
+      yaml_path = 'config/simpler_tiles.yml'
+      copy_file yaml_path, yaml_path
+      copy_file initializer_path, initializer_path
     end
 
     def install_geoserver_config
@@ -89,6 +73,20 @@ module GeoConcerns
       copy_file file_path, file_path
     end
 
+    def install_messaging_config
+      config_file_path = 'config/messaging.yml'
+      initializer_file_path = 'config/initializers/messaging_config.rb'
+      copy_file config_file_path, config_file_path
+      copy_file initializer_file_path, initializer_file_path
+    end
+
+    def install_geoblacklight_config
+      config_file_path = 'config/geoblacklight.yml'
+      initializer_file_path = 'config/initializers/geoblacklight_config.rb'
+      copy_file config_file_path, config_file_path
+      copy_file initializer_file_path, initializer_file_path
+    end
+
     def inject_into_file_set
       file_path = 'app/models/file_set.rb'
       if File.exist?(file_path)
@@ -138,10 +136,6 @@ module GeoConcerns
       end
     end
 
-    def install_locale_config
-      copy_file 'config/locales/geo_concerns.en.yml'
-    end
-
     private
 
       def install_work