remove the grouping model and replace it with the generic relationshi…

…p model

git-svn-id: svn+ssh://rubyforge.org/var/svn/biocatalogue/trunk@401 1acaf488-1b9d-4964-8077-0a2fdb83ef00

app/models/relationship.rb

@@ -0,0 +1,2 @@
+class Relationship < ActiveRecord::Base
+end

app/models/soaplab_server.rb

@@ -104,12 +104,12 @@ def create_groupings(wsdls=[])
     services = find_services_in_catalogue(wsdls)
     services.each{ |service|
 
-    grouping = Grouping.new(:subject_type => service.class.to_s,
-                            :subject_id =>service.id, 
-                            :predicate =>'BioCatalogue:memberOf', 
-                            :object_type => self.class.to_s,
-                            :object_id =>self.id)
-    grouping.save!
+    relationship = Relationship.new(:subject_type => service.class.to_s,
+                                    :subject_id =>service.id, 
+                                    :predicate =>'BioCatalogue:memberOf', 
+                                    :object_type => self.class.to_s,
+                                    :object_id =>self.id)
+    relationship.save!
     }
   end
 

db/migrate/20090130095555_create_relationships.rb

@@ -0,0 +1,17 @@
+class CreateRelationships < ActiveRecord::Migration
+  def self.up
+    create_table :relationships do |t|
+      t.string :subject_type, :null => false
+      t.integer :subject_id , :null => false
+      t.string :predicate   , :null => false
+      t.string :object_type , :null => false
+      t.integer :object_id  , :null => false
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :relationships
+  end
+end

test/unit/grouping_test.rb → test/unit/relationship_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class GroupingTest < ActiveSupport::TestCase
+class RelationshipTest < ActiveSupport::TestCase
   # Replace this with your real tests.
   test "the truth" do
     assert true