trusty-clipped-extension 2.0.0.pre.beta → 2.0.1.pre.beta

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDAyNjY1MmY3ZjRmMzYxNTEwOTVkM2I2NTIyZDcwNzMxNTBmNjJlZg==
+    ZGUwNGRlODI5NDc1YWI3YzI0YzgxN2NiNDY4YjE1MjBmYWJiNmM4MQ==
   data.tar.gz: !binary |-
-    OGNkYTE2NjYwZjM2MjgxZGY0NGE1YmJkMWY3OWNiMDk4Y2JlMGYyZQ==
+    MmVhZDk0YWRlNmViYjZmNWFlODQ0MDNlYWZhY2MxYWU5YzNjOGI5YQ==
 SHA512:
   metadata.gz: !binary |-
-    NjBlMGJmY2E2NjQ5MzBhY2E0ZDk1NWViYjA0NDE4NmFlNTIxZWU5NTU0ZTNl
-    MWZmN2EyNWJlNzczZjRiNWQzNWE2ODUxZGJkOTcwMzE2MzAyYTRiNmI4MDRm
-    YjRjNTRkMzczZTI0NWM0YjlhOTc3MmZhNDAyMmIwZGNjNzU4NWY=
+    NTA2ZThiZTMxNjk2MWExZjBhMmE2ZGQ1ODJiOTlkYjY5MjRhYzhjOWYyOWZk
+    OTczN2FhMWFhZmYwNGU0MTRiYjY3ZGRmODhlOTdjNjFhM2Q1ZGIxYjFhMTU2
+    Nzc4ZTU3MGViMmJhZjM3MjViNDY0MGIwMTI2ZWRjNDYyZGM4MTE=
   data.tar.gz: !binary |-
-    ZGM4ZjczOTE3M2E1NjU4N2JiMGM2ZjNkYjUzZmU3Mjg2NzYyZGM4MDA0MzJm
-    NzVlZDEyMDE4OWZkYWFhMmZiNWI2NWJkMzM2ZmQ5MTcwZDEzYjM5MGMxZmIx
-    ZjQxNTcyYzQxNjdhODhkNDM4ZDIwZmU5YzA5ODE0MDM2YTI1OTc=
+    MDBiNjBhYmYzNjI1NjViMWVlNDdjYmEyNTQ0MWEyZDZlODhkMjU2MDM5MWEz
+    NmE1NjI5MzE0MTNkYjM5NWYxMWU0NjM1ZWYyMTlhYzNiZTdhN2YyMjMxYTBj
+    NTg4ZGIyZmM3ZDhmYmM2OWYzNDFiMmQ1OTZjZTRlMWViMmQzN2Q=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-clipped-extension (1.1.1)
+    trusty-clipped-extension (2.0.1.pre.beta)
       acts_as_list (= 0.4.0)
       cocaine (~> 0.5)
       paperclip (~> 4.2)
@@ -92,7 +92,7 @@ GEM
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    highline (1.7.2)
+    highline (1.7.3)
     hike (1.2.3)
     html2haml (2.0.0)
       erubis (~> 2.7.0)
@@ -189,7 +189,7 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    trusty-cms (2.0.0.pre.beta)
+    trusty-cms (2.0.9.pre.beta)
       RedCloth (~> 4.2)
       acts_as_tree (~> 2.1)
       bundler (~> 1.7)

data/app/controllers/admin/assets_controller.rb

@@ -3,7 +3,6 @@ class Admin::AssetsController < Admin::ResourceController
   
   def index
     assets = Asset.order("created_at DESC")
-
     @page = Page.find(params[:page_id]) if params[:page_id]
 
     @term = params[:search] || ''

data/app/models/asset.rb

@@ -10,24 +10,26 @@ class Asset < ActiveRecord::Base
 
   default_scope {order("created_at DESC")}
 
+  attr_accessible :title, :asset, :caption
+
   scope :latest, lambda { |limit|
-    { :order => "created_at DESC", :limit => limit }
+    order("created_at DESC").limit(limit)
   }
 
   scope :of_types, lambda { |types|
     mimes = AssetType.slice(*types).map(&:mime_types).flatten
-    { :conditions => ["asset_content_type IN (#{mimes.map{'?'}.join(',')})", *mimes] }
+    where(["asset_content_type IN (#{mimes.map{'?'}.join(',')})", *mimes])
   }
 
   scope :matching, lambda { |term|
-    { :conditions => ["LOWER(assets.asset_file_name) LIKE (:term) OR LOWER(title) LIKE (:term) OR LOWER(caption) LIKE (:term)", {:term => "%#{term.downcase}%" }] }
+    where(["LOWER(assets.asset_file_name) LIKE (:term) OR LOWER(title) LIKE (:term) OR LOWER(caption) LIKE (:term)", {:term => "%#{term.downcase}%" }])
   }
 
   scope :excepting, lambda { |assets|
     if assets.any?
       assets = assets.split(',') if assets.is_a?(String)
       asset_ids = assets.first.is_a?(Asset) ? assets.map(&:id) : assets
-      { :conditions => ["assets.id NOT IN(#{asset_ids.map{ '?' }.join(',')})", *asset_ids] }
+      where(["assets.id NOT IN(#{asset_ids.map{ '?' }.join(',')})", *asset_ids])
     else
       {}
     end

data/lib/trusty-clipped-extension.rb

@@ -1,5 +1,5 @@
 module TrustyCmsClippedExtension
-  VERSION     = "2.0.0-beta"
+  VERSION     = "2.0.1-beta"
   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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-clipped-extension
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta
+  version: 2.0.1.pre.beta
 platform: ruby
 authors:
 - Keith Bingman
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list