publish_my_data 0.0.29 → 0.0.30

data/app/models/publish_my_data/theme.rb

@@ -3,7 +3,7 @@ module PublishMyData
   class Theme
 
     include Tripod::Resource
-    include PublishMyData::Concerns::Models::Resource  #some common methods for resources.
+    include BasicFeatures
 
     class << self
       def theme_graph
@@ -18,9 +18,7 @@ module PublishMyData
     rdf_type RDF::SITE.Theme
     graph_uri Theme.theme_graph
 
-    field :label, RDF::RDFS.label
     field :slug, RDF::SKOS.notation
-    field :comment, RDF::RDFS.comment
 
     def datasets_count
       PublishMyData::SparqlQuery.new(datasets_query_str).count

data/app/models/publish_my_data/third_party/concept_scheme.rb

@@ -0,0 +1,30 @@
+module PublishMyData
+  module ThirdParty
+    class ConceptScheme < PublishMyData::ConceptScheme
+      delegate :comment, :description, :license, :publisher, :contact_email, to: :data_resource
+
+      # Overrides
+      ['to_rdf', 'to_ttl', 'to_nt', 'to_json'].each do |method_name|
+        define_method method_name do |opts={}|
+          resources = Resource.find_by_sparql("
+            SELECT DISTINCT ?uri
+            WHERE { GRAPH <#{self.data_graph_uri}> {?uri ?p ?o} }
+          ")
+          Tripod::ResourceCollection.new(resources).send(method_name)
+        end
+      end
+
+      def local?
+        false
+      end
+
+      private
+
+      def data_resource
+        @data_resource = PublishMyData::ConceptScheme.new(self.uri, self.data_graph_uri)
+        @data_resource.hydrate!
+        @data_resource
+      end
+    end
+  end
+end

data/app/models/publish_my_data/third_party/ontology.rb

@@ -0,0 +1,30 @@
+module PublishMyData
+  module ThirdParty
+    class Ontology < PublishMyData::Ontology
+      delegate :comment, :description, :license, :publisher, :contact_email, to: :data_resource
+
+      # Overrides
+      ['to_rdf', 'to_ttl', 'to_nt', 'to_json'].each do |method_name|
+        define_method method_name do |opts={}|
+          resources = Resource.find_by_sparql("
+            SELECT DISTINCT ?uri
+            WHERE { GRAPH <#{self.data_graph_uri}> {?uri ?p ?o} }
+          ")
+          Tripod::ResourceCollection.new(resources).send(method_name)
+        end
+      end
+
+      def local?
+        false
+      end
+
+      private
+
+      def data_resource
+        @data_resource = PublishMyData::Ontology.new(self.uri, self.data_graph_uri)
+        @data_resource.hydrate!
+        @data_resource
+      end
+    end
+  end
+end

data/app/models/publish_my_data/vocabulary.rb

@@ -0,0 +1,22 @@
+# A generic vocabulary class, used to retrieve/differentiate third-party vocabularies (ontologies *and* concept schemes)
+module PublishMyData
+  class Vocabulary
+    include Tripod::Resource
+    include AllFeatures
+
+    def self.find_by_data_dump(data_dump_uri)
+      all.where("?uri <#{RDF::VOID.dataDump}> <#{data_dump_uri}>").first
+    end
+
+    # override
+    def slug
+      uri_hash(self.uri)
+    end
+
+    private
+
+    def uri_hash(uri)
+      Digest::SHA1.hexdigest(uri)
+    end
+  end
+end

data/app/views/publish_my_data/classes/show.html.erb

@@ -0,0 +1,3 @@
+<%= render 'publish_my_data/resources/uri_and_label', resource: ontology_class %>
+<%= render 'publish_my_data/resources/predicates_table', resource: ontology_class %>
+<%= render 'publish_my_data/resources/resource_formats', resource: ontology_class %>

data/app/views/publish_my_data/concept_schemes/_concepts.html.erb

@@ -1,3 +1,18 @@
-<% concepts.each do |c| %>
-  <%= render 'publish_my_data/resources/predicates_table', :resource => c, :show_title => true %>
-<% end %>
+<table>
+  <thead>
+    <tr><th><%= pluralize concepts.length, 'concept' %></th></tr>
+  </thead>
+  <tbody>
+    <% concepts.each do |c| %>
+      <tr>
+        <td class="details">
+          <hgroup>
+            <h3><%= c.label %><br/></h3>
+            <%= link_to c.uri.to_s, c.uri.to_s %>
+          </hgroup>
+          <section><%= c.comment %></section>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/publish_my_data/concept_schemes/show.html.erb

@@ -1,9 +1,11 @@
 <h1>Concept Scheme: <%= concept_scheme.label || concept_scheme.uri %></h1>
 
+<%= concept_scheme.description %>
+
 <h2>Overview</h2>
 <%= render 'publish_my_data/resources/predicates_table', resource: concept_scheme %>
 
 <h2>Concepts</h2>
-<%= render 'publish_my_data/concept_schemes/concepts', concepts: concepts %>
+<%= render 'publish_my_data/concept_schemes/concepts', concepts: concept_scheme.concepts %>
 
 <%= render 'publish_my_data/resources/resource_formats', :resource => concept_scheme, :resource_descriptor => 'concept scheme' %>

data/app/views/publish_my_data/concepts/show.html.erb

@@ -1,3 +1,3 @@
-<%= render 'uri_and_label', resource: concept %>
-<%= render 'predicates_table', resource: concept %>
-<%= render 'resource_formats', resource: concept %>
+<%= render 'publish_my_data/resources/uri_and_label', resource: concept %>
+<%= render 'publish_my_data/resources/predicates_table', resource: concept %>
+<%= render 'publish_my_data/resources/resource_formats', resource: concept %>

data/app/views/publish_my_data/datasets/show.html.erb

@@ -4,9 +4,9 @@
 
 <h2> Types in this ds</h2>
 
-<% types.each do |t| %>
+<% dataset.types.each do |t| %>
   <%= link_to t.label || t.uri, resource_path_from_uri(t.uri) %>
-  (<%= link_to "#{type_resource_counts[t.uri.to_s]} resources", list_resources_path(dataset: dataset.slug, type_uri: t.uri)%>)
+  (<%= link_to "#{dataset.type_count(t)} resources", list_resources_path(dataset: dataset.slug, type_uri: t.uri)%>)
   <br/>
 <% end %>
 

data/app/views/publish_my_data/ontologies/show.html.erb

@@ -1,15 +1,15 @@
 <h1>Ontology <%= ontology.label || ontology.uri %></h1>
 
+<%= ontology.description %>
+
 <h2>Overview</h2>
 <%= render 'publish_my_data/resources/predicates_table', resource: ontology %>
 
-<h2>Classes</h2>
-<%= render 'publish_my_data/ontologies/classes', :ontology_classes => ontology_classes %>
-
-<br/>
+<h3>Classes</h3>
+<%= render 'publish_my_data/resources/summaries', :resources => ontology.classes %>
 
-<h2>Properties</h2>
-<%= render 'publish_my_data/ontologies/properties', :ontology_properties => ontology_properties %>
+<h3>Properties</h3>
+<%= render 'publish_my_data/resources/summaries', :resources => ontology.properties %>
 
 <br/><br/>
 

data/app/views/publish_my_data/properties/show.html.erb

@@ -1,3 +1,3 @@
-<%= render 'uri_and_label', resource: property %>
-<%= render 'predicates_table', resource: property %>
-<%= render 'resource_formats', resource: property %>
+<%= render 'publish_my_data/resources/uri_and_label', resource: property %>
+<%= render 'publish_my_data/resources/predicates_table', resource: property %>
+<%= render 'publish_my_data/resources/resource_formats', resource: property %>

data/app/views/publish_my_data/resources/_summaries.html.erb

@@ -0,0 +1,18 @@
+<table class="resources-summary">
+  <thead>
+    <tr><th><%= pluralize resources.length, 'resource' %></th></tr>
+  </thead>
+  <tbody>
+    <% resources.each do |r| %>
+      <tr>
+        <td class="details hardwrap">
+          <hgroup>
+            <h3><%= resource_uri_or_label(r, r.uri) %></h3>
+            <h4 class="click-to-select"><%= r.uri %></h4>
+          </hgroup>
+          <section><%= r.comment %></section>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/publish_my_data/resources/show.html.erb

@@ -1,3 +1,3 @@
-<%= render 'uri_and_label', resource: resource %>
-<%= render 'predicates_table', resource: resource %>
-<%= render 'resource_formats', resource: resource %>
+<%= render 'publish_my_data/resources/uri_and_label', resource: resource %>
+<%= render 'publish_my_data/resources/predicates_table', resource: resource %>
+<%= render 'publish_my_data/resources/resource_formats', resource: resource %>

data/config/routes.rb

@@ -10,8 +10,8 @@ PublishMyData::Engine.routes.draw do
 
   # note that the separate .:format and no-format verisons allow extensions like .json on the end of the uri not to be globbed as the *id
   match "/data/*id/dump" => "datasets#dump", :as => 'dataset_dump'
-  match "/data/*id.:format" => "information_resources#show"
-  match "/data/*id" => "information_resources#show", :as => 'dataset'
+  match "/data/*id.:format" => "information_resources#data"
+  match "/data/*id" => "information_resources#data", :as => 'dataset'
   match "/data(.:format)" => "datasets#index",  :as => 'datasets'
 
   # themes
@@ -22,9 +22,13 @@ PublishMyData::Engine.routes.draw do
   match "/doc/*path.:format" => "resources#doc"
   match "/doc/*path" => "resources#doc"
 
+  # download paths
+  match "/def/*id/dump" => "information_resources#dump"
+  match "/vocabularies/:id/dump" => "vocabularies#dump"
+
   # def pages
-  match "/def/*path.:format" => "resources#definition"
-  match "/def/*path" => "resources#definition"
+  match "/def/*id.:format" => "information_resources#def"
+  match "/def/*id" => "information_resources#def"
 
   # queries
   resources :queries, :only => [:show] # add index later

data/lib/publish_my_data.rb

@@ -1,11 +1,20 @@
 require "publish_my_data/engine"
-require "publish_my_data/concerns"
 require "publish_my_data/renderers"
 require "publish_my_data/sparql_query"
 require "publish_my_data/sparql_query_result"
-require "publish_my_data/defined_by_ontology"
 require "publish_my_data/paginator"
-require "publish_my_data/render_params"
+
+# A bit nasty, but these paths are included by default in Rails 4 so
+# this is only a temporary measure
+#Dir[File.expand_path('../../app/models/concerns/**/*.rb', __FILE__)].each {|f| require f}
+
+# load them in the right order so that dataset powers can access all features.
+require File.expand_path('../../app/models/concerns/publish_my_data/all_features.rb', __FILE__)
+require File.expand_path('../../app/models/concerns/publish_my_data/basic_features.rb', __FILE__)
+require File.expand_path('../../app/models/concerns/publish_my_data/dataset_powers.rb', __FILE__)
+require File.expand_path('../../app/models/concerns/publish_my_data/defined_by_ontology.rb', __FILE__)
+
+Dir[File.expand_path('../../app/controllers/concerns/**/*.rb', __FILE__)].each {|f| require f}
 
 
 module PublishMyData
@@ -47,7 +56,7 @@ module PublishMyData
 
   mattr_accessor :aws_access_key_id
   mattr_accessor :aws_secret_access_key
-  mattr_accessor :dataset_downloads_s3_bucket
+  mattr_accessor :downloads_s3_bucket
 
 
   # Use +configure+ to override PublishMyData configuration in an app, e.g.:
@@ -62,7 +71,7 @@ module PublishMyData
   #     config.default_html_sparql_per_page = 20
   #     config.max_resources_per_page = 1000
   #     config.aws_default_host = 's3-eu-west-1.amazonaws.com'
-  #     config.dataset_downloads_s3_bucket = nil # the s3 bucket for dataset dumps. Used for redirecting to the right location for dataset downloads.
+  #     config.downloads_s3_bucket = nil # the s3 bucket for dataset dumps. Used for redirecting to the right location for dataset downloads.
   #     config.aws_access_key_id = nil # the access key for the s3 bucket
   #     config.aws_secret_access_key = nil # the secret key for the s3 bucket
   #     config.tripod_cache_store = nil #e.g Tripod::CacheStores::MemcachedCacheStore.new('localhost:11211')

data/lib/publish_my_data/engine.rb

@@ -5,5 +5,8 @@ module PublishMyData
     config.generators do |g|
       g.test_framework :rspec
     end
+
+    config.autoload_paths << "./app/models/concerns"
+    config.autoload_paths << "./app/controllers/concerns"
   end
 end

data/lib/publish_my_data/version.rb

@@ -1,3 +1,3 @@
 module PublishMyData
-  VERSION = "0.0.29"
+  VERSION = "0.0.30"
 end

data/spec/controllers/publish_my_data/datasets_controller_spec.rb

@@ -116,7 +116,7 @@ module PublishMyData
 
       before do
         s3 = AWS::S3.new
-        bucket = s3.buckets[PublishMyData.dataset_downloads_s3_bucket]
+        bucket = s3.buckets[PublishMyData.downloads_s3_bucket]
         bucket.clear! # wipe the bucket
       end
 
@@ -129,7 +129,7 @@ module PublishMyData
           before do
             # make some downloads.
             s3 = AWS::S3.new
-            bucket = s3.buckets[PublishMyData.dataset_downloads_s3_bucket]
+            bucket = s3.buckets[PublishMyData.downloads_s3_bucket]
 
             @obj1 = bucket.objects.create("dataset_data_my|dataset_201007011200.nt.zip", 'data')
             @obj2 = bucket.objects.create("dataset_data_my|dataset_201007011201.nt.zip", 'data')
@@ -154,7 +154,7 @@ module PublishMyData
           before do
             # make some downloads.
             s3 = AWS::S3.new
-            bucket = s3.buckets[PublishMyData.dataset_downloads_s3_bucket]
+            bucket = s3.buckets[PublishMyData.downloads_s3_bucket]
 
             @obj1 = bucket.objects.create("dataset_data_#{dataset.slug}_201007011159.nt.zip", 'data')
 

data/spec/controllers/publish_my_data/information_resources_controller_spec.rb

@@ -1,159 +1,213 @@
 require 'spec_helper'
 
+shared_examples 'as json' do
+  it "should return its json" do
+    JSON.parse(response.body).should == JSON.parse(resource.to_json)
+  end
+
+  it "should respond successfully" do
+    response.should be_success
+  end
+end
+
+shared_examples 'as rdf' do
+  it "should return its rdf" do
+    response.body.should == resource.to_rdf
+  end
+
+  it "should respond successfully" do
+    response.should be_success
+  end
+end
+
+shared_examples 'as ttl' do
+  it "should return its ttl" do
+    response.body.should == resource.to_ttl
+  end
+
+  it "should respond successfully" do
+    response.should be_success
+  end
+end
+
+shared_examples "as n-triples" do
+  it "should return the its n-triples" do
+    response.body.should == resource.to_nt
+  end
+
+  it "should respond successfully" do
+    response.should be_success
+  end
+end
+
 module PublishMyData
   describe InformationResourcesController do
+    # dump an ontology
+    it_should_behave_like 'a controller with a dump action' do
+      let(:resource) { FactoryGirl.create(:ontology) }
+    end
 
-    describe "showing an information resource" do
-      let!(:resource) { FactoryGirl.create(:information_resource) }
+    # dump a concept scheme
+    it_should_behave_like 'a controller with a dump action' do
+      let(:resource) { FactoryGirl.create(:concept_scheme) }
+    end
 
-      shared_examples_for "resource show" do
+    describe '#data' do
+      context "given a dataset" do
+        let(:resource) { FactoryGirl.create(:my_dataset) }
 
-        context "for an existing resource" do
-          it  "should respond successfully" do
-            get :show, id: "information/resource", use_route: :publish_my_data, :format => format
-            response.should be_success
+        context 'as html' do
+          before { get :data, id: resource.slug, use_route: :publish_my_data } 
+            
+          it "should render the dataset show template" do
+            response.should render_template("publish_my_data/datasets/show")
           end
-        end
 
-        context "with a non-existent dataset slug" do
-          it "should respond with not found" do
-            get :show, id: "non-existent/resource", use_route: :publish_my_data, :format => format
-            response.should be_not_found
+          it "should respond successfully" do
+            response.should be_success
           end
         end
-      end
 
-      shared_examples_for "resource html format" do
-        it "should render the resource show template" do
-          get :show, id: "information/resource", use_route: :publish_my_data, :format => format
-          response.should render_template("publish_my_data/resources/show")
+        context "as rdf" do
+          before { get :data, id: resource.slug, use_route: :publish_my_data, :format => 'rdf' }
+          include_examples 'as rdf'
         end
-      end
 
-      shared_examples_for "resource non html format" do
+        context "as json" do
+          before { get :data, id: resource.slug, use_route: :publish_my_data, :format => 'json' }
+          include_examples 'as json'
+        end
 
-        context "for an existing resource" do
-          it "should return the resource in that format" do
-            get :show, id: "information/resource", use_route: :publish_my_data, :format => format
-            response.body.should == resource.send("to_#{format}")
-          end
+        context "as ttl" do
+          before { get :data, id: resource.slug, use_route: :publish_my_data, :format => 'ttl' }
+          include_examples 'as ttl'
         end
 
-        context "for a non-existent resource" do
-          it "should return a blank body" do
-            get :show, id: "non-existent/resource", use_route: :publish_my_data, :format => format
-            response.body.should == "Not Found"
-          end
+        context "as n-triples" do
+          before { get :data, id: resource.slug, use_route: :publish_my_data, :format => 'nt' }
+          include_examples 'as n-triples'
         end
       end
 
-      context "for html format" do
-        let(:format){ 'html' }
-        it_should_behave_like "resource html format"
-        it_should_behave_like "resource show"
-      end
+      context "given an arbitrary information resource which is not a dataset" do
+        let!(:resource) { FactoryGirl.create(:information_resource) }
 
-      # try another format.
-      context "for rdf format" do
-        let(:format){ 'rdf' }
-        it_should_behave_like "resource non html format"
-        it_should_behave_like "resource show"
-      end
+        context 'as html' do
+          before { get :data, id: "information/resource", use_route: :publish_my_data }
 
-    end
+          it "should render the resource show template" do
+            response.should render_template("publish_my_data/resources/show")
+          end
 
-    describe "showing a dataset" do
+          it "should respond successfully" do
+            response.should be_success
+          end
+        end
 
-      let(:dataset) { FactoryGirl.create(:my_dataset) }
+        context "as rdf" do
+          before { get :data, id: "information/resource", use_route: :publish_my_data, :format => 'rdf' }
+          include_examples 'as rdf'
+        end
 
-      shared_examples_for "dataset show" do
+        context "as json" do
+          before { get :data, id: "information/resource", use_route: :publish_my_data, :format => 'json' }
+          include_examples 'as json'
+        end
 
-        context "for an existing dataset" do
-          it  "should respond successfully" do
-            get :show, id: dataset.slug, use_route: :publish_my_data, :format => format
-            response.should be_success
-          end
+        context "as ttl" do
+          before { get :data, id: "information/resource", use_route: :publish_my_data, :format => 'ttl' }
+          include_examples 'as ttl'
         end
 
-        context "with a non-existent dataset slug" do
-          it "should respond with not found" do
-            get :show, id: "slug-that-doesnt-exist", use_route: :publish_my_data, :format => format
-            response.should be_not_found
-          end
+        context "as n-triples" do
+          before { get :data, id: "information/resource", use_route: :publish_my_data, :format => 'nt' }
+          include_examples 'as n-triples'
         end
       end
 
-      shared_examples_for "dataset html format" do
-        it "should render the dataset show template" do
-          get :show, id: dataset.slug, use_route: :publish_my_data, :format => format
-          response.should render_template("publish_my_data/datasets/show")
+      describe 'given a non-existent identifier' do
+        it "should respond with not found" do
+          get :data, id: "non-existent/resource", use_route: :publish_my_data
+          response.should be_not_found
         end
       end
+    end
 
-      shared_examples_for "dataset non html format" do
+    describe "#def" do
+      context "when resource is an ontology" do
+        let!(:resource) { FactoryGirl.create(:ontology) }
 
-        context "for an existing dataset" do
-          it "should return the dataset dtls in that format" do
-            get :show, id: dataset.slug, use_route: :publish_my_data, :format => format
-            response.body.should == dataset.send("to_#{format}")
-          end
+        it "should respond successfully" do
+          get :def, :id => "my-topic", use_route: :publish_my_data
+          response.should be_success
         end
 
-        context "for a non-existent dataset slug" do
-          it "should return a blank body" do
-            get :show, id: "slug-that-doesnt-exist", use_route: :publish_my_data, :format => format
-            response.body.should == "Not Found"
-          end
+        it "should render the ontologies#show template" do
+          get :def, :id => "my-topic", use_route: :publish_my_data
+          response.should render_template("publish_my_data/ontologies/show")
         end
-      end
 
-      context "for html format" do
-        let(:format){ 'html' }
-        it_should_behave_like "dataset html format"
-        it_should_behave_like "dataset show"
-      end
+        context "as rdf" do
+          before { get :def, :id => "my-topic", use_route: :publish_my_data, :format => 'rdf' }
+          include_examples 'as rdf'
+        end
+
+        context "as json" do
+          before { get :def, :id => "my-topic", use_route: :publish_my_data, :format => 'json' }
+          include_examples 'as json'
+        end
+
+        context "as ttl" do
+          before { get :def, :id => "my-topic", use_route: :publish_my_data, :format => 'ttl' }
+          include_examples 'as ttl'
+        end
 
-      context "for rdf format" do
-        let(:format){ 'rdf' }
-        it_should_behave_like "dataset non html format"
-        it_should_behave_like "dataset show"
+        context "as n-triples" do
+          before { get :def, :id => "my-topic", use_route: :publish_my_data, :format => 'nt' }
+          include_examples 'as n-triples'
+        end
       end
 
-      context "for json format" do
-        let(:format){ 'json' }
+      context "when resource is a concept scheme" do
+        let!(:resource) { FactoryGirl.create(:concept_scheme) }
 
-        # note: we don't use the shared example group here because the JSON format sometimes brings stuff back in different orders!
+        it "should respond successfully" do
+          get :def, :id => "my-topic", use_route: :publish_my_data
+          response.should be_success
+        end
 
-        context "for an existing dataset" do
-          it "should return the dataset dtls in that format" do
-            get :show, id: dataset.slug, use_route: :publish_my_data, :format => format
-            JSON.parse(response.body).should == JSON.parse(dataset.send("to_#{format}"))
-          end
+        it "should render the concept_schemes#show template" do
+          get :def, :id => "my-topic", use_route: :publish_my_data
+          response.should render_template("publish_my_data/concept_schemes/show")
         end
 
-        context "for a non-existent dataset slug" do
-          it "should return a blank body" do
-            get :show, id: "slug-that-doesnt-exist", use_route: :publish_my_data, :format => format
-            response.body.should == "Not Found"
-          end
+        context "as rdf" do
+          before { get :def, :id => "my-topic", use_route: :publish_my_data, :format => 'rdf' }
+          include_examples 'as rdf'
         end
 
-        it_should_behave_like "dataset show"
-      end
+        context "as json" do
+          before { get :def, :id => "my-topic", use_route: :publish_my_data, :format => 'json' }
+          include_examples 'as json'
+        end
 
-      context "for ttl format" do
-        let(:format){ 'ttl' }
-        it_should_behave_like "dataset non html format"
-        it_should_behave_like "dataset show"
-      end
+        context "as ttl" do
+          before { get :def, :id => "my-topic", use_route: :publish_my_data, :format => 'ttl' }
+          include_examples 'as ttl'
+        end
 
-      context "for ntriples format" do
-        let(:format){ 'nt' }
-        it_should_behave_like "dataset non html format"
-        it_should_behave_like "dataset show"
+        context "as n-triples" do
+          before { get :def, :id => "my-topic", use_route: :publish_my_data, :format => 'nt' }
+          include_examples 'as n-triples'
+        end
       end
 
+      context "when resource doesn't exist" do
+        it "should 404" do
+          get :def, :id => "statistics/nonExistent", use_route: :publish_my_data
+          response.should be_not_found
+        end
+      end
     end
-
   end
 end