ksk 0.1.2 → 0.1.3

data/app/helpers/ksk/application_helper.rb

@@ -21,11 +21,13 @@ module Ksk
     end
 
     def md(text)
+      return '' if text.blank?
       markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new(), fenced_code_blocks: true, autolink: true)
       markdown.render(text).html_safe
     end
 
     def mdap(text, images, data_files)
+      return '' if text.blank?
       t = place_images(text, images)
       t = place_data_files(t, data_files)
       md(t)

data/lib/actives/asset.rb

@@ -7,7 +7,7 @@ module Ksk
 
       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
@@ -16,12 +16,12 @@ module Ksk
       #validates_attachment :file, :content_type => { :content_type => IMGTYPE }
       IMGTYPE = ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png', 'image/tif', 'image/gif']
 
-      scope :only_images, where(file_content_type: IMGTYPE)
-      scope :first_image, only_images.limit(1)
-      scope :other_images, only_images.offset(1)
+      scope :only_images, -> {where(file_content_type: IMGTYPE)}
+      scope :first_image, -> {only_images.limit(1)}
+      scope :other_images, -> {only_images.offset(1)}
 
-      scope :only_data_files, where(['file_content_type not in (?)', IMGTYPE])
-      scope :first_data_files, only_data_files.limit(1)
+      scope :only_data_files, -> {where(['file_content_type not in (?)', IMGTYPE])}
+      scope :first_data_files, -> {only_data_files.limit(1)}
 
       before_file_post_process :allow_only_images
     end

data/lib/actives/navigation.rb

@@ -10,16 +10,16 @@ module Ksk
 
       before_validation :static_setter
 
-      default_scope :order => 'position ASC, created_at DESC'
+      default_scope -> {order 'position ASC, created_at DESC'}
 
       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
 
-      scope :top_level, where(parent_id: 0)
+      scope :top_level, -> {where(parent_id: 0)}
 
-      scope :not_hidden, where(hidden: false)
+      scope :not_hidden, -> {where(hidden: false)}
 
       before_save :set_slug, :set_link
     end

data/lib/actives/post.rb

@@ -8,18 +8,14 @@ module Ksk
       include Apdown
 
       belongs_to :category
-      belongs_to :event
       has_many :assets, as: :fileable
       accepts_nested_attributes_for :assets, allow_destroy: true
 
-      default_scope order: 'created_at DESC'
-      default_scope where(published: true)
+      default_scope -> {order 'created_at DESC'}
+      default_scope -> {where(published: true)}
 
-      scope :all_posts,   except(:where)
-      scope :top,         where(top_news: true)
-
-      validates_length_of :headline, minimum: 3
-      validates_length_of :content, minimum: 10, maximum: 5000
+      scope :all_posts, ->  {except(:where)}
+      scope :top,       ->  {where(top_news: true)}
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ksk
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bhf