bulldog 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.2.1 2010-07-15
+
+ * Path/URL templates may be symbols specifying methods to call to
+   generate the path/URL. Method is passed attachment name and style.
+
 == 0.2.0 2010-07-14
 
  * Remove dimensions and aspect ratio as a storable attributes. Store

data/lib/bulldog/attachment/maybe.rb

@@ -152,7 +152,11 @@ module Bulldog
       def interpolate_path(style_name, params={})
         template = reflection.path_template
         style = reflection.styles[style_name]
-        Interpolation.interpolate(template, record, name, style, params)
+        if template.is_a?(Symbol)
+          record.send(template, name, style)
+        else
+          Interpolation.interpolate(template, record, name, style, params)
+        end
       end
 
       #
@@ -166,7 +170,11 @@ module Bulldog
       def interpolate_url(style_name, params={})
         template = reflection.url_template
         style = reflection.styles[style_name]
-        Interpolation.interpolate(template, record, name, style, params)
+        if template.is_a?(Symbol)
+          record.send(template, name, style)
+        else
+          Interpolation.interpolate(template, record, name, style, params)
+        end
       end
 
       protected  # ---------------------------------------------------

data/lib/bulldog/version.rb

@@ -1,5 +1,5 @@
 module Bulldog
-  VERSION = [0, 2, 0]
+  VERSION = [0, 2, 1]
 
   class << VERSION
     include Comparable

data/spec/unit/attachment/maybe_spec.rb

@@ -22,107 +22,157 @@ describe Attachment::Maybe do
   end
 
   describe "#interpolate_path" do
-    it "should return the path that the given style name would be stored at" do
-      spec = self
-      configure_attachment do
-        path "#{spec.temporary_directory}/:attachment.:style.jpg"
+    describe "when the path template is a Symbol" do
+      before do
+        Thing.class_eval do
+          has_attachment :photo do
+            path :test_path
+          end
+
+          define_method :test_path do |@name, @style|
+            "#{name}-#{style.name}"
+          end
+
+          attr_reader :name, :style
+        end
+        @thing = Thing.new
       end
-      @thing.photo.interpolate_path(:original).should == "#{temporary_directory}/photo.original.jpg"
-    end
 
-    it "should use the given interpolation parameters" do
-      spec = self
-      configure_attachment do
-        path "#{spec.temporary_directory}/:attachment.:style.jpg"
+      it "should call the specified method with the attachment name and style" do
+        @thing.photo.interpolate_path(:original).should == "photo-original"
+        @thing.name == :photo
+        @thing.style.name == :original
       end
-      @thing.photo.interpolate_path(:original, :style => 'STYLE').should == "#{temporary_directory}/photo.STYLE.jpg"
     end
 
-    it "should use the style's format attribute for the extension by default" do
-      spec = self
-      configure_attachment do
-        style :processed, :format => 'png'
-        path "#{spec.temporary_directory}/:attachment.:style.:extension"
-      end
-      @thing.photo.interpolate_path(:processed, :format => 'png').should == "#{temporary_directory}/photo.processed.png"
-    end
-
-    describe "for the original style" do
-      it "should support the :basename interpolation key if the basename is given" do
+    describe "when the path template is a String" do
+      it "should return the path that the given style name would be stored at" do
         spec = self
         configure_attachment do
-          path "#{spec.temporary_directory}/:attachment.:style/:basename"
+          path "#{spec.temporary_directory}/:attachment.:style.jpg"
         end
-        @thing.photo.interpolate_path(:original, :basename => 'file.xyz').should == "#{temporary_directory}/photo.original/file.xyz"
+        @thing.photo.interpolate_path(:original).should == "#{temporary_directory}/photo.original.jpg"
       end
 
-      it "should support the :extension interpolation key if the basename is given" do
+      it "should use the given interpolation parameters" do
         spec = self
         configure_attachment do
-          path "#{spec.temporary_directory}/:attachment.:style.:extension"
+          path "#{spec.temporary_directory}/:attachment.:style.jpg"
         end
-        @thing.photo.interpolate_path(:original, :basename => 'file.xyz').should == "#{temporary_directory}/photo.original.xyz"
+        @thing.photo.interpolate_path(:original, :style => 'STYLE').should == "#{temporary_directory}/photo.STYLE.jpg"
       end
 
-      it "should support the :extension interpolation key if the extension is given" do
+      it "should use the style's format attribute for the extension by default" do
         spec = self
         configure_attachment do
+          style :processed, :format => 'png'
           path "#{spec.temporary_directory}/:attachment.:style.:extension"
         end
-        @thing.photo.interpolate_path(:original, :extension => 'xyz').should == "#{temporary_directory}/photo.original.xyz"
+        @thing.photo.interpolate_path(:processed, :format => 'png').should == "#{temporary_directory}/photo.processed.png"
       end
-    end
-  end
 
-  describe "#interpolate_url" do
-    it "should return the url that the given style name would be found at" do
-      spec = self
-      configure_attachment do
-        url "/:attachment.:style.jpg"
+      describe "for the original style" do
+        it "should support the :basename interpolation key if the basename is given" do
+          spec = self
+          configure_attachment do
+            path "#{spec.temporary_directory}/:attachment.:style/:basename"
+          end
+          @thing.photo.interpolate_path(:original, :basename => 'file.xyz').should == "#{temporary_directory}/photo.original/file.xyz"
+        end
+
+        it "should support the :extension interpolation key if the basename is given" do
+          spec = self
+          configure_attachment do
+            path "#{spec.temporary_directory}/:attachment.:style.:extension"
+          end
+          @thing.photo.interpolate_path(:original, :basename => 'file.xyz').should == "#{temporary_directory}/photo.original.xyz"
+        end
+
+        it "should support the :extension interpolation key if the extension is given" do
+          spec = self
+          configure_attachment do
+            path "#{spec.temporary_directory}/:attachment.:style.:extension"
+          end
+          @thing.photo.interpolate_path(:original, :extension => 'xyz').should == "#{temporary_directory}/photo.original.xyz"
+        end
       end
-      @thing.photo.interpolate_url(:original).should == "/photo.original.jpg"
     end
+  end
 
-    it "should use the given interpolation parameters" do
-      spec = self
-      configure_attachment do
-        url "/:attachment.:style.jpg"
+  describe "#interpolate_url" do
+    describe "when the url template is a Symbol" do
+      before do
+        Thing.class_eval do
+          has_attachment :photo do
+            url :test_url
+          end
+
+          define_method :test_url do |@name, @style|
+            "#{name}-#{style.name}"
+          end
+
+          attr_reader :name, :style
+        end
+        @thing = Thing.new
       end
-      @thing.photo.interpolate_url(:original, :style => 'STYLE').should == "/photo.STYLE.jpg"
-    end
 
-    it "should use the style's format attribute for the extension by default" do
-      spec = self
-      configure_attachment do
-        style :processed, :format => 'png'
-        url "/:attachment.:style.:extension"
+      it "should call the specified method with the attachment name and style" do
+        @thing.photo.interpolate_url(:original).should == "photo-original"
+        @thing.name == :photo
+        @thing.style.name == :original
       end
-      @thing.photo.interpolate_url(:processed).should == "/photo.processed.png"
     end
 
-    describe "for the original style" do
-      it "should support the :basename interpolation key if the basename is given" do
+    describe "when the url template is a String" do
+      it "should return the url that the given style name would be found at" do
         spec = self
         configure_attachment do
-          url "/:attachment.:style/:basename"
+          url "/:attachment.:style.jpg"
         end
-        @thing.photo.interpolate_url(:original, :basename => 'file.xyz').should == "/photo.original/file.xyz"
+        @thing.photo.interpolate_url(:original).should == "/photo.original.jpg"
       end
 
-      it "should support the :extension interpolation key if the basename is given" do
+      it "should use the given interpolation parameters" do
         spec = self
         configure_attachment do
-          url "/:attachment.:style.:extension"
+          url "/:attachment.:style.jpg"
         end
-        @thing.photo.interpolate_url(:original, :basename => 'file.xyz').should == "/photo.original.xyz"
+        @thing.photo.interpolate_url(:original, :style => 'STYLE').should == "/photo.STYLE.jpg"
       end
 
-      it "should support the :extension interpolation key if the extension is given" do
+      it "should use the style's format attribute for the extension by default" do
         spec = self
         configure_attachment do
+          style :processed, :format => 'png'
           url "/:attachment.:style.:extension"
         end
-        @thing.photo.interpolate_url(:original, :extension => 'xyz').should == "/photo.original.xyz"
+        @thing.photo.interpolate_url(:processed).should == "/photo.processed.png"
+      end
+
+      describe "for the original style" do
+        it "should support the :basename interpolation key if the basename is given" do
+          spec = self
+          configure_attachment do
+            url "/:attachment.:style/:basename"
+          end
+          @thing.photo.interpolate_url(:original, :basename => 'file.xyz').should == "/photo.original/file.xyz"
+        end
+
+        it "should support the :extension interpolation key if the basename is given" do
+          spec = self
+          configure_attachment do
+            url "/:attachment.:style.:extension"
+          end
+          @thing.photo.interpolate_url(:original, :basename => 'file.xyz').should == "/photo.original.xyz"
+        end
+
+        it "should support the :extension interpolation key if the extension is given" do
+          spec = self
+          configure_attachment do
+            url "/:attachment.:style.:extension"
+          end
+          @thing.photo.interpolate_url(:original, :extension => 'xyz').should == "/photo.original.xyz"
+        end
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - George Ogata
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 -04:00
+date: 2010-07-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency