thumbkit 0.1.2 → 0.1.3

data/Gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: .
   specs:
-    thumbkit (0.1.1)
+    thumbkit (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/thumbkit/adapters/{carrierwave.rb → carrier_wave.rb}

@@ -20,8 +20,20 @@
 #   end
 #
 module Thumbkit::Adapters::CarrierWave
-  def thumbkit(width, height, options = {})
-    options.merge!(width: width, height: height)
+  def thumbkit_options(args)
+    {}.tap do |options|
+      if args.size > 1
+        width = args.shift
+        height = args.shift
+        options.merge!(width: width, height: height)
+      end
+
+      options.merge! args.fetch(0, {})
+    end
+  end
+
+  def thumbkit(*args)
+    options = thumbkit_options(args)
     cache_stored_file! if !cached?
     thumbkit = Thumbkit.new(current_path)
     result = thumbkit.write_thumbnail(nil, options)

data/lib/thumbkit/adapters.rb

@@ -1,3 +1,3 @@
 module Thumbkit::Adapters
-  autoload :CarrierWave, 'thumbkit/adapters/carrierwave'
+  autoload :CarrierWave, 'thumbkit/adapters/carrier_wave'
 end

data/lib/thumbkit/version.rb

@@ -1,3 +1,3 @@
 class Thumbkit
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thumbkit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies: []
 description: Thumbkit makes thumbnails!
 email:
@@ -18,7 +18,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/thumbkit/adapters/carrierwave.rb
+- lib/thumbkit/adapters/carrier_wave.rb
 - lib/thumbkit/adapters.rb
 - lib/thumbkit/options.rb
 - lib/thumbkit/processor/audio.rb