publish_my_data 0.0.14 → 0.0.15

data/app/controllers/publish_my_data/application_controller.rb

@@ -9,12 +9,13 @@ module PublishMyData
 
     private
 
-    def is_request_html_format?
-      (request.format.to_sym || :html) == :html
+    def is_request_html_format?(c=self)
+      (c.request.format.to_sym || :html) == :html
     end
     # TODO: deal with javaascript errors - respond with 200
 
     def handle_uncaught_error(e)
+
       @e = e
 
       if defined?(Raven)

data/app/controllers/publish_my_data/datasets_controller.rb

@@ -6,7 +6,7 @@ module PublishMyData
     respond_to :html, :ttl, :rdf, :nt, :json, :text
 
     caches_action :show, :index,
-      :cache_path => Proc.new { |c| c.params }, :if => Proc.new { |c| c.request.format.html? }
+      :cache_path => Proc.new { |c| c.params }, :if => Proc.new { |c| is_request_html_format?(c) }
 
     # /data/:id (where :id is the dataset 'slug')
     def show

data/app/controllers/publish_my_data/resources_controller.rb

@@ -6,7 +6,7 @@ module PublishMyData
     respond_to :html, :ttl, :rdf, :nt, :json, :text
 
     caches_action :show, :index, :doc, :definition,
-      :cache_path => Proc.new { |c| c.params }, :if => Proc.new { |c| c.request.format.html? }
+      :cache_path => Proc.new { |c| c.params }, :if => Proc.new { |c| is_request_html_format?(c)  }
 
     # /resources
     # /resources?type=[http://type-uri]&dataset=[dataset-slug]
@@ -27,15 +27,20 @@ module PublishMyData
       # RubyProf.start
 
       uri = params[:uri]
-      begin
-        render_resource_with_uri(uri)
-      rescue Tripod::Errors::ResourceNotFound
-        # if it's not there
-        respond_to do |format|
-          format.html { redirect_to uri }
-          # This is meant for UI browsing only, really. Just 404 for other mimes.
-          format.any { render :nothing => true, :status => 404, :content_type => 'text/plain' }
+
+      if uri.present?
+        begin
+          render_resource_with_uri(uri)
+        rescue Tripod::Errors::ResourceNotFound
+          # if it's not there
+          respond_to do |format|
+            format.html { redirect_to uri }
+            # This is meant for UI browsing only, really. Just 404 for other mimes.
+            format.any { render :nothing => true, :status => 404, :content_type => 'text/plain' }
+          end
         end
+      else
+        raise Tripod::Errors::ResourceNotFound.new
       end
     end
 

data/app/controllers/publish_my_data/themes_controller.rb

@@ -4,9 +4,9 @@ module PublishMyData
   class ThemesController < ApplicationController
 
     caches_action :show, :index,
-      :cache_path => Proc.new { |c| c.params }, :if => Proc.new { |c| c.request.format.html? }
+      :cache_path => Proc.new { |c| c.params }, :if => Proc.new { |c| is_request_html_format?(c)  }
 
-    respond_to :html, :ttl, :rdf, :nt, :json
+    respond_to :html, :ttl, :rdf, :nt, :json, :text
 
     def index
       # don't bother paginating this for now - there probably wont be that many themes

data/lib/publish_my_data/version.rb

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

data/spec/controllers/publish_my_data/resources_controller_spec.rb

@@ -188,6 +188,15 @@ module PublishMyData
 
     describe "#show" do
 
+      context "with no uri parameter" do
+        before do
+          get :show, use_route: :publish_my_data
+        end
+        it "should respond with not found" do
+          response.should be_not_found
+        end
+      end
+
       context "with a resource not in our database" do
 
         uri = "http://purl.org/linked-data/sdmx/2009/dimension%23refArea"