callisto 0.9 → 0.9.1

data/lib/callisto/configuration.rb

@@ -1,3 +1,5 @@
+require "delegate"
+
 module Callisto
 
   class Configuration
@@ -10,32 +12,43 @@ module Callisto
         :max_workers => 4
       }
 
+      THUMBNAIL = {
+        :quality => 90
+      }
+
+      SHELL = {}
+
     end
 
     attr_accessor :thumbnail_defaults
 
     def initialize
-      self.thumbnail_defaults = {}
-      load_defaults
+      reset
     end
 
-    def load_defaults
-      Pool.settings = Defaults::POOL
+    def reset
+      self.thumbnail_defaults = Defaults::THUMBNAIL.clone
+      Pool.settings = Defaults::POOL.clone
+      Shell.bin_path = Defaults::SHELL.clone[:bin_path]
     end
 
     def max_workers=(val)
       Pool.settings.max_workers = val
     end
 
+    def bin_path=(val)
+      Shell.bin_path = val
+    end
+
     def method_missing(method, *args, &block)
       if /^thumbnail_(?<name>[a-z\_]+)(?<setter>=)?/ =~ method
         if setter
-          self.thumbnail_defaults[name] = args.first
+          self.thumbnail_defaults[name.to_sym] = args.first
         else
-          thumbnail_defaults[name]
+          thumbnail_defaults[name.to_sym]
         end
       else
-        super
+        super(method, *args, &block)
       end
     end
 

data/lib/callisto/pool.rb

@@ -17,11 +17,11 @@ module Callisto
           :identifier  => proc { |entry| entry.object_id },
           :callback    => proc { |entry| entry.call }
         }
-        @@settings = OpenStruct.new(defaults.merge(options))
+        @settings = OpenStruct.new(defaults.merge(options))
       end
 
       def settings
-        @@settings
+        @settings
       end
 
     end

data/lib/callisto/shell.rb

@@ -5,7 +5,11 @@ module Callisto
     attr_accessor :executable, :arguments
 
     def self.bin_path=(path)
-      @@bin_path = path
+      @bin_path = path
+    end
+
+    def self.bin_path
+      @bin_path
     end
 
     def initialize(executable, arguments)
@@ -14,11 +18,7 @@ module Callisto
     end
 
     def command
-      prefix = if defined?(@@bin_path)
-                 File.join(@@bin_path, executable)
-               else
-                 executable
-               end
+      prefix = File.join(*[self.class.bin_path, executable].compact)
       "#{prefix} #{arguments}"
     end
 

data/lib/callisto/thumbnail.rb

@@ -25,7 +25,7 @@ module Callisto
       location = File.join(root_path, prefix)
       if !File.exist?(save_path)
         FileUtils.mkdir_p(location) unless File.directory?(location)
-        task = Shell.new("convert", "#{file_path} -strip -quality #{quality || 90} -resize #{size}#{flag} #{crop} #{save_path}")
+        task = Shell.new("convert", "#{file_path} -strip -quality #{quality} -resize #{size}#{flag} #{crop} #{save_path}")
         pid = Callisto::Pool.instance << task
         Callisto::Pool.instance.wait(pid)
       end

data/lib/callisto/version.rb

@@ -1,3 +1,3 @@
 module Callisto
-  VERSION = "0.9"
+  VERSION = "0.9.1"
 end

data/spec/configuration_spec.rb

@@ -3,6 +3,10 @@ require File.expand_path("../minitest_helper", __FILE__)
 
 describe "Configuration" do
 
+  before do
+    Callisto.configuration.reset
+  end
+
   it "should assign max workers to pool" do
     Callisto.configure do |config|
       config.max_workers = 13
@@ -20,4 +24,16 @@ describe "Configuration" do
     Callisto.configuration.thumbnail_quality.must_equal 75
   end
 
+  it "can be reset" do
+    default_size = Callisto::Configuration::Defaults::THUMBNAIL[:size]
+    default_quality = Callisto::Configuration::Defaults::THUMBNAIL[:quality]
+    Callisto.configure do |config|
+      config.thumbnail_size = "20x45"
+      config.thumbnail_quality = 75
+    end
+    Callisto.configuration.reset
+    Callisto.configuration.thumbnail_size.must_equal default_size
+    Callisto.configuration.thumbnail_quality.must_equal default_quality
+  end
+
 end

data/spec/minitest_helper.rb

@@ -6,3 +6,8 @@ def reset_pool
   Callisto::Pool.settings = {}
   Callisto::Pool.reset_instance
 end
+
+def cleanup(path)
+  matcher = File.join(path, "*.*")
+  Dir[matcher].each { |entry| File.unlink(entry) }
+end

data/spec/thumbnail_spec.rb

@@ -1,16 +1,11 @@
 require "minitest/autorun"
 require File.expand_path("../minitest_helper", __FILE__)
 
-def cleanup(path)
-  matcher = File.join(path, "*.*")
-  Dir[matcher].each { |entry| File.unlink(entry) }
-end
-
 describe "Thumbnail" do
 
   before do
     reset_pool
-    Callisto.configuration.load_defaults
+    Callisto.configuration.reset
   end
 
   describe "when saving" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: callisto
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000Z
+date: 2012-04-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &25241560 !ruby/object:Gem::Requirement
+  requirement: &27777500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25241560
+  version_requirements: *27777500
 description: Image thumbnails on the fly
 email:
 - daniel@thegeek.ro