publish_my_data 0.0.3 → 0.0.4

data/lib/publish_my_data/paginator.rb

@@ -0,0 +1,63 @@
+module PublishMyData
+
+  class PaginationParams
+
+    DEFAULT_PAGE_SIZE = 20
+    MAX_PAGE_SIZE = 10000
+
+    attr_accessor :page
+    attr_accessor :per_page
+    attr_accessor :offset
+    attr_accessor :format
+
+    # example opts:
+    #  {:per_page => 10, :page => 2, :format => :html}
+    def initialize(opts={})
+      self.per_page = (opts[:per_page] || PaginationParams::DEFAULT_PAGE_SIZE).to_i
+      self.per_page = PaginationParams::MAX_PAGE_SIZE if self.per_page > PaginationParams::MAX_PAGE_SIZE
+      self.page = (opts[:page] || 1).to_i
+      self.offset = self.per_page.to_i * (self.page.to_i-1)
+      self.format = opts[:format]
+    end
+
+    def self.from_request(request)
+      PaginationParams.new(per_page: request.params[:per_page], page: request.params[:page], format: request.format.to_sym)
+    end
+
+    def ==(other)
+      other.page == self.page &&
+        other.per_page == self.per_page &&
+        other.format == self.format
+    end
+
+  end
+
+  class Paginator
+
+    attr_accessor :pagination_params
+    attr_accessor :criteria
+
+    def initialize(criteria, pagination_params)
+      self.criteria = criteria
+      self.pagination_params = pagination_params
+    end
+
+    # returns a Kaminari paginatable array, or a plain old array
+    def paginate
+      count = criteria.count #this has to happen first, before we modify the criteria with limit/offset
+      resources = criteria.limit(self.pagination_params.per_page).offset(self.pagination_params.offset).resources
+
+      if self.pagination_params.format == :html
+        Kaminari.paginate_array(resources.to_a, total_count: count).page(self.pagination_params.page).per(self.pagination_params.per_page)
+      else
+        resources # non html versions just need the raw array
+      end
+    end
+
+    def ==(other)
+      self.pagination_params == other.pagination_params &&
+        self.criteria == other.criteria
+    end
+
+  end
+end

data/lib/publish_my_data/render_params/concept_render_params.rb

@@ -0,0 +1,14 @@
+module PublishMyData
+  class ConceptRenderParams
+
+    def initialize(resource)
+      @resource = resource
+      @concept = resource.as_concept
+    end
+
+    def render_params(opts={})
+      {template: 'publish_my_data/concepts/show', locals: {concept: @concept}}
+    end
+
+  end
+end

data/lib/publish_my_data/render_params/concept_scheme_render_params.rb

@@ -0,0 +1,14 @@
+module PublishMyData
+  class ConceptSchemeRenderParams
+
+    def initialize(resource)
+      @resource = resource
+      @concept_scheme = resource.as_concept_scheme
+    end
+
+    def render_params(opts={})
+      {template: 'publish_my_data/concept_schemes/show', locals: {concept_scheme: @concept_scheme}}
+    end
+
+  end
+end

data/lib/publish_my_data/render_params/ontology_class_render_params.rb

@@ -0,0 +1,14 @@
+module PublishMyData
+  class OntologyClassRenderParams
+
+    def initialize(resource)
+      @resource = resource
+      @ontology_class = resource.as_ontology_class
+    end
+
+    def render_params(opts={})
+      {template: 'publish_my_data/classes/show', locals: {ontology_class: @ontology_class}}
+    end
+
+  end
+end

data/lib/publish_my_data/render_params/ontology_render_params.rb

@@ -0,0 +1,14 @@
+module PublishMyData
+  class OntologyRenderParams
+
+    def initialize(resource)
+      @resource = resource
+      @ontology = resource.as_ontology
+    end
+
+    def render_params(opts={})
+      {template: 'publish_my_data/ontologies/show', locals: {ontology: @ontology}}
+    end
+
+  end
+end

data/lib/publish_my_data/render_params/property_render_params.rb

@@ -0,0 +1,14 @@
+module PublishMyData
+  class PropertyRenderParams
+
+    def initialize(resource)
+      @resource = resource
+      @property = resource.as_property
+    end
+
+    def render_params(opts={})
+      {template: 'publish_my_data/properties/show', locals: {property: @property}}
+    end
+
+  end
+end

data/lib/publish_my_data/render_params/resource_render_params.rb

@@ -0,0 +1,13 @@
+module PublishMyData
+  class ResourceRenderParams
+
+    def initialize(resource)
+      @resource = resource
+    end
+
+    def render_params(opts={})
+      {template: 'publish_my_data/resources/show', locals: {resource: @resource}}
+    end
+
+  end
+end

data/lib/publish_my_data/render_params/theme_render_params.rb

@@ -0,0 +1,23 @@
+module PublishMyData
+  class ThemeRenderParams
+
+    def initialize(resource)
+      @resource = resource
+      @theme = resource.as_theme
+    end
+
+    # e.g. opts[:pagination_params] => PaginationParams.new
+    def render_params(opts)
+      datasets = Paginator.new(@theme.datasets_criteria, opts[:pagination_params]).paginate
+      {
+         template: 'publish_my_data/themes/show',
+         locals: {
+           theme: @theme,
+           datasets: datasets,
+           pagination_params: opts[:pagination_params]
+         }
+      }
+    end
+
+  end
+end

data/lib/publish_my_data/render_params.rb

@@ -0,0 +1,7 @@
+require "publish_my_data/render_params/resource_render_params"
+require "publish_my_data/render_params/ontology_render_params"
+require "publish_my_data/render_params/theme_render_params"
+require "publish_my_data/render_params/property_render_params"
+require "publish_my_data/render_params/ontology_class_render_params"
+require "publish_my_data/render_params/concept_scheme_render_params"
+require "publish_my_data/render_params/concept_render_params"

data/lib/publish_my_data/resource_module.rb

@@ -0,0 +1,8 @@
+module PublishMyData
+  module ResourceModule
+    # Is this resource in the host domain?
+    def local?
+      uri.starts_with?("http://" + PublishMyData.local_domain)
+    end
+  end
+end

data/lib/publish_my_data/version.rb

@@ -1,3 +1,3 @@
 module PublishMyData
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/publish_my_data.rb

@@ -2,9 +2,13 @@ require "publish_my_data/engine"
 require "publish_my_data/renderers"
 require "publish_my_data/sparql_query"
 require "publish_my_data/sparql_query_result"
+require "publish_my_data/resource_module"
+require "publish_my_data/defined_by_ontology"
+require "publish_my_data/paginator"
+require "publish_my_data/render_params"
 
-module PublishMyData
 
+module PublishMyData
 
   # The local domain of the website. Used to decide if resources andexdsf
   # datasets are local or not
@@ -37,6 +41,7 @@ module PublishMyData
 end
 
 require 'kaminari'
+require 'rdiscount'
 
 Kaminari.configure do |config|
   config.default_per_page = 20

data/spec/controllers/publish_my_data/datasets_controller_spec.rb

@@ -87,7 +87,6 @@ module PublishMyData
           graph = Dataset.metadata_graph_uri(slug)
           d = PublishMyData::Dataset.new(uri, graph)
           d.title = "Dataset #{i.to_s}"
-          d.theme = (i.even? ? 'theme' : 'othertheme')
           d.save!
         end
       end
@@ -175,15 +174,6 @@ module PublishMyData
         end
       end
 
-      context "with a theme parameter" do
-        let(:theme) {'theme'}
-
-        it "should filter the results to only datasets in the theme" do
-          get :index, theme: theme, use_route: :publish_my_data
-          assigns['datasets'].length.should == 15 # only the even ones are in this theme
-        end
-      end
-
     end
 
   end

data/spec/controllers/publish_my_data/resources_controller_spec.rb

@@ -15,6 +15,7 @@ module PublishMyData
           response.status.should eq(303)
           response.should redirect_to "/doc/this/is/my/path"
         end
+
       end
 
       context "with an alternative mime type passed in the header" do
@@ -29,32 +30,31 @@ module PublishMyData
           response.content_type.should == Mime::RDF
         end
       end
-
     end
 
     describe "#doc" do
 
-      before do
-        @resource = FactoryGirl.create(:yuri_unicorn_resource)
-      end
+      let!(:resource) { FactoryGirl.create(:yuri_unicorn_resource) }
 
       it "should respond successfully" do
         get :doc, :path => "unicorns/yuri", use_route: :publish_my_data
         response.should be_success
       end
 
-      it "should render the show template" do
-        get :doc, :path => "unicorns/yuri", use_route: :publish_my_data
-        response.should render_template("publish_my_data/resources/show")
-      end
-
       context "for html" do
         it "should eager load the labels" do
-          Resource.should_receive(:find).and_return(@resource)
-          @resource.should_receive(:eager_load_predicate_triples!)
-          @resource.should_receive(:eager_load_object_triples!)
+          Resource.should_receive(:find).and_return(resource)
+          resource.should_receive(:eager_load_predicate_triples!)
+          resource.should_receive(:eager_load_object_triples!)
           get :doc, :path => "unicorns/yuri", use_route: :publish_my_data
         end
+
+        context "with an arbitrary resource" do
+          it "should render the show template" do
+            get :doc, :path => "unicorns/yuri", use_route: :publish_my_data
+            response.should render_template("publish_my_data/resources/show")
+          end
+        end
       end
 
       context "with an alternative mime type passed in the header" do
@@ -69,13 +69,13 @@ module PublishMyData
         end
 
         it "should respond with the right content" do
-          response.body.should == @resource.to_rdf
+          response.body.should == resource.to_rdf
         end
 
         it "should not eager load the labels" do
-          Resource.should_receive(:find).and_return(@resource)
-          @resource.should_not_receive(:eager_load_predicate_triples!)
-          @resource.should_not_receive(:eager_load_object_triples!)
+          Resource.should_receive(:find).and_return(resource)
+          resource.should_not_receive(:eager_load_predicate_triples!)
+          resource.should_not_receive(:eager_load_object_triples!)
           get :doc, :path => "unicorns/yuri", use_route: :publish_my_data
         end
 
@@ -98,7 +98,7 @@ module PublishMyData
 
         it "should respond with the right content" do
           get :doc, :path => "unicorns/yuri", format: 'ttl', use_route: :publish_my_data
-          response.body.should == @resource.to_ttl
+          response.body.should == resource.to_ttl
         end
 
       end
@@ -114,13 +114,26 @@ module PublishMyData
         end
 
       end
-
     end
 
     describe "#definition" do
 
+      let!(:resource) { FactoryGirl.create(:mean_result) }
+      let!(:theme) { FactoryGirl.create(:my_theme) }
+      let!(:onotology) { FactoryGirl.create(:ontology) }
+      let!(:concept_scheme) { FactoryGirl.create(:concept_scheme) }
+
       before do
-        @resource = FactoryGirl.create(:mean_result)
+        # make some datasets
+        (1..30).each do |i|
+          slug = i
+          uri = PublishMyData::Dataset.uri_from_slug(slug)
+          graph = PublishMyData::Dataset.metadata_graph_uri(slug)
+          d = PublishMyData::Dataset.new(uri, graph)
+          d.theme = theme.uri if i.even?
+          d.title = "Dataset #{i.to_s}"
+          d.save!
+        end
       end
 
       context "for resource in our database" do
@@ -130,19 +143,39 @@ module PublishMyData
           response.should be_success
         end
 
-        it "should render the doc template" do
-          get :definition, :path => "statistics/meanResult", use_route: :publish_my_data
-          response.should render_template("publish_my_data/resources/show")
+        context "for an html request" do
+
+          context "for an abitrary resource" do
+            it "should render the show template" do
+              get :definition, :path => "statistics/meanResult", use_route: :publish_my_data
+              response.should render_template("publish_my_data/resources/show")
+            end
+          end
+
+          context "when resource is an ontology" do
+            it "should render the ontologies#show template" do
+              get :definition, :path => "my-topic/ontology", use_route: :publish_my_data
+              response.should render_template("publish_my_data/ontologies/show")
+            end
+          end
+
+          context "when resource is a concept scheme" do
+            it "should render the concept_schemes#show template" do
+              get :definition, :path => "my-topic/concept-scheme/my-concept-scheme", use_route: :publish_my_data
+              response.should render_template("publish_my_data/concept_schemes/show")
+            end
+          end
+
         end
 
+
         context "with an alternative mime type" do
           it "should with the right mime type and content" do
             get :definition, :path => "statistics/meanResult", :format => 'nt', use_route: :publish_my_data
             response.content_type.should == Mime::NT
-            response.body.should == @resource.to_nt
+            response.body.should == resource.to_nt
           end
         end
-
       end
 
       context "when resource doesn't exist" do
@@ -151,7 +184,6 @@ module PublishMyData
           response.should be_not_found
         end
       end
-
     end
 
     describe "#show" do
@@ -188,30 +220,40 @@ module PublishMyData
 
       context "with a resource in our database" do
 
-        before do
-          uri = 'http://uri'
-          graph = 'http://graph'
-          r = Resource.new(uri, graph)
-          r.write_predicate('http://foo', 'blah')
-          r.save!
-
-          get :show, :uri => r.uri, use_route: :publish_my_data
-        end
+        let!(:resource) { FactoryGirl.create(:foreign_resource) }
+        let!(:external_concept_scheme) { FactoryGirl.create(:external_concept_scheme) }
+        let!(:external_ontology) { FactoryGirl.create(:external_ontology) }
 
         it "should respond succesfully" do
+          get :show, :uri => resource.uri, use_route: :publish_my_data
           response.should be_success
         end
 
         it "should render the show template" do
+          get :show, :uri => resource.uri, use_route: :publish_my_data
           response.should render_template("publish_my_data/resources/show")
         end
 
+        context "when resource is an ontology" do
+          it "should render the ontologies#show template" do
+            get :show, :uri => external_ontology.uri, use_route: :publish_my_data
+            response.should render_template("publish_my_data/ontologies/show")
+          end
+        end
+
+        context "when resource is a concept scheme" do
+          it "should render the concept_schemes#show template" do
+            get :show, :uri => external_concept_scheme.uri, use_route: :publish_my_data
+            response.should render_template("publish_my_data/concept_schemes/show")
+          end
+        end
+
       end
     end
 
     describe "#index" do
 
-       shared_examples_for "resource kaminari pagination" do
+      shared_examples_for "resource kaminari pagination" do
         it "should call kaminari to paginate the results" do
           res_array = Resource.all.limit(per_page).offset(offset).resources.to_a
           count = Resource.count
@@ -287,7 +329,7 @@ module PublishMyData
         end
 
         it "should return paginated results for Resource.all" do
-          subject.should_receive(:paginate_resources).with(Resource.all).and_call_original
+          Paginator.should_receive(:new).with(Resource.all, PaginationParams.from_request(@request)).and_call_original
           get :index, use_route: :publish_my_data
           assigns['resources'].length.should == 10 # 8 resources, plus ds and type!
         end
@@ -393,7 +435,5 @@ module PublishMyData
       end
     end
 
-
-
   end
 end