publify_core 9.0.0.pre5 → 9.2.0

data/lib/publify_textfilter_none.rb

@@ -1,10 +1,12 @@
-require 'text_filter_plugin'
+# frozen_string_literal: true
+
+require "text_filter_plugin"
 
 class PublifyApp
   class Textfilter
     class None < TextFilterPlugin::Markup
-      plugin_display_name 'None'
-      plugin_description 'Raw HTML only'
+      plugin_display_name "None"
+      plugin_description "Raw HTML only"
 
       def self.filtertext(text)
         text

data/lib/publify_textfilter_smartypants.rb

@@ -1,10 +1,12 @@
-require 'rubypants'
+# frozen_string_literal: true
+
+require "rubypants"
 
 class PublifyApp
   class Textfilter
     class Smartypants < TextFilterPlugin::PostProcess
-      plugin_display_name 'Smartypants'
-      plugin_description 'Converts HTML to use typographically correct quotes and dashes'
+      plugin_display_name "Smartypants"
+      plugin_description "Converts HTML to use typographically correct quotes and dashes"
 
       def self.filtertext(text)
         RubyPants.new(text).to_html

data/lib/publify_textfilter_textile.rb

@@ -1,11 +1,13 @@
-require 'text_filter_plugin'
-require 'RedCloth'
+# frozen_string_literal: true
+
+require "text_filter_plugin"
+require "RedCloth"
 
 class PublifyApp
   class Textfilter
     class Textile < TextFilterPlugin::Markup
-      plugin_display_name 'Textile'
-      plugin_description 'Textile markup language'
+      plugin_display_name "Textile (Deprecated)"
+      plugin_description "Textile markup language"
 
       def self.help_text
         %{
@@ -14,6 +16,7 @@ See [_why's Textile reference](http://hobix.com/textile/).
       end
 
       def self.filtertext(text)
+        ActiveSupport::Deprecation.warn "Use of Textile is deprecated"
         RedCloth.new(text).to_html(:textile)
       end
     end

data/lib/publify_textfilter_twitterfilter.rb

@@ -1,10 +1,12 @@
-require 'text_filter_plugin'
+# frozen_string_literal: true
+
+require "text_filter_plugin"
 
 class PublifyApp
   class Textfilter
     class Twitterfilter < TextFilterPlugin::PostProcess
-      plugin_display_name 'HTML Filter'
-      plugin_description 'Strip HTML tags'
+      plugin_display_name "HTML Filter"
+      plugin_description "Strip HTML tags"
 
       def self.filtertext(text)
         # First, autolink
@@ -16,14 +18,18 @@ class PublifyApp
         # hashtags
         text.split.grep(/^#\w+/) do |item|
           # strip_html because Ruby considers "#prouddad</p>" as a word
-          uri = URI.escape("https://twitter.com/search?q=#{item.strip_html}&src=tren&mode=realtime")
-          text = text.gsub(item, "<a href='#{uri}'>#{item.strip_html}</a>")
+          item = item.strip_html
+          search_item = URI.encode_www_form_component(item)
+
+          uri = "https://twitter.com/search?q=#{search_item}&src=tren&mode=realtime"
+          text = text.gsub(item, "<a href='#{uri}'>#{item}</a>")
         end
 
         # @mention
         text.to_s.split.grep(/@\w+/) do |item|
-          uri = URI.escape("https://twitter.com/#{item.strip_html.delete('@')}")
-          text = text.gsub(item, "<a href='#{uri}'>#{item.strip_html}</a>")
+          item = item.strip_html
+          uri = html_escape("https://twitter.com/#{item.delete("@")}")
+          text = text.gsub(item, "<a href='#{uri}'>#{item}</a>")
         end
 
         text

data/lib/publify_time.rb

@@ -1,14 +1,18 @@
+# frozen_string_literal: true
+
 class PublifyTime
   def self.delta(year = nil, month = nil, day = nil)
     return nil if year.nil? && month.nil? && day.nil?
+
     year = year.to_i unless year.nil?
     month = month.to_i unless month.nil?
     day = day.to_i unless day.nil?
     return nil if year.zero?
+
     from = Time.zone.local(year, month, day)
     to = from.end_of_year
-    to = from.end_of_month unless month.blank?
-    to = from.end_of_day unless day.blank?
+    to = from.end_of_month if month.present?
+    to = from.end_of_day if day.present?
     from..to
   end
 

data/lib/sidebar_field.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 class SidebarField
-  attr_accessor :key
-  attr_accessor :options
-  attr_accessor :default
+  attr_accessor :key, :options, :default
+
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::FormTagHelper
   include ActionView::Helpers::FormOptionsHelper
@@ -13,20 +14,19 @@ class SidebarField
   end
 
   def label
-    options[:label] || key.humanize.gsub(/url/i, 'URL')
+    options[:label] || key.humanize.gsub(/url/i, "URL")
   end
 
   def label_html(_sidebar)
-    content_tag('label', label)
+    tag.label(label)
   end
 
   def input_html(sidebar)
-    text_field_tag(input_name(sidebar), sidebar.config[key], class: 'form-control')
+    text_field_tag(input_name(sidebar), current_value(sidebar), class: "form-control")
   end
 
   def line_html(sidebar)
-    html = label_html(sidebar)
-    html << content_tag(:div, input_html(sidebar), class: 'form-group')
+    tag.div(label_html(sidebar) + input_html(sidebar), class: "form-group")
   end
 
   def input_name(sidebar)
@@ -37,29 +37,37 @@ class SidebarField
     value
   end
 
+  def current_value(sidebar)
+    canonicalize(sidebar.config[key])
+  end
+
   class SelectField < self
     def input_html(sidebar)
       select_tag(input_name(sidebar),
-                 options_for_select(options[:choices], sidebar.config[key]),
+                 options_for_select(options[:choices], current_value(sidebar)),
                  options)
     end
   end
 
   class TextAreaField < self
     def input_html(sidebar)
-      html_options = { 'rows' => '10', 'class' => 'form-control' }.update(options.stringify_keys)
-      text_area_tag(input_name(sidebar), sidebar.config[key], html_options)
+      html_options = { "rows" => "10", "class" => "form-control" }.
+        update(options.stringify_keys)
+      text_area_tag(input_name(sidebar), current_value(sidebar), html_options)
     end
   end
 
   class RadioField < self
     def input_html(sidebar)
-      options[:choices].map do |choice|
+      choices = options[:choices].map do |choice|
         value = value_for(choice)
-        radio_button_tag(input_name(sidebar), value,
-                         value == sidebar.config[key], options) +
-          content_tag('label', label_for(choice))
-      end.join('<br />')
+        radio_button = radio_button_tag(input_name(sidebar),
+                                        value,
+                                        value == current_value(sidebar),
+                                        options)
+        tag.div(tag.label(radio_button + label_for(choice)), class: "radio")
+      end
+      safe_join(choices)
     end
 
     def label_for(choice)
@@ -73,14 +81,15 @@ class SidebarField
 
   class CheckBoxField < self
     def line_html(sidebar)
-      hidden_field_tag(input_name(sidebar), 0) +
-        content_tag('label',
-                    safe_join([check_box_tag(input_name(sidebar), 1, sidebar.config[key], options), label], ' '))
+      content = hidden_field_tag(input_name(sidebar), 0) +
+        tag.label(check_box_tag(input_name(sidebar), 1,
+                                current_value(sidebar), options) + label)
+      tag.div(content, class: "checkbox")
     end
 
     def canonicalize(value)
       case value
-      when '0'
+      when "0"
         false
       else
         true

data/lib/sidebar_registry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SidebarRegistry
   class << self
     def register_sidebar(klass_name)
@@ -13,14 +15,14 @@ class SidebarRegistry
     end
 
     def register_sidebar_directory(plugins_root, paths)
-      separator = plugins_root.include?('/') ? '/' : '\\'
+      separator = plugins_root.include?("/") ? "/" : '\\'
 
-      Dir.glob(File.join(plugins_root, '*_sidebar')).select do |file|
+      Dir.glob(File.join(plugins_root, "*_sidebar")).select do |file|
         plugin_name = file.split(separator).last
         register_sidebar plugin_name.classify
         # TODO: Move Sidebars to app/models, and views to app/views so this can
         # be simplified.
-        paths << File.join(plugins_root, plugin_name, 'lib')
+        paths << File.join(plugins_root, plugin_name, "lib")
       end
     end
 

data/lib/spam_protection.rb

@@ -1,8 +1,10 @@
-require 'format'
+# frozen_string_literal: true
+
+require "format"
 
 class SpamProtection
-  IP_RBLS = ['opm.blitzed.us', 'bsb.empty.us'].freeze
-  HOST_RBLS = ['multi.surbl.org', 'bsb.empty.us'].freeze
+  IP_RBLS = ["opm.blitzed.us", "bsb.empty.us"].freeze
+  HOST_RBLS = ["multi.surbl.org", "bsb.empty.us"].freeze
   SECOND_LEVEL = %w(co com net org gov).freeze
 
   attr_accessor :this_blog
@@ -25,7 +27,7 @@ class SpamProtection
 
     if reason
       logger.info("[SP] Hit: #{reason}")
-      return true
+      true
     end
   end
 
@@ -33,11 +35,12 @@ class SpamProtection
 
   def scan_ip(ip_address)
     logger.info("[SP] Scanning IP #{ip_address}")
-    query_rbls(IP_RBLS, ip_address.split('.').reverse.join('.'))
+    query_rbls(IP_RBLS, ip_address.split(".").reverse.join("."))
   end
 
   def scan_text(string)
-    uri_list = string.scan(/(http:\/\/[^\s"]+)/m).flatten
+    # FIXME: Unify HTTP URI matchers
+    uri_list = string.scan(%r{(http://[^\s"]+)}m).flatten
 
     check_uri_count(uri_list)
     scan_uris(uri_list)
@@ -48,9 +51,8 @@ class SpamProtection
   def check_uri_count(uris)
     limit = this_blog.sp_url_limit
     return if limit.to_i.zero?
-    if uris.size > limit
-      throw :hit, "Hard URL Limit hit: #{uris.size} > #{limit}"
-    end
+
+    throw :hit, "Hard URL Limit hit: #{uris.size} > #{limit}" if uris.size > limit
   end
 
   def scan_uris(uris = [])
@@ -60,9 +62,9 @@ class SpamProtection
              rescue URI::InvalidURIError
                next
              end
-      return scan_ip(host) if host =~ Format::IP_ADDRESS
+      return scan_ip(host) if Format::IP_ADDRESS.match?(host)
 
-      host_parts = host.split('.').reverse
+      host_parts = host.split(".").reverse
       domain = []
 
       # Check for two level TLD
@@ -70,9 +72,9 @@ class SpamProtection
         domain.unshift(host_parts.shift)
       end
 
-      logger.info("[SP] Scanning domain #{domain.join('.')}")
-      query_rbls(HOST_RBLS, host, domain.join('.'))
-      logger.info("[SP] Finished domain scan #{domain.join('.')}")
+      logger.info("[SP] Scanning domain #{domain.join(".")}")
+      query_rbls(HOST_RBLS, host, domain.join("."))
+      logger.info("[SP] Finished domain scan #{domain.join(".")}")
       return false
     end
   end
@@ -81,8 +83,8 @@ class SpamProtection
     rbls.each do |rbl|
       subdomains.uniq.each do |d|
         begin
-          response = IPSocket.getaddress([d, rbl].join('.'))
-          if response =~ /^127\.0\.0\./
+          response = IPSocket.getaddress([d, rbl].join("."))
+          if response.start_with?("127.0.0.")
             throw :hit,
                   "#{rbl} positively resolved subdomain #{d} => #{response}"
           end
@@ -96,6 +98,6 @@ class SpamProtection
   end
 
   def logger
-    @logger ||= ::Rails.logger || Logger.new(STDOUT)
+    @logger ||= ::Rails.logger || Logger.new($stdout)
   end
 end

data/lib/tasks/i18n.rake

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+namespace :i18n do
+  desc "Check translation health"
+  task :health do
+    `i18n-tasks health`
+    abort("Translation problems found") unless $CHILD_STATUS.success?
+  end
+end

data/lib/tasks/manifest.rake

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+namespace :manifest do
+  def gemmable_files
+    `git ls-files -z`.split("\x0").reject do |file|
+      file.match(%r{^(bin|spec)/}) ||
+        file.end_with?("/.keep") ||
+        file.start_with?(".") ||
+        %w(Manifest.txt Gemfile Rakefile publify_core.gemspec).include?(file)
+    end
+  end
+
+  def manifest_files
+    File.open("Manifest.txt").readlines.map(&:chomp)
+  end
+
+  desc "Create manifest"
+  task :create do
+    File.open("Manifest.txt", "w") do |manifest|
+      gemmable_files.each { |file| manifest.puts file }
+    end
+  end
+
+  desc "Check manifest"
+  task :check do
+    unless gemmable_files == manifest_files
+      raise "Manifest check failed, try recreating the manifest"
+    end
+  end
+end

data/lib/tasks/publify_core_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :publify_core do
 #   # Task goes here

data/lib/text_filter_plugin.rb

@@ -1,4 +1,6 @@
-require 'publify_plugins'
+# frozen_string_literal: true
+
+require "publify_plugins"
 
 class TextFilterPlugin
   class << self
@@ -9,7 +11,9 @@ class TextFilterPlugin
 
   @@filter_map = {}
   def self.inherited(sub)
-    if sub.to_s =~ /^Plugin/ || sub.to_s =~ /^PublifyApp::Textfilter/
+    super
+
+    if sub.to_s.start_with?("Plugin", "PublifyApp::Textfilter")
       name = sub.short_name
       @@filter_map[name] = sub
     end
@@ -25,11 +29,11 @@ class TextFilterPlugin
 
   def self.available_filter_types
     unless @cached_filter_types
-      types = { 'macropre' => [],
-                'macropost' => [],
-                'markup' => [],
-                'postprocess' => [],
-                'other' => [] }
+      types = { "macropre" => [],
+                "macropost" => [],
+                "markup" => [],
+                "postprocess" => [],
+                "other" => [] }
 
       available_filters.each { |filter| types[filter.filter_type].push(filter) }
 
@@ -42,8 +46,8 @@ class TextFilterPlugin
     available_filters.select { |filter| TextFilterPlugin::Macro > filter }
   end
 
-  plugin_display_name 'Unknown Text Filter'
-  plugin_description 'Unknown Text Filter Description'
+  plugin_display_name "Unknown Text Filter"
+  plugin_description "Unknown Text Filter Description"
 
   def self.reloadable?
     false
@@ -66,7 +70,7 @@ class TextFilterPlugin
   end
 
   def self.filter_type
-    'other'
+    "other"
   end
 
   def self.default_config
@@ -74,15 +78,14 @@ class TextFilterPlugin
   end
 
   def self.help_text
-    ''
+    ""
   end
 
   def self.sanitize(*args)
     (@sanitizer ||= Rails::Html::WhiteListSanitizer.new).sanitize(*args)
   end
 
-  def self.default_helper_module!
-  end
+  def self.default_helper_module!; end
 
   # Look up a config paramater, falling back to the default as needed.
   def self.config_value(params, name)
@@ -90,13 +93,13 @@ class TextFilterPlugin
   end
 
   def self.logger
-    @logger ||= ::Rails.logger || Logger.new(STDOUT)
+    @logger ||= ::Rails.logger || Logger.new($stdout)
   end
 end
 
 class TextFilterPlugin::PostProcess < TextFilterPlugin
   def self.filter_type
-    'postprocess'
+    "postprocess"
   end
 end
 
@@ -120,47 +123,45 @@ class TextFilterPlugin::Macro < TextFilterPlugin
   end
 
   def self.filtertext(text)
-    regex1 = /<publify:#{short_name}(?:[ \t][^>]*)?\/>/
-    regex2 = /<publify:#{short_name}([ \t][^>]*)?>(.*?)<\/publify:#{short_name}>/m
+    regex1 = %r{<publify:#{short_name}(?:[ \t][^>]*)?/>}
+    regex2 = %r{<publify:#{short_name}([ \t][^>]*)?>(.*?)</publify:#{short_name}>}m
 
     new_text = text.gsub(regex1) do |match|
       macrofilter(attributes_parse(match))
     end
 
-    new_text = new_text.gsub(regex2) do |_match|
+    new_text.gsub(regex2) do |_match|
       macrofilter(attributes_parse(Regexp.last_match[1].to_s), Regexp.last_match[2].to_s)
     end
-
-    new_text
   end
 end
 
 class TextFilterPlugin::MacroPre < TextFilterPlugin::Macro
   def self.filter_type
-    'macropre'
+    "macropre"
   end
 end
 
 class TextFilterPlugin::MacroPost < TextFilterPlugin::Macro
   def self.filter_type
-    'macropost'
+    "macropost"
   end
 end
 
 class TextFilterPlugin::Markup < TextFilterPlugin
   def self.filter_type
-    'markup'
+    "markup"
   end
 end
 
 class PublifyApp
   class Textfilter
     class MacroPost < TextFilterPlugin
-      plugin_display_name 'MacroPost'
-      plugin_description 'Macro expansion meta-filter (post-markup)'
+      plugin_display_name "MacroPost"
+      plugin_description "Macro expansion meta-filter (post-markup)"
 
       def self.filtertext(text)
-        macros = TextFilterPlugin.available_filter_types['macropost']
+        macros = TextFilterPlugin.available_filter_types["macropost"]
         macros.reduce(text) do |new_text, macro|
           macro.filtertext(new_text)
         end
@@ -168,11 +169,11 @@ class PublifyApp
     end
 
     class MacroPre < TextFilterPlugin
-      plugin_display_name 'MacroPre'
-      plugin_description 'Macro expansion meta-filter (pre-markup)'
+      plugin_display_name "MacroPre"
+      plugin_description "Macro expansion meta-filter (pre-markup)"
 
       def self.filtertext(text)
-        macros = TextFilterPlugin.available_filter_types['macropre']
+        macros = TextFilterPlugin.available_filter_types["macropre"]
         macros.reduce(text) do |new_text, macro|
           macro.filtertext(new_text)
         end