spider_monkey 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca54d3b1d9e3ae2d36c0baff41cec4bf784e8d76
-  data.tar.gz: 6e72c92b2332feadc22301c34d8979085ecab0d2
+  metadata.gz: aede00e4f9c44275ad949e133edd5f90dd61f77a
+  data.tar.gz: 8a4649fca749bee467eebbc9191b40338c72e905
 SHA512:
-  metadata.gz: 39f64bccf3aa5bb8e57f471a9dc4a2558b5dfeb17ed2b3fe4a75422060f069c0a62e9e8ec2e1d708b8db01a7840283947c1c5745581f0870cc2db425bf6579c6
-  data.tar.gz: 28ba8f0600e665273eada889d9e6b509c809e77ae50cdbb782703ba81094e0ab1fef9b847404df3cc6bdd7b75eb5dcea6feecf5e760e73da000bfed1a83926e6
+  metadata.gz: eb3d2b530ff15ae669724d57410e94876bfe0edf480893cef294bbec59d8fe5a7c6ff76bacc8534dc0dd4d9a11e1fb1a6c377f8de88dbfb779ec443bcc1393b2
+  data.tar.gz: 9e971b4a2372c4d4abc3c6e9bc1c202b1a42a66bfaac7bb31f011bdf18695c8c25ecce574ad5344320219f3e757118ae2da663b1244cc46ac11c9281d6b8e66c

data/lib/spider_monkey/validator.rb

@@ -38,18 +38,22 @@ module SpiderMonkey
       @options.delete(:source_bucket)
       
       
+      validate_option(:string, :key, true) # This is the user API key, not the source key. Probably should rename this.
+      validate_option(:integer_like, :width, true)
+      validate_option(:integer_like, :height, true)
       validate_option(:colorspace, :read_colorspace)
       validate_option(:integer_like, :read_density)
       validate_option(:integer_like, :quality)
-      validate_option(:integer_like, :width, true)
-      validate_option(:integer_like, :height, true)
       validate_option(:resize_method, :resize_method)
       validate_option(:gravity, :resize_gravity)
       validate_option(:boolean, :thumbnail)
       validate_option(:integer_like, :density)
-      validate_option(:string, :key, true)
       validate_option(:colorspace, :colorspace)
       validate_option(:color, :background_color)
+      validate_option(:string, :template)
+      
+      # Merge Variables
+      @valid_options[:template_merge_variables] = @options[:template_merge_variables] if @options[:template_merge_variables]
 
       #:annotate,
       @valid_options[:annotate] = @options[:annotate] if @options[:annotate]
@@ -257,7 +261,9 @@ module SpiderMonkey
         :colorspace,
         :annotate,
         :composite,
-        :background_color
+        :background_color,
+        :template,
+        :template_merge_variables
       ].include?(symbol)
     end
     

data/spider_monkey.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "spider_monkey"
-  s.version     = "0.0.4"
+  s.version     = "0.0.5"
   s.platform    = Gem::Platform::RUBY
 
   s.authors = ["Ben McFadden"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spider_monkey
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ben McFadden