rename Metadatum to Link, head to head_uuid, tail to tail_uuid

diff --git a/app/assets/javascripts/metadata.js.coffee b/app/assets/javascripts/links.js.coffee
similarity index 100%
rename from app/assets/javascripts/metadata.js.coffee
rename to app/assets/javascripts/links.js.coffee

diff --git a/app/assets/stylesheets/metadata.css.scss b/app/assets/stylesheets/links.css.scss
similarity index 63%
rename from app/assets/stylesheets/metadata.css.scss
rename to app/assets/stylesheets/links.css.scss
index bcefd20cdff950c47ec6679131e256fe1ecb89a2..220eb7091fa783ec5716ce111c69d89f9576833d 100644 (file)
--- a/app/assets/stylesheets/metadata.css.scss
+++ b/app/assets/stylesheets/links.css.scss
@@ -1,3 +1,3 @@
-// Place all the styles related to the Metadata controller here.
+// Place all the styles related to the Links controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e3f006b57692f3a40314c35b56427d2edc50751d..5dfb8bc8436e99b92dfee9be5ded1b49cc0d350f 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -123,6 +123,6 @@ class ApplicationController < ActionController::Base
   end
 
   def verify_api_token
-    Metadatum.where(uuid: 'the-philosophers-stone').size rescue false
+    Link.where(uuid: 'the-philosophers-stone').size rescue false
   end
 end

diff --git a/app/controllers/metadata_controller.rb b/app/controllers/links_controller.rb
similarity index 100%
rename from app/controllers/metadata_controller.rb
rename to app/controllers/links_controller.rb

diff --git a/app/helpers/links_helper.rb b/app/helpers/links_helper.rb
new file mode 100644 (file)
index 0000000..f6bc988
--- /dev/null
+++ b/app/helpers/links_helper.rb
@@ -0,0 +1,2 @@
+module LinksHelper
+end

diff --git a/app/helpers/metadata_helper.rb b/app/helpers/metadata_helper.rb
deleted file mode 100644 (file)
index 300d90e..0000000
--- a/app/helpers/metadata_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module MetadataHelper
-end

diff --git a/app/models/link.rb b/app/models/link.rb
new file mode 100644 (file)
index 0000000..4110261
--- /dev/null
+++ b/app/models/link.rb
@@ -0,0 +1,5 @@
+class Link < OrvosBase
+  def self.by_tail(t, opts={})
+    where(opts.merge :tail_kind => t.kind, :tail_uuid => t.uuid)
+  end
+end

diff --git a/app/models/metadatum.rb b/app/models/metadatum.rb
deleted file mode 100644 (file)
index 9b8fab4..0000000
--- a/app/models/metadatum.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class Metadatum < OrvosBase
-  def self.by_tail(t, opts={})
-    where(opts.merge :tail_kind => t.kind, :tail => t.uuid)
-  end
-end

diff --git a/app/models/orvos_base.rb b/app/models/orvos_base.rb
index c3029fd8a5f9c990983fad0d3db6d9b05f10c316..e4eff9c93aa37ed6e587d47b70ba172538731dd2 100644 (file)
--- a/app/models/orvos_base.rb
+++ b/app/models/orvos_base.rb
@@ -57,16 +57,16 @@ class OrvosBase < ActiveRecord::Base
   def save!
     self.save or raise Exception.new("Save failed")
   end
-  def metadata(*args)
+  def links(*args)
     o = {}
     o.merge!(args.pop) if args[-1].is_a? Hash
-    o[:metadata_class] ||= args.shift
+    o[:link_class] ||= args.shift
     o[:name] ||= args.shift
     o[:head_kind] ||= args.shift
     o[:tail_kind] = self.kind
-    o[:tail] = self.uuid
-    if all_metadata
-      return all_metadata.select do |m|
+    o[:tail_uuid] = self.uuid
+    if all_links
+      return all_links.select do |m|
         ok = true
         o.each do |k,v|
           if !v.nil?
@@ -79,20 +79,20 @@ class OrvosBase < ActiveRecord::Base
         ok
       end
     end
-    @metadata = $orvos_api_client.api Metadatum, '', { _method: 'GET', where: o, eager: true }
-    @metadata = $orvos_api_client.unpack_api_response(@metadata)
+    @links = $orvos_api_client.api Link, '', { _method: 'GET', where: o, eager: true }
+    @links = $orvos_api_client.unpack_api_response(@links)
   end
-  def all_metadata
-    return @all_metadata if @all_metadata
-    res = $orvos_api_client.api Metadatum, '', {
+  def all_links
+    return @all_links if @all_links
+    res = $orvos_api_client.api Link, '', {
       _method: 'GET',
       where: {
         tail_kind: self.kind,
-        tail: self.uuid
+        tail_uuid: self.uuid
       },
       eager: true
     }
-    @all_metadata = $orvos_api_client.unpack_api_response(res)
+    @all_links = $orvos_api_client.unpack_api_response(res)
   end
   def reload
     private_reload(self.uuid)
@@ -118,7 +118,7 @@ class OrvosBase < ActiveRecord::Base
         end
       end
     end
-    @all_metadata = nil
+    @all_links = nil
     self
   end
   def dup

diff --git a/config/routes.rb b/config/routes.rb
index c67b601432bb7cd67d5db36de5c0f30eab1ba2e0..77f116801c6ab16f53b0eec62841d9f29613f89e 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -20,7 +20,7 @@ Vcffarm::Application.routes.draw do
   resources :pipeline_invocations
 
 
-  resources :metadata
+  resources :links
 
 
   resources :collections
@@ -29,7 +29,7 @@ Vcffarm::Application.routes.draw do
 
   # Send unroutable requests to an arbitrary controller
   # (ends up at ApplicationController#render_not_found)
-  match '*a', :to => 'metadata#render_not_found'
+  match '*a', :to => 'links#render_not_found'
 
 
   # The priority is based upon order of creation:

diff --git a/test/fixtures/metadata.yml b/test/fixtures/links.yml
similarity index 100%
rename from test/fixtures/metadata.yml
rename to test/fixtures/links.yml

diff --git a/test/functional/metadata_controller_test.rb b/test/functional/links_controller_test.rb
similarity index 100%
rename from test/functional/metadata_controller_test.rb
rename to test/functional/links_controller_test.rb

diff --git a/test/unit/helpers/metadata_helper_test.rb b/test/unit/helpers/links_helper_test.rb
similarity index 100%
rename from test/unit/helpers/metadata_helper_test.rb
rename to test/unit/helpers/links_helper_test.rb

diff --git a/test/unit/metadatum_test.rb b/test/unit/link_test.rb
similarity index 100%
rename from test/unit/metadatum_test.rb
rename to test/unit/link_test.rb