lib/spontaneous/field/image.rb in spontaneous-0.2.0.beta4 vs lib/spontaneous/field/image.rb in spontaneous-0.2.0.beta5

@@ -13,27 +13,14 @@
 
     def self.accepts
       %w{image/(png|jpeg|gif)}
     end
 
-    class TemplateParameters < DelegateClass(S::Media::Image::Attributes)
-      attr_reader :image
-
-      def initialize(image, args)
-        super(image)
-        @image, @args = image, args.extract_options!
-      end
-
-      def to_html(attributes = {})
-        @image.to_html(@args.merge(attributes))
-      end
-    end
-
     def self.size(name, options = {}, &process)
       self.sizes[name.to_sym] = [options, process]
       unless method_defined?(name)
-        class_eval "def #{name}(*args); TemplateParameters.new(sizes[:#{name}], args); end"
+        class_eval "def #{name}(*args); sizes[:#{name}]; end"
       end
     end
 
     def self.sizes
       size_definitions
@@ -89,19 +76,19 @@
     def original
       @original ||= sizes[:original]
     end
 
     def width
-      original.width
+      original.width || 0
     end
 
     def height
-      original.height
+      original.height || 0
     end
 
     def filesize
-      original.filesize
+      original.filesize || 0
     end
 
     def src
       original.src
     end
@@ -117,15 +104,15 @@
 
     def value(format=:html, *args)
       sizes[:original].src
     end
 
-    def set_value!(value, process = true)
+    def set_value!(value, process = true, site = nil)
       @sizes = nil
       super
     end
 
-    def generate(name, media_file)
+    def generate(name, media_file, site)
       return { :src => media_file } if media_file.is_a?(::String)
       options, process = self.class.size_definitions[name]
       size = Size.new(media_file, name, options, process)
       size.generate
     end