trusty-clipped-extension 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fce717bd67ef70ea0e3774db95e25a180756849
-  data.tar.gz: d51fc2ff098036779c65888f8353dfd27f12974b
+  metadata.gz: 4c7870dd8f93f612fe64926f97ae2ad59a969898
+  data.tar.gz: 323b6d75f201492d2ce7010e83e3dad655dc3a2c
 SHA512:
-  metadata.gz: 5611804194eb69bf1db5f7ea5c56ebaaf8dbb2557b76bafb3750228a5151bd8d6d4e292978efdab5657d81511a66022dabe33e1c70e85f4334b79655caf6b81b
-  data.tar.gz: d178ef14986b71849c54d5a88b6437154c61256e9dc489a60fd142506e1f6b546e03b84dd81fa4faf64ee52e742689e561820fc94c3e9b1962bce0ac08477429
+  metadata.gz: fe435a4124f36c1c190cee022d7e5d4449f1db12c0866e42b439f494875a4845e65ea3dc35511c23ff732ca6e9081ade6a203160c238f06a0bdb9f3d4dd93182
+  data.tar.gz: a3bc26bb3c1508506fc9915fd41146f9e7065f2df536fe09754db11f5b85498207ec483dcab49b4955c9de0da8639d5b58b65252e68e2dedeccad46146ef6092

data/Gemfile.lock

@@ -8,11 +8,11 @@ GIT
 PATH
   remote: .
   specs:
-    trusty-clipped-extension (3.1.2)
+    trusty-clipped-extension (3.1.3)
       acts_as_list (~> 0.9.5)
       cocaine (~> 0.5.8)
       kraken-io
-      paperclip (~> 5.1)
+      paperclip (< 5.2)
       rake (< 11.0)
       trusty-cms (~> 3.1.0)
       uuidtools (~> 2.1.5)
@@ -58,7 +58,7 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    acts_as_list (0.9.9)
+    acts_as_list (0.9.10)
       activerecord (>= 3.0)
     acts_as_tree (2.6.1)
       activerecord (>= 3.0.0)
@@ -74,7 +74,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    chunky_png (1.3.8)
+    chunky_png (1.3.10)
     ckeditor (4.2.4)
       cocaine
       orm_adapter (~> 0.5.0)
@@ -114,7 +114,7 @@ GEM
     factory_girl_rails (4.6.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    ffi (1.9.18)
+    ffi (1.9.23)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     haml (5.0.4)
@@ -126,19 +126,15 @@ GEM
       haml (>= 4.0.6, < 6.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    highline (1.7.8)
+    highline (1.7.10)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    httparty (0.15.6)
+    httparty (0.16.0)
       multi_xml (>= 0.5.2)
     i18n (0.8.6)
-    jquery-rails (4.3.1)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
     json (2.1.0)
     kraken-io (0.1.3)
       activesupport
@@ -160,11 +156,11 @@ GEM
     mini_mime (1.0.0)
     mini_portile2 (2.2.0)
     minitest (5.10.3)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mysql2 (0.4.9)
-    nio4r (2.1.0)
+    mysql2 (0.4.10)
+    nio4r (2.2.0)
     nokogiri (1.8.0)
       mini_portile2 (~> 2.2.0)
     orm_adapter (0.5.0)
@@ -244,16 +240,16 @@ GEM
       rspec-mocks (~> 3.6.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
-    ruby_parser (3.10.1)
+    ruby_parser (3.11.0)
       sexp_processor (~> 4.9)
     sass (3.4.25)
-    sass-rails (5.0.6)
+    sass-rails (5.0.7)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sexp_processor (4.10.0)
+    sexp_processor (4.10.1)
     slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
@@ -270,7 +266,7 @@ GEM
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    trusty-cms (3.1.3)
+    trusty-cms (3.1.10)
       RedCloth (~> 4.3.2)
       acts_as_tree (~> 2.6.1)
       bundler (~> 1.7)
@@ -281,7 +277,6 @@ GEM
       haml (~> 5.0)
       haml-rails (~> 1.0.0)
       highline (~> 1.7.8)
-      jquery-rails (~> 4.3.1)
       mysql2 (~> 0.4.2)
       rack (~> 2.0.1)
       rack-cache (~> 1.7)

data/app/controllers/admin/assets_controller.rb

@@ -31,11 +31,12 @@ class Admin::AssetsController < Admin::ResourceController
 
   def create
     @assets, @page_attachments = [], []
+    compress = current_site.try(:compress) ? current_site.compress : true
     asset_params[:asset][:asset].to_a.each do |uploaded_asset|
       if uploaded_asset.content_type == "application/octet-stream"
         flash[:notice] = "Please only upload assets that have a valid extension in the name."
       else
-        uploaded_asset = compress(uploaded_asset) if $kraken.api_key.present? && COMPRESS_FILE_TYPE.include?(uploaded_asset.content_type)
+        uploaded_asset = compress(uploaded_asset) if $kraken.api_key.present? && COMPRESS_FILE_TYPE.include?(uploaded_asset.content_type) && compress
         @asset = Asset.create(:asset => uploaded_asset, :caption => asset_params[:asset][:caption])
         if params[:for_attachment]
           @page = Page.find_by_id(params[:page_id]) || Page.new

data/lib/trusty-clipped-extension.rb

@@ -1,5 +1,5 @@
 module TrustyCmsClippedExtension
-  VERSION     = '3.1.2'
+  VERSION     = '3.1.3'
   SUMMARY     = %q{Assets for TrustyCms CMS}
   DESCRIPTION = %q{Asset-management derived from Keith Bingman's Paperclipped extension.}
   URL         = "https://github.com/pgharts/trusty-clipped-extension"

data/trusty-clipped-extension.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = TrustyCmsClippedExtension::DESCRIPTION
 
   s.add_dependency "acts_as_list", "~> 0.9.5"
-  s.add_dependency "paperclip",    "~> 5.1"
+  s.add_dependency "paperclip",    "< 5.2"
   s.add_dependency "uuidtools",    "~> 2.1.5"
   s.add_dependency "cocaine",      "~> 0.5.8"
   s.add_dependency "trusty-cms",   "~> 3.1.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-clipped-extension
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Keith Bingman
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -35,16 +35,16 @@ dependencies:
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement