publish_my_data 0.0.32 → 1.0.0

data/app/views/publish_my_data/shared/_google_analytics.html.haml

@@ -0,0 +1,11 @@
+- if true #Rails.env.to_s == 'production'
+  :javascript
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-0000000-00']);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();

data/app/views/publish_my_data/shared/_logo.html.haml

@@ -0,0 +1 @@
+%h1 Your logo here.

data/app/views/publish_my_data/shared/_meta_title.html.haml

@@ -0,0 +1,2 @@
+Your App Name Here
+= yield :page_title

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

@@ -0,0 +1,28 @@
+= form_tag sparql_endpoint_path, method: :get do
+  .form-group
+    = text_area_tag :query, @query_text
+
+  - # this is the interpolation form:
+  - if @expected_variables && @expected_variables.any?
+    %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.
+
+      - @expected_variables.each do |v|
+
+        :ruby
+          field_options = {:class => 'field'}
+
+          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]
+
+  = submit_tag "Run Query", id: 'run-sparql-query'

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

@@ -0,0 +1,11 @@
+= render "publish_my_data/sparql/formats_dropdowns/#{@sparql_query.query_type.to_s}"
+
+:javascript
+  $(function() {
+    var formatSelect = $('.api-links select.formats');
+    formatSelect.change(function() {
+      var newVal = formatSelect.val();
+      $('.api-links code').text(newVal);
+    });
+    formatSelect.change(); // trigger the change.
+  });

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

@@ -0,0 +1,125 @@
+- page_title "SPARQL Endpoint"
+
+- content_for :crumbs do
+  %ol.breadcrumb
+    %li= link_to_home
+    %li SPARQL
+
+%article#sparql
+  %header
+    - if @sparql_query
+      %h1 SPARQL Query Results
+    - else
+      %h1 Run a SPARQL Query
+
+  - if @sparql_query || @error_message
+    %section#results
+      - if @error_message
+        #error-message
+          %h3 Sorry, your query failed to run.</h3>
+          %p= @error_message
+
+      - else
+        - unless @sparql_query.query_type == :select
+          - # not a select
+          #results.ascii
+            %pre~ @sparql_query_result.to_s
+
+        - else
+          - #selects
+          - #no script fallback is just the ascii-art version (paginated)
+          %noscript
+            :scss
+              #js-grid-results {
+                display:none;
+              }
+
+            %h3.results Results
+            #results.ascii.select
+              %pre~ @sparql_query_result.to_s
+            .pagination
+              = link_to("Previous #{@pagination_params.per_page} results".html_safe, params.merge({:page => (@pagination_params.page-1)}), class: 'previous' ) if @pagination_params.page > 1
+              = link_to("Next #{@pagination_params.per_page} results".html_safe, params.merge({:page => (@pagination_params.page+1)}), class: 'next' ) if @more_pages
+
+          - #js version here:
+          #js-grid-results
+            .grid-status
+              .status-value
+              = image_tag("publish_my_data/small-spinner.gif", alt: "busy", style: "display:none", class: "busy")
+
+            #results-grid.data-grid
+              - # results go in here.
+            .grid-footer
+              .footer-content
+                %a.download-csv{href: sparql_endpoint_url(format: 'csv', query: @sparql_query.query)}
+                  %i.icon-download
+                  Download Results as CSV
+
+            :javascript
+              // use this instead of $(function(){}) to fix slick grid stylesheet load issues.
+              $(window).load(function() {
+                var encodedQuery = "#{CGI.escape(@sparql_query.query)}"; // note that we encode on the server so we don't hit the multiline JS prob
+                new Swirrl.SparqlResultsGrid(encodedQuery);
+              });
+
+  %section#Query
+    - if @sparql_query
+      %h3 Edit the query
+    - else
+      %h3 Enter a query
+
+    = render 'publish_my_data/sparql/form'
+
+  %footer.api
+    - query_params = { :query => params[:query] }.merge(@interpolations||{})
+    %h3 Permalink
+    %code.click-to-select.permalink
+      = sparql_endpoint_url(query_params)
+
+    - if @sparql_query && !@error_message
+
+      %h3 API
+      %div.api-links
+        %p
+          %span
+            Request this
+            %strong complete set
+            of results as
+          = render 'publish_my_data/sparql/formats_dropdown', :query_params => query_params
+          %span
+            by issuing an HTTP GET request to the following URL:
+
+        %code.click-to-select
+          = sparql_endpoint_url(query_params.merge(:format => 'format'))
+        %p
+          Don't forget you can also use the links at the foot of the page.
+
+  %footer.alternative-formats
+
+    - if @error_message || (!@sparql_query) || @sparql_query.query_type == :unknown
+      :markdown
+        This **page** is available as:
+      %ul
+        %li HTML
+
+    - else
+      :markdown
+        The **complete set of results** is available as:
+      -if @sparql_query.query_type == :select
+        %ul
+          %li= link_to_sparql_results_format("XML", "xml", @sparql_query.query)
+          %li= link_to_sparql_results_format("JSON", "json", @sparql_query.query)
+          %li= link_to_sparql_results_format("CSV", "csv", @sparql_query.query)
+          %li= link_to_sparql_results_format("Text", "text", @sparql_query.query)
+
+      -elsif @sparql_query.query_type == :construct || @sparql_query.query_type == :describe
+        %ul
+          %li= link_to_sparql_results_format( "N-triples", "nt", @sparql_query.query )
+          %li= link_to_sparql_results_format( "Turtle", "ttl", @sparql_query.query )
+          %li= link_to_sparql_results_format( "RDF/XML", "rdf", @sparql_query.query )
+
+      -elsif @sparql_query.query_type == :ask
+        %ul
+          %li= link_to_sparql_results_format( "JSON", "json", @sparql_query.query )
+          %li= link_to_sparql_results_format( "XML", "xml", @sparql_query.query )
+          %li= link_to_sparql_results_format( "Text", "text", @sparql_query.query )

data/app/views/publish_my_data/sparql/formats_dropdowns/_ask.html.haml

@@ -0,0 +1,7 @@
+%select.formats{style:'display:inline;'}
+  %option{value: sparql_endpoint_url(:format => 'json', :query => @sparql_query.query)}
+    JSON
+  %option{value: sparql_endpoint_url(:format => 'xml', :query => @sparql_query.query)}
+    XML
+  %option{value: sparql_endpoint_url(:format => 'txt', :query => @sparql_query.query)}
+    Text

data/app/views/publish_my_data/sparql/formats_dropdowns/_construct.html.haml

@@ -0,0 +1,7 @@
+%select.formats{style:'display:inline;'}
+  %option{value: sparql_endpoint_url(:format => 'ttl', :query => @sparql_query.query)}
+    Turtle
+  %option{value: sparql_endpoint_url(:format => 'nt', :query => @sparql_query.query)}
+    N-triples
+  %option{value: sparql_endpoint_url(:format => 'rdf', :query => @sparql_query.query)}
+    RDF/XML

data/app/views/publish_my_data/sparql/formats_dropdowns/_describe.html.haml

@@ -0,0 +1 @@
+= render 'publish_my_data/sparql/formats_dropdowns/construct'

data/app/views/publish_my_data/sparql/formats_dropdowns/_select.html.haml

@@ -0,0 +1,9 @@
+%select.formats{style:'display:inline;'}
+  %option{value: sparql_endpoint_url(:format => 'json', :query => @sparql_query.query)}
+    JSON
+  %option{value: sparql_endpoint_url(:format => 'xml', :query => @sparql_query.query)}
+    XML
+  %option{value: sparql_endpoint_url(:format => 'csv', :query => @sparql_query.query)}
+    CSV
+  %option{value: sparql_endpoint_url(:format => 'text', :query => @sparql_query.query)}
+    Text

data/app/views/publish_my_data/themes/index.html.haml

@@ -0,0 +1,30 @@
+- page_title "Themes"
+
+- content_for :crumbs do
+  %ol.breadcrumb
+    %li= link_to_home
+    %li Themes
+
+%section#themes
+  %header
+    %h1 Themes
+    %p The datasets in this site are collected into #{pluralize @themes.length, "broad themes"}.
+
+  %ul
+    - @themes.each do |theme|
+      %li
+        %h3= link_to (theme.label || theme.uri), theme
+        %p.comment= theme.comment
+        %p.dataset-count= pluralize( theme.datasets_count, "dataset" )
+
+
+  %footer.alternative-formats
+    :markdown
+      This **list of themes** is available as
+
+    %ul
+      %li HTML
+      %li= link_to 'N-triples', format: 'nt'
+      %li= link_to "Turtle", format: 'ttl'
+      %li= link_to "RDF/XML", format: 'rdf'
+      %li= link_to "JSON", format: 'json'

data/app/views/publish_my_data/themes/show.html.haml

@@ -0,0 +1,43 @@
+- page_title "Theme: #{@theme.label || @theme.uri}"
+
+- content_for :crumbs do
+  %ol.breadcrumb
+    %li= link_to_home
+    %li= link_to "Themes", themes_path
+    %li Theme
+
+%article#theme
+  %header
+    %h3 Theme
+    %h1= @theme.label || @theme.uri
+    %h3 Comment
+    %p
+      = @theme.comment
+      = link_to "Metadata for this theme", resource_path_from_uri(@theme.uri)
+
+  %section#datasets
+    %h3= pluralize(@datasets.length, "dataset")
+
+    %ul
+      - @datasets.each do |dataset|
+        %li
+          %h3= link_to dataset.title, dataset
+          %p
+            =dataset.comment
+            - if dataset.deprecated?
+              %span.discontinued
+                %i.icon.-warning
+                Discontinued
+    - if pagination_required?(@datasets, @pagination_params)
+      = paginate @datasets
+
+  %footer.alternative-formats
+    :markdown
+      This **page of datasets** is available as:
+
+    %ul
+      %li HTML
+      %li= link_to('N-triples', :format => 'nt', :page => @pagination_params.page, :per_page => @pagination_params.per_page)
+      %li= link_to("Turtle", :format => 'ttl', :page => @pagination_params.page, :per_page => @pagination_params.per_page)
+      %li= link_to("RDF/XML", :format => 'rdf', :page => @pagination_params.page, :per_page => @pagination_params.per_page)
+      %li= link_to("JSON", :format => 'json', :page => @pagination_params.page, :per_page => @pagination_params.per_page)

data/config/routes.rb

@@ -8,10 +8,23 @@ PublishMyData::Engine.routes.draw do
 
   # datasets
 
+  # data cube stuff
+  match "/data/*id/cube/dimensions(.:format)" => "data_cube/dimensions#index" # list the dimensions for the cube
+  match "/data/*id/cube/measure(.:format)" => "data_cube/dimensions#measure" # the measure property for the cube
+  match "/data/*id/cube/dimension_values(.:format)" => "data_cube/dimensions#values" # all values for a single dimension in the cube. Useful for getting axes.
+  match "/data/*id/cube/dimension_size(.:format)" => "data_cube/dimensions#size" # number of values for a dimension in the cube.
+  match "/data/*id/cube/recommended_dimensions(.:format)" => "data_cube/dimensions#recommended" # recommended dimensions to use.
+  match "/data/*id/cube/observations(.:format)" => "data_cube/observations#index", as: :cube_observations # supply row, col and locked dimensions as query string parameters
+
+  # example resources for datasets
+  match "/data/*id/example-data" => "example_resources#index", as: :example_resources
+
+  # dataset resource
   # 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#data"
   match "/data/*id" => "information_resources#data", :as => 'dataset'
+
+  #dataset list
   match "/data(.:format)" => "datasets#index",  :as => 'datasets'
 
   # themes
@@ -22,10 +35,6 @@ 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/*id.:format" => "information_resources#def"
   match "/def/*id" => "information_resources#def"
@@ -36,6 +45,12 @@ PublishMyData::Engine.routes.draw do
   # SPARQL
   match "sparql(.:format)" => "sparql#endpoint", :as => 'sparql_endpoint' # the main sparql endpoint
 
+  # Static pages
+  match "/docs" => "home#docs", :as => 'developer_docs'
+  match "/privacy" => "home#privacy", :as => 'privacy'
+  match "/accessibility" => "home#accessibility", :as => 'accessibility'
+  match "/" => 'home#home', :as => 'home'
+
   #http://techoctave.com/c7/posts/36-rails-3-0-rescue-from-routing-error-solution
   match '*a', :to => 'errors#routing'
 end

data/lib/publish_my_data/version.rb

@@ -1,3 +1,3 @@
 module PublishMyData
-  VERSION = "0.0.32"
+  VERSION = "1.0.0"
 end

data/lib/publish_my_data.rb

@@ -6,7 +6,8 @@ require "publish_my_data/paginator"
 
 # 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}
+
+require File.expand_path('../../app/models/concerns/publish_my_data/cube_results.rb', __FILE__)
 
 # 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__)
@@ -51,13 +52,6 @@ module PublishMyData
   mattr_accessor :max_resources_per_page
   @@max_resources_per_page = 1000
 
-  mattr_accessor :aws_default_host
-  @@aws_default_host = 's3-eu-west-1.amazonaws.com'
-
-  mattr_accessor :aws_access_key_id
-  mattr_accessor :aws_secret_access_key
-  mattr_accessor :downloads_s3_bucket
-
 
   # Use +configure+ to override PublishMyData configuration in an app, e.g.:
   # (defaults shown)
@@ -70,10 +64,6 @@ module PublishMyData
   #     config.default_html_resources_per_page = 20
   #     config.default_html_sparql_per_page = 20
   #     config.max_resources_per_page = 1000
-  #     config.aws_default_host = 's3-eu-west-1.amazonaws.com'
-  #     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')
   #       # note: if using memcached, make sure you set the -I (slab size) to big enough to store each result (i.e. to more than SparqlQueryResult.MAX_SIZE)
   #       # and set the -m (total size) to something quite big (or the cache will recycle too often).
@@ -87,6 +77,11 @@ end
 require 'kaminari'
 require 'rdiscount'
 require 'aws-sdk'
+require 'rails_autolink'
+require 'haml-rails'
+require 'sass-rails'
+require 'jquery-rails'
+require 'entypo-rails'
 
 Kaminari.configure do |config|
   config.default_per_page = 20

data/spec/controllers/publish_my_data/datasets_controller_spec.rb

@@ -112,80 +112,5 @@ module PublishMyData
 
     end
 
-    describe "#dump" do
-
-      before do
-        s3 = AWS::S3.new
-        bucket = s3.buckets[PublishMyData.downloads_s3_bucket]
-        bucket.clear! # wipe the bucket
-      end
-
-      context "and a dataset with the slug exists" do
-
-        let(:dataset) { FactoryGirl.create(:my_dataset) }
-
-        context "when a download exists on s3 for today" do
-
-          before do
-            # make some downloads.
-            s3 = AWS::S3.new
-            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')
-            @obj3 = bucket.objects.create("dataset_data_my|dataset_201007011202.nt.zip", 'data')
-            # this one's on another day:
-            @obj4 = bucket.objects.create("dataset_data_my|dataset_201007021202.nt.zip", 'data')
-
-            # make them public readable
-            [@obj1, @obj2, @obj3].each { |o| o.acl = :public_read }
-          end
-
-          it "should redirect to the latest download that exists for that dataset" do
-            get :dump, :id => dataset.slug, :use_route => :publish_my_data
-            response.should be_redirect
-            response.should redirect_to(@obj3.public_url.to_s)
-          end
-
-        end
-
-        context "when a download exists on s3 for today, but before the modified date" do
-
-          before do
-            # make some downloads.
-            s3 = AWS::S3.new
-            bucket = s3.buckets[PublishMyData.downloads_s3_bucket]
-
-            @obj1 = bucket.objects.create("dataset_data_#{dataset.slug}_201007011159.nt.zip", 'data')
-
-            # make them public readable
-            [@obj1].each { |o| o.acl = :public_read }
-          end
-
-          it "should 404" do
-            get :dump, :id => dataset.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 => dataset.slug, :use_route => :publish_my_data
-            response.should be_not_found
-          end
-        end
-
-      end
-
-      context "when a dataset 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
 end

data/spec/controllers/publish_my_data/information_resources_controller_spec.rb

@@ -42,23 +42,14 @@ 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
-
-    # dump a concept scheme
-    it_should_behave_like 'a controller with a dump action' do
-      let(:resource) { FactoryGirl.create(:concept_scheme) }
-    end
 
     describe '#data' do
       context "given a dataset" do
         let(:resource) { FactoryGirl.create(:my_dataset) }
 
         context 'as html' do
-          before { get :data, id: resource.slug, use_route: :publish_my_data } 
-            
+          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

data/spec/dummy/config/environments/development.rb

@@ -32,10 +32,6 @@ Dummy::Application.configure do
   PublishMyData.configure do |config|
     config.sparql_endpoint = 'http://localhost:3030/pmd/sparql'
     config.local_domain = 'pmd.dev'
-
-    config.downloads_s3_bucket = "publishmydata-dev"
-    config.aws_access_key_id = "AKIAIMGJ3RKNJJ6CVGTA"
-    config.aws_secret_access_key = "O0AylxAfa2dKj0eao3Y4ISYZXJrnGZyUs1U8sOlT"
   end
 
 end

data/spec/dummy/config/environments/test.rb

@@ -35,9 +35,5 @@ Dummy::Application.configure do
   PublishMyData.configure do |config|
     config.sparql_endpoint = 'http://localhost:3030/pmdtest/sparql'
     config.local_domain = 'pmdtest.dev'
-
-    config.downloads_s3_bucket = "publishmydata-dev"
-    config.aws_access_key_id = "AKIAIMGJ3RKNJJ6CVGTA"
-    config.aws_secret_access_key = "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"
   end
 end