publish_my_data 1.0.3 → 1.0.4

data/app/helpers/publish_my_data/datasets_helper.rb

@@ -4,10 +4,6 @@ module PublishMyData
       DateTime.parse(date_string).to_s(:long)
     end
 
-    def link_to_resource_uri_or_label(resource, term)
-      link_to resource_uri_or_label(resource, term), resource_path_from_uri(term)
-    end
-
     def vocabulary_class(dataset, uri)
       dataset.ontologies.each_with_index do |ontology, index|
         uris = ontology.classes.map(&:uri) + ontology.properties.map(&:uri)

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

@@ -3,6 +3,11 @@ module PublishMyData
     class ConceptScheme < PublishMyData::ConceptScheme
       delegate :comment, :description, :license, :publisher, :contact_email, to: :data_resource
 
+      # if there's no data graph set, return the graph uri
+      def data_graph_uri
+        super || self.graph_uri
+      end
+
       # Overrides
       ['to_rdf', 'to_ttl', 'to_nt', 'to_json'].each do |method_name|
         define_method method_name do |opts={}|

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

@@ -3,6 +3,11 @@ module PublishMyData
     class Ontology < PublishMyData::Ontology
       delegate :comment, :description, :license, :publisher, :contact_email, to: :data_resource
 
+      # if there's no data graph set, return the graph uri
+      def data_graph_uri
+        super || self.graph_uri
+      end
+
       # Overrides
       ['to_rdf', 'to_ttl', 'to_nt', 'to_json'].each do |method_name|
         define_method method_name do |opts={}|

data/app/views/publish_my_data/datasets/_example_resources.html.haml

@@ -21,11 +21,11 @@
       - resource.predicates.each do |pred|
         %tr
           %td
-            %span(class="#{ vocabulary_class(dataset, pred) }")= link_to_resource_uri_or_label(resource, pred)
+            %span(class="#{ vocabulary_class(dataset, pred) }")= resource_uri_or_label(resource, pred)
           %td
             %ul
               - resource.read_predicate(pred).each do |obj|
-                %li(class="#{ vocabulary_class(dataset, obj) }")= link_to_resource_uri_or_label(resource, obj)
+                %li(class="#{ vocabulary_class(dataset, obj) }")= resource_uri_or_label(resource, obj)
 
       %tfoot
         %tr

data/app/views/publish_my_data/sparql/_form.html.haml

@@ -7,22 +7,24 @@
     %fieldset.sparql-parameters
       %legend Parameters
 
-      :markdown
-        Values supplied below will be substituted into the query in place of the <code>%{tokens}</code>. See the [developer docs](/docs) for more details.
+      .fields
+        - @expected_variables.each do |v|
 
-      - @expected_variables.each do |v|
+          :ruby
+            field_options = {:class => 'field'}
 
-        :ruby
-          field_options = {:class => 'field'}
+            if @missing_variables && @missing_variables.include?(v)
+              field_options.merge!(:class => 'field has-error')
+            end
 
-          if @missing_variables && @missing_variables.include?(v)
-            field_options.merge!(:class => 'field has-error')
-          end
+          - unless @reserved_variables_used && @reserved_variables_used.include?(v)
+            - # don't include reserved ones
+            = content_tag :div, field_options do
+              %label=v
+              = text_field_tag v, @interpolations[v]
+      .notes
+        :markdown
+          Values supplied will be substituted into the query in place of the <code>%{tokens}</code>. See the [developer docs](/docs) for more details.
 
-        - unless @reserved_variables_used && @reserved_variables_used.include?(v)
-          - # don't include reserved ones
-          = content_tag :div, field_options do
-            %label=v
-            = text_field_tag v, @interpolations[v]
-
-  = submit_tag "Run Query", id: 'run-sparql-query'
+  .run
+    = submit_tag "Run Query", id: 'run-sparql-query'

data/app/views/publish_my_data/sparql/endpoint.html.haml

@@ -13,7 +13,7 @@
       %h1 Run a SPARQL Query
 
   - if @sparql_query || @error_message
-    %section#results
+    %section.results
       - if @error_message
         #error-message
           %h3 Sorry, your query failed to run.</h3>
@@ -62,7 +62,7 @@
                 new Swirrl.SparqlResultsGrid(encodedQuery);
               });
 
-  %section#Query
+  %section.query
     - if @sparql_query
       %h3 Edit the query
     - else

data/lib/publish_my_data/version.rb

@@ -1,3 +1,3 @@
 module PublishMyData
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end