avatar 0.0.4 → 0.0.5

data/test/test_string_substitution_source_wrapper.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'avatar/source/static_url_source'
+require 'avatar/source/wrapper/string_substitution_source_wrapper'
+
+class TestStringSubstitutionSourceWrapper < Test::Unit::TestCase
+  
+  def setup
+    @source = Avatar::Source::StaticUrlSource.new('#{a} and #{b} but not {b}')
+    @wrapper = Avatar::Source::Wrapper::StringSubstitutionSourceWrapper.new(@source)
+  end
+  
+  def test_returns_nil_if_underlying_source_returns_nil
+    @source.instance_eval { def avatar_url_for(*args); nil; end }
+    assert_nil @wrapper.avatar_url_for(:a_person)
+  end
+  
+  def test_avatar_url_nil_when_not_all_variables_replaced
+    assert_nil @wrapper.avatar_url_for(:bar, :b => 'ham')
+  end
+  
+  def test_avatar_url_when_all_variables_replaced
+    assert_equal 'green eggs and ham but not {b}', @wrapper.avatar_url_for(:bar, :a => 'green eggs', :b => 'ham')
+  end
+  
+end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Avatar</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/avatar"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/avatar" class="numbers">0.0.4</a>
+      <a href="http://rubyforge.org/projects/avatar" class="numbers">0.0.5</a>
     </div>
     <h1>&#x2192; &#8216;Avatar&#8217;</h1>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: avatar
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - James Rosen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-28 00:00:00 -04:00
+date: 2008-04-01 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -42,11 +42,13 @@ files:
 - lib/avatar/source/file_column_source.rb
 - lib/avatar/source/gravatar_source.rb
 - lib/avatar/source/nil_source.rb
-- lib/avatar/source/rails_asset_source.rb
+- lib/avatar/source/paperclip_source.rb
 - lib/avatar/source/source_chain.rb
 - lib/avatar/source/static_url_source.rb
-- lib/avatar/source/string_substitution_source.rb
-- lib/avatar/string_substitution.rb
+- lib/avatar/source/wrapper.rb
+- lib/avatar/source/wrapper/abstract_source_wrapper.rb
+- lib/avatar/source/wrapper/rails_asset_source_wrapper.rb
+- lib/avatar/source/wrapper/string_substitution_source_wrapper.rb
 - lib/avatar/version.rb
 - lib/avatar/view.rb
 - lib/avatar/view/abstract_view_support.rb
@@ -86,6 +88,30 @@ files:
 - test/lib/file_column/test/fixtures/skanthak.png
 - test/lib/file_column/test/magick_test.rb
 - test/lib/file_column/test/magick_view_only_test.rb
+- test/lib/paperclip/README
+- test/lib/paperclip/Rakefile
+- test/lib/paperclip/generators/paperclip/USAGE
+- test/lib/paperclip/generators/paperclip/paperclip_generator.rb
+- test/lib/paperclip/generators/paperclip/templates/paperclip_migration.rb
+- test/lib/paperclip/init.rb
+- test/lib/paperclip/lib/paperclip.rb
+- test/lib/paperclip/lib/paperclip/attachment.rb
+- test/lib/paperclip/lib/paperclip/geometry.rb
+- test/lib/paperclip/lib/paperclip/iostream.rb
+- test/lib/paperclip/lib/paperclip/thumbnail.rb
+- test/lib/paperclip/lib/paperclip/upfile.rb
+- test/lib/paperclip/tasks/paperclip_tasks.rake
+- test/lib/paperclip/test/database.yml
+- test/lib/paperclip/test/fixtures/12k.png
+- test/lib/paperclip/test/fixtures/5k.png
+- test/lib/paperclip/test/fixtures/bad.png
+- test/lib/paperclip/test/helper.rb
+- test/lib/paperclip/test/test_attachment.rb
+- test/lib/paperclip/test/test_geometry.rb
+- test/lib/paperclip/test/test_integration.rb
+- test/lib/paperclip/test/test_iostream.rb
+- test/lib/paperclip/test/test_paperclip.rb
+- test/lib/paperclip/test/test_thumbnail.rb
 - test/lib/schema.rb
 - test/lib/user_suit.png
 - test/test_abstract_view_support.rb
@@ -95,11 +121,11 @@ files:
 - test/test_gravatar_source.rb
 - test/test_helper.rb
 - test/test_nil_source.rb
-- test/test_rails_asset_source.rb
+- test/test_paperclip_source.rb
+- test/test_rails_asset_source_wrapper.rb
 - test/test_source_chain.rb
 - test/test_static_url_source.rb
-- test/test_string_substitution.rb
-- test/test_string_substitution_source.rb
+- test/test_string_substitution_source_wrapper.rb
 - website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js
@@ -134,6 +160,12 @@ specification_version: 2
 summary: helpers for displaying avatars
 test_files: 
 - test/lib/file_column/lib/test_case.rb
+- test/lib/paperclip/test/test_attachment.rb
+- test/lib/paperclip/test/test_geometry.rb
+- test/lib/paperclip/test/test_integration.rb
+- test/lib/paperclip/test/test_iostream.rb
+- test/lib/paperclip/test/test_paperclip.rb
+- test/lib/paperclip/test/test_thumbnail.rb
 - test/test_abstract_view_support.rb
 - test/test_action_view_support.rb
 - test/test_avatar.rb
@@ -141,8 +173,8 @@ test_files:
 - test/test_gravatar_source.rb
 - test/test_helper.rb
 - test/test_nil_source.rb
-- test/test_rails_asset_source.rb
+- test/test_paperclip_source.rb
+- test/test_rails_asset_source_wrapper.rb
 - test/test_source_chain.rb
 - test/test_static_url_source.rb
-- test/test_string_substitution.rb
-- test/test_string_substitution_source.rb
+- test/test_string_substitution_source_wrapper.rb

data/lib/avatar/source/rails_asset_source.rb

@@ -1,64 +0,0 @@
-require 'avatar/string_substitution'
-require 'avatar/source/abstract_source'
-require 'action_view/helpers/asset_tag_helper'
-
-module Avatar # :nodoc:
-  module Source # :nodoc:
-    # Source representing a constant path.  Allows string variable
-    # substitution (see link:classes/Avatar/StringSubstitution.html).
-    # Good as a default or last-resort source in Rails projects.
-    class RailsAssetSource
-      include StringSubstitution
-      include AbstractSource
-      
-      attr_accessor :path
-      attr_accessor :default_options
-      attr_reader :url_helper
-      
-      private :url_helper
-      
-      # Create a new source with static path +path+.
-      # Raises an error unless +path+ exists.
-      # +default_options+ can include any variables
-      # to be substituted into +path+ as defaults.
-      # Additionally, it can contain the key :only_path,
-      # which determines whether a path or full URI is generated
-      # by default, :only_path is false.
-      def initialize(path, default_options = {})
-        raise ArgumentError.new("path cannot be nil") if path.nil?
-        self.path = path.to_s
-        self.default_options = { :only_path => false }.merge(default_options)
-        @url_helper = Object.new
-        @url_helper.extend(ActionView::Helpers::AssetTagHelper)
-      end
-      
-      def only_path?
-        default_options[:default_path]
-      end
-      
-      def default_options=(opts)
-        @default_options = opts || {}
-      end
-      
-      # Returns nil if person is nil; the static path or URI otherwise.
-      # Options:
-      #  * :only_path (Boolean) - whether to output only the path or a fully-qualified URI; defaults to object-level value
-      # Raises an error if both +options[:only_path]+ and the object-level default are both false
-      # and the url returned would only be a path.  Try setting
-      # <code>ActionController::Base.asset_host</code> to avoid this error.
-      #
-      # Note: +only_path+ being true is not a guarantee
-      # that only a path will be generated; if it is false,
-      # however, generated URLs will be full URIs.
-      def avatar_url_for(person, options = {})
-        return nil if person.nil?
-        options = default_options.merge(options)
-        path = apply_substitution(self.path, options)
-        uri = url_helper.image_path(path)
-        raise "could not generate protocol and host for #{uri}" unless uri =~ /^http[s]?\:\/\// || options[:only_path]
-        substitution_needed?(uri) ? nil : uri
-      end
-      
-    end
-  end
-end

data/lib/avatar/source/string_substitution_source.rb

@@ -1,45 +0,0 @@
-require 'avatar/string_substitution'
-require 'avatar/source/abstract_source'
-
-module Avatar # :nodoc:
-  module Source # :nodoc:
-    # Like a StaticUrlSource, but allows variable replacement within the string.
-    # Usage:
-    #   source = StringSubstitutionSource.new('#{gender}_icon_#{size}.png')
-    #   url = source.avatar_url_for(@person, :gender => :female, :size => :large)
-    #     # => 'female_icon_large.png'
-    class StringSubstitutionSource
-      include StringSubstitution
-      include AbstractSource
-      
-      attr_accessor :url
-      attr_accessor :default_options
-      
-      # Create a new source with static url +url+, which can contain any number
-      # of variables to be subsituted through +options+.  See link:classes/Avatar/StringSubstitution.html
-      #
-      # Optionally, can pass in +default _options+ to be applied in replacement, overwritable
-      # by the +options+ passed to :avatar_url_for.
-      def initialize(url, default_options = {})
-        raise ArgumentError.new("URL cannot be nil") if url.nil?
-        self.url = url.to_s
-        self.default_options = default_options || {}
-      end
-      
-      # Returns nil if +person+ is nil or if variables in <code>url</code>
-      # remain un-bound after substituting +options+; otherwise, returns
-      # the result of replacing each variable within <code>url</code>
-      # with the value of the corresponding key within +options+.
-      def avatar_url_for(person, options = {})
-        return nil if person.nil?
-        result = apply_substitution(self.url, self.default_options.merge(options))
-        substitution_needed?(result) ? nil : result
-      end
-      
-      def default_options=(opts)
-        @default_options = opts || {}
-      end
-      
-    end
-  end
-end

data/lib/avatar/string_substitution.rb

@@ -1,28 +0,0 @@
-require 'avatar/object_support'
-
-module Avatar # :nodoc:
-  
-  # Allows runtime variable substitution into a String.
-  module StringSubstitution
-    
-    # For each key in +options+ replaces '#{key}' in +string+ with the
-    # corresponding value in +options+.
-    # +string+ should
-    # be of the form '...#{variable_a}...#{variable_b}...'.  <em>Note the
-    # single quotes</em>.  Double quotes will cause the variables to be
-    # substituted before this method is run, which is almost
-    # certainly <strong>not</strong> what you want.
-    def apply_substitution(string, options)
-      returning(string.dup) do |result|
-        options.each do |k,v|
-          result.gsub!(Regexp.new('#\{' + "#{k}" + '\}'), "#{v}")
-        end
-      end
-    end
-    
-    def substitution_needed?(string)
-      string =~ /#\{.*\}/
-    end
-    
-  end
-end

data/test/test_rails_asset_source.rb

@@ -1,50 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'avatar/source/rails_asset_source'
-require 'action_controller/base'
-
-class TestRailsAssetSource < Test::Unit::TestCase
-  
-  def setup
-    ActionController::Base.asset_host = 'http://test.com'
-  end
-  
-  def test_fully_qualified_uri
-    source = Avatar::Source::RailsAssetSource.new('http://example.com/images/avatar.png')
-    assert_equal 'http://example.com/images/avatar.png', source.avatar_url_for(3)
-  end
-  
-  def test_string_substitution
-    source = Avatar::Source::RailsAssetSource.new('http://example.com/images/avatar_#{size}.png')
-    assert_equal 'http://example.com/images/avatar_huge.png', source.avatar_url_for(4, {:size => 'huge'})
-  end
-  
-  def test_uses_asset_host
-    source = Avatar::Source::RailsAssetSource.new('/images/avatar.png')
-    assert_equal 'http://test.com/images/avatar.png', source.avatar_url_for(4)
-  end
-  
-  def test_error_if_cannot_generate_full_uri_and_only_path_false
-    ActionController::Base.asset_host = ''
-    source = Avatar::Source::RailsAssetSource.new('/images/avatar.png')
-    assert_raise(RuntimeError) {
-      source.avatar_url_for(4)
-    }
-  end
-  
-  def test_no_error_if_cannot_generate_full_uri_and_only_path_true
-    ActionController::Base.asset_host = ''
-    source = Avatar::Source::RailsAssetSource.new('/images/avatar.png')
-    assert_equal '/images/avatar.png', source.avatar_url_for(12, :only_path => true)
-  end
-  
-  def test_no_url_generated_if_person_is_nil
-    source = Avatar::Source::RailsAssetSource.new('/images/avatar.png')
-    assert_nil source.avatar_url_for(nil)
-  end
-  
-  def test_no_url_generated_if_substitution_incomplete
-    source = Avatar::Source::RailsAssetSource.new('/images/avatar_#{size}.png')
-    assert_nil source.avatar_url_for(8)
-  end
-  
-end

data/test/test_string_substitution.rb

@@ -1,28 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'avatar/string_substitution'
-
-class TestStringSubstitution < Test::Unit::TestCase
-  
-  def setup
-    @foo = Object.new
-    @foo.extend Avatar::StringSubstitution
-    @string = 'I don\'t like #{a}, #{b}, or #{c}'
-  end
-  
-  def test_apply_complete_substitution
-    assert_equal "I don't like Detroit, jam, or the letter e", @foo.apply_substitution(@string, {:a => 'Detroit', :b => 'jam', :c => 'the letter e'})
-  end
-  
-  def test_apply_incomplete_substitution
-    assert_equal 'I don\'t like #{a}, jam, or #{c}', @foo.apply_substitution(@string, {:b => 'jam'})
-  end
-  
-  def test_substitution_not_needed
-    assert !@foo.substitution_needed?('foo # bar { baz }# { yoo}')
-  end
-  
-  def test_substitution_needed
-    assert @foo.substitution_needed?('foo #{bar} #{baz}')
-  end
-  
-end

data/test/test_string_substitution_source.rb

@@ -1,22 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'avatar/source/string_substitution_source'
-
-class TestStringSubstitutionSource < Test::Unit::TestCase
-  
-  def setup
-    @source = Avatar::Source::StringSubstitutionSource.new('#{a} and #{b} but not {b}')
-  end
-  
-  def test_avatar_url_nil_for_nil_person
-    assert_nil @source.avatar_url_for(nil)
-  end
-  
-  def test_avatar_url_nil_when_not_all_variables_replaced
-    assert_nil @source.avatar_url_for(:bar, :b => 'ham')
-  end
-  
-  def test_avatar_url_when_all_variables_replaced
-    assert_equal 'green eggs and ham but not {b}', @source.avatar_url_for(:bar, :a => 'green eggs', :b => 'ham')
-  end
-  
-end