loft 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35d974bd9cf0bbb027b139f1fdde3650368fa0e7
-  data.tar.gz: 9ed9c4f737df7a62f5ec3036d91e4811abec8be9
+  metadata.gz: 523861138105d45da2f415abcce810c7db3264b7
+  data.tar.gz: c424e92dbf6d06e32c9afb835c7ee417d16e0af8
 SHA512:
-  metadata.gz: 9efca926bf5d610f4a807a6f9c435d2fee197e014042d95a8fd111f7318c253eafc8b79f4c03a23142ae854efc4c57a0da75e33c7ead7532c30c7d868e6ec8bd
-  data.tar.gz: 2fad8c539b3247218ff1fa911246a7b29cf969e36e20b88b09acc75c3a22d20d68aeefd9b56e5460d4a9e6f7c604c4505d4ac25ee26533ecdd3e790e33f520ca
+  metadata.gz: 15f5d2447dddb59cb49d4553c574bc49c3418c99e80874ec716d0364daf29e9b52d7dfc51284f2fecb4c4adb3915ae33c1edead49086bcd96ed54f926e0068b8
+  data.tar.gz: 41bd0933ab33c0a07c5db72c762d7d2b0eceff99b6b407f01453b6e8b1b48f91ec0c2555fd8c8d0814049192b85bd4fdc85137c353c0b8103caaf9f8413d4f77

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    loft (0.3.1)
+    loft (0.4.0)
       ants (>= 0.3.10)
       carrierwave-mongoid (>= 0.7.1)
       chr (>= 0.5.4)
@@ -49,7 +49,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ants (0.3.10)
+    ants (0.3.13)
       devise
       meta-tags
       mongoid (>= 4.0)
@@ -70,11 +70,11 @@ GEM
       carrierwave (>= 0.8.0, < 0.11.0)
       mongoid (>= 3.0, < 6.0)
       mongoid-grid_fs (>= 1.3, < 3.0)
-    chr (0.5.4)
+    chr (0.5.7)
       bourbon
       coffee-rails (>= 4.0)
       font-awesome-rails
-      formagic (>= 0.3.7)
+      formagic (>= 0.3.9)
       jquery-rails
       rails (~> 4.2.5)
       sass-rails
@@ -99,7 +99,7 @@ GEM
     fast-stemmer (1.0.2)
     font-awesome-rails (4.5.0.0)
       railties (>= 3.2, < 5.0)
-    formagic (0.3.7)
+    formagic (0.3.9)
       bourbon (>= 3.2)
       normalize-rails (>= 3.0)
     globalid (0.3.6)
@@ -133,7 +133,7 @@ GEM
     minitest (5.8.3)
     mongo (2.2.1)
       bson (~> 4.0)
-    mongoid (5.0.1)
+    mongoid (5.0.2)
       activemodel (~> 4.0)
       mongo (~> 2.1)
       origin (~> 2.1)
@@ -198,8 +198,8 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
+    responders (2.1.1)
+      railties (>= 4.2.0, < 5.1)
     sass (3.4.20)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)

data/app/assets/javascripts/loft/inputs/loft-image.coffee

@@ -49,7 +49,7 @@ class @InputLoftImage extends InputString
     @$actions.append @$chooseBtn
 
     @$chooseBtn.on 'click', (e) =>
-      chr.modules.loft.showModal 'images', false, (objects) =>
+      chr.modules.loft.showImages false, (objects) =>
         asset = objects[0]
         @updateValue(asset.file.url)
 

data/app/assets/javascripts/loft/module.coffee

@@ -6,7 +6,9 @@
 # -----------------------------------------------------------------------------
 # Public methods:
 #   new Loft(title, resource, resourcePath)
-#   showModal(assetType, @selectMultipleAssets, @onAcceptCallback, @closeOnAccept)
+#   showAll(@selectMultipleAssets, @onAcceptCallback, @closeOnAccept)
+#   showImages(@selectMultipleAssets, @onAcceptCallback, @closeOnAccept)
+#   showDocuments(@selectMultipleAssets, @onAcceptCallback, @closeOnAccept)
 #   closeModal()
 # -----------------------------------------------------------------------------
 class @Loft
@@ -48,12 +50,13 @@ class @Loft
     @selectMultipleAssets = true
     @store = @module.rootList.config.arrayStore
 
-    @module.showModal = (assetType, selectMultipleAssets, callback, closeOnAccept) =>
-      @showModal(assetType, selectMultipleAssets, callback, closeOnAccept)
-
     @_add_close_button()
     @_enable_grid_mode()
 
+    @module.showAll = $.proxy(@showAll, this)
+    @module.showImages = $.proxy(@showImages, this)
+    @module.showDocuments = $.proxy(@showDocuments, this)
+
   _add_close_button: ->
     @module.rootList.$modalCloseBtn =$ """<a href='#' class='modal-close'>
                                             <i class='fa fa-times'></i>
@@ -121,15 +124,24 @@ class @Loft
     list.groupActions.hide()
     list.$items.find(".asset-checkbox").prop("checked", false)
 
+  _show_modal: ($tab) ->
+    @module.$el.addClass("module-modal")
+    @module.show()
+    @module.activeList.selectTab($tab, true)
+
   # PUBLIC ====================================================================
 
+  showAll: (@selectMultipleAssets=false, @onAcceptCallback=$.noop, @closeOnAccept=true) ->
+    @_show_modal(@module.rootList.tabLinks[0])
+
+  showImages: (@selectMultipleAssets=false, @onAcceptCallback=$.noop, @closeOnAccept=true) ->
+    @_show_modal(@module.rootList.tabLinks[1])
+
+  showDocuments: (@selectMultipleAssets=false, @onAcceptCallback=$.noop, @closeOnAccept=true) ->
+    @_show_modal(@module.rootList.tabLinks[2])
+
   closeModal: ->
     @selectMultipleAssets = true
     @_clear_assets_selection(@module.activeList)
     @module.$el.removeClass("module-modal")
     @module.hide()
-
-  showModal: (assetType="all", @selectMultipleAssets=false, @onAcceptCallback=$.noop, @closeOnAccept=true) ->
-    @module.$el.addClass("module-modal")
-    @module.show()
-    @module.activeList.updateItems()

data/app/assets/javascripts/loft/redactor-loft.coffee

@@ -21,16 +21,15 @@ RedactorPlugins.loft = ->
       fileButton = @button.add('file', 'Insert File')
       @button.addCallback(fileButton, @loft.showAllModal)
 
-
     showImagesModal: ->
-      chr.modules.loft.showModal 'images', true, (objects) => @loft.insertImages(objects)
-
+      chr.modules.loft.showImages true, (objects) =>
+        @loft.insertImages(objects)
 
     # allow multiple assets when no text is selected
     showAllModal: ->
       multipleAssets = this.selection.getText() == ''
-      chr.modules.loft.showModal 'all', multipleAssets, (objects) => @loft.insertFiles(objects)
-
+      chr.modules.loft.showAll multipleAssets, (objects) =>
+        @loft.insertFiles(objects)
 
     # if text is selected replace text with <a>{{ text }}</a>
     # otherwise add link(s) split by <br/> tag
@@ -48,7 +47,6 @@ RedactorPlugins.loft = ->
 
         this.insert.html(html, false)
 
-
     insertImages: (objects) ->
       if objects.length > 0
         images = []
@@ -59,9 +57,4 @@ RedactorPlugins.loft = ->
 
         this.insert.html(html, false)
 
-
   return methods
-
-
-
-

data/app/models/concerns/loft_asset_file_uploader.rb

@@ -8,16 +8,29 @@ module LoftAssetFileUploader
       "loft/#{ model._number }"
     end
 
+    version :_40x40_2x, if: :is_image? do
+      process :resize_to_fill => [80, 80]
+    end
 
     version :_200x150_2x, if: :is_image? do
       process :resize_to_fill => [400, 300]
     end
 
+    version :thumbnail, if: :is_image? do
+      process :resize_to_fill => [320, 320]
+    end
 
-    version :_40x40_2x, if: :is_image? do
-      process :resize_to_fill => [80, 80]
+    version :small, if: :is_image? do
+      process :resize_to_fit => [320, 320]
+    end
+
+    version :medium, if: :is_image? do
+      process :resize_to_fit => [640, 640]
     end
 
+    version :large, if: :is_image? do
+      process :resize_to_fit => [1280, 1280]
+    end
 
     def is_image? new_file
       model.is_image?

data/lib/loft/version.rb

@@ -1,3 +1,3 @@
 module Loft
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/tasks/recreate_versions.rake

@@ -0,0 +1,12 @@
+namespace :loft do
+  desc "Recreate Loft asset versions"
+  task :recreate_versions => :environment do
+    ::Asset.all.to_a.each do |a|
+      begin
+        a.file.recreate_versions!
+      rescue Errno::ENOENT
+        puts "Skip #{a._number}: source file not found"
+      end
+    end
+  end
+end

data/loft.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.summary  = "Media assets manager for Character CMS"
   s.description = <<-DESC
 This plugin adds an assets library that provides an easy way
-to upload, manage and insert files into documents.
+to upload, manage and insert file links to documents.
   DESC
 
   s.rubyforge_project = "loft"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loft
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Alexander Kravets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chr
@@ -152,7 +152,7 @@ dependencies:
         version: '10.0'
 description: |
   This plugin adds an assets library that provides an easy way
-  to upload, manage and insert files into documents.
+  to upload, manage and insert file links to documents.
 email: alex@slatestudio.com
 executables: []
 extensions: []
@@ -183,6 +183,7 @@ files:
 - lib/loft/engine.rb
 - lib/loft/routing.rb
 - lib/loft/version.rb
+- lib/tasks/recreate_versions.rake
 - loft.gemspec
 homepage: http://slatestudio.com
 licenses: