fastimage_inline 1.0.3 → 1.0.4

data/README.textile

@@ -52,7 +52,7 @@ h4. As a Rails plugin
 h4. As a Gem
 
 <pre>
-  sudo gem install sdsykes-fastimage_inline -s http://gems.github.com
+  sudo gem install fastimage_inline
 </pre>
 
 Install the gem as above, and configure it in your environment.rb file as below:
@@ -61,7 +61,7 @@ Install the gem as above, and configure it in your environment.rb file as below:
   ...
   Rails::Initializer.run do |config|
     ...
-    config.gem "sdsykes-fastimage_inline", :lib=>"fastimage_inline"
+    config.gem "fastimage_inline", :lib=>"fastimage_inline"
     ...
   end
   ...
@@ -72,7 +72,7 @@ h2. Requirements
 * "FastImage":http://github.com/sdsykes/fastimage
 
 <pre>
-  sudo gem install sdsykes-fastimage -s http://gems.github.com
+  sudo gem install fastimage
 </pre>
 
 h2. Documentation

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 3
+:patch: 4
 :major: 1
 :minor: 0
 :build: 

data/lib/fastimage_inline.rb

@@ -60,11 +60,14 @@ module FastImageInline
   # in a data uri rather than just the path to the image
   #
   def inline_image_path(source)
+    public_path = respond_to?(:compute_public_path) ? compute_public_path(source, 'images') : asset_paths.compute_public_path(source, 'images')
+
     has_request = respond_to?(:request)
+
     if has_request && inline_capable_browser?
-      inline_image_data(compute_public_path(source, 'images'))
+      inline_image_data(public_path)
     else
-      compute_public_path(source, 'images')
+      public_path
     end
   end
   

data/test/config/boot.rb

@@ -1,110 +1,6 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
+require 'rubygems'
 
-RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-module Rails
-  class << self
-    def boot!
-      unless booted?
-        preinitialize
-        pick_boot.run
-      end
-    end
-
-    def booted?
-      defined? Rails::Initializer
-    end
-
-    def pick_boot
-      (vendor_rails? ? VendorBoot : GemBoot).new
-    end
-
-    def vendor_rails?
-      File.exist?("#{RAILS_ROOT}/vendor/rails")
-    end
-
-    def preinitialize
-      load(preinitializer_path) if File.exist?(preinitializer_path)
-    end
-
-    def preinitializer_path
-      "#{RAILS_ROOT}/config/preinitializer.rb"
-    end
-  end
-
-  class Boot
-    def run
-      load_initializer
-      Rails::Initializer.run(:set_load_path)
-    end
-  end
-
-  class VendorBoot < Boot
-    def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-      Rails::Initializer.run(:install_gem_spec_stubs)
-      Rails::GemDependency.add_frozen_gem_path
-    end
-  end
-
-  class GemBoot < Boot
-    def load_initializer
-      self.class.load_rubygems
-      load_rails_gem
-      require 'initializer'
-    end
-
-    def load_rails_gem
-      if version = self.class.gem_version
-        gem 'rails', version
-      else
-        gem 'rails'
-      end
-    rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-      exit 1
-    end
-
-    class << self
-      def rubygems_version
-        Gem::RubyGemsVersion rescue nil
-      end
-
-      def gem_version
-        if defined? RAILS_GEM_VERSION
-          RAILS_GEM_VERSION
-        elsif ENV.include?('RAILS_GEM_VERSION')
-          ENV['RAILS_GEM_VERSION']
-        else
-          parse_gem_version(read_environment_rb)
-        end
-      end
-
-      def load_rubygems
-        min_version = '1.3.2'
-        require 'rubygems'
-        unless rubygems_version >= min_version
-          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
-          exit 1
-        end
-
-      rescue LoadError
-        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
-        exit 1
-      end
-
-      def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
-      end
-
-      private
-        def read_environment_rb
-          File.read("#{RAILS_ROOT}/config/environment.rb")
-        end
-    end
-  end
-end
-
-# All that for this:
-Rails.boot!
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/test/config/environment.rb

@@ -1,39 +1,5 @@
-# Be sure to restart your server when you modify this file
+# Load the rails application
+require File.expand_path('../application', __FILE__)
 
-# Bootstrap the Rails environment, frameworks, and default configuration
-require File.join(File.dirname(__FILE__), 'boot')
-
-Rails::Initializer.run do |config|
-  # Settings in config/environments/* take precedence over those specified here.
-  # Application configuration should go into files in config/initializers
-  # -- all .rb files in that directory are automatically loaded.
-
-  # Add additional load paths for your own custom dirs
-  # config.load_paths += %W( #{RAILS_ROOT}/extras )
-
-  # Specify gems that this application depends on and have them installed with rake gems:install
-  # config.gem "bj"
-  # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
-  # config.gem "sqlite3-ruby", :lib => "sqlite3"
-  # config.gem "aws-s3", :lib => "aws/s3"
-
-  # Only load the plugins named here, in the order given (default is alphabetical).
-  # :all can be used as a placeholder for all plugins not explicitly named
-  # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-  # Skip frameworks you're not going to use. To use Rails without a database,
-  # you must remove the Active Record framework.
-  config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
-
-  # Activate observers that should always be running
-  # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-  # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-  # Run "rake -D time" for a list of tasks for finding time zone names.
-  config.time_zone = 'UTC'
-
-  # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
-  # config.i18n.default_locale = :de
-  config.action_controller.session = { :key => "_myapp_session", :secret => "some secret phrase blah blah blah blah" }
-end
+# Initialize the rails application
+Test::Application.initialize!

data/test/config/routes.rb

@@ -1,3 +1,58 @@
-ActionController::Routing::Routes.draw do |map|
-  map.connect ':controller/:action/:id'
+Test::Application.routes.draw do
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+
+  # Sample of regular route:
+  #   match 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action
+
+  # Sample of named route:
+  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+  # This route can be invoked with purchase_url(:id => product.id)
+
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Sample resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Sample resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Sample resource route with more complex sub-resources
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', :on => :collection
+  #     end
+  #   end
+
+  # Sample resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
+
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => 'welcome#index'
+
+  # See how all your routes lay out with "rake routes"
+
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  match ':controller(/:action(/:id))(.:format)'
 end

data/test/test.rb

@@ -17,7 +17,7 @@ require File.join(PathHere, 'config', 'environment')
 
 require File.join(PathHere, "..", "lib", 'fastimage_inline')
 
-require 'test_help'
+require 'rails/test_help'
 
 class InlineTests < ActionController::TestCase
   def setup
@@ -35,20 +35,20 @@ class InlineTests < ActionController::TestCase
     @request.env['HTTP_USER_AGENT'] = "msie 7"
     get "index"
     assert_response :success
-    assert_select "img#i1[src=?]", %r{/images/bg.png\?\d+}
+    assert_select "img#i1[src=?]", %r{/assets/bg.png}
     @request.env['HTTP_USER_AGENT'] = "msie 8"
     get "index"
     assert_response :success
-    assert_select "img#i1[src=?]", %r{/images/bg.png\?\d+}
+    assert_select "img#i1[src=?]", %r{/assets/bg.png}
   end
 
   test "inline image tags are rendered as normal tags if browser is not recognised" do
     @request.env['HTTP_USER_AGENT'] = "rails test"
     get "index"
     assert_response :success
-    assert_select "img#i2[src=?]", %r{/images/bg.png\?\d+}
-    assert_select "img#i3[src=?]", %r{/images/bullet.gif\?\d+}
-    assert_select "img#i4[src=?]", %r{/images/flag.jpg\?\d+}
+    assert_select "img#i2[src=?]", %r{/images/bg.png}
+    assert_select "img#i3[src=?]", %r{/images/bullet.gif}
+    assert_select "img#i4[src=?]", %r{/images/flag.jpg}
   end
   
   test "inline images are rendered inline for ie 8" do

metadata

@@ -1,37 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fastimage_inline
-version: !ruby/object:Gem::Version 
-  version: 1.0.3
+version: !ruby/object:Gem::Version
+  version: 1.0.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-12-22 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fastimage
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.2
-    version: 
-description: FastImage Inline places small images inline in you HTML IMG tags code using a 'data' url.
+description: FastImage Inline places small images inline in you HTML IMG tags code
+  using a 'data' url.
 email: sdsykes@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - README.textile
-files: 
+files:
 - README
 - README.textile
 - Rakefile
@@ -47,35 +51,33 @@ files:
 - test/public/images/bullet.gif
 - test/public/images/flag.jpg
 - test/test.rb
-has_rdoc: true
 homepage: http://github.com/sdsykes/fastimage_inline
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: FastImage Inline - Speeds up your webpages with inline images in HTML using a data url
-test_files: 
+summary: FastImage Inline - Speeds up your webpages with inline images in HTML using
+  a data url
+test_files:
 - test/app/controllers/main_controller.rb
 - test/config/boot.rb
 - test/config/environment.rb