ksk 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cc3c547d2aacadccf428677a7d4e22e2db5a855
-  data.tar.gz: 71d29e1440ece753f8625399c62a5fe9db41d65e
+  metadata.gz: 193d5f9ed9d086c53469c338aa19251871b095d6
+  data.tar.gz: 06b4468a591b944e2c62ae509c1832b049090573
 SHA512:
-  metadata.gz: 36882cb6a3852af87bfc9c9f1bca8fc438b3ed9110b4fea9bb8369c24bfca97183cfc1a762537f6bbd18acb2900b0d0d2e0d2230fe75dd2c8d14f515d0fc6090
-  data.tar.gz: 7e6a326165db77b746f85272c9e6e8702f87737674e8c2ed3220995762af35072a07303b7b46eb8190bcdb40c2aa6d5b22d5a9e8995c083f74425c38ad30baa7
+  metadata.gz: 4f4ea30f5539f4d680ffe29396923a404427d92e3d893f349ff7bfc53bcfdedaf1127d55feaf566c5501fd19ea67e133eb700a618fe09f4d43f3313a47fe116c
+  data.tar.gz: e2350618d867fa41bcaa43488c8333617c7dc1b167039aaff8e732b454046e84425c6936b737b31aae8ba2d867f53a4a71535d5e966a90ab3b51cc9208ace720

data/Gemfile.lock

@@ -1,27 +1,27 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.1.1)
-      actionpack (= 4.1.1)
-      actionview (= 4.1.1)
+    actionmailer (4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
       mail (~> 2.5.4)
-    actionpack (4.1.1)
-      actionview (= 4.1.1)
-      activesupport (= 4.1.1)
+    actionpack (4.1.4)
+      actionview (= 4.1.4)
+      activesupport (= 4.1.4)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.1)
-      activesupport (= 4.1.1)
+    actionview (4.1.4)
+      activesupport (= 4.1.4)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.1)
-      activesupport (= 4.1.1)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
       builder (~> 3.1)
-    activerecord (4.1.1)
-      activemodel (= 4.1.1)
-      activesupport (= 4.1.1)
+    activerecord (4.1.4)
+      activemodel (= 4.1.4)
+      activesupport (= 4.1.4)
       arel (~> 5.0.0)
-    activesupport (4.1.1)
+    activesupport (4.1.4)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -29,9 +29,9 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.6)
     arel (5.0.1.20140414130214)
-    bhf (0.9.0)
+    bhf (0.9.4)
       haml-rails (~> 0.4)
-      kaminari (~> 0.15)
+      kaminari (~> 0.16)
       rails (~> 4)
       sass-rails (~> 4.0)
       turbolinks (~> 2.1)
@@ -43,13 +43,13 @@ GEM
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.7.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    docile (1.1.3)
+    docile (1.1.5)
     erubis (2.7.0)
     execjs (2.2.1)
     faraday (0.9.0)
@@ -70,10 +70,10 @@ GEM
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
       railties (>= 4.0.1)
-    hashie (3.0.0)
+    hashie (3.2.0)
     highline (1.6.21)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.6.11)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -93,19 +93,19 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.25.1)
     mini_portile (0.6.0)
-    minitest (5.3.4)
+    minitest (5.4.0)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
-    oauth2 (0.9.4)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    paperclip (4.1.1)
+    paperclip (4.2.0)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
@@ -114,19 +114,19 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.1)
-      actionmailer (= 4.1.1)
-      actionpack (= 4.1.1)
-      actionview (= 4.1.1)
-      activemodel (= 4.1.1)
-      activerecord (= 4.1.1)
-      activesupport (= 4.1.1)
+    rails (4.1.4)
+      actionmailer (= 4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
+      activemodel (= 4.1.4)
+      activerecord (= 4.1.4)
+      activesupport (= 4.1.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.1)
+      railties (= 4.1.4)
       sprockets-rails (~> 2.0)
-    railties (4.1.1)
-      actionpack (= 4.1.1)
-      activesupport (= 4.1.1)
+    railties (4.1.4)
+      actionpack (= 4.1.4)
+      activesupport (= 4.1.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/app/assets/javascripts/ksk/application.js

@@ -12,7 +12,6 @@ window.addEvent('bhfDomChunkReady', function(scope){
 					parent_id: parentId
 				};
 				queryParams[this.getNaviName()] = this.getIdPositions();
-
 				new Request({
 					url: elem.get('data-update-url')
 				}).post(queryParams);
@@ -24,7 +23,6 @@ window.addEvent('bhfDomChunkReady', function(scope){
 			var tmpl = platform.getElement('.template_data');
 			var name = prompt(tmpl.get('data-prompt-question'), '');
 			if ( ! name) { return; }
-
 			var naviName = naviA.getNaviName();
 			var queryParams = {};
 			queryParams[naviName] = {
@@ -50,10 +48,23 @@ window.addEvent('bhfDomChunkReady', function(scope){
 			$.noConflict();
 			jQuery('.js_crop_image').each(function(){
 				var $cropImg = jQuery(this);
+				var minWidth, minHeight;
+				var styleGeo = $cropImg.attr('data-crop-style') || '';
+				var styleGeoArray = styleGeo.split('x');
+				if (styleGeoArray.length === 2) {
+					if ( ! styleGeo.match('<') && ! styleGeo.match('>')) {
+						minWidth  = parseInt(styleGeoArray[0], 10);
+						minHeight = parseInt(styleGeoArray[1], 10);
+					}
+				}
+				var hasSize = minWidth && minHeight;
+				
 				$cropImg.Jcrop({
-					boxWidth: 800,
-          boxHeight: 800,
-          onSelect: function(c){
+					// minSize:  (hasSize ? [minWidth, minHeight]  : undefined),
+					aspectRatio: (hasSize ? (minWidth / minHeight) : undefined),
+					boxWidth:    800,
+					boxHeight:   800,
+					onSelect: function(c){
 						$cropImg.parent().find('.js_cords_x').val(c.x);
 						$cropImg.parent().find('.js_cords_y').val(c.y);
 						$cropImg.parent().find('.js_cords_w').val(c.w);

data/app/models/concerns/ksk/asset.rb

@@ -4,15 +4,14 @@ module Ksk::Asset
   included do
     belongs_to :fileable, polymorphic: true
 
-    default_scope -> {order 'position ASC, created_at DESC'}
+    default_scope -> { order('position ASC, created_at DESC') }
 
     has_one :preview
     before_create :set_last_position
     
-    after_initialize :resize_attr_accessors
-    before_save :crop_thumbs, if: :cropping?
-
     do_not_validate_attachment_file_type :file
+    before_file_post_process :is_image?
+    include Ksk::PaperclipCrop
 
     scope :only_images, -> {where(file_content_type: Bhf.configuration.paperclip_image_types)}
     scope :first_image, -> {only_images.limit(1)}
@@ -20,55 +19,13 @@ module Ksk::Asset
 
     scope :only_data_files, -> {where('file_content_type not in (?)', Bhf.configuration.paperclip_image_types)}
     scope :first_data_files, -> {only_data_files.limit(1)}
-
-    before_file_post_process :is_image?
-  end
-  
-  def resize_attr_accessors
-    file.styles.each_pair do |style, meta|
-      self.class.send(:attr_accessor, "#{style}_x")
-      self.class.send(:attr_accessor, "#{style}_y")
-      self.class.send(:attr_accessor, "#{style}_w")
-      self.class.send(:attr_accessor, "#{style}_h")
-    end
-  end
-  
-  def cropping?
-    needs_crop = false
-    file.styles.each_pair do |style, meta|
-      if !needs_crop
-        needs_crop = cords_set?(style)
-      end
-    end
-    needs_crop
-  end
-  
-  def cords_set?(style)
-    !send("#{style}_x").blank? && !send("#{style}_y").blank? && !send("#{style}_w").blank? && !send("#{style}_h").blank?
-  end
-  
-  def crop_thumbs
-    file.styles.each_pair do |style, meta|
-      if cords_set?(style)
-        resize_banner style, [send("#{style}_x"), send("#{style}_y"), send("#{style}_w"), send("#{style}_h")], meta.attachment.options[:styles][style][0]
-        send("#{style}_x=", false)
-      end
-    end
-    file.save
-    file.instance.save
-  end
-  
-  def resize_banner(name, cords, resize)
-    file.queued_for_write[name] = Paperclip.processor(:ksk_crop).make(file, cords, file)
-    style = Paperclip::Style.new(name, [resize, :jpg], file)
-    file.queued_for_write[name] = Paperclip.processor(:thumbnail).make(file.queued_for_write[name], style.processor_options, file.queued_for_write[name])
-    file.queued_for_write[name] = Paperclip.io_adapters.for(file.queued_for_write[name])
   end
   
   def is_image?
     Bhf.configuration.paperclip_image_types.include?(file.content_type)
   end
-
+  
+  
   def has_preview?
     preview && (preview.assets.any? || !preview.name.blank?)
   end
@@ -91,4 +48,8 @@ module Ksk::Asset
     self.position = self.class.where(fileable_id: self.fileable_id).count + 1
   end
   
-end
+  def ksk_images_for_crop
+    { file: [] }
+  end
+  
+end

data/app/models/concerns/ksk/paperclip_crop.rb

@@ -0,0 +1,60 @@
+module Ksk::PaperclipCrop
+  extend ActiveSupport::Concern
+  
+  included do
+    after_initialize :resize_attr_accessors
+    before_save :crop_thumbs, if: :cropping?
+  end
+  
+  def resize_attr_accessors
+    ksk_images_for_crop.each_pair do |image_name, style_names|
+      send(image_name).styles.each_pair do |style, meta|
+        self.class.send(:attr_accessor, "#{image_name}_#{style}_x")
+        self.class.send(:attr_accessor, "#{image_name}_#{style}_y")
+        self.class.send(:attr_accessor, "#{image_name}_#{style}_w")
+        self.class.send(:attr_accessor, "#{image_name}_#{style}_h")
+      end
+    end
+  end
+  
+  def cropping?
+    needs_crop = false
+    ksk_images_for_crop.each_pair do |image_name, style_names|
+      send(image_name).styles.each_pair do |style, meta|
+        unless needs_crop
+          needs_crop = cords_set?(image_name, style)
+        end
+      end
+    end
+    needs_crop
+  end
+  
+  def cords_set?(image_name, style)
+    !send("#{image_name}_#{style}_x").blank? && !send("#{image_name}_#{style}_y").blank? && !send("#{image_name}_#{style}_w").blank? && !send("#{image_name}_#{style}_h").blank?
+  end
+  
+  def crop_thumbs
+    ksk_images_for_crop.each_pair do |image_name, style_names|
+      image = send(image_name)
+      image.styles.each_pair do |style, meta|
+        if cords_set?(image_name, style)
+          resize_banner style, [send("#{image_name}_#{style}_x"), send("#{image_name}_#{style}_y"), send("#{image_name}_#{style}_w"), send("#{image_name}_#{style}_h")], meta.attachment.options[:styles][style][0]
+          send("#{image_name}_#{style}_x=", false)
+        end
+      end
+      image.save
+      image.instance.save
+    end
+  end
+  
+  def resize_banner(name, cords, resize)
+    ksk_images_for_crop.each_pair do |image_name, style_names|
+      image = send(image_name)
+      image.queued_for_write[name] = Paperclip.processor(:ksk_crop).make(image, cords, image)
+      style = Paperclip::Style.new(name, [resize, :jpg], image)
+      image.queued_for_write[name] = Paperclip.processor(:thumbnail).make(image.queued_for_write[name], style.processor_options, image.queued_for_write[name])
+      image.queued_for_write[name] = Paperclip.io_adapters.for(image.queued_for_write[name])
+    end
+  end
+  
+end

data/app/views/bhf/form/column/_crop_style.haml

@@ -0,0 +1,18 @@
+- style_name = "#{meta.attachment.name}_#{style}"
+- image = f.object.send(meta.attachment.name)
+- if image.exists?
+  .node{class: field.form_type}
+    .label= f.label "#{style_name}_crop", f.object.class.human_attribute_name("#{style_name}_crop")
+    .input
+      = image_tag image.url(:original), class: 'js_crop_image', data: {crop_style: meta.geometry}
+
+      = f.hidden_field "#{style_name}_x", class: 'js_cords_x'
+      = f.hidden_field "#{style_name}_y", class: 'js_cords_y'
+      = f.hidden_field "#{style_name}_w", class: 'js_cords_w'
+      = f.hidden_field "#{style_name}_h", class: 'js_cords_h'
+
+      - if image.exists?(style)
+        %div{style: 'margin-top: 30px'}
+          = render partial: 'bhf/helper/field_errors', locals: {f: f, field: "#{style_name}_crop"}
+          = image_tag image.url(style), class: 'uploaded_image'
+          = render partial: 'bhf/helper/info', locals: {info: t("bhf.platforms.assets.infos.#{style_name}_crop", default: '')}

data/app/views/bhf/form/column/_crop_thumbs.html.haml

@@ -1,17 +1,6 @@
 - return if @quick_edit
-- f.object.file.styles.each_pair do |style, meta|
-  .node{class: field.form_type}
-    .label= f.label "crop_#{style}", f.object.class.human_attribute_name("crop_#{style}")
-    .input
-        
-      = image_tag f.object.file.url(:original), class: 'js_crop_image'
-
-      = f.hidden_field "#{style}_x", class: 'js_cords_x'
-      = f.hidden_field "#{style}_y", class: 'js_cords_y'
-      = f.hidden_field "#{style}_w", class: 'js_cords_w'
-      = f.hidden_field "#{style}_h", class: 'js_cords_h'
-  
-      %div{style: 'margin-top: 30px'}
-        = render partial: 'bhf/helper/field_errors', locals: {f: f, field: "crop_#{style}"}
-        = image_tag f.object.file.url(style), class: 'uploaded_image'
-        = render partial: 'bhf/helper/info', locals: {info: t("bhf.platforms.assets.infos.crop_#{style}", default: '')}
+- f.object.ksk_images_for_crop.each_pair do |image_name, style_names|
+  - f.object.send(image_name).styles.each_pair do |style, meta|
+    - if style_names.any?
+      - next unless style_names.include?(style)
+    = render partial: 'bhf/form/column/crop_style', locals: {style: style, meta: meta, f: f, field: field}

data/ksk.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ksk 0.4.0 ruby lib
+# stub: ksk 0.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ksk"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Anton Pawlik"]
-  s.date = "2014-07-07"
+  s.date = "2014-07-13"
   s.description = "Fast and friendly"
   s.email = "anton.pawlik@gmail.com"
   s.extra_rdoc_files = [
@@ -35,9 +35,11 @@ Gem::Specification.new do |s|
     "app/models/concerns/ksk/markdown.rb",
     "app/models/concerns/ksk/navigation.rb",
     "app/models/concerns/ksk/navigation_type.rb",
+    "app/models/concerns/ksk/paperclip_crop.rb",
     "app/models/concerns/ksk/post.rb",
     "app/models/concerns/ksk/preview.rb",
     "app/models/concerns/ksk/static.rb",
+    "app/views/bhf/form/column/_crop_style.haml",
     "app/views/bhf/form/column/_crop_thumbs.html.haml",
     "app/views/bhf/form/column/_file.html.haml",
     "app/views/bhf/form/column/_select_file_assets.html.haml",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ksk
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bhf
@@ -146,9 +146,11 @@ files:
 - app/models/concerns/ksk/markdown.rb
 - app/models/concerns/ksk/navigation.rb
 - app/models/concerns/ksk/navigation_type.rb
+- app/models/concerns/ksk/paperclip_crop.rb
 - app/models/concerns/ksk/post.rb
 - app/models/concerns/ksk/preview.rb
 - app/models/concerns/ksk/static.rb
+- app/views/bhf/form/column/_crop_style.haml
 - app/views/bhf/form/column/_crop_thumbs.html.haml
 - app/views/bhf/form/column/_file.html.haml
 - app/views/bhf/form/column/_select_file_assets.html.haml