scale_down 0.5.3 → 0.6.0

data/.gitignore

@@ -1,3 +1,4 @@
+Gemfile.lock
 pkg/*
 *.gem
 .bundle

data/CHANGES

@@ -1,3 +1,8 @@
+== 2011-12-09 ==
+Version 0.6.0
+public_path is renamed public_folder
+bug fixes
+
 == 2011-12-09 ==
 Version 0.5.1
 Fix for non PNG/JPG images.  Redirect to the JPG version.

data/README.rdoc

@@ -100,7 +100,7 @@ Create a Rackup file (config.ru). See https://github.com/jweir/ScaleDown/tree/ma
     config.hmac_key    = "secret"
 
     # Path to the public directory
-    config.public_path = File.expand_path(File.dirname(__FILE__))+"/public"
+    config.public_folder = File.expand_path(File.dirname(__FILE__))+"/public"
   end
 
   run ScaleDown::Controller

data/lib/scale_down/configuration.rb

@@ -29,11 +29,11 @@ module ScaleDown
 
     # The location of the public path for you application
     # +Must be set+
-    attr_accessor :public_path
+    attr_accessor :public_folder
 
-    def public_path=(str)
-      @public_path = str
-      ScaleDown::Controller.public = str
+    def public_folder=(str)
+      @public_folder = str
+      ScaleDown::Controller.public_folder = str
     end
 
     def logger=(logger)

data/lib/scale_down/dispatcher.rb

@@ -21,7 +21,7 @@ class ScaleDown::Dispatcher
 
     # TODO return a JSON response with a full set of image details
     def info(relative_path)
-      path = [ScaleDown.public_path, relative_path].join("/")
+      path = [ScaleDown.public_folder, relative_path].join("/")
       if File.exists?(path)
         GC.start
         image = Magick::Image.read(path).first
@@ -73,11 +73,11 @@ class ScaleDown::Dispatcher
 
   def root_path
     root = @params[:path].gsub(/\/scaled$/,"")
-    File.join(ScaleDown.public_path, root, @params[:filename])
+    File.join(ScaleDown.public_folder, root, @params[:filename])
   end
 
   def scaled_file_path
-    File.join(ScaleDown.public_path, redirect_path)
+    File.join(ScaleDown.public_folder, redirect_path)
   end
 
   def scaled_filename

data/lib/scale_down/image.rb

@@ -41,9 +41,8 @@ class ScaleDown::Image
   def initialize(properties = {})
     load_file(properties[:file]) do |file|
       resize(file, properties[:options])
-      fix_color_space(file)
-
-      @valid = write(file, properties[:out])
+      corrected = fix_color_space(file)
+      @valid = write(corrected, properties[:out])
     end
   end
 
@@ -72,7 +71,9 @@ class ScaleDown::Image
     def fix_color_space(file)
       if file.colorspace == Magick::CMYKColorspace
         file.add_profile "#{File.expand_path(File.dirname(__FILE__))}/../../color_profiles/sRGB.icm"
-        file = file.quantize 2**24, Magick::RGBColorspace
+        file.quantize 2**24, Magick::RGBColorspace
+      else
+        file
       end
     end
 

data/lib/scale_down/version.rb

@@ -1,3 +1,3 @@
 module ScaleDown
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

data/test/scale_down/configuration_test.rb

@@ -3,10 +3,10 @@ require File.expand_path(File.dirname(__FILE__))+'/../test_helper'
 class ScaleDown::Test < Test::Unit::TestCase
 
   context "Configuration" do
-    context "public_path" do
+    context "public_folder" do
       should "set the controller's public setting" do
-        ScaleDown.public_path = "/tmp/directory"
-        assert_equal "/tmp/directory", ScaleDown::Controller.public
+        ScaleDown.public_folder = "/tmp/directory"
+        assert_equal "/tmp/directory", ScaleDown::Controller.public_folder
       end
     end
   end

data/test/scale_down/dispatcher_test.rb

@@ -7,7 +7,7 @@ class ScaleDown::Dispatcher::Test < Test::Unit::TestCase
       ScaleDown.hmac_key    = "secret"
       ScaleDown.hmac_method = HMAC::SHA1
       ScaleDown.hmac_length = 8
-      ScaleDown.public_path = "/tmp"
+      ScaleDown.public_folder = "/tmp"
 
       hmac = HMAC::SHA1.new("secret").update("file/path/400x300-crop/filename.png").to_s
 
@@ -143,7 +143,7 @@ class ScaleDown::Dispatcher::Test < Test::Unit::TestCase
 
   context "#info" do
     setup do
-      ScaleDown.public_path = File.join(File.expand_path(File.dirname(__FILE__)), "..")
+      ScaleDown.public_folder = File.join(File.expand_path(File.dirname(__FILE__)), "..")
     end
 
     should "return the width x height for an image" do

data/test/scale_down_test.rb

@@ -16,7 +16,7 @@ class ScaleDown::Test < Test::Unit::TestCase
       ScaleDown.hmac_key    = "secret"
       ScaleDown.hmac_method = HMAC::SHA1
       ScaleDown.hmac_length = 8
-      ScaleDown.public_path = "/tmp/scale_down"
+      ScaleDown.public_folder = "/tmp/scale_down"
     end
 
     context "HMAC" do
@@ -53,8 +53,8 @@ class ScaleDown::Test < Test::Unit::TestCase
       end
 
       should "get image info" do
-        FileUtils.cp fixture_path("files/cmyk.tif"), "/tmp/scale_down/test_images/example_1/long name .tiff"
-        get "/test_images/example_1/#{CGI.escape 'long name .tiff'}/info"
+        FileUtils.cp fixture_path("files/cmyk.tif"), "/tmp/scale_down/test_images/example_1/long-name.tiff"
+        get "/test_images/example_1/#{CGI.escape 'long-name.tiff'}/info"
         assert_equal "300x500", last_response.body
       end
 

data/test/scaled_image_tag_test.rb

@@ -13,7 +13,7 @@ class ScaleDown::Test < Test::Unit::TestCase
     ScaleDown.hmac_key    = "secret"
     ScaleDown.hmac_method = HMAC::SHA1
     ScaleDown.hmac_length = 8
-    ScaleDown.public_path = "/tmp"
+    ScaleDown.public_folder = "/tmp"
   end
 
   should "create a URL with the HMAC signature" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scale_down
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000Z
+date: 2012-01-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &2153528900 !ruby/object:Gem::Requirement
+  requirement: &2164341720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2153528900
+  version_requirements: *2164341720
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2153528400 !ruby/object:Gem::Requirement
+  requirement: &2164341220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153528400
+  version_requirements: *2164341220
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &2153527940 !ruby/object:Gem::Requirement
+  requirement: &2164340760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153527940
+  version_requirements: *2164340760
 - !ruby/object:Gem::Dependency
   name: contest
-  requirement: &2153527480 !ruby/object:Gem::Requirement
+  requirement: &2164340300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.2
   type: :development
   prerelease: false
-  version_requirements: *2153527480
+  version_requirements: *2164340300
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2153527020 !ruby/object:Gem::Requirement
+  requirement: &2164370020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *2153527020
+  version_requirements: *2164370020
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2153556740 !ruby/object:Gem::Requirement
+  requirement: &2164369560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,7 +76,7 @@ dependencies:
         version: 0.5.6
   type: :development
   prerelease: false
-  version_requirements: *2153556740
+  version_requirements: *2164369560
 description: ''
 email:
 - john@famedriver.com
@@ -87,7 +87,6 @@ files:
 - .gitignore
 - CHANGES
 - Gemfile
-- Gemfile.lock
 - README.rdoc
 - Rakefile
 - color_profiles/sRGB.icm

data/Gemfile.lock

@@ -1,40 +0,0 @@
-PATH
-  remote: .
-  specs:
-    scale_down (0.2.9)
-      rmagick (>= 2.1)
-      ruby-hmac (>= 0.4.0)
-      sinatra (>= 1.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    contest (0.1.3)
-    daemons (1.1.4)
-    eventmachine (0.12.10)
-    mocha (0.9.8)
-      rake
-    rack (1.2.2)
-    rack-test (0.5.6)
-      rack (>= 1.0)
-    rake (0.8.7)
-    rmagick (2.13.1)
-    ruby-hmac (0.4.0)
-    sinatra (1.2.7)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
-    thin (1.3.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  contest (>= 0.1.2)
-  mocha (= 0.9.8)
-  rack-test (= 0.5.6)
-  scale_down!
-  thin