geo_concerns 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7859ed88c8abf63d62c3f01656c86bef9100759a
-  data.tar.gz: 9d9b2132b6e5497633bc66604656917fe6cf801b
+  metadata.gz: a7a2c566517e2692c326da44ff6ac325a8605e91
+  data.tar.gz: 19af506201f28b351939901a46fb02dd599c6ff7
 SHA512:
-  metadata.gz: 9396b438f6ee45eef45ecd87b180e54f66e4a23bc83297c27dad047f4065eede959f5870c84ae94adff9529c3a13d6242067be951cbc1ccef497921618d83efb
-  data.tar.gz: a21f787e7a4762b5aeab53a76386975a6f92170a2b55dec1e2537438cb5466df028e9ddbf4856dc3eff3da6c51b5eafa7186910d9528bce9a9a60e8c218ec468
+  metadata.gz: 07c9520851640a1241417a758dea76fc4bc284e1463ee62d39b14de0b6bc675bf1e8063843b31d8a4d9ef664d094eb903a3758fc5b02ac68e744847586382cf5
+  data.tar.gz: 6d097f13341e4f4d5350bf89f6dba9f9eaff1a6808c5229b1a4993e4c6cea48244368e3d82fc6bf39211e2c0b382a5daa5f928d545e14f323ca3cc032e2a451c

data/README.md

@@ -57,7 +57,6 @@ Add GeoConcerns models to an existing CurationConcerns application:
 1. `bundle install`
 2. `rake engine_cart:generate`
 3. `rake geo_concerns:dev_servers`
-4. `cd .internal_test_app && rails s`
 
 ## Testing
 
@@ -74,6 +73,11 @@ Then, in another terminal window:
 ```
 $ rake spec
 ```
+To run a specific test:
+
+```bash
+rspec spec/path/to/your_spec.rb:linenumber
+```
 
 ## Running GeoServer for Development with Docker
 
@@ -87,6 +91,12 @@ $ rake spec
    ```
    $ source ./run-docker.sh
    ```
+1. To stop the server and remove port forwarding:
+
+	```
+	$ docker-compose stop
+	$ killall ssh
+	```
 
 ### Linux
 
@@ -98,7 +108,6 @@ $ rake spec
 
 	```
 	$ docker-compose up -d
-	$ export GEOSERVER_URL="http://localhost:8181/geoserver/rest"
 	```
 
 ## Running GeoServer for Development with Vagrant

data/Rakefile

@@ -7,17 +7,18 @@ require 'engine_cart/rake_task'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'active_fedora/rake_support'
+require 'solr_wrapper/rake_task'
 
 Dir.glob('tasks/*.rake').each { |r| import r }
 
 Bundler::GemHelper.install_tasks
 
-desc 'Run test suite and style checker'
-task spec: ['geo_concerns:spec']
+desc 'Run test suite'
+task spec: ['geo_concerns:rspec']
 
 desc 'Spin up Solr & Fedora and run the test suite'
 task ci: ['geo_concerns:rubocop', 'engine_cart:generate'] do
-  Rake::Task['spec'].invoke
+  Rake::Task['geo_concerns:spec'].invoke
 end
 
 task clean: 'engine_cart:clean'

data/app/actors/geo_concerns/actors/file_actor.rb

@@ -2,13 +2,10 @@ module GeoConcerns
   module Actors
     class FileActor < CurationConcerns::Actors::FileActor
       def ingest_file(file)
-        working_file = CurationConcerns::WorkingDirectory
-                       .copy_file_to_working_directory(file, file_set.id)
         IngestFileJob.perform_later(file_set,
-                                    working_file,
-                                    mime_type(file),
+                                    working_file(file),
                                     user,
-                                    relation)
+                                    ingest_options(file))
         true
       end
 
@@ -21,6 +18,15 @@ module GeoConcerns
         return file_set.geo_mime_type if file_set.geo_mime_type
         file.respond_to?(:content_type) ? file.content_type : nil || file_set.geo_mime_type
       end
+
+      private
+
+        def ingest_options(file, opts = {})
+          opts[:mime_type] = mime_type(file)
+          opts[:filename] = file.original_filename if file.respond_to?(:original_filename)
+          opts[:relation] = relation
+          opts
+        end
     end
   end
 end

data/app/schemas/geo_concerns/basic_geo_metadata_optional.rb

@@ -3,7 +3,7 @@ module GeoConcerns
     #
     # The following properties are inherited from Curation Concerns' metadata
     #
-    # @see https://github.com/projecthydra/curation_concerns/blob/v1.5.0/app/models/concerns/curation_concerns/basic_metadata.rb
+    # @see https://github.com/projecthydra/curation_concerns/blob/v1.6.0/app/models/concerns/curation_concerns/basic_metadata.rb
     # Optional:
     #   :contributor
     #   :creator
@@ -14,6 +14,7 @@ module GeoConcerns
     #   :part_of
     #   :publisher
     #   :resource_type (DC.type)
+    #   :rights (license)
     #   :rights
     #   :source
     #   :subject

data/app/schemas/geo_concerns/basic_geo_metadata_required.rb

@@ -3,7 +3,7 @@ module GeoConcerns
     #
     # The following properties are inherited from Curation Concerns' metadata
     #
-    # @see https://github.com/projecthydra/curation_concerns/blob/v1.5.0/app/models/concerns/curation_concerns/required_metadata.rb
+    # @see https://github.com/projecthydra/curation_concerns/blob/v1.6.0/app/models/concerns/curation_concerns/required_metadata.rb
     # Required:
     #   :title
     #   :date_uploaded (DC.dateSubmitted)

data/app/services/geo_concerns/delivery/geoserver.rb

@@ -20,14 +20,12 @@ module GeoConcerns
         @catalog ||= RGeoServer.catalog(config)
       end
 
-      def publish(type = :vector)
+      def publish
         case type
         when :vector
           publish_vector
         when :raster
           publish_raster
-        else
-          raise ArgumentError, "Unknown file type #{type}"
         end
       end
 
@@ -51,6 +49,12 @@ module GeoConcerns
           end
         end
 
+        def type
+          return :vector if file_path =~ /\.zip$/
+          return :raster if file_path =~ /\.tif$/
+          raise ArgumentError, "Not a ZIPed Shapefile or GeoTIFF: #{file_path}"
+        end
+
         def workspace
           workspace = RGeoServer::Workspace.new catalog, name: workspace_name
           workspace.save if workspace.new?
@@ -62,13 +66,15 @@ module GeoConcerns
         end
 
         def publish_vector
-          raise ArgumentError, "Not ZIPed Shapefile: #{file_path}" unless file_path =~ /\.zip$/
           datastore.upload_file file_path, publish: true
         end
 
+        def coveragestore
+          RGeoServer::CoverageStore.new catalog, workspace: workspace, name: file_set.id
+        end
+
         def publish_raster
-          raise ArgumentError, "Not GeoTIFF: #{file_path}" unless file_path =~ /\.tif$/
-          raise NotImplementedError
+          coveragestore.upload file_path
         end
     end
   end

data/config/fcrepo_wrapper_test.yml

@@ -0,0 +1,3 @@
+#config/fcrepo_wrapper_test.yml.sample
+port: 8986
+enable_jms: false

data/config/solr_wrapper_test.yml

@@ -0,0 +1,7 @@
+#config/solr_wrapper_test.yml
+# version: 6.2.0
+port: 8985
+collection:
+    persist: false
+    dir: solr/config
+    name: hydra-test

data/geo_concerns.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.2' # same as Rails 5
 
-  spec.add_dependency 'curation_concerns', '1.5.0'
+  spec.add_dependency 'curation_concerns', '1.6.0'
   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.9.1'
+  spec.add_dependency 'rgeoserver', '>= 0.10.0'
 
 
   spec.add_development_dependency 'bundler', '~> 1.13'

data/lib/geo_concerns/version.rb

@@ -1,3 +1,3 @@
 module GeoConcerns
-  VERSION = "0.0.9".freeze
+  VERSION = "0.0.10".freeze
 end

data/run-docker.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 docker-machine start
-docker_ip=$(docker-machine ip)
 eval $(docker-machine env)
 docker-compose up -d
-geoserver_url="http://"$docker_ip":8181/geoserver/rest"
-export GEOSERVER_URL=$geoserver_url
+# forward geoserver ports in the background
+docker-machine ssh default -f -N -L 8181:localhost:8181

data/spec/services/geo_concerns/delivery/geoserver_spec.rb

@@ -28,35 +28,31 @@ describe GeoConcerns::Delivery::Geoserver do
   end
 
   describe '#publish' do
-    it 'requires a valid type' do
-      expect { subject.publish(:unknown) }.to raise_error(ArgumentError, /Unknown file type/)
-    end
-
     context 'when type is vector' do
-      let(:type) { :vector }
+      let(:path) { 'spec/fixtures/files/tufts-cambridgegrid100-04.zip' }
       it 'routes to publish_vector' do
         expect(subject).to receive(:publish_vector)
-        subject.publish(type)
+        subject.publish
       end
     end
 
     context 'when type is raster' do
-      let(:type) { :raster }
+      let(:path) { 'spec/fixtures/files/S_566_1914_clip.tif' }
       it 'routes to publish_raster' do
         expect(subject).to receive(:publish_raster)
-        subject.publish(type)
+        subject.publish
       end
     end
-  end
 
-  describe '#publish_vector' do
-    context 'when a vector is not a zip file' do
-      let(:path) { 'not-a-zip' }
+    context 'when type is not a raster or vector' do
+      let(:path) { 'not-a-zip-or-tif' }
       it 'raises an error' do
-        expect { subject.send(:publish_vector) }.to raise_error(ArgumentError, /Not ZIPed Shapefile/)
+        expect { subject.publish }.to raise_error(ArgumentError, /Not a ZIPed Shapefile/)
       end
     end
+  end
 
+  describe '#publish_vector' do
     context 'with a path to a zipped shapefile' do
       let(:ws) { double }
       let(:ds) { double }
@@ -74,16 +70,16 @@ describe GeoConcerns::Delivery::Geoserver do
 
   describe '#publish_raster' do
     let(:path) { 'spec/fixtures/files/S_566_1914_clip.tif' }
+    let(:ws) { double }
+    let(:cs) { double }
 
-    it 'is not implemented yet' do
-      expect { subject.send(:publish_raster) }.to raise_error(NotImplementedError)
-    end
-
-    context 'when a raster is not a GeoTIFF file' do
-      let(:path) { 'not-a-tiff' }
-      it 'raises an error' do
-        expect { subject.send(:publish_raster) }.to raise_error(ArgumentError, /Not GeoTIFF/)
-      end
+    it 'dispatches to RGeoServer' do
+      expect(RGeoServer::Workspace).to receive(:new).with(subject.catalog, hash_including(name: 'public')).and_return(ws)
+      expect(ws).to receive(:'new?').and_return(true)
+      expect(ws).to receive(:save)
+      expect(RGeoServer::CoverageStore).to receive(:new).with(subject.catalog, hash_including(workspace: ws, name: id)).and_return(cs)
+      expect(cs).to receive(:upload).with(path)
+      subject.send(:publish_raster)
     end
   end
 

data/tasks/geo_concerns.rake

@@ -20,7 +20,7 @@ namespace :geo_concerns do
   task :dev_servers do
     with_server 'development' do
       begin
-        sleep
+        Rake::Task['engine_cart:server'].invoke
       rescue Interrupt
         puts "Shutting down..."
       end

data/template.rb

@@ -1,5 +1,5 @@
-gem 'curation_concerns', '1.5.0'
-gem 'geo_concerns', '0.0.9'
+gem 'curation_concerns', '1.6.0'
+gem 'geo_concerns', '0.0.10'
 
 run 'bundle install'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_concerns
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - James Griffin
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curation_concerns
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: leaflet-rails
   requirement: !ruby/object:Gem::Requirement
@@ -76,14 +76,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -467,7 +467,9 @@ files:
 - app/views/geo_concerns/related/_parent_member.html.erb
 - app/views/geo_concerns/related/_parent_works.html.erb
 - app/vocabs/geo_concerns/geo_terms.rb
+- config/fcrepo_wrapper_test.yml
 - config/routes.rb
+- config/solr_wrapper_test.yml
 - docker-compose.yml
 - geo_concerns.gemspec
 - lib/generators/geo_concerns/install_generator.rb