whoops - that was in the wrong spot. move swf_asset_parent.rb, refactor a bit

app/models/item.rb

@@ -1,9 +1,7 @@
 class Item < ActiveRecord::Base
   include SwfAssetParent
   
-  def swf_asset_type
+  SwfAssetType = 'object'
-    'object'
-  end
   
   set_table_name 'objects' # Neo & PHP Impress call them objects, but the class name is a conflict (duh!)
   set_inheritance_column 'inheritance_type' # PHP Impress used "type" to describe category

app/models/pet_type.rb

@@ -1,9 +1,7 @@
 class PetType < ActiveRecord::Base
   include SwfAssetParent
   
-  def swf_asset_type
+  SwfAssetType = 'biology'
-    'biology'
-  end
   
   BasicHashes = YAML::load_file(Rails.root.join('config', 'basic_type_hashes.yml'))
   

app/models/swf_asset_parent.rb

@@ -0,0 +1,12 @@
+module SwfAssetParent
+  def swf_assets
+    rels = Table(ParentSwfAssetRelationship.table_name)
+    type = self.class::SwfAssetType
+    ids = ParentSwfAssetRelationship.
+      where(rels[:parent_id].eq(id).and(rels[:swf_asset_type].eq(type))).
+      select(rels[:swf_asset_id]).
+      all.map(&:swf_asset_id)
+    assets = Table(SwfAsset.table_name)
+    SwfAsset.where(assets[:id].in(ids)).all
+  end
+end

spec/models/swf_asset_parent.rb

@@ -1,10 +0,0 @@
-module SwfAssetParent
-  def swf_assets
-    rels = Table(ParentSwfAssetRelationship.table_name)
-    swf_asset_ids = ParentSwfAssetRelationship.where(
-      rels[:parent_id].eq(id).and(rels[:swf_asset_type].eq(swf_asset_type))
-    ).map(&:swf_asset_id)
-    swf_assets = Table(SwfAsset.table_name)
-    SwfAsset.where(swf_assets[:id].in(swf_asset_ids))
-  end
-end

spec/models/swf_asset_spec.rb

@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe SwfAsset do
-  pending "add some examples to (or delete) #{__FILE__}"
-end

spec/views/swf_assets/index.html.erb_spec.rb

@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe "swf_assets/index.html.erb" do
-  pending "add some examples to (or delete) #{__FILE__}"
-end