add query method for testing for content presence

sbfaulkner · Jan 20, 2009 · 48ccd33 · 48ccd33
1 parent b9f7e48
commit 48ccd33
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/sequel_container.rb b/lib/sequel_container.rb
@@ -15,22 +15,28 @@ def contains(object, options = {})
 
           class_eval <<-CONTAINED_PATH, __FILE__, __LINE__ + 1
             def #{object}_path
-              return if #{object}_data.nil? || #{object}_data.empty?
+              return unless #{object}?
               @#{object}_path ||= write_#{object}
             end
           CONTAINED_PATH
 
           class_eval <<-CONTAINED_URL, __FILE__, __LINE__ + 1
             def #{object}_url
-              return if #{object}_data.nil? || #{object}_data.empty?
+              return unless #{object}?
               @#{object}_path ||= write_#{object}
               @#{object}_url ||= "/#{container}/\#{id}/\#{#{object}_filename}"
             end
           CONTAINED_URL
 
+          class_eval <<-CONTAINED_QUERY, __FILE__, __LINE__ + 1
+            def #{object}?
+              !#{object}_data.nil?
+            end
+          CONTAINED_QUERY
+
           class_eval <<-CONTAINED_IMAGE, __FILE__, __LINE__ + 1
             def #{object}_image?
-              #{object}_type[0,6] == 'image/'
+              #{object}? && #{object}_type[0,6] == 'image/'
             end
           CONTAINED_IMAGE