ksk 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ba89b85e998d5a247ec3430b491f4101781cf6e
-  data.tar.gz: 7186043f16771af0c6ae982d1ec746859b912790
+  metadata.gz: 1f1117bfa072fc86f0d4a0e0804dafc783600877
+  data.tar.gz: e9960d1cde7f3371527b898cc66d5f977a4a15ca
 SHA512:
-  metadata.gz: 5460018dc72567d5d246f8fad5e2c5a51768a5799d89620c9f2d4a403ff64b5ffd6491526542d2c3194a8915d84f6400792cea692c201b14aab45758f1342ca1
-  data.tar.gz: 4efbcb388ba61312e55efe1c59e4f3abfd270150e6044242c77ca8323367ec0b6bdff4e56445a408e0d8bc6248d388a2ae7038e18d3cfc04e983741945a3e6b7
+  metadata.gz: c3b6ae16f1866b3ee7fc377e1f4d505d1b9b1d038e87f4478180ddb6c4b2ec9a5bc5cedb7c10187ec16e15694f62c994be2a33bf09994258c5c01a3f818cb774
+  data.tar.gz: f298664be559d2b119ca43ab8832582f316a77e5fa150c5c3a820b3e4676b93a2085fe898ae16939e6a3b500b33a322d3e9e8cf42e99fa40984e55533d3b09ff

data/app/assets/stylesheets/ksk/application.css.sass

@@ -111,4 +111,6 @@ table.navigation_capiton
     .alt_button
       margin-right: 0
   
-  
+    
+.jcrop-holder
+  background-color: white !important

data/app/helpers/ksk/frontend_helper.rb

@@ -36,9 +36,10 @@ module Ksk
     def place_content(text, files, type, &html)
       t = text
       (text || '').scan(Apdown.parse_regex(type)).each do |match|
-        if asset = files[match[1].to_i-1]
-          t = t.gsub(match[0], html.call(asset, match[2]))
+        relpace = if asset = files[match[1].to_i-1]
+          html.call(asset, match[2])
         end
+        t = t.gsub(match[0], relpace.to_s)
       end
       t.html_safe
     end

data/app/views/bhf/entries/form/has_many/_upload.html.haml

@@ -7,14 +7,15 @@
       = a.check_box :_destroy
       = a.label :_destroy, t(asset.is_image? ? 'bhf.helpers.image.delete' : 'bhf.helpers.file.delete')
 
+    - return_to = {return_to: (edit_entry_path(@platform.name, f.object) unless @platform.return_to == false)}
     - if asset.is_image?
       = image_tag(asset.file.url(:medium), class: 'uploaded_image float_left')
-      = link_to t('ksk.asset.image_preview.button.edit'), edit_entry_path('assets', asset.id), class: 'alt_button float_right'
+      = link_to t('ksk.asset.image_preview.button.edit'), edit_entry_path('assets', asset.id, return_to), class: 'alt_button float_right'
     - else
       = link_to asset.file_file_name, asset.file.url, class: 'uploaded_file float_left'
       - if asset.has_preview?
-        = link_to t('ksk.asset.file_preview.button.edit'), edit_entry_path('previews', asset.preview), class: 'alt_button float_right'
+        = link_to t('ksk.asset.file_preview.button.edit'), edit_entry_path('previews', asset.preview, return_to), class: 'alt_button float_right'
       - else
-        = link_to t('ksk.asset.file_preview.button.create'), new_entry_path('previews', asset_id: asset.id), class: 'alt_button float_right'
+        = link_to t('ksk.asset.file_preview.button.create'), new_entry_path('previews', {asset_id: asset.id}.merge(return_to)), class: 'alt_button float_right'
 
     .clear

data/lib/actives/asset.rb

@@ -16,7 +16,7 @@ module Ksk
       before_save :crop_thumbs, if: :cropping?
 
       IMGTYPE = ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png', 'image/tif', 'image/gif']
-      validates_attachment_content_type :file, :content_type => /.*/
+      do_not_validate_attachment_file_type :file
 
       scope :only_images, -> {where(file_content_type: IMGTYPE)}
       scope :first_image, -> {only_images.limit(1)}

data/lib/actives/navigation.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Ksk
   module Navigation
     extend ActiveSupport::Concern
@@ -14,8 +13,8 @@ module Ksk
 
       belongs_to :static
       belongs_to :navigation_type
-      belongs_to :parent, :foreign_key => 'parent_id', :class_name => 'Navigation'
-      has_many   :children, :foreign_key => 'parent_id', :class_name => 'Navigation', :dependent => :delete_all
+      belongs_to :parent, foreign_key: 'parent_id', class_name: 'Navigation'
+      has_many   :children, foreign_key: 'parent_id', class_name: 'Navigation', dependent: :delete_all
 
       scope :top_level, -> {where(parent_id: 0)}
 

data/lib/actives/static.rb

@@ -8,7 +8,7 @@ module Ksk
       include Apdown
 
       has_one :navigation
-      has_many :assets, :as => :fileable
+      has_many :assets, as: :fileable
       # TODO: needs on_delete hook to destroy navigation if Navigation is availible for this object
 
       accepts_nested_attributes_for :assets, allow_destroy: true

data/lib/paperclip_processors/ksk_crop.rb

@@ -2,7 +2,7 @@ module Paperclip
   
   class KskCrop < Processor
     
-    def initialize file, options = {}, attachment = nil
+    def initialize(file, options = {}, attachment = nil)
       super
       @crop = options
       @format = File.extname(@file.path)
@@ -13,18 +13,23 @@ module Paperclip
       src = @file
       dst = Tempfile.new([@basename, @format])
       dst.binmode
+      
+      parameters = []
+      parameters << ":source"
+      parameters << "-crop '#{@crop[2]}x#{@crop[3]}+#{@crop[0]}+#{@crop[1]}'"
+      parameters << ":dest"
 
-        parameters = []
-        parameters << ":source"
-        parameters << "-crop '#{@crop[2]}x#{@crop[3]}+#{@crop[0]}+#{@crop[1]}'"
-        parameters << ":dest"
-
-        parameters = parameters.flatten.compact.join(" ").strip.squeeze(" ")
-
-        success = Paperclip.run("convert", parameters, :source => "#{File.expand_path(src.path)}[0]", :dest => File.expand_path(dst.path))
+      parameters = parameters.flatten.compact.join(' ').strip.squeeze(' ')
+      
+      path = if @file.options && @file.options[:storage] == :s3
+        src.url
+      else
+        File.expand_path(src.path)
+      end
+      success = Paperclip.run('convert', parameters, source: path, dest: File.expand_path(dst.path))
 
       dst
     end
     
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ksk
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bhf