publish_my_data 0.0.13 → 0.0.14

data/app/controllers/publish_my_data/application_controller.rb

@@ -9,6 +9,9 @@ module PublishMyData
 
     private
 
+    def is_request_html_format?
+      (request.format.to_sym || :html) == :html
+    end
     # TODO: deal with javaascript errors - respond with 200
 
     def handle_uncaught_error(e)
@@ -30,20 +33,42 @@ module PublishMyData
         Rails.logger.info e.backtrace.join("\n")
         respond_to do |format|
           format.html { render(:template => "publish_my_data/errors/uncaught", :layout => 'publish_my_data/error', :status => 500) and return false }
-          format.any{ head(:status => 500, :content_type => 'text/plain') and return false }
+          format.any{ render(:text => 'Error', :status => 500, :content_type => 'text/plain') and return false }
         end
       end
 
     end
 
     def handle_timeout(e)
+      if defined?(Raven)
+        Raven.capture_message("query timeout", {
+          :extra => {
+            'url' => request.url
+          },
+          :tags => {
+            'message_type' => 'timeout'
+          },
+          :level => 'warning'
+        })
+      end
       respond_to do |format|
         format.html { render(:template => "publish_my_data/errors/timeout", :layout => 'publish_my_data/error', :status => 503) and return false }
-        format.any { head(:status => 503, :content_type => 'text/plain') and return false }
+        format.any { render(:text => 'Timeout', :status => 503, :content_type => 'text/plain') and return false }
       end
     end
 
     def handle_response_too_large(e)
+      if defined?(Raven)
+        Raven.capture_message("response too large", {
+          :extra => {
+            'url' => request.url
+          },
+          :tags => {
+            'message_type' => 'too_Large'
+          },
+          :level => 'warning'
+        })
+      end
       respond_to do |format|
         format.html { render(:template => "publish_my_data/errors/response_too_large", :layout => 'publish_my_data/error', :status => 400) and return false }
         format.any { render(:text => "Response too large.", :status => 400, :content_type => 'text/plain') and return false }
@@ -56,7 +81,7 @@ module PublishMyData
       Rails.logger.debug(e.backtrace.join("\n"))
       respond_to do |format|
         format.html { render(:template => "publish_my_data/errors/not_found", :layout => 'publish_my_data/error', :status => 404) and return false }
-        format.any { head(:status => 404, :content_type => 'text/plain') and return false }
+        format.any { render(:text => "Not Found" ,:status => 404, :content_type => 'text/plain') and return false }
       end
     end
 

data/app/controllers/publish_my_data/datasets_controller.rb

@@ -17,7 +17,7 @@ module PublishMyData
 
       @types = RdfType.where('?s a ?uri').graph(@dataset.data_graph_uri).resources
 
-      if request.format && request.format.html?
+      if is_request_html_format?
         @type_resource_counts = {}
         @resources_count = 0
         @types.each do |t|

data/app/controllers/publish_my_data/resources_controller.rb

@@ -67,7 +67,7 @@ module PublishMyData
     def render_resource_with_uri(uri)
       resource = Resource.find(uri)
 
-      if request.format.html?
+      if is_request_html_format?
         resource.eager_load_predicate_triples!(:labels_only => true)
         resource.eager_load_object_triples!(:labels_only => true)
       end

data/app/controllers/publish_my_data/sparql_controller.rb

@@ -12,7 +12,7 @@ module PublishMyData
       @query_text = params[:query]
 
       if @query_text.blank?
-        unless request.format.html? #the html view handles this ok
+        unless is_request_html_format? #the html view handles this ok
           render :text => "no query supplied", :status => 400
         end
       else

data/app/controllers/publish_my_data/themes_controller.rb

@@ -10,7 +10,7 @@ module PublishMyData
 
     def index
       # don't bother paginating this for now - there probably wont be that many themes
-      @themes = Theme.all.resources
+      @themes = Theme.all.where("?uri <#{RDF::RDFS.label}> ?label").order("?label").resources
       respond_with(@themes)
     end
 

data/lib/publish_my_data/concerns/controllers/sparql.rb

@@ -38,7 +38,7 @@ module PublishMyData
               # if there are pagination paramters, then use them
               if @pagination_params.per_page && @pagination_params.page
                 sparql_query_result = sparql_query.paginate(@pagination_params.page, @pagination_params.per_page)
-                if request.format.html?
+                if is_request_html_format?
                   count = sparql_query.as_pagination_query(@pagination_params.page, @pagination_params.per_page, 1).count
                   @more_pages = (count > @pagination_params.per_page)
                 end

data/lib/publish_my_data/paginator.rb

@@ -17,7 +17,7 @@ module PublishMyData
     end
 
     def self.from_request(request)
-      self.new(per_page: request.params[:per_page], page: request.params[:page], format: request.format.to_sym)
+      self.new(per_page: request.params[:per_page], page: request.params[:page], format: (request.format.to_sym || :html))
     end
 
     def ==(other)

data/lib/publish_my_data/version.rb

@@ -1,3 +1,3 @@
 module PublishMyData
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/spec/controllers/publish_my_data/datasets_controller_spec.rb

@@ -41,7 +41,7 @@ module PublishMyData
         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 be_blank
+            response.body.should == "Not Found"
           end
         end
       end
@@ -72,7 +72,7 @@ module PublishMyData
         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 be_blank
+            response.body.should == "Not Found"
           end
         end
 

data/spec/controllers/publish_my_data/resources_controller_spec.rb

@@ -83,7 +83,7 @@ module PublishMyData
           it "should 404 with a blank response" do
             get :doc, :path => "unicorns/borat", use_route: :publish_my_data
             response.should be_not_found
-            response.body.should be_blank
+            response.body.should == "Not Found"
           end
         end
 

data/spec/controllers/publish_my_data/themes_controller_spec.rb

@@ -66,7 +66,8 @@ module PublishMyData
 
           it "should respond with an empty body" do
             get :show, :id => "theme-that-doesnt-exist", :use_route => :publish_my_data, :format => 'rdf'
-            response.body.strip.should be_blank
+            response.body.strip.should == "Not Found"
+
           end
         end
       end