cartoonist 0.0.19 → 0.0.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bb9fd86c97df55571e625a98fc8922e44a3339c
-  data.tar.gz: 576c5902bb5a1d1eb3379045871855277963fad6
+  metadata.gz: 38127839d9063d465a90b25cd7de8b455c482870
+  data.tar.gz: 991ab59f3bd9f8d06bc14197e977bb5b3608ed0a
 SHA512:
-  metadata.gz: 7fcfd49c48767c5c21d2f6a67ec2d2beac9ce016c45d61065d6a4e777c442168f1f9aa10c868b70e9f8c0388e22350354f140bed545af8335ad9ef89e2fe7325
-  data.tar.gz: 64e43dc9b00272c249fdcda75e5fccd71c45f4d3f01008885292fdfdbe6096c49589087b69570ecc7991cd072cda0b19c0b06d9a66814e70e3be47e475ce7aaf
+  metadata.gz: 406996381365ae93a3355611735880a87ecaa344552456f4899e36298351b065d7ace6821106f25e2d45305c78c0360e9a17dc35c377234875d6d4b2b35c9c42
+  data.tar.gz: 07311127ded11081f7433d655857ae0620cf8dc0594bb0597448cc604b42229e5671b32b484405fd90ea8426bb5bad7795aee8be68147b9737cae14658a2ed89

data/lib/cartoonist/nginxtra.rb

@@ -1,6 +1,7 @@
 Nginxtra::Config::Extension.partial "nginx.conf", "cartoonist_rails" do |args, block|
   rails_server = args[:server] || :passenger
   ssl_details = args[:ssl]
+  ruby_version = args[:ruby]
 
   if ssl_details
     default_port = 443
@@ -11,7 +12,7 @@ Nginxtra::Config::Extension.partial "nginx.conf", "cartoonist_rails" do |args, b
   if rails_server == :passenger && !@passenger_requirements_done
     @config.require_passenger!
     passenger_root!
-    passenger_ruby!
+    passenger_ruby! unless ruby_version
     @passenger_requirements_done = true
   end
 
@@ -20,6 +21,7 @@ Nginxtra::Config::Extension.partial "nginx.conf", "cartoonist_rails" do |args, b
     server_name(args[:server_name] || "localhost")
     root File.join(File.absolute_path(File.expand_path(args[:root] || ".")), "public")
     gzip_static "on"
+    passenger_ruby ruby_version if ruby_version
     passenger_on! if rails_server == :passenger
     rails_env(args[:environment] || "production")
 
@@ -49,9 +51,10 @@ Nginxtra::Config::Extension.partial "nginx.conf", "cartoonist" do |args, block|
   ssl_details = { :ssl => ssl_details } if ssl_details
   short_expiration = args[:short_expiration] || "2h"
   long_expiration = args[:long_expiration] || "7d"
+  ruby_version = args[:ruby]
 
   [{}, ssl_details].compact.each do |additional_options|
-    options = { :server => :custom, :server_name => server_name, :root => root_path }.merge additional_options
+    options = { :server => :custom, :server_name => server_name, :root => root_path, :ruby => ruby_version }.merge additional_options
 
     cartoonist_rails options do
       location "~*", "^/_long_expiration_/#{cartoonist_type}(/.*?)(?:\\.html)?$" do

data/lib/cartoonist/version.rb

@@ -2,7 +2,7 @@ module Cartoonist
   class Version
     class << self
       def to_s
-        "0.0.19"
+        "0.0.19.3"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.19.3
 platform: ruby
 authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching