publish_my_data 0.0.29 → 0.0.30

data/spec/models/publish_my_data/example_resource_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe PublishMyData::ExampleResource do
+  let(:example_resource) { FactoryGirl.create(:example_resource) }
+
+  describe '#as_ttl' do
+    before do
+      example_resource.write_predicate('http://example.com/foo', 'foo')
+      example_resource.write_predicate('http://example.com/bar', 'bar')
+    end
+    it 'should return the turtle representation of the example resource' do
+      example_resource.as_ttl.should == """
+<http://pmdtest.dev/data/trousers/measurement1> <http://example.com/bar> \"bar\";
+   <http://example.com/foo> \"foo\" .
+"""
+    end
+  end
+end

data/spec/models/publish_my_data/ontology_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe PublishMyData::Ontology do
+  let(:ontology) { FactoryGirl.create(:ontology) }
+
+  it_behaves_like PublishMyData::AllFeatures do
+    let(:resource) { ontology }
+  end
+
+  it_behaves_like 'an in-house vocabulary' do
+    let(:vocabulary) { ontology }
+    let(:vocabulary_resource) { ontology.classes.first }
+  end
+
+  describe '#local?' do
+    it 'should be true' do
+      ontology.local?.should be_true
+    end
+  end
+end

data/spec/models/publish_my_data/resource_spec.rb

@@ -19,5 +19,68 @@ module PublishMyData
 
     end
 
+    describe '.find' do
+      context 'for a local resource' do
+        let(:opts) { {local: true} }
+
+        context 'of type Ontology' do
+          let(:ontology) { FactoryGirl.create(:ontology) }
+
+          it 'should return an Ontology given its URI' do
+            Resource.find(ontology.uri, opts).should be_a(PublishMyData::Ontology)
+          end
+        end
+
+        context 'of type ConceptScheme' do
+          let(:concept_scheme) { FactoryGirl.create(:concept_scheme) }
+
+          it 'should return a ConceptScheme' do
+            Resource.find(concept_scheme.uri, opts).should be_a(PublishMyData::ConceptScheme)
+          end
+        end
+      end
+
+      context 'given an external concept scheme' do
+        let(:concept_scheme) { FactoryGirl.create(:external_concept_scheme) }
+
+        it 'should return a ThirdParty::ConceptScheme' do
+          Resource.find(concept_scheme.uri).should be_a(PublishMyData::ThirdParty::ConceptScheme)
+        end
+      end
+
+      context 'given an external ontology' do
+        let(:ontology) { FactoryGirl.create(:external_ontology) }
+        let(:domain) { 'http://pmde.test' }
+
+        it 'should return a ThirdParty::Ontology' do
+          Resource.find(ontology.uri).should be_a(PublishMyData::ThirdParty::Ontology)
+        end
+
+        context 'with an ontology class' do
+          let(:ontology_class) { ontology.classes.first }
+
+          it 'should return an OntologyClass given its URI' do
+            Resource.find(ontology_class.uri).should be_a(PublishMyData::OntologyClass)
+          end
+        end
+
+        context 'with an ontology property' do
+          let(:property) { ontology.properties.first }
+
+          it 'should return a Property given its URI' do
+            Resource.find(property.uri).should be_a(PublishMyData::Property)
+          end
+        end
+      end
+
+      context 'given a resource of unknown type' do
+        let(:resource) { FactoryGirl.create(:information_resource) }
+        let(:domain) { 'http://pmde.test' }
+
+        it 'should return a Resource' do
+          Resource.find(resource.uri).should be_a(PublishMyData::Resource)
+        end
+      end
+    end
   end
 end

data/spec/models/publish_my_data/third_party_concept_scheme_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe PublishMyData::ThirdParty::ConceptScheme do
+  let(:concept_scheme) { FactoryGirl.create(:external_concept_scheme) }
+
+  it_behaves_like 'an external vocabulary' do
+    let(:vocabulary) { concept_scheme }
+    let(:vocabulary_resource) { concept_scheme.concepts.first }
+  end
+
+  describe '#local?' do
+    it 'should be false' do
+      concept_scheme.local?.should be_false
+    end
+  end
+end

data/spec/models/publish_my_data/third_party_ontology_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe PublishMyData::ThirdParty::Ontology do
+  let(:ontology) { FactoryGirl.create(:external_ontology) }
+
+  it_behaves_like 'an external vocabulary' do
+    let(:vocabulary) { ontology }
+    let(:vocabulary_resource) { ontology.classes.first }
+  end
+
+  describe '#local?' do
+    it 'should be false' do
+      ontology.local?.should be_false
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -9,7 +9,8 @@ require 'active_support/core_ext/numeric/bytes'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+# NB: Relative to the dummy app!
+Dir[Rails.root.join("../support/*.rb")].each {|f| require f}
 
 RSpec.configure do |config|
 

data/spec/support/all_features.rb

@@ -0,0 +1,26 @@
+shared_examples_for PublishMyData::AllFeatures do
+  describe '#deprecated?' do
+    it 'should be false' do
+      resource.deprecated?.should be_false
+    end
+
+    context 'when the dataset has been deprecated' do
+      before { resource.rdf_type = [resource.rdf_type, resource.class.get_deprecated_rdf_type] }
+
+      it 'should be true' do
+        resource.deprecated?.should be_true
+      end
+    end
+  end
+
+  describe '#in_domain?' do
+    it 'should return true if the resource URI is in the given domain' do
+      host = URI(resource.uri).host
+      resource.in_domain?(host).should be_true
+    end
+
+    it 'should return false if the resource URI is not in the given domain' do
+      resource.in_domain?('http://google.com').should be_false
+    end
+  end
+end

data/spec/support/data_download.rb

@@ -0,0 +1,60 @@
+shared_examples 'a controller with a dump action' do
+  describe "#dump" do
+
+    before do
+      s3 = AWS::S3.new
+      bucket = s3.buckets[PublishMyData.downloads_s3_bucket]
+      bucket.clear! # wipe the bucket
+    end
+
+    context "where the given slug exists" do
+      context "when a download exists on s3" do
+        before do
+          # make some downloads.
+          s3 = AWS::S3.new
+          bucket = s3.buckets[PublishMyData.downloads_s3_bucket]
+          @object = bucket.objects.create(resource.download_prefix, 'data')
+          @object.acl = :public_read
+        end
+
+        it "should redirect to the latest download that exists for the resource" do
+          get :dump, :id => resource.slug, :use_route => :publish_my_data
+          response.should be_redirect
+          response.should redirect_to(@object.public_url.to_s)
+        end
+      end
+
+      context "when a download exists on s3 for a previous day" do
+        before do
+          # make some downloads.
+          s3 = AWS::S3.new
+          bucket = s3.buckets[PublishMyData.downloads_s3_bucket]
+
+          resource.modified = resource.modified - 1.day # temp. set the modified date so a new backup prefix is generated
+          @object = bucket.objects.create(resource.download_prefix, 'data')
+          resource.modified = resource.modified + 1.day # and now set it back again!
+          @object.acl = :public_read
+        end
+
+        it "should 404" do
+          get :dump, :id => resource.slug, :use_route => :publish_my_data
+          response.should be_not_found
+        end
+      end
+
+      context "when a download doesn't exist on s3" do
+        it "should 404" do
+          get :dump, :id => resource.slug, :use_route => :publish_my_data
+          response.should be_not_found
+        end
+      end
+    end
+
+    context "when a resource with that slug doesn't exist" do
+      it "should 404" do
+        get :dump, :id => "i-dont-exist", :use_route => :publish_my_data
+        response.should be_not_found
+      end
+    end
+  end
+end

data/spec/support/vocabularies.rb

@@ -0,0 +1,150 @@
+shared_examples 'an in-house vocabulary' do
+  shared_examples 'contains data from both data and metadata graphs' do
+    it 'should contain data about an associated resource in the data graph' do
+      dump.should include(vocabulary_resource.uri.to_s)
+    end
+
+    it 'should contain data from the metadata graph' do
+      dump.should include(vocabulary.label)
+    end
+  end
+
+  describe '#to_rdf' do
+    include_examples 'contains data from both data and metadata graphs' do
+      let(:dump) { vocabulary.to_rdf }
+    end
+
+    it 'should return valid rdf' do
+      RDF::Reader.for(:rdf).new(vocabulary.to_rdf) do |reader|
+        reader.readable?.should be_true
+      end
+    end
+  end
+
+  describe '#to_ttl' do
+    include_examples 'contains data from both data and metadata graphs' do
+      let(:dump) { vocabulary.to_ttl }
+    end
+
+    it 'should return valid turtle' do
+      RDF::Reader.for(:ttl).new(vocabulary.to_ttl) do |reader|
+        reader.readable?.should be_true
+      end
+    end
+  end
+
+  describe '#to_nt' do
+    include_examples 'contains data from both data and metadata graphs' do
+      let(:dump) { vocabulary.to_nt }
+    end
+
+    it 'should return valid n-triples' do
+      RDF::Reader.for(:ntriples).new(vocabulary.to_nt) do |reader|
+        reader.readable?.should be_true
+      end
+    end
+  end
+
+  describe '#to_json' do
+    include_examples 'contains data from both data and metadata graphs' do
+      let(:dump) { vocabulary.to_json }
+    end
+
+    it 'should return valid json' do
+      JSON.parse(vocabulary.to_json).should be_true
+    end
+  end
+end
+
+shared_examples 'an external vocabulary' do
+  shared_examples 'contains data from the data graph only' do
+    it 'should contain data from the data graph' do
+      dump.should include(vocabulary_resource.uri.to_s)
+    end
+
+    it 'should not contain data from the metadata graph' do
+      dump.should_not include(vocabulary.label)
+    end
+  end
+
+  describe '#to_rdf' do
+    include_examples 'contains data from the data graph only' do
+      let(:dump) { vocabulary.to_rdf }
+    end
+
+    it 'should return valid rdf' do
+      RDF::Reader.for(:rdf).new(vocabulary.to_rdf) do |reader|
+        reader.readable?.should be_true
+      end
+    end
+  end
+
+  describe '#to_ttl' do
+    include_examples 'contains data from the data graph only' do
+      let(:dump) { vocabulary.to_ttl }
+    end
+
+    it 'should return valid turtle' do
+      RDF::Reader.for(:ttl).new(vocabulary.to_ttl) do |reader|
+        reader.readable?.should be_true
+      end
+    end
+  end
+
+  describe '#to_nt' do
+    include_examples 'contains data from the data graph only' do
+      let(:dump) { vocabulary.to_nt }
+    end
+
+    it 'should return valid n-triples' do
+      RDF::Reader.for(:ntriples).new(vocabulary.to_nt) do |reader|
+        reader.readable?.should be_true
+      end
+    end
+  end
+
+  describe '#to_json' do
+    include_examples 'contains data from the data graph only' do
+      let(:dump) { vocabulary.to_json }
+    end
+
+    it 'should return valid json' do
+      JSON.parse(vocabulary.to_json).should be_true
+    end
+  end
+
+  context 'with metadata triples in the data graph' do
+    let!(:data_resource) do
+      r = PublishMyData::Ontology.new(vocabulary.uri, vocabulary.data_graph_uri)
+      r.title = 'Awesome Title, by Bob'
+      r.label = 'Awesome Title, by Bob'
+      r.comment = 'Awesome external vocabulary'
+      r.description = 'Awesome external vocabulary. Lorem Ipsum etc.'
+      r.publisher = 'http://example.com/people#Bob'
+      r.license = 'http://example.com/licenses#AwesomeLicence'
+      r.contact_email = 'mailto:bob@example.com'
+      r.save!
+      r
+    end
+
+    describe '#label' do
+      it 'should come from the metadata graph' do
+        vocabulary.label.should == vocabulary.read_attribute(:label)
+      end
+    end
+
+    describe '#tags' do
+      it 'should come from the metadata graph' do
+        vocabulary.tags.should == vocabulary.read_attribute(:tags)
+      end
+    end
+
+    ['comment', 'description', 'publisher', 'license', 'contact_email'].each do |field_name|
+      describe "##{field_name}" do
+        it 'should come from the data graph' do
+          vocabulary.send(field_name).should == data_resource.send(field_name)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publish_my_data
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70112141472920 !ruby/object:Gem::Requirement
+  requirement: &70216212925300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -25,10 +25,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70112141472920
+  version_requirements: *70216212925300
 - !ruby/object:Gem::Dependency
   name: tripod
-  requirement: &70112141483460 !ruby/object:Gem::Requirement
+  requirement: &70216212924640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,10 +36,10 @@ dependencies:
         version: 0.7.19
   type: :runtime
   prerelease: false
-  version_requirements: *70112141483460
+  version_requirements: *70216212924640
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70112141508140 !ruby/object:Gem::Requirement
+  requirement: &70216212924120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -47,10 +47,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112141508140
+  version_requirements: *70216212924120
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70112137405400 !ruby/object:Gem::Requirement
+  requirement: &70216212923700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -58,10 +58,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112137405400
+  version_requirements: *70216212923700
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70112137413840 !ruby/object:Gem::Requirement
+  requirement: &70216212923120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,10 +69,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112137413840
+  version_requirements: *70216212923120
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70112145230240 !ruby/object:Gem::Requirement
+  requirement: &70216212922660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -80,7 +80,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112145230240
+  version_requirements: *70216212922660
 description: The PublishMyData Rails Engine. Create rails apps with Linked Data functionality.
 email:
 - ric@swirrl.com
@@ -90,6 +90,9 @@ extra_rdoc_files: []
 files:
 - app/assets/javascripts/publish_my_data.js
 - app/assets/stylesheets/publish_my_data.css
+- app/controllers/concerns/publish_my_data/data_download.rb
+- app/controllers/concerns/publish_my_data/resource_rendering.rb
+- app/controllers/concerns/publish_my_data/sparql_processing.rb
 - app/controllers/publish_my_data/application_controller.rb
 - app/controllers/publish_my_data/datasets_controller.rb
 - app/controllers/publish_my_data/errors_controller.rb
@@ -98,20 +101,30 @@ files:
 - app/controllers/publish_my_data/resources_controller.rb
 - app/controllers/publish_my_data/sparql_controller.rb
 - app/controllers/publish_my_data/themes_controller.rb
+- app/controllers/publish_my_data/vocabularies_controller.rb
 - app/helpers/publish_my_data/application_helper.rb
 - app/helpers/publish_my_data/resources_helper.rb
 - app/helpers/publish_my_data/sparql_helper.rb
+- app/models/concerns/publish_my_data/all_features.rb
+- app/models/concerns/publish_my_data/basic_features.rb
+- app/models/concerns/publish_my_data/dataset_powers.rb
+- app/models/concerns/publish_my_data/defined_by_ontology.rb
 - app/models/publish_my_data/concept.rb
 - app/models/publish_my_data/concept_scheme.rb
 - app/models/publish_my_data/dataset.rb
+- app/models/publish_my_data/example_resource.rb
 - app/models/publish_my_data/ontology.rb
 - app/models/publish_my_data/ontology_class.rb
 - app/models/publish_my_data/property.rb
 - app/models/publish_my_data/rdf_type.rb
 - app/models/publish_my_data/resource.rb
 - app/models/publish_my_data/theme.rb
+- app/models/publish_my_data/third_party/concept_scheme.rb
+- app/models/publish_my_data/third_party/ontology.rb
+- app/models/publish_my_data/vocabulary.rb
 - app/views/layouts/publish_my_data/application.html.erb
 - app/views/layouts/publish_my_data/error.html.erb
+- app/views/publish_my_data/classes/show.html.erb
 - app/views/publish_my_data/concept_schemes/_concepts.html.erb
 - app/views/publish_my_data/concept_schemes/show.html.erb
 - app/views/publish_my_data/concepts/show.html.erb
@@ -121,13 +134,12 @@ files:
 - app/views/publish_my_data/errors/response_too_large.html.erb
 - app/views/publish_my_data/errors/timeout.html.erb
 - app/views/publish_my_data/errors/uncaught.html.erb
-- app/views/publish_my_data/ontologies/_classes.html.erb
-- app/views/publish_my_data/ontologies/_properties.html.erb
 - app/views/publish_my_data/ontologies/show.html.erb
 - app/views/publish_my_data/properties/show.html.erb
 - app/views/publish_my_data/resources/_predicates_table.html.erb
 - app/views/publish_my_data/resources/_predicates_table_head.html.erb
 - app/views/publish_my_data/resources/_resource_formats.html.erb
+- app/views/publish_my_data/resources/_summaries.html.erb
 - app/views/publish_my_data/resources/_uri_and_label.html.erb
 - app/views/publish_my_data/resources/index.html.erb
 - app/views/publish_my_data/resources/show.html.erb
@@ -147,23 +159,9 @@ files:
 - config/initializers/00_tripod.rb
 - config/initializers/10_vocabularies.rb
 - config/initializers/20_s3_setup.rb
-- config/initializers/zz_factories.rb
 - config/routes.rb
-- lib/publish_my_data/concerns/controllers/resource.rb
-- lib/publish_my_data/concerns/controllers/sparql.rb
-- lib/publish_my_data/concerns/models/resource.rb
-- lib/publish_my_data/concerns.rb
-- lib/publish_my_data/defined_by_ontology.rb
 - lib/publish_my_data/engine.rb
 - lib/publish_my_data/paginator.rb
-- lib/publish_my_data/render_params/concept_render_params.rb
-- lib/publish_my_data/render_params/concept_scheme_render_params.rb
-- lib/publish_my_data/render_params/dataset_render_params.rb
-- lib/publish_my_data/render_params/ontology_class_render_params.rb
-- lib/publish_my_data/render_params/ontology_render_params.rb
-- lib/publish_my_data/render_params/property_render_params.rb
-- lib/publish_my_data/render_params/resource_render_params.rb
-- lib/publish_my_data/render_params.rb
 - lib/publish_my_data/renderers.rb
 - lib/publish_my_data/sparql_query.rb
 - lib/publish_my_data/sparql_query_result.rb
@@ -178,6 +176,7 @@ files:
 - spec/controllers/publish_my_data/resources_controller_spec.rb
 - spec/controllers/publish_my_data/sparql_controller_spec.rb
 - spec/controllers/publish_my_data/themes_controller_spec.rb
+- spec/controllers/publish_my_data/vocabularies_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -210,6 +209,7 @@ files:
 - spec/factories/00_theme_factories.rb
 - spec/factories/concept_scheme_factories.rb
 - spec/factories/dataset_factories.rb
+- spec/factories/example_resource_factories.rb
 - spec/factories/ontology_factories.rb
 - spec/factories/property_factories.rb
 - spec/factories/resource_factories.rb
@@ -219,11 +219,20 @@ files:
 - spec/features/viewing_a_def_spec.rb
 - spec/features/viewing_a_doc_spec.rb
 - spec/features/viewing_resource_not_in_our_domain_spec.rb
+- spec/features/viewing_resources_spec.rb
+- spec/lib/publish_my_data/renderers_spec.rb
 - spec/lib/publish_my_data/sparql_query_spec.rb
+- spec/models/publish_my_data/concept_scheme_spec.rb
 - spec/models/publish_my_data/dataset_spec.rb
+- spec/models/publish_my_data/example_resource_spec.rb
+- spec/models/publish_my_data/ontology_spec.rb
 - spec/models/publish_my_data/resource_spec.rb
-- spec/renderers/publish_my_data/renderers_spec.rb
+- spec/models/publish_my_data/third_party_concept_scheme_spec.rb
+- spec/models/publish_my_data/third_party_ontology_spec.rb
 - spec/spec_helper.rb
+- spec/support/all_features.rb
+- spec/support/data_download.rb
+- spec/support/vocabularies.rb
 homepage: http://github.com/Swirrl/publish_my_data
 licenses: []
 post_install_message: 
@@ -238,7 +247,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3112249071899351957
+      hash: 3755761626571352511
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -257,6 +266,7 @@ test_files:
 - spec/controllers/publish_my_data/resources_controller_spec.rb
 - spec/controllers/publish_my_data/sparql_controller_spec.rb
 - spec/controllers/publish_my_data/themes_controller_spec.rb
+- spec/controllers/publish_my_data/vocabularies_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -289,6 +299,7 @@ test_files:
 - spec/factories/00_theme_factories.rb
 - spec/factories/concept_scheme_factories.rb
 - spec/factories/dataset_factories.rb
+- spec/factories/example_resource_factories.rb
 - spec/factories/ontology_factories.rb
 - spec/factories/property_factories.rb
 - spec/factories/resource_factories.rb
@@ -298,8 +309,17 @@ test_files:
 - spec/features/viewing_a_def_spec.rb
 - spec/features/viewing_a_doc_spec.rb
 - spec/features/viewing_resource_not_in_our_domain_spec.rb
+- spec/features/viewing_resources_spec.rb
+- spec/lib/publish_my_data/renderers_spec.rb
 - spec/lib/publish_my_data/sparql_query_spec.rb
+- spec/models/publish_my_data/concept_scheme_spec.rb
 - spec/models/publish_my_data/dataset_spec.rb
+- spec/models/publish_my_data/example_resource_spec.rb
+- spec/models/publish_my_data/ontology_spec.rb
 - spec/models/publish_my_data/resource_spec.rb
-- spec/renderers/publish_my_data/renderers_spec.rb
+- spec/models/publish_my_data/third_party_concept_scheme_spec.rb
+- spec/models/publish_my_data/third_party_ontology_spec.rb
 - spec/spec_helper.rb
+- spec/support/all_features.rb
+- spec/support/data_download.rb
+- spec/support/vocabularies.rb