bulldog 0.0.6 → 0.0.7

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.0.7 2009-11-17
+
+ * Allow configuration through config/bulldog.yml in Rails.
+
 == 0.0.6 2009-11-17
 
  * Add attachment#reload for when the file changes behind Bulldog's

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/bulldog.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bulldog}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["George Ogata"]
@@ -58,6 +58,7 @@ Flexible file attachments for active record.
      "lib/bulldog/validations.rb",
      "lib/bulldog/vector2.rb",
      "rails/init.rb",
+     "rails/rails.rb",
      "script/console",
      "spec/data/empty.txt",
      "spec/data/test.jpg",
@@ -91,6 +92,7 @@ Flexible file attachments for active record.
      "spec/unit/processor/ffmpeg_spec.rb",
      "spec/unit/processor/image_magick_spec.rb",
      "spec/unit/processor/one_shot_spec.rb",
+     "spec/unit/rails_spec.rb",
      "spec/unit/reflection_spec.rb",
      "spec/unit/stream_spec.rb",
      "spec/unit/style_set_spec.rb",
@@ -129,6 +131,7 @@ Flexible file attachments for active record.
      "spec/unit/processor/ffmpeg_spec.rb",
      "spec/unit/processor/image_magick_spec.rb",
      "spec/unit/processor/one_shot_spec.rb",
+     "spec/unit/rails_spec.rb",
      "spec/unit/reflection_spec.rb",
      "spec/unit/stream_spec.rb",
      "spec/unit/style_set_spec.rb",

data/lib/bulldog.rb

@@ -37,6 +37,24 @@ module Bulldog
     #
     attr_accessor :default_url_template
 
+    #
+    # The path to `ffmpeg'.  Only required if you use ffmpeg
+    # (processing videos, or retrieving video attributes).
+    #
+    delegate :ffmpeg_path, :ffmpeg_path=, :to => Processor::Ffmpeg
+
+    #
+    # The path to `convert'.  Only required if you use convert
+    # (processing images or pdfs).
+    #
+    delegate :convert_path, :convert_path=, :to => Processor::ImageMagick
+
+    #
+    # The path to `identify'.  Only required if you use identify
+    # (retrieving image attributes).
+    #
+    delegate :identify_path, :identify_path=, :to => Processor::ImageMagick
+
     #
     # Define an interpolation token.
     #
@@ -89,6 +107,9 @@ module Bulldog
   self.logger = nil
   self.default_path_template = nil
   self.default_url_template = "/assets/:class/:id.:style.:extension"
+  self.convert_path = 'convert'
+  self.identify_path = 'identify'
+  self.ffmpeg_path = 'ffmpeg'
 end
 
 ActiveRecord::Base.send :include, Bulldog::HasAttachment

data/lib/bulldog/processor/ffmpeg.rb

@@ -2,11 +2,9 @@ module Bulldog
   module Processor
     class Ffmpeg < Base
       class << self
-        attr_accessor :ffmpeg_command
+        attr_accessor :ffmpeg_path
       end
 
-      self.ffmpeg_command = Bulldog.find_in_path('ffmpeg')
-
       def initialize(*args)
         super
         @operation = nil
@@ -155,7 +153,7 @@ module Bulldog
 
       def run_ffmpeg
         @arguments.each do |style, arguments|
-          command = [self.class.ffmpeg_command]
+          command = [self.class.ffmpeg_path]
           command << '-i' << input_file
           command.concat(arguments)
           Bulldog.run(*command) or

data/lib/bulldog/processor/image_magick.rb

@@ -4,13 +4,10 @@ module Bulldog
   module Processor
     class ImageMagick < Base
       class << self
-        attr_accessor :convert_command
-        attr_accessor :identify_command
+        attr_accessor :convert_path
+        attr_accessor :identify_path
       end
 
-      self.convert_command = Bulldog.find_in_path('convert')
-      self.identify_command = Bulldog.find_in_path('identify')
-
       def initialize(*args)
         super
         @tree = ArgumentTree.new(styles)
@@ -119,7 +116,7 @@ module Bulldog
       end
 
       def run_convert_command
-        command = [self.class.convert_command, "#{input_file}[0]", *@tree.arguments].flatten
+        command = [self.class.convert_path, "#{input_file}[0]", *@tree.arguments].flatten
         output = Bulldog.run(*command) or
           record.errors.add name, "convert failed (status #$?)"
         output

data/lib/bulldog/util.rb

@@ -1,19 +1,5 @@
 module Bulldog
   module Util
-    #
-    # Return the path of the first occurrence of +basename+ in the
-    # current PATH, or nil if the file cannot be found.
-    #
-    def find_in_path(basename)
-      ENV['PATH'].split(/:+/).each do |dirname|
-        path = File.join(dirname, basename)
-        if File.file?(path) && File.executable?(path)
-          return path
-        end
-      end
-      nil
-    end
-
     #
     # Run the given command, logging everything obsessively.
     #

data/rails/init.rb

@@ -1,9 +1,4 @@
 require 'bulldog'
+require File.dirname(__FILE__) + '/rails'
 
-Bulldog.instance_eval do
-  self.logger = Rails.logger
-
-  to_interpolate(:rails_root){Rails.root}
-  to_interpolate(:rails_env){Rails.env}
-  to_interpolate(:public_path){Rails.public_path}
-end
+Bulldog::Rails.init("#{Rails.root}/config/bulldog.yml", Rails)

data/rails/rails.rb

@@ -0,0 +1,47 @@
+#
+# Helper library for rails/init.rb.
+#
+module Bulldog
+  module Rails
+    class << self
+      def init(config_path, rails)
+        config = read_config(config_path, rails.env)
+        set_logger(config, rails.logger)
+        set_attribute config, :default_path_template
+        set_attribute config, :default_url_template
+        set_attribute config, :convert_path
+        set_attribute config, :identify_path
+        set_attribute config, :ffmpeg_path
+        define_interpolations(rails)
+      end
+
+      def read_config(path, environment)
+        File.exist?(path) or
+          return {}
+        YAML.load_file(path)[environment]
+      end
+
+      def set_logger(config, default_logger)
+        case (log_path = config['log_path'])
+        when false
+          Bulldog.logger = nil
+        when nil
+          Bulldog.logger = default_logger
+        else
+          Bulldog.logger = Logger.new(log_path)
+        end
+      end
+
+      def set_attribute(config, name)
+        value = config[name.to_s] and
+          Bulldog.send("#{name}=", value)
+      end
+
+      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
+end

data/spec/helpers/image_creation.rb

@@ -1,7 +1,7 @@
 module ImageCreation
   def create_image(path, options={})
     options[:size] ||= '10x10'
-    convert = Bulldog::Processor::ImageMagick.convert_command
+    convert = Bulldog::Processor::ImageMagick.convert_path
     system(convert, '-geometry', "#{options[:size]}!", 'pattern:checkerboard', path)
     path
   end

data/spec/integration/processing_image_attachments.rb

@@ -6,7 +6,7 @@ describe "Processing image attachments" do
                   :height => :integer)
 
   def identify
-    Bulldog::Processor::ImageMagick.identify_command
+    Bulldog::Processor::ImageMagick.identify_path
   end
 
   before do

data/spec/spec_helper.rb

@@ -42,7 +42,6 @@ module SpecHelper
     mod.use_temporary_attribute_value Bulldog, :default_path_template do
       "#{temporary_directory}/attachments/:class/:id.:style"
     end
-
     mod.use_temporary_attribute_value Bulldog, :logger do
       buffer = StringIO.new
       logger = Logger.new(buffer)
@@ -51,6 +50,9 @@ module SpecHelper
       end
       logger
     end
+    mod.use_temporary_attribute_value Bulldog, :convert_path, 'convert'
+    mod.use_temporary_attribute_value Bulldog, :identify_path, 'identify'
+    mod.use_temporary_attribute_value Bulldog, :ffmpeg_path, 'ffmpeg'
   end
 
   #

data/spec/unit/processor/ffmpeg_spec.rb

@@ -22,7 +22,7 @@ describe Processor::Ffmpeg do
   end
 
   def ffmpeg
-    Bulldog::Processor::Ffmpeg.ffmpeg_command
+    Bulldog::Processor::Ffmpeg.ffmpeg_path
   end
 
   def original_video_path

data/spec/unit/processor/image_magick_spec.rb

@@ -13,7 +13,7 @@ describe Processor::ImageMagick do
   end
 
   def convert
-    Processor::ImageMagick.convert_command
+    Processor::ImageMagick.convert_path
   end
 
   def original_path

data/spec/unit/rails_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+require "#{ROOT}/rails/rails"
+
+describe Rails do
+  describe "#init" do
+    def config_path
+      "#{temporary_directory}/config.yml"
+    end
+
+    def make_config(attributes)
+      config = {'ENVIRONMENT' => attributes}
+      open(config_path, 'w') do |file|
+        file.puts config.to_yaml
+      end
+    end
+
+    def init
+      fake_rails = OpenStruct.new(
+        :env => 'ENVIRONMENT',
+        :logger => Logger.new('/dev/null'),
+        :root => 'ROOT',
+        :public_path => 'PUBLIC'
+      )
+      Rails.init(config_path, fake_rails)
+    end
+
+    it "should set the default path template from the configuration file, if present" do
+      make_config('default_path_template' => 'DEFAULT PATH TEMPLATE')
+      init
+      Bulldog.default_path_template.should == 'DEFAULT PATH TEMPLATE'
+    end
+
+    it "should set the default url template from the configuration file, if present" do
+      make_config('default_url_template' => 'DEFAULT URL TEMPLATE')
+      init
+      Bulldog.default_url_template.should == 'DEFAULT URL TEMPLATE'
+    end
+
+    it "should set the ffmpeg path from the configuration file, if present" do
+      make_config('ffmpeg_path' => 'FFMPEG')
+      init
+      Bulldog.ffmpeg_path.should == 'FFMPEG'
+    end
+
+    it "should set the convert path from the configuration file, if present" do
+      make_config('convert_path' => 'CONVERT')
+      init
+      Bulldog.convert_path.should == 'CONVERT'
+    end
+
+    it "should set the identify path from the configuration file, if present" do
+      make_config('identify_path' => 'IDENTIFY')
+      init
+      Bulldog.identify_path.should == 'IDENTIFY'
+    end
+
+    it "should not set anything if the configuration file does not exist" do
+      default_default_path_template = Bulldog.default_path_template
+      init
+      Bulldog.default_path_template.should == default_default_path_template
+    end
+
+    describe "interpolations" do
+      def interpolate(template)
+        Interpolation.interpolate(template, @thing, :photo, Style.new(:style))
+      end
+
+      it "should interpolate :rails_root as Rails.root" do
+        init
+        interpolate("a/:rails_root/b").should == "a/ROOT/b"
+      end
+
+      it "should interpolate :rails_env as Rails.env" do
+        init
+        interpolate("a/:rails_env/b").should == "a/ENVIRONMENT/b"
+      end
+
+      it "should interpolate :public_path as Rails.public_path" do
+        init
+        interpolate("a/:public_path/b").should == "a/PUBLIC/b"
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bulldog
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - George Ogata
@@ -94,6 +94,7 @@ files:
 - lib/bulldog/validations.rb
 - lib/bulldog/vector2.rb
 - rails/init.rb
+- rails/rails.rb
 - script/console
 - spec/data/empty.txt
 - spec/data/test.jpg
@@ -127,6 +128,7 @@ files:
 - spec/unit/processor/ffmpeg_spec.rb
 - spec/unit/processor/image_magick_spec.rb
 - spec/unit/processor/one_shot_spec.rb
+- spec/unit/rails_spec.rb
 - spec/unit/reflection_spec.rb
 - spec/unit/stream_spec.rb
 - spec/unit/style_set_spec.rb
@@ -187,6 +189,7 @@ test_files:
 - spec/unit/processor/ffmpeg_spec.rb
 - spec/unit/processor/image_magick_spec.rb
 - spec/unit/processor/one_shot_spec.rb
+- spec/unit/rails_spec.rb
 - spec/unit/reflection_spec.rb
 - spec/unit/stream_spec.rb
 - spec/unit/style_set_spec.rb