ksk 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2c08aa17cd779df40e840a56103cbf7b89962cd9
-  data.tar.gz: ee1a10393144081274648719ddff2a3f6248260b
+SHA256:
+  metadata.gz: 854dba2b8616df8ff94efcfb63205183583b860e18b7af07f3bf4bda39136fce
+  data.tar.gz: 8f52208f069053160c0bb8390211606973f91ecf1de2961a093d28f096992eeb
 SHA512:
-  metadata.gz: 339e121eebc45a3ade6433ff2dfa7d5f8933a32083d31af61178ff44751d1d47e16d0d6c1b5a9be31bbfabd2b96a359e9d27046151ccd050b4a90d6fe467f08b
-  data.tar.gz: f638437b538c5e4eaaae5ce29c89f4f24dc2fa27833f79dbfd475eea64b237cd95eac2a051e82adf7822d108b54977a071dcf116b926fc63b5cecf17201717bd
+  metadata.gz: 1900426cfe5512d4c00b4460950110af5c9ecceab997892ad21854ad2b6f5ad0885736af5e59d205623f271e57ef9f7a67ee9368eb86777166e18e86f00b542e
+  data.tar.gz: b626e2d8dc835497ee4a5e1f28553081be52503b3850818fbc782a882c5c5d427779f3497dce1ccb25f0b53472271636a5dd59d648b5b1a1de097122941a8fba

data/.editorconfig

@@ -0,0 +1,13 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

data/Gemfile

@@ -1,8 +1,7 @@
 source 'http://rubygems.org'
 
-gem 'bhf',          '>= 0'
+gem 'bhf',          '>= 1.0.0.beta7'
 gem 'stringex',     '>= 2'
-gem 'paperclip',    '>= 4'
 
 
 group :development do

data/README.md

@@ -8,7 +8,6 @@ Blog/Website management plugin for [bhf](http://antpaw.github.io/bhf/).
 * The abstract [settings `.yml`](https://github.com/antpaw/ksk/tree/master/config/bhf/ksk.yml)
   ([learn how to use it in your own settings `.yml`](http://antpaw.github.io/bhf/#abstract_platform_settings))
 * Include this [concerns](https://github.com/antpaw/ksk/tree/master/app/models/concerns/ksk) to your models.
-* Use this [partials](https://github.com/antpaw/ksk/tree/master/app/views/bhf), for example to crop paperclip images.
 
 
 ## Contributing to ksk

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

@@ -1,7 +1,7 @@
 //= require_tree ./classes
 
 window.addEvent('bhfDomChunkReady', function(scope){
-  
+
 	scope.getElements('.js_tree_holder').each(function(elem){
 		var naviA = new NaviAdmin({
 			elemTree: elem.getElement('.js_tree_list'),
@@ -31,17 +31,18 @@ window.addEvent('bhfDomChunkReady', function(scope){
 			new Request({
 				url: platform.getElement('.template_data').get('data-update-path'),
 				onSuccess: function(responseText){
+					var newId = JSON.parse(responseText).id;
 					new Element('li', {
-					  'id': naviName+'_'+responseText,
-					  'html': '<div> <span class="title">'+name+'</span> <span class="links">'+tmpl.get('html')+'</span></div>'.replace(/NAVIID/g, responseText)
+					  'id': naviName+'_'+newId,
+					  'html': '<div> <span class="title">'+name+'</span> <span class="links">'+tmpl.get('html')+'</span></div>'.replace(/NAVIID/g, newId)
 					})
 					.inject(platform.getElement('.js_tree_list li'), 'before');
 					naviA.reInit();
 				}
 			}).post(queryParams);
 		});
-	});	
-	
+	});
+
 	cropImages = scope.getElements('.js_crop_image');
 	if (cropImages.length) {
 		var cropInit = function(){
@@ -58,7 +59,7 @@ window.addEvent('bhfDomChunkReady', function(scope){
 					}
 				}
 				var hasSize = minWidth && minHeight;
-				
+
 				$cropImg.Jcrop({
 					// minSize:  (hasSize ? [minWidth, minHeight]  : undefined),
 					aspectRatio: (hasSize ? (minWidth / minHeight) : undefined),
@@ -85,5 +86,5 @@ window.addEvent('bhfDomChunkReady', function(scope){
 			}
 		});
 	}
-	
+
 });

data/app/assets/javascripts/ksk/classes/NaviAdmin.js

@@ -162,9 +162,15 @@ var NaviAdmin = new Class({
 	},
 	
 	getNaviName: function(){
-		return this.getId(
-			this.elemTree.getElement('li.item').get('id')
-		).name || 'navigation';
+		var navigationElements = this.elemTree.getElement('li.item');
+		if (navigationElements && navigationElements.length) {
+			return this.getId(
+				navigationElements.get('id')
+			).name;
+		}
+		else {
+			return 'navigation';
+		}
 	},
 	
 	getIdPositions: function(){
@@ -181,4 +187,4 @@ var NaviAdmin = new Class({
 	reInit: function(){
 		this.initialize(this.options);
 	}
-});
+});

data/app/controllers/ksk/navigations_controller.rb

@@ -8,14 +8,17 @@ class Ksk::NavigationsController < Bhf::ApplicationController
 
   def create
     n = Navigation.new(params_navigation)
-    n.save
-    render text: n.id
+    if n.save
+      render json: {id: n.id}
+    else
+      render status: 400, json: n.errors
+    end
   end
   
   private
     def params_navigation
-      ActionController::Parameters.new(params[:navigation]).permit!
+      a = params.require(:navigation).permit(:title)
+      a
     end
 
 end
-

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

@@ -11,18 +11,18 @@ module Ksk::Asset
     
     do_not_validate_attachment_file_type :file
     before_file_post_process :is_image?
-    include Ksk::PaperclipCrop
+    include Ksk::ImageCrop
 
-    scope :only_images, -> {where(file_content_type: Bhf.configuration.paperclip_image_types)}
+    scope :only_images, -> {where(file_content_type: Bhf.configuration.image_types)}
     scope :first_image, -> {only_images.limit(1)}
     scope :other_images, -> {only_images.offset(1)}
 
-    scope :only_data_files, -> {where('file_content_type not in (?)', Bhf.configuration.paperclip_image_types)}
+    scope :only_data_files, -> {where('file_content_type not in (?)', Bhf.configuration.image_types)}
     scope :first_data_files, -> {only_data_files.limit(1)}
   end
   
   def is_image?
-    Bhf.configuration.paperclip_image_types.include?(file.content_type)
+    Bhf.configuration.image_types.include?(file.content_type)
   end
   
   
@@ -52,4 +52,4 @@ module Ksk::Asset
     { file: [] }
   end
   
-end
+end

data/app/models/concerns/ksk/{paperclip_crop.rb → image_crop.rb}

@@ -1,4 +1,4 @@
-module Ksk::PaperclipCrop
+module Ksk::ImageCrop
   extend ActiveSupport::Concern
   
   included do
@@ -50,11 +50,11 @@ module Ksk::PaperclipCrop
   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])
+      # 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
+end

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

@@ -11,7 +11,7 @@ module Ksk::Navigation
 
     belongs_to :static
     belongs_to :navigation_type
-    belongs_to :parent, foreign_key: 'parent_id', class_name: 'Navigation'
+    belongs_to :parent, foreign_key: 'parent_id', class_name: 'Navigation', optional: true
     has_many   :children, foreign_key: 'parent_id', class_name: 'Navigation', dependent: :delete_all
 
     scope :top_level, -> {where(parent_id: 0)}
@@ -21,7 +21,6 @@ module Ksk::Navigation
     before_save :set_slug, :set_link
   end
 
-
   def set_slug
     return if !slug.blank?
     write_attribute(:slug, title.to_url)

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

@@ -2,7 +2,6 @@ module Ksk::Post
   extend ActiveSupport::Concern
 
   included do
-    include Ksk::Markdown
 
     belongs_to :category
     has_many :assets, as: :fileable

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

@@ -2,13 +2,13 @@ module Ksk::Static
   extend ActiveSupport::Concern
 
   included do
-    include Ksk::Markdown
-
     has_one :navigation
     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
+
+    has_rich_text :content
   end
 
 end

data/config/bhf/ksk.yml

@@ -11,8 +11,8 @@ pages:
         multipart: true
         types:
           assets: assets
-          content: markdown
-          
+          content: rich_text
+
   - category:
       table:
         columns: [id, title, updated_at, created_at]
@@ -22,11 +22,10 @@ pages:
         columns: [id, title, content, updated_at, created_at]
         per_page: 30
       form:
-        display: [id, title, content, assets]
+        display: [id, title, content]
         multipart: true
         types:
-          assets: assets
-          content: markdown
+          content: rich_text
 
   - navigation:
       table:

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.7 ruby lib
+# stub: ksk 0.4.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ksk".freeze
-  s.version = "0.4.7"
+  s.version = "0.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Anton Pawlik".freeze]
-  s.date = "2018-05-06"
+  s.date = "2019-12-27"
   s.description = "Blog/Website management plugin for bhf. Includes abstract settings .yml, model concerns and bhf view partials.".freeze
   s.email = "anton.pawlik@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".editorconfig",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -32,10 +33,9 @@ Gem::Specification.new do |s|
     "app/helpers/ksk/frontend_helper.rb",
     "app/models/concerns/ksk/asset.rb",
     "app/models/concerns/ksk/category.rb",
-    "app/models/concerns/ksk/markdown.rb",
+    "app/models/concerns/ksk/image_crop.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",
@@ -53,30 +53,28 @@ Gem::Specification.new do |s|
     "config/locales/en.yml",
     "config/routes.rb",
     "ksk.gemspec",
-    "lib/ksk.rb",
-    "lib/paperclip_processors/ksk_crop.rb"
+    "lib/image_processors/ksk_crop.rb",
+    "lib/ksk.rb"
   ]
   s.homepage = "http://github.com/antpaw/ksk".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.13".freeze
+  s.rubygems_version = "3.0.6".freeze
   s.summary = "Blog/Website management plugin for bhf".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bhf>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<bhf>.freeze, [">= 1.0.0.beta8"])
       s.add_runtime_dependency(%q<stringex>.freeze, [">= 2"])
-      s.add_runtime_dependency(%q<paperclip>.freeze, [">= 4"])
       s.add_development_dependency(%q<shoulda>.freeze, [">= 3"])
       s.add_development_dependency(%q<rdoc>.freeze, [">= 3"])
       s.add_development_dependency(%q<bundler>.freeze, [">= 1"])
       s.add_development_dependency(%q<jeweler>.freeze, [">= 2"])
       s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<bhf>.freeze, [">= 0"])
+      s.add_dependency(%q<bhf>.freeze, [">= 1.0.0.beta8"])
       s.add_dependency(%q<stringex>.freeze, [">= 2"])
-      s.add_dependency(%q<paperclip>.freeze, [">= 4"])
       s.add_dependency(%q<shoulda>.freeze, [">= 3"])
       s.add_dependency(%q<rdoc>.freeze, [">= 3"])
       s.add_dependency(%q<bundler>.freeze, [">= 1"])
@@ -84,9 +82,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<bhf>.freeze, [">= 0"])
+    s.add_dependency(%q<bhf>.freeze, [">= 1.0.0.beta8"])
     s.add_dependency(%q<stringex>.freeze, [">= 2"])
-    s.add_dependency(%q<paperclip>.freeze, [">= 4"])
     s.add_dependency(%q<shoulda>.freeze, [">= 3"])
     s.add_dependency(%q<rdoc>.freeze, [">= 3"])
     s.add_dependency(%q<bundler>.freeze, [">= 1"])

data/lib/{paperclip_processors → image_processors}/ksk_crop.rb

@@ -1,4 +1,4 @@
-module Paperclip
+module ImageProcessors
   
   class KskCrop < Processor
     
@@ -26,10 +26,10 @@ module Paperclip
       else
         File.expand_path(src.path)
       end
-      success = Paperclip.run('convert', parameters, source: path, dest: File.expand_path(dst.path))
+      # success = Paperclip.run('convert', parameters, source: path, dest: File.expand_path(dst.path))
 
       dst
     end
     
   end
-end
+end

data/lib/ksk.rb

@@ -1,6 +1,6 @@
 module Ksk
   class Engine < Rails::Engine
-    
+
     isolate_namespace Ksk
 
     Bhf.configure do |config|
@@ -8,16 +8,17 @@ module Ksk
       config.js << 'ksk/application'
       config.abstract_settings << "#{File.expand_path("../..", __FILE__)}/config/bhf/ksk"
     end
-    
+
     initializer 'ksk.helper' do
       ActiveSupport.on_load :action_controller do
         helper Ksk::FrontendHelper
       end
     end
-    
+
+    initializer 'ksk.assets.precompile' do |app|
+      app.config.assets.precompile += %w( ksk/application.css ksk/application.js )
+    end
   end
 end
 
 require 'stringex'
-require 'paperclip/processor'
-require 'paperclip_processors/ksk_crop'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ksk
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2019-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bhf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.beta8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.beta8
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: paperclip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +117,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- ".editorconfig"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -144,10 +131,9 @@ files:
 - app/helpers/ksk/frontend_helper.rb
 - app/models/concerns/ksk/asset.rb
 - app/models/concerns/ksk/category.rb
-- app/models/concerns/ksk/markdown.rb
+- app/models/concerns/ksk/image_crop.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
@@ -165,8 +151,8 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - ksk.gemspec
+- lib/image_processors/ksk_crop.rb
 - lib/ksk.rb
-- lib/paperclip_processors/ksk_crop.rb
 homepage: http://github.com/antpaw/ksk
 licenses:
 - MIT
@@ -186,8 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Blog/Website management plugin for bhf

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

@@ -1,78 +0,0 @@
-module Ksk::Markdown
-  extend ActiveSupport::Concern
-
-  def text_used_content(type)
-    Ksk::Markdown.parse_text(markdown_text, type).each_with_object([]) do |match, used_numbers|
-      used_numbers << match[1].to_i
-    end
-  end
-
-  def text_unused_content(all_files, type, preselected = [])
-    all_numbers = []
-    all_files.each_with_index { |a, i| all_numbers << i+1 }
-    
-    unused_numbers = all_numbers - (text_used_content(type)+preselected)
-    
-    unused_files = []
-    all_files.each_with_index do |a, i|
-      unused_files << a if unused_numbers.include?(i+1)
-    end
-    
-    unused_files
-  end
-
-  def text_used_images
-    text_used_content('img')
-  end
-  
-  def text_unused_images
-    text_unused_content(assets.only_images, 'img', respond_to?(:markdown_preselect) && markdown_preselect || [])
-  end
-
-  def text_used_data_files
-    text_used_content('file')
-  end
-  
-  def text_unused_data_files
-    text_unused_content(assets.only_data_files, 'file')
-  end
-  
-  
-  def markdown_text
-    content
-  end
-
-  def content_long
-    "#{intro} #{hidden_text}"
-  end
-
-  def content_short
-    intro
-  end
-
-  def intro
-    split_content[0]
-  end
-
-  def hidden_text
-    split_content[1]
-  end
-
-  def split_content
-    return [] if read_attribute(:content).blank?
-    read_attribute(:content).split('@@@')
-  end
-
-  def content_has_more?
-    !hidden_text.blank?
-  end
-
-  
-  def self.parse_regex(type)
-    /(\{#{type}_(\d{1,2})_?(\w+)?\})/i
-  end
-  
-  def self.parse_text(text, type)
-    text.to_s.scan(parse_regex(type))
-  end
-end