bulldog 0.0.15 → 0.1.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.1.0 2010-06-23
+
+ * Add Bulldog.path_root, for specifying per-environment roots.
+ * Add :root interpolation key. Replaces :public_path for Rails apps.
+
 == 0.0.15 2010-04-13
 
  * Fix image dimensions when exif:Orientation is 8.

data/lib/bulldog.rb

@@ -37,6 +37,11 @@ module Bulldog
     #
     attr_accessor :default_url_template
 
+    #
+    # The root directory to use for paths.
+    #
+    attr_accessor :path_root
+
     #
     # The path to `ffmpeg'.  Only required if you use ffmpeg
     # (processing videos, or retrieving video attributes).

data/lib/bulldog/interpolation.rb

@@ -65,6 +65,10 @@ module Bulldog
           raise Error, ":extension interpolation used when file_name not set - if you need to interpolate the url, pass a :basename override"
         File.extname(basename).sub(/\A\./, '')
       end
+
+      to_interpolate(:root) do
+        Bulldog.path_root
+      end
     end
 
     #

data/lib/bulldog/reflection.rb

@@ -43,7 +43,7 @@ module Bulldog
     end
 
     def path_template
-      @path_template || Bulldog.default_path_template || File.join(':public_path', url_template)
+      @path_template || Bulldog.default_path_template || File.join(':root', url_template)
     end
 
     def url_template

data/lib/bulldog/version.rb

@@ -1,3 +1,11 @@
 module Bulldog
-  VERSION = [0, 0, 15]
+  VERSION = [0, 1, 0]
+
+  class << VERSION
+    include Comparable
+
+    def to_s
+      join('.')
+    end
+  end
 end

data/rails/rails.rb

@@ -7,6 +7,7 @@ module Bulldog
       def init(config_path, rails)
         config = read_config(config_path, rails.env)
         set_logger(config, rails.logger)
+        Bulldog.path_root = rails.public_path
         set_attribute config, :default_path_template
         set_attribute config, :default_url_template
         set_attribute config, :convert_path
@@ -40,7 +41,6 @@ module Bulldog
       def define_interpolations(rails)
         Bulldog.to_interpolate(:rails_root){rails.root}
         Bulldog.to_interpolate(:rails_env){rails.env}
-        Bulldog.to_interpolate(:public_path){rails.public_path}
       end
     end
   end

data/spec/unit/interpolation_spec.rb

@@ -104,6 +104,11 @@ describe Interpolation do
         interpolate("a/:extension/b", :basename => 'BASENAME.EXT').should == 'a/FMT/b'
       end
 
+      it "should interpolate :root as Bulldog.path_root" do
+        Bulldog.path_root = 'TEST'
+        interpolate("a/:root/b").should == 'a/TEST/b'
+      end
+
       it "should not modify the hash of overrides, if given" do
         overrides = {:basename => 'BASENAME.EXT'}
         interpolate("a/:extension/b", overrides).should == 'a/EXT/b'

data/spec/unit/rails_spec.rb

@@ -75,9 +75,9 @@ describe Rails do
         interpolate("a/:rails_env/b").should == "a/ENVIRONMENT/b"
       end
 
-      it "should interpolate :public_path as Rails.public_path" do
+      it "should interpolate :root as Rails.public_path" do
         init
-        interpolate("a/:public_path/b").should == "a/PUBLIC/b"
+        interpolate("a/:root/b").should == "a/PUBLIC/b"
       end
     end
   end

data/spec/unit/reflection_spec.rb

@@ -103,8 +103,8 @@ describe Reflection do
         end
       end
 
-      it "should return the URL prefixed with the public path" do
-        reflection.path_template.should == ":public_path/configured/url"
+      it "should return the URL prefixed with the root" do
+        reflection.path_template.should == ":root/configured/url"
       end
     end
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 15
-  version: 0.0.15
+  version: 0.1.0
 platform: ruby
 authors: 
 - George Ogata
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 -04:00
+date: 2010-06-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency