fix conten-type crosscite#98

digitaldogsbody · Mar 25, 2020 · 76e7cbe · 76e7cbe
1 parent 2b1e39a
commit 76e7cbe
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 53 deletions.
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
@@ -13,7 +13,7 @@
 Mime::Type.register "application/vnd.crosscite.crosscite+json", :crosscite
 Mime::Type.register "application/vnd.datacite.datacite+xml", :datacite, %w(application/x-datacite+xml)
 Mime::Type.register "application/vnd.datacite.datacite+json", :datacite_json
-Mime::Type.register "application/vnd.schemaorg.ld+json", :schema_org, %w(application/ld-json)
+Mime::Type.register "application/vnd.schemaorg.ld+json", :schema_org, %w(application/ld+json)
 Mime::Type.register "application/vnd.jats+xml", :jats
 Mime::Type.register "application/vnd.citationstyles.csl+json", :citeproc, %w(application/citeproc+json)
 Mime::Type.register "application/vnd.codemeta.ld+json", :codemeta

diff --git a/config/routes.rb b/config/routes.rb
@@ -6,7 +6,7 @@
   get '/application/vnd.datacite.datacite+json/:id', :to => 'index#show', constraints: { :id => /.+/ }, defaults: { format: :datacite_json }
   get '/application/vnd.crosscite.crosscite+json/:id', :to => 'index#show', constraints: { :id => /.+/ }, defaults: { format: :crosscite }
   get '/application/vnd.schemaorg.ld+json/:id', :to => 'index#show', constraints: { :id => /.+/ }, defaults: { format: :schema_org }
-  get '/application/ld-json/:id', :to => 'index#show', constraints: { :id => /.+/ }, defaults: { format: :schema_org }
+  get '/application/ld+json/:id', :to => 'index#show', constraints: { :id => /.+/ }, defaults: { format: :schema_org }
   get '/application/vnd.codemeta.ld+json/:id', :to => 'index#show', constraints: { :id => /.+/ }, defaults: { format: :codemeta }
   get '/application/vnd.citationstyles.csl+json/:id', :to => 'index#show', constraints: { :id => /.+/ }, defaults: { format: :citeproc }
   get '/application/vnd.jats+xml/:id', :to => 'index#show', constraints: { :id => /.+/ }, defaults: { format: :jats }

diff --git a/spec/api/api_spec.rb b/spec/api/api_spec.rb
@@ -96,17 +96,17 @@
     end
   end
 
-  context "application/ld-json" do
+  context "application/ld+json" do
     it "header" do
-      get "/#{doi}", nil, { "HTTP_ACCEPT" => "application/ld-json" }
+      get "/#{doi}", nil, { "HTTP_ACCEPT" => "application/ld+json" }
 
       expect(last_response.status).to eq(200)
       response = JSON.parse(last_response.body)
       expect(response["@type"]).to eq("BlogPosting")
     end
 
     it "link" do
-      get "/application/ld-json/#{doi}"
+      get "/application/ld+json/#{doi}"
 
       expect(last_response.status).to eq(200)
       response = JSON.parse(last_response.body)
@@ -412,17 +412,17 @@
     end
   end
 
-  context "application/ld-json" do
+  context "application/ld+json" do
     it "header" do
-      get "/#{doi}", nil, { "HTTP_ACCEPT" => "application/ld-json" }
+      get "/#{doi}", nil, { "HTTP_ACCEPT" => "application/ld+json" }
 
       expect(last_response.status).to eq(200)
       response = JSON.parse(last_response.body)
       expect(response["@type"]).to eq("ScholarlyArticle")
     end
 
     it "link" do
-      get "/application/ld-json/#{doi}"
+      get "/application/ld+json/#{doi}"
 
       expect(last_response.status).to eq(200)
       response = JSON.parse(last_response.body)

diff --git a/spec/concerns/helpable_spec.rb b/spec/concerns/helpable_spec.rb
@@ -30,7 +30,7 @@
         "application/vnd.schemaorg.ld+json"=>:schema_org,
         "application/vnd.citationstyles.csl+json"=>:citeproc,
         "application/citeproc+json"=>:citeproc,
-        "application/ld-json" => :schema_org,
+        "application/ld+json" => :schema_org,
         "application/vnd.codemeta.ld+json"=>:codemeta,
         "application/x-bibtex" => :bibtex,
         "application/x-research-info-systems"=>:ris,

diff --git a/...egotiation/application/ld-json/header.yml → ...egotiation/application/ld_json/header.yml b/...egotiation/application/ld-json/header.yml → ...egotiation/application/ld_json/header.yml
diff --git a/..._negotiation/application/ld-json/link.yml → ..._negotiation/application/ld_json/link.yml b/..._negotiation/application/ld-json/link.yml → ..._negotiation/application/ld_json/link.yml
diff --git a/...n_crossref/application/ld-json/header.yml → ...n_crossref/application/ld_json/header.yml b/...n_crossref/application/ld-json/header.yml → ...n_crossref/application/ld_json/header.yml
diff --git a/...ion_crossref/application/ld-json/link.yml → ...ion_crossref/application/ld_json/link.yml b/...ion_crossref/application/ld-json/link.yml → ...ion_crossref/application/ld_json/link.yml
diff --git a/...s/vcr_cassettes/content_negotiation_crossref/application/vnd_schemaorg_ld_json/header.yml b/...s/vcr_cassettes/content_negotiation_crossref/application/vnd_schemaorg_ld_json/header.yml
diff --git a/...res/vcr_cassettes/content_negotiation_crossref/application/vnd_schemaorg_ld_json/link.yml b/...res/vcr_cassettes/content_negotiation_crossref/application/vnd_schemaorg_ld_json/link.yml