jeremyboles-graffic 0.3.1 → 0.3.2

data/lib/graffic.rb

@@ -200,8 +200,12 @@ class Graffic < ActiveRecord::Base
   end
   
   # Return the url for displaying the image
-  def url
-    self.s3_key.public_link
+  def url(calculate = false)
+    if calculate
+      self.s3_key.public_link
+    else
+      "http://#{self.bucket}/#{uploaded_file_path}"
+    end
   end
   
   attr_accessor :use_queue

data/lib/graffic/view_helpers.rb

@@ -4,7 +4,8 @@ module Graffic::ViewHelpers
       if version_or_opts.is_a?(Symbol)
         graffic_tag(graffic.try(version_or_opts), opts)
       else
-        image_tag(graffic.url, version_or_opts.merge(:size => graffic.size))
+        
+        image_tag(graffic.url, { :size => graffic.size }.merge(version_or_opts))
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeremyboles-graffic
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Jeremy Boles