trusty-clipped-extension 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2fb41422be496362c51471a7724e1465fe92c98
-  data.tar.gz: 2e1d74ff4a2697100eca306cc27b9d6dc167e4bf
+  metadata.gz: e0f7e2fbb77337dab6ed69bce384fc481e248523
+  data.tar.gz: a11a10b0f8d511e1625296d038d3532da092a482
 SHA512:
-  metadata.gz: 1927086017144c19b551421927083521ced218f31ff2cba42d2039feaedac258082112204c3ddc6773908bc9fadc348d8e3ce9d000e6e8156ad351f0f3f0f49d
-  data.tar.gz: b398be896ef40026d13b16518cf5f97be35ce26d02c4b900a8da2430dcfc8219e8f6dc22e9dc1b5c9b308fa40875349bad321b628d11811474d14b7e092aedef
+  metadata.gz: 3f9469774d156389987291efb0f9c3a0c689e544832458910941c54e1d11f47d07828444bef137d7f341cacb3bd24bb927042ec8229a5ab1f5f8b3a4dea3b6b8
+  data.tar.gz: 5eb2bcdcb657f0475c5eeb3567b1eb82213b0336a348399b59110aecfcfe3617845437e6191f5b1c6aaad6e2502e22d6e893aa8246d54c2b063eb13f7617dfa0

data/Gemfile.lock

@@ -1,47 +1,48 @@
 PATH
   remote: .
   specs:
-    trusty-clipped-extension (2.0.5)
+    trusty-clipped-extension (2.0.6)
       acts_as_list (~> 0.4.0)
       cocaine (~> 0.5)
       paperclip (~> 4.2)
-      trusty-cms (~> 2.0.0)
+      rake (< 11.0)
+      trusty-cms (~> 2.0.16)
       uuidtools (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.3)
-      actionview (= 4.2.3)
-      activesupport (= 4.2.3)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.3)
-      activesupport (= 4.2.3)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.3)
-      activesupport (= 4.2.3)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
       globalid (>= 0.3.0)
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.3)
-      activemodel (= 4.2.3)
-      activesupport (= 4.2.3)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
       arel (~> 6.0)
-    activesupport (4.2.3)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -49,30 +50,28 @@ GEM
       tzinfo (~> 1.1)
     acts_as_list (0.4.0)
       activerecord (>= 3.0)
-    acts_as_tree (2.2.0)
+    acts_as_tree (2.4.0)
       activerecord (>= 3.0.0)
-    addressable (2.3.8)
+    addressable (2.4.0)
     arel (6.0.3)
     builder (3.2.2)
-    byebug (5.0.0)
-      columnize (= 0.9.0)
+    byebug (8.2.2)
     capybara (2.3.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    chunky_png (1.3.4)
-    ckeditor (4.1.3)
+    chunky_png (1.3.5)
+    ckeditor (4.1.6)
       cocaine
       orm_adapter (~> 0.5.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)
-    cocaine (0.5.7)
+    cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    coderay (1.1.0)
-    columnize (0.9.0)
+    coderay (1.1.1)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -85,9 +84,9 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    compass-rails (2.0.3)
+    compass-rails (2.0.5)
       compass (~> 1.0.0)
-      sass-rails (<= 5.0.1)
+      sass-rails (< 5.1)
       sprockets (< 2.13)
     daemons (1.2.3)
     database_cleaner (1.3.0)
@@ -95,8 +94,8 @@ GEM
       rails (>= 3.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    eventmachine (1.0.8)
-    execjs (2.5.2)
+    eventmachine (1.0.9.1)
+    execjs (2.6.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
@@ -113,7 +112,7 @@ GEM
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    highline (1.7.3)
+    highline (1.7.8)
     hike (1.2.3)
     html2haml (2.0.0)
       erubis (~> 2.7.0)
@@ -121,28 +120,28 @@ GEM
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
     i18n (0.7.0)
-    jquery-rails (3.1.3)
+    jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (3.16.14.11)
-    loofah (2.0.2)
+    libv8 (3.16.14.13)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.6.1)
+    mime-types (2.99.1)
     mimemagic (0.3.0)
-    mini_portile (0.6.2)
-    minitest (5.8.0)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
     multi_json (1.11.2)
-    mysql (2.9.1)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    mysql2 (0.4.3)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
     orm_adapter (0.5.0)
-    paperclip (4.3.0)
+    paperclip (4.3.5)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
@@ -155,48 +154,48 @@ GEM
       websocket-driver (>= 0.2.0)
     protected_attributes (1.0.9)
       activemodel (>= 4.0.1, < 5.0)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.2.0)
-      byebug (~> 5.0)
+    pry-byebug (3.3.0)
+      byebug (~> 8.0)
       pry (~> 0.10)
     rack (1.6.4)
-    rack-cache (1.2)
+    rack-cache (1.6.1)
       rack (>= 0.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     radius (0.7.4)
-    rails (4.2.3)
-      actionmailer (= 4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
-      activemodel (= 4.2.3)
-      activerecord (= 4.2.3)
-      activesupport (= 4.2.3)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.3)
+      railties (= 4.2.6)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
-    railties (4.2.3)
-      actionpack (= 4.2.3)
-      activesupport (= 4.2.3)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.5)
-    rb-inotify (0.9.5)
+    rake (10.5.0)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -217,23 +216,23 @@ GEM
       rspec-mocks (~> 3.0.0)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.4)
-    ruby_parser (3.7.1)
+    ruby_parser (3.8.1)
       sexp_processor (~> 4.1)
-    sass (3.4.16)
-    sass-rails (5.0.1)
+    sass (3.4.21)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
-    sexp_processor (4.6.0)
+      tilt (>= 1.1, < 3)
+    sexp_processor (4.7.0)
     slop (3.6.0)
     sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.2)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -241,14 +240,14 @@ GEM
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    thin (1.6.3)
+    thin (1.6.4)
       daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
+      eventmachine (~> 1.0, >= 1.0.4)
       rack (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    trusty-cms (2.0.11)
+    trusty-cms (2.0.16)
       RedCloth (~> 4.2)
       acts_as_tree (~> 2.1)
       bundler (~> 1.7)
@@ -260,7 +259,7 @@ GEM
       haml-rails (~> 0.5)
       highline (~> 1.6)
       jquery-rails (~> 3.1)
-      mysql (~> 2.9)
+      mysql2 (~> 0.4.2)
       protected_attributes (~> 1.0.9)
       rack (~> 1.4)
       rack-cache (~> 1.2)
@@ -276,14 +275,14 @@ GEM
       rake
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.1)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     uuidtools (2.1.5)
-    websocket-driver (0.6.2)
+    websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    will_paginate (3.0.7)
+    will_paginate (3.1.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -306,3 +305,6 @@ DEPENDENCIES
   thin (~> 1.6.2)
   trusty-clipped-extension!
   trustygems (~> 0.2.0)
+
+BUNDLED WITH
+   1.11.2

data/app/models/asset.rb

@@ -18,7 +18,7 @@ class Asset < ActiveRecord::Base
 
   scope :of_types, lambda { |types|
     mimes = AssetType.slice(*types).map(&:mime_types).flatten
-    where(["asset_content_type IN (#{mimes.map{'?'}.join(',')})", *mimes])
+    Asset.select { |x| mimes.include?(x.asset_content_type) }
   }
 
   scope :matching, lambda { |term|
@@ -34,7 +34,7 @@ class Asset < ActiveRecord::Base
       {}
     end
   }
-    
+
   has_attached_file :asset,
                     :styles => lambda { |attachment|
                       AssetType.for(attachment).paperclip_styles
@@ -56,7 +56,7 @@ class Asset < ActiveRecord::Base
 
   before_save :assign_title
   before_save :assign_uuid
-  
+
   after_post_process :read_dimensions
 
   validates_attachment_presence :asset, :message => "You must choose a file to upload!"
@@ -86,14 +86,14 @@ class Asset < ActiveRecord::Base
 
   def extension(style_name='original')
      if style_name == 'original'
-       return original_extension 
+       return original_extension
      elsif style = paperclip_styles[style_name.to_sym]
-       return style.format 
+       return style.format
      else
        return original_extension
      end
   end
-  
+
   def original_extension
     return asset_file_name.split('.').last.downcase if asset_file_name
   end
@@ -101,11 +101,11 @@ class Asset < ActiveRecord::Base
   def attached_to?(page)
     pages.include?(page)
   end
-  
+
   def original_geometry
     @original_geometry ||= Paperclip::Geometry.new(original_width, original_height)
   end
-  
+
   def geometry(style_name='original')
     raise Paperclip::StyleError, "Requested style #{style_name} is not defined for this asset." unless has_style?(style_name)
     @geometry ||= {}
@@ -131,9 +131,9 @@ class Asset < ActiveRecord::Base
     case
     when a == nil?
       'unknown'
-    when a < 1.0 
+    when a < 1.0
       'vertical'
-    when a > 1.0 
+    when a > 1.0
       'horizontal'
     else
       'square'
@@ -159,17 +159,17 @@ class Asset < ActiveRecord::Base
   def horizontal?(style_name='original')
     geometry(style_name).horizontal?
   end
-  
+
   def dimensions_known?
     original_width? && original_height?
   end
-  
+
 private
 
   # at this point the file queue will not have been written
   # but the upload should be in place. We read dimensions from the
   # original file and calculate thumbnail dimensions later, on demand.
-  
+
   def read_dimensions
     if image?
       if file = asset.queued_for_write[:original]
@@ -185,16 +185,16 @@ private
   def assign_title
     self.title = basename unless title?
   end
-  
+
   def assign_uuid
     self.uuid = UUIDTools::UUID.timestamp_create.to_s unless uuid?
   end
-  
+
   class << self
     def known_types
       AssetType.known_types
     end
-    
+
     # searching and pagination moved to the controller
 
     def find_all_by_asset_types(asset_types, *args)
@@ -206,7 +206,8 @@ private
     end
 
     def with_asset_types(asset_types, &block)
-      with_scope(where(AssetType.conditions_for(asset_types)), &block)
+      w_asset_types = AssetType.conditions_for(asset_types)
+      with_scope(where(:conditions => ["#{w_asset_types} = ?", block]))
     end
   end
 
@@ -231,14 +232,14 @@ private
 
   # this is a convenience for image-pickers
   def self.thumbnail_options
-    asset_sizes = thumbnail_sizes.collect{|k,v| 
+    asset_sizes = thumbnail_sizes.collect{|k,v|
       size_id = k
       size_description = "#{k}: "
       size_description << (v.is_a?(Array) ? v.join(' as ') : v)
-      [size_description, size_id] 
+      [size_description, size_id]
     }.sort_by{|pair| pair.last.to_s}
     asset_sizes.unshift ['Original (as uploaded)', 'original']
     asset_sizes
   end
-  
+
 end