geo_combine 0.9.2 → 0.11.0

data/lib/geo_combine/indexer.rb

@@ -10,12 +10,19 @@ module GeoCombine
   class Indexer
     attr_reader :solr
 
-    def initialize(solr: nil, logger: GeoCombine::Logger.logger)
+    # Initialize a new indexer
+    # @param solr [RSolr::Client] an existing RSolr client
+    # @param solr_url [String] the URL of the Solr instance to connect to
+    # @param logger [Logger] a logger instance for logging messages
+    def initialize(
+      solr: nil,
+      solr_url: ENV.fetch('SOLR_URL', nil),
+      logger: GeoCombine::Logger.logger
+    )
       @logger = logger
       @batch_size = ENV.fetch('SOLR_BATCH_SIZE', 100).to_i
 
       # If SOLR_URL is set, use it; if in a Geoblacklight app, use its solr core
-      solr_url = ENV.fetch('SOLR_URL', nil)
       solr_url ||= Blacklight.default_index.connection.base_uri.to_s if defined? Blacklight
 
       # If neither, warn and try to use local Blacklight default solr core
@@ -24,6 +31,7 @@ module GeoCombine
         solr_url = 'http://localhost:8983/solr/blacklight-core'
       end
 
+      # If solr connection was provided directly, use it; otherwise connect now
       @solr = solr || RSolr.connect(client, url: solr_url)
     end
 

data/lib/geo_combine/ogp.rb

@@ -8,6 +8,7 @@ module GeoCombine
   class OGP
     class InvalidMetadata < RuntimeError; end
     include GeoCombine::Formatting
+
     attr_reader :metadata
 
     ##
@@ -123,7 +124,7 @@ module GeoCombine
     # Builds a Solr Envelope using CQL syntax
     # @return [String]
     def envelope
-      raise ArgumentError unless west >= -180 && west <= 180 &&
+      raise ArgumentError unless west.between?(-180, 180) &&
                                  east >= -180 && east <= 180 &&
                                  north >= -90 && north <= 90 &&
                                  south >= -90 && south <= 90 &&
@@ -144,6 +145,15 @@ module GeoCombine
       GeoCombine::Fgdc.new(metadata['FgdcText']) if metadata['FgdcText']
     end
 
+    SLUG_STRIP_VALUES = %w[
+      SDE_DATA.
+      SDE.
+      SDE2.
+      GISPORTAL.GISOWNER01.
+      GISDATA.
+      MORIS.
+    ].freeze
+
     private
 
     ##
@@ -207,15 +217,6 @@ module GeoCombine
       sluggify(filter_name(name))
     end
 
-    SLUG_STRIP_VALUES = %w[
-      SDE_DATA.
-      SDE.
-      SDE2.
-      GISPORTAL.GISOWNER01.
-      GISDATA.
-      MORIS.
-    ].freeze
-
     def filter_name(name)
       # strip out schema and usernames
       SLUG_STRIP_VALUES.each do |strip_val|

data/lib/geo_combine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GeoCombine
-  VERSION = '0.9.2'
+  VERSION = '0.11.0'
 end

data/lib/tasks/geo_combine.rake

@@ -11,20 +11,26 @@ require 'geo_combine/geo_blacklight_harvester'
 namespace :geocombine do
   desc 'Clone OpenGeoMetadata repositories'
   task :clone, [:repo] do |_t, args|
-    harvester = GeoCombine::Harvester.new
+    ogm_path = ENV.fetch('OGM_PATH', 'tmp/opengeometadata')
+
+    harvester = GeoCombine::Harvester.new(ogm_path: ogm_path)
     args[:repo] ? harvester.clone(args.repo) : harvester.clone_all
   end
 
   desc '"git pull" OpenGeoMetadata repositories'
   task :pull, [:repo] do |_t, args|
-    harvester = GeoCombine::Harvester.new
+    ogm_path = ENV.fetch('OGM_PATH', 'tmp/opengeometadata')
+
+    harvester = GeoCombine::Harvester.new(ogm_path: ogm_path)
     args[:repo] ? harvester.pull(args.repo) : harvester.pull_all
   end
 
   desc 'Index all JSON documents except Layers.json'
-  task :index do
-    harvester = GeoCombine::Harvester.new
+  task :index, [:ogm_path] => [:environment] do |_t, args|
+    ogm_path = args.ogm_path || ENV.fetch('OGM_PATH', 'tmp/opengeometadata')
+
     indexer = GeoCombine::Indexer.new
+    harvester = GeoCombine::Harvester.new(ogm_path: ogm_path)
     indexer.index(harvester.docs_to_index)
   end