trusty-clipped-extension 2.0.13 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f9539db936bd51405eb6384a0f2d2d11713d299
-  data.tar.gz: a52524601529faeb53f019681a26693c32905e56
+  metadata.gz: 820cbfb1f50f886f5aaf0b92d3f410bae2c22ebc
+  data.tar.gz: f2fedd62e3f042f1aa6e9997721433a2b088949c
 SHA512:
-  metadata.gz: 4b71b6576be354faf6c8104858a8b4b23b952f0e56469c9f633e2d401f68e60915eccc55ce98122d1d69e1482af7a93e478cdf0a0b46f0f3b5b6a0c3433ed728
-  data.tar.gz: 4cc8b9e38c1c9d29a56f06e82014be4080b94aca84dcac859b19cbd1f99c33b029d2ad2a64fa681f566572e72aa697f80a65015ef1b39e874a8cd8ae7794de2f
+  metadata.gz: 0dfa3ad9edb6883fbbcb362f8a446049685ce4d3845dac89b4ca0da46bb982472e2955b42549ecba566a023500d79bcc54ceea28d9788b1dc8117f02bbaf0741
+  data.tar.gz: 681b616db09c3f49594c62a9ce6c8412db598e34ed3f43a9c904c731be12516b43c4cd76d96b76ce27185e1958a901aeec1ab76d6580a03f27d941efff792df9

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    trusty-clipped-extension (2.0.13)
+    trusty-clipped-extension (2.0.14)
       acts_as_list (~> 0.4.0)
       cocaine (~> 0.5)
+      kraken-io
       paperclip (~> 4.2)
       rake (< 11.0)
       trusty-cms (~> 2.0.16)
@@ -12,7 +13,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
+    RedCloth (4.3.2)
     actionmailer (4.2.6)
       actionpack (= 4.2.6)
       actionview (= 4.2.6)
@@ -50,10 +51,10 @@ GEM
       tzinfo (~> 1.1)
     acts_as_list (0.4.0)
       activerecord (>= 3.0)
-    acts_as_tree (2.4.0)
+    acts_as_tree (2.6.1)
       activerecord (>= 3.0.0)
     addressable (2.4.0)
-    arel (6.0.3)
+    arel (6.0.4)
     builder (3.2.2)
     byebug (8.2.2)
     capybara (2.3.0)
@@ -95,14 +96,14 @@ GEM
     diff-lcs (1.2.5)
     erubis (2.7.0)
     eventmachine (1.2.0.1)
-    execjs (2.6.0)
+    execjs (2.7.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
     ffi (1.9.10)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
     haml (4.0.7)
       tilt
@@ -114,19 +115,26 @@ GEM
       railties (>= 4.0.1)
     highline (1.7.8)
     hike (1.2.3)
-    html2haml (2.0.0)
+    html2haml (2.1.0)
       erubis (~> 2.7.0)
-      haml (~> 4.0.0)
-      nokogiri (~> 1.6.0)
+      haml (~> 4.0)
+      nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
+    httparty (0.14.0)
+      multi_xml (>= 0.5.2)
     i18n (0.7.0)
     jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
+    kraken-io (0.1.3)
+      activesupport
+      httparty
+      json
+      multipart-post
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (3.16.14.13)
+    libv8 (3.16.14.19)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
@@ -139,11 +147,13 @@ GEM
     mini_portile2 (2.0.0)
     minitest (5.8.4)
     multi_json (1.11.2)
-    mysql2 (0.4.3)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    mysql2 (0.4.5)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     orm_adapter (0.5.0)
-    paperclip (4.3.6)
+    paperclip (4.3.7)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
@@ -164,7 +174,7 @@ GEM
       byebug (~> 8.0)
       pry (~> 0.10)
     rack (1.6.4)
-    rack-cache (1.6.1)
+    rack-cache (1.7.0)
       rack (>= 0.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -218,7 +228,7 @@ GEM
       rspec-mocks (~> 3.0.0)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.4)
-    ruby_parser (3.8.1)
+    ruby_parser (3.8.4)
       sexp_processor (~> 4.1)
     sass (3.4.21)
     sass-rails (5.0.4)
@@ -227,7 +237,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sexp_processor (4.7.0)
+    sexp_processor (4.8.0)
     slop (3.6.0)
     sprockets (2.12.4)
       hike (~> 1.2)
@@ -239,8 +249,8 @@ GEM
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     stringex (1.5.1)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
       ref
     thin (1.6.4)
       daemons (~> 1.0, >= 1.0.9)
@@ -249,8 +259,8 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    trusty-cms (2.0.20)
-      RedCloth (~> 4.2)
+    trusty-cms (2.0.26)
+      RedCloth (~> 4.3.2)
       acts_as_tree (~> 2.1)
       bundler (~> 1.7)
       ckeditor (~> 4.1)
@@ -285,7 +295,7 @@ GEM
     websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    will_paginate (3.1.0)
+    will_paginate (3.1.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -310,4 +320,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   1.11.2
+   1.14.5

data/app/controllers/admin/assets_controller.rb

@@ -1,5 +1,6 @@
 class Admin::AssetsController < Admin::ResourceController
   paginate_models(:per_page => 50)
+  COMPRESS_FILE_TYPE = ["image/jpeg", "image/png", "image/gif", "image/svg+xml"]
   
   def index
     assets = Asset.order("created_at DESC")
@@ -34,6 +35,7 @@ class Admin::AssetsController < Admin::ResourceController
       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)
         @asset = Asset.create(:asset => uploaded_asset, :caption => params[:asset][:caption])
         if params[:for_attachment]
           @page = Page.find_by_id(params[:page_id]) || Page.new
@@ -70,5 +72,12 @@ class Admin::AssetsController < Admin::ResourceController
     flash[:notice] = t('clipped_extension.all_thumbnails_refreshed')
     redirect_to admin_assets_path
   end
+
+private
+  def compress(uploaded_asset)
+    data = $kraken.upload(uploaded_asset.tempfile.path)
+    File.write(uploaded_asset.tempfile, open(data.kraked_url).read, { :mode => 'wb' })
+    uploaded_asset
+  end
   
 end

data/app/models/asset_type.rb

@@ -1,5 +1,5 @@
 class AssetType
-  
+
   # The Asset Type encapsulates a type of attachment.
   # Conventionally this would a sensible category like 'image' or 'video'
   # that should be processed and presented in a particular way.
@@ -9,14 +9,14 @@ class AssetType
   #   * mime type list for file recognition
   #   * selectors and scopes for retrieving this (or not this) category of asset
   #   * radius tags for those subsets of assets (temporarily removed pending discussion of interface)
-  
+
   @@types = []
   @@type_lookup = {}
   @@extension_lookup = {}
   @@mime_lookup = {}
   @@default_type = nil
   attr_reader :name, :processors, :styles, :icon_name, :catchall, :default_radius_tag
-  
+
   def initialize(name, options = {})
     options = options.symbolize_keys
     @name = name
@@ -31,17 +31,17 @@ class AssetType
     @mimes.each { |mimetype| @@mime_lookup[mimetype] ||= self }
 
     this = self
-    Asset.send :define_method, "#{name}?".intern do this.mime_types.include?(asset_content_type) end 
+    Asset.send :define_method, "#{name}?".intern do this.mime_types.include?(asset_content_type) end
     Asset.send :define_class_method, "#{name}_condition".intern do this.condition; end
     Asset.send :define_class_method, "not_#{name}_condition".intern do this.non_condition; end
     Asset.send :scope, plural.to_sym, -> {where(:conditions => condition)}
     Asset.send :scope, "not_#{plural}".to_sym, -> {where(:conditions => non_condition)}
-    
+
     self.define_radius_tags
     @@types.push self
     @@type_lookup[@name] = self
   end
-  
+
   def plural
     name.to_s.pluralize
   end
@@ -53,11 +53,11 @@ class AssetType
       return "/assets/admin/#{icon_name}_icon.png"
     end
   end
-  
+
   def icon_path(style_name='icon')
     Rails.root + "public#{icon(style_name)}"
   end
-  
+
   def condition
     if @mimes.any?
       ["asset_content_type IN (#{@mimes.map{'?'}.join(',')})", *@mimes]
@@ -65,7 +65,7 @@ class AssetType
       self.class.other_condition
     end
   end
-  
+
   def sanitized_condition
     ActiveRecord::Base.send :sanitize_sql_array, condition
   end
@@ -89,9 +89,9 @@ class AssetType
   def paperclip_processors
     TrustyCms.config["assets.create_#{name}_thumbnails?"] ? processors : []
   end
-  
+
   # Parses and combines the various ways in which paperclip styles can be defined, and normalises them into
-  # the format that paperclip expects. Note that :styles => :standard has already been replaced with the 
+  # the format that paperclip expects. Note that :styles => :standard has already been replaced with the
   # results of a call to standard_styles.
   # Styles are passed to paperclip as a hash and arbitrary keys can be passed through from configuration.
   #
@@ -105,9 +105,9 @@ class AssetType
     end
     @paperclip_styles
   end
-  
+
   # Takes a motley collection of differently-defined styles and renders them into the standard hash-of-hashes format.
-  # Solitary strings are assumed to be 
+  # Solitary strings are assumed to be
   #TODO: define permitted and/or expected options for the asset type and pass through that subset of the style-definition hash
   #
   def normalize_style_rules(styles={})
@@ -128,12 +128,10 @@ class AssetType
   
   def standard_styles
     {
-      :native => { :geometry => "", :format => :jpg },
-      :icon => { :geometry => '42x42#', :format => :png },
       :thumbnail => { :geometry => '100x100#', :format => :png }
     }
   end
-  
+
   # Paperclip styles are defined in the config entry `assets.thumbnails.asset_type`, with the format:
   # foo:key-x,key=y,key=z|bar:key-x,key=y,key=z
   # where 'key' can be any parameter understood by your paperclip processors. Usually they include :geometry and :format.
@@ -153,17 +151,17 @@ class AssetType
       {}
     end
   end
-  
+
   def legacy_styles
     TrustyCms::config["assets.additional_thumbnails"].to_s.gsub(' ','').split(',').collect{|s| s.split('=')}.inject({}) {|ha, (k, v)| ha[k.to_sym] = v; ha}
   end
-  
+
   def style_dimensions(style_name)
     if style = paperclip_styles[style_name.to_sym]
       style[:size]
     end
   end
-  
+
   def define_radius_tags
     type = self.name
     Page.class_eval {
@@ -175,9 +173,9 @@ class AssetType
       end
     }
   end
-  
+
   # class methods
-  
+
   def self.for(attachment)
     extension = File.extname(attachment.original_filename).sub(/^\.+/, "")
     from_extension(extension) || from_mimetype(attachment.instance_read(:content_type)) || catchall
@@ -190,11 +188,11 @@ class AssetType
   def self.from_mimetype(mimetype)
     @@mime_lookup[mimetype]
   end
-  
+
   def self.catchall
     @@default_type ||= self.find(:other)
   end
-  
+
   def self.known?(name)
     !self.find(name).nil?
   end
@@ -209,7 +207,7 @@ class AssetType
   def self.[](type)
     find(type)
   end
-  
+
   def self.all
     @@types
   end
@@ -221,7 +219,7 @@ class AssetType
   def self.known_mimetypes
     @@mime_lookup.keys
   end
-    
+
   def self.mime_types_for(*names)
     names.collect{ |name| find(name).mime_types }.flatten
   end