rdf-marmotta 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca8d084b6dd3a1127eace872b52c7b6ca941b766
-  data.tar.gz: 22b92c906a5e092328e735fa60b8b00f3963b7c9
+  metadata.gz: 4d25c88d77d8ced4a8c4bcb17822f614bce46248
+  data.tar.gz: ceba3df460c114a78b5eea6b146f79d007404c39
 SHA512:
-  metadata.gz: a15e863ab6c6af68a43c7ff133fa608bfe45159ebdbb7d82665b2a5e4a346483e05c504275314d79dc9a84f9c58efe928cae6e28708ac8cd05d6d3733739adc8
-  data.tar.gz: 309eba551ec09d8b647476d3d9daf0615afca7ccc663633a08189b6e6dd4f07f1219234bcbcd611456da2defbf80ba52dca8792c8a32abbb1f2203184b0006d8
+  metadata.gz: 4e1e5c2b40b5db654e827a3347cc8f1ea89f4218da9b850fca6acc313fae889b649838baebaa28db4d1d6926d18f83c64dda6962bdd41117d21889cbe70be4c1
+  data.tar.gz: d234bc13325174069d95f206ec97408aa04c3be62d19a2825c0379c174ca609ac427b7111fd2142a196eafbebe28853fc91132cef27902a2f83d6d84c94233a6

data/.gitignore

@@ -0,0 +1,3 @@
+Gemfile.lock
+*.gem
+tmp

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+bundler_args: --without debug
+script: "bundle exec rake ci"
+rvm:
+  - 2.1.3

data/README.md

@@ -1,7 +1,7 @@
 RDF::Marmotta
 =============
 
-A Ruby RDF::Repository implementation for Apache Marmotta.
+A Ruby RDF::Repository implementation for [Apache Marmotta](http://marmotta.apache.org).
 
 Installing & Using
 ------------------

data/Rakefile

@@ -0,0 +1,23 @@
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+require 'jettywrapper'
+
+import 'lib/tasks/jetty.rake'
+
+MARMOTTA_HOME = ENV['MARMOTTA_HOME'] ||
+  File.expand_path(File.join(Jettywrapper.app_root, 'marmotta'))
+
+Jettywrapper.url =
+  'https://github.com/dpla/marmotta-jetty/archive/3.3.0-solr-4.9.0.zip'
+
+desc "Run all specs in spec directory"
+task :ci => ['jetty:clean'] do
+  Jettywrapper.wrap(quiet: true, jetty_port: 8983, :startup_wait => 30) do
+    Rake::Task["spec"].invoke
+  end
+end
+
+desc "Run all specs in spec directory (excluding plugin specs)"
+RSpec::Core::RakeTask.new(:spec)
+task :default => :ci

data/UNLICENSE

@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org/>

data/lib/rdf/marmotta.rb

@@ -14,11 +14,25 @@ module RDF
       :ldpath => 'ldpath'
     }
 
+    ##
+    # Supported Accept headers for Marmotta. As of 3.3.0, Marmotta will reject
+    # a request if the first content type listed is not suppported.
+    #
+    # @see https://issues.apache.org/jira/browse/MARMOTTA-585
+    CTYPES = RDF::Format.content_types.select do |key, values|
+      !(values.map(&:to_s) & ['RDF::RDFXML::Format',
+                              'RDF::Turtle::Format',
+                              'RDF::TriG::Format',
+                              'RDF::TriX::Format',
+                              'RDF::N3::Format']).empty?
+    end
+
     def initialize(base_url, options = {})
       @endpoints = DEFAULT_OPTIONS
       @endpoints.merge!(options)
       @endpoints.each do |k, v|
-        @endpoints[k] = URI(base_url.to_s + v.to_s) unless v.is_a? ::URI
+        next unless RDF::URI(v.to_s).relative?
+        @endpoints[k] = (RDF::URI(base_url.to_s) / v.to_s)
       end
     end
 
@@ -69,11 +83,24 @@ module RDF
     end
 
     class Client < SPARQL::Client
+      MARMOTTA_GRAPH_ALL = (Marmotta::CTYPES.keys + ['*/*;p=0.1'])
+        .join(', ').freeze
+
       def initialize(url, options = {}, &block)
         options[:method] ||= :get
         options[:protocol] ||= '1.1'
         super
       end
+
+      ##
+      # Limit to accepted content types per comment on RDF::Marmotta::CTYPES
+      def request(query, headers={}, &block)
+        headers['Accept'] ||= MARMOTTA_GRAPH_ALL if
+          (query.respond_to?(:expects_statements?) ?
+           query.expects_statements? :
+           (query =~ /CONSTRUCT|DESCRIBE|DELETE|CLEAR/))
+        super
+      end
     end
   end
 end

data/lib/tasks/jetty.rake

@@ -0,0 +1,19 @@
+require 'fileutils'
+require 'jettywrapper'
+
+namespace :jetty do
+
+  desc 'Configure solr schema'
+  task :config do
+    cp('solr_conf/schema.xml', 'jetty/solr/development-core/conf/schema.xml')
+    cp('solr_conf/solrconfig.xml',
+       'jetty/solr/development-core/conf/solrconfig.xml')
+  end
+
+  desc 'Remove the jetty and marmotta directories and recreate them'
+  task :clean do
+    FileUtils.rm_rf(MARMOTTA_HOME)
+    Jettywrapper.clean
+  end
+
+end

data/rdf-marmotta.gemspec

@@ -3,25 +3,29 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "rdf-marmotta"
-  s.version     = '0.0.4'
+  s.version     = '0.0.6'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tom Johnson"]
   s.homepage    = 'https://github.com/dpla/rdf-marmotta'
   s.email       = 'tom@dp.la'
   s.summary     = %q{RDF::Repository layer for Apache Marmotta.}
   s.description = %q{RDF::Repository layer for Apache Marmotta.}
-  s.license     = "undeclared"
+  s.license     = "Unlicense"
   s.required_ruby_version     = '>= 1.9.3'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
 
+  s.add_dependency('rake')
   s.add_dependency('rdf', '~> 1.1')
   s.add_dependency('nokogiri')
   s.add_dependency('rdf-rdfxml', '~> 1.1')
   s.add_dependency('sparql-client', '~> 1.1')
+  s.add_development_dependency('jettywrapper')
+  s.add_development_dependency('linkeddata')
   s.add_development_dependency('rspec')
   s.add_development_dependency('rspec-its')
   s.add_development_dependency('rdf-spec')
   s.add_development_dependency('pry')
+
 end

data/spec/marmotta_spec.rb

@@ -8,7 +8,7 @@ require 'rdf/marmotta'
 
 describe RDF::Marmotta do
 
-  let(:base_url) { 'http://localhost:8080/marmotta/' }
+  let(:base_url) { 'http://localhost:8983/marmotta/' }
   let(:opts) { {} }
   let(:statement) { RDF::Statement(RDF::URI('http://api.dp.la/example/item/1234'), RDF::DC.title, 'Moomin') }
   let(:statements) {

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'linkeddata'
 require 'bundler/setup'
 Bundler.setup
 
@@ -6,7 +7,7 @@ Dir['./spec/support/**/*.rb'].each { |f| require f }
 RSpec.configure do |config|
   config.color = true
   config.tty = true
-  
+
   # Uncomment the following line to get errors and backtrace for deprecation warnings
   # config.raise_errors_for_deprecations!
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rdf-marmotta
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Tom Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: jettywrapper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: linkeddata
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,15 +170,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
+- Rakefile
+- UNLICENSE
+- jetty/.gitkeep
 - lib/rdf/marmotta.rb
+- lib/tasks/jetty.rake
 - rdf-marmotta.gemspec
 - spec/marmotta_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/dpla/rdf-marmotta
 licenses:
-- undeclared
+- Unlicense
 metadata: {}
 post_install_message: 
 rdoc_options: []