? .DS_Store
? .cvsignore
? browser
? media-popup.patch
? media.interpolateUrl.patch
? images/icons/tango
? images/icons/tango-icon-theme-0.8.90.tar.gz
Index: media.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.info,v
retrieving revision 1.4
diff -u -p -r1.4 media.info
--- media.info	7 Apr 2010 06:29:34 -0000	1.4
+++ media.info	18 Nov 2010 19:00:01 -0000
@@ -17,4 +17,3 @@ files[] = test/media.entity.test
 dependencies[] = file
 dependencies[] = image
 dependencies[] = file_styles
-dependencies[] = entity
Index: media.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.module,v
retrieving revision 1.57
diff -u -p -r1.57 media.module
--- media.module	15 Nov 2010 13:13:16 -0000	1.57
+++ media.module	18 Nov 2010 19:00:01 -0000
@@ -1091,8 +1091,6 @@ function media_entity_info() {
   $return = array(
     'media' => array(
       'label' => t('Media'),
-  	  'entity class' => 'Media',
-      'controller class' => 'MediaEntityController',
       'base table' => 'file_managed',
       'fieldable' => TRUE,
       'view modes' => $view_modes,
Index: media.types.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/media.types.inc,v
retrieving revision 1.14
diff -u -p -r1.14 media.types.inc
--- media.types.inc	15 Nov 2010 02:55:44 -0000	1.14
+++ media.types.inc	18 Nov 2010 19:00:01 -0000
@@ -267,24 +267,4 @@ function media_media_format_form_prepare
       );
       break;
   }
-}
-
-if (!class_exists('EntityDB')) {
-  if (basename($_SERVER["SCRIPT_NAME"]) == 'index.php') {
-    // Don't show the warning if they are on update.php or running via drush.
-    //drupal_set_message('You must run update.php immediately to enable the entity module or Media will not function.', 'error');
-  }
-}
-else {
-
-  class Media extends EntityDB {
-  }
-
-  // Historically, this Entitycontroller has a point, now it is simply here
-  // so that the EntityAPI can be used.  Media isn't really using this API much anyway
-  // since the main benefits are CRUD extensions and media is based on the files API
-  // which has its own (bad) CRUD stuff.
-  // @todo: remove coupling on entity API (needs issue).
-  class MediaEntityController extends EntityAPIController{}
-}
-
+}
\ No newline at end of file
Index: test/media.entity.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/test/media.entity.test,v
retrieving revision 1.3
diff -u -p -r1.3 media.entity.test
--- test/media.entity.test	11 Nov 2010 23:11:38 -0000	1.3
+++ test/media.entity.test	18 Nov 2010 19:00:01 -0000
@@ -40,37 +40,39 @@ class MediaEntityTest extends DrupalWebT
       'status' 	 => 1,
       'timestamp'=> time(),
     );
-    
-    $m = new Media($values);
-    $m->save();
-    return $m;
-  }
-  
-  function testCreateMedia() {
-    $m = $this->createMedia('blah.jpg');
-    $loaded = entity_get_controller('media')->load(array($m->fid));
-    $media = current($loaded);
-    $this->assertEqual($media->filename, 'blah.jpg');
+
+    return file_save((object)$values);
   }
 
   /**
    * Test the ability to create and query media items.
    */
   function testQueryMedia() {
-    $this->createMedia('blah.jpg');
-    $this->createMedia('blah2.jpg');
+    $text_files = $this->drupalGetTestFiles('text');
+    $images = $this->drupalGetTestFiles('image');
+    // Moves serveral images to public://
+    foreach (array_merge($text_files, $images) as $file) {
+      file_save($file);
+    }
     
     $query = new EntityFieldQuery();
     $query->entityCondition('entity_type', 'media');
-    $query->propertyCondition('uri', 'temporary://%', 'LIKE');
+    $query->propertyCondition('uri', 'public://%', 'LIKE');
+    $result = $query->execute();
+    $this->verbose(dpr($result, 1));
+    $this->assertEqual(count($result['media']), count($images) + count($text_files), "Returned results as expected for like % condition");
+
+    $query = new EntityFieldQuery();
+    $query->entityCondition('entity_type', 'media');
+    $query->propertyCondition('uri', '%.jpg', 'LIKE');
     $result = $query->execute();
-    $this->assertEqual(count($result['media']), 2, "Returned two results as expected for like % condition");
+    $this->assertEqual(count($result['media']), 2, "Returned 2 results as expected for jpgs");
     
     $query = new EntityFieldQuery();
     $query->entityCondition('entity_type', 'media');
-    $query->propertyCondition('uri', 'temporary://blah.jpg');
+    $query->propertyCondition('type', 'image');
     $result = $query->execute();
-    $this->assertEqual(count($result['media']), 1, "Got one result for equality query");
+    $this->assertEqual(count($result['media']), count($images), "Returned expected results for type query");
 
     $query = new EntityFieldQuery();
     $query->entityCondition('entity_type', 'media');