landable 1.13.1 → 1.13.2

data/lib/landable/engine.rb

@@ -1,7 +1,7 @@
-require "rack/cors"
-require "active_model_serializers"
-require "carrierwave"
-require "rake"
+require 'rack/cors'
+require 'active_model_serializers'
+require 'carrierwave'
+require 'rake'
 
 module Landable
   class Engine < ::Rails::Engine
@@ -9,46 +9,46 @@ module Landable
 
     config.generators do |g|
       g.test_framework :rspec
-      g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      g.fixture_replacement :factory_girl, dir: 'spec/factories'
     end
 
-    initializer "landable.enable_cors" do |app|
+    initializer 'landable.enable_cors' do |app|
       config = Landable.configuration
       if config.cors.enabled?
         app.middleware.insert 0, Rack::Cors do
           allow do
             origins config.cors.origins
             resource "#{config.api_namespace}/*",
-              methods: [:get, :post, :put, :patch, :delete],
-              headers: :any,
-              expose: 'X-Landable-Media-Type',
-              credentials: false,
-              max_age: 15.minutes
+                     methods: [:get, :post, :put, :patch, :delete],
+                     headers: :any,
+                     expose: 'X-Landable-Media-Type',
+                     credentials: false,
+                     max_age: 15.minutes
           end
         end
       end
     end
 
-    initializer "landable.json_schema" do |app|
+    initializer 'landable.json_schema' do |app|
       if ENV['LANDABLE_VALIDATE_JSON']
         require 'rack/schema'
         app.middleware.use Rack::Schema
       end
     end
 
-    initializer "landable.seed_required" do |app|
-      Landable::Seeds.seed(:required) rescue nil
+    initializer 'landable.seed_required' do |_app|
+      suppress(StandardError) { Landable::Seeds.seed(:required) }
     end
 
-    initializer "landable.create_themes" do |app|
-      Theme.create_from_layouts! rescue nil
+    initializer 'landable.create_themes' do |_app|
+      suppress(StandardError) { Theme.create_from_layouts! }
     end
 
-    initializer 'landable.create_templates' do |app|
-      Template.create_from_partials! rescue nil
+    initializer 'landable.create_templates' do |_app|
+      suppress(StandardError) { Template.create_from_partials! }
     end
 
-    initializer "landable.action_controller" do
+    initializer 'landable.action_controller' do
       ActiveSupport.on_load :action_controller do
         # includes
         include Landable::Traffic

data/lib/landable/error.rb

@@ -1,9 +1,8 @@
 module Landable
   class Error < StandardError
-
     STATUS_CODE = 500
 
-    def initialize message = nil
+    def initialize(message = nil)
       message ||= "Status code: #{status_code} (Hint: rescue this in your ApplicationController)"
       super
     end
@@ -11,6 +10,5 @@ module Landable
     def status_code
       self.class::STATUS_CODE
     end
-
   end
 end

data/lib/landable/layout.rb

@@ -14,7 +14,7 @@ module Landable
       path = @file.dup
       self.class.paths.each { |p| path.sub!(p, '') }
 
-      path.sub!(/^\//, '')
+      path.sub!(%r{^\/}, '')
 
       @path, @extension = path.split('.html.', 2)
 
@@ -27,12 +27,12 @@ module Landable
       process unless @processed
 
       theme = Theme.where(file: @path).first_or_initialize
-      theme.name          ||= @path.gsub('/', ' ').titlecase
+      theme.name ||= @path.gsub('/', ' ').titlecase
       theme.extension       = @extension
       theme.description     = description if theme.description.blank? || theme.description =~ /^Defined in/
       theme.body            = @body
       theme.editable        = false
-      theme.thumbnail_url ||= "http://placehold.it/300x200"
+      theme.thumbnail_url ||= 'http://placehold.it/300x200'
 
       theme.save!
 
@@ -40,7 +40,7 @@ module Landable
     end
 
     def description
-      "Defined in #@path.html.#@extension"
+      "Defined in #{@path}.html.#{@extension}"
     end
 
     class << self
@@ -52,8 +52,8 @@ module Landable
         files = []
 
         paths.map do |path|
-          files << Dir[path + "/**/[^_]*.html.*"]
-          files << Dir[path + "/**/application*"]
+          files << Dir[path + '/**/[^_]*.html.*']
+          files << Dir[path + '/**/application*']
         end
 
         files.flatten.uniq

data/lib/landable/liquid/asset_tags.rb

@@ -2,7 +2,6 @@ require 'action_view'
 
 module Landable
   module Liquid
-
     class AssetTag < ::Liquid::Tag
       attr_accessor :tag_name, :asset_name
 
@@ -41,11 +40,11 @@ module Landable
 
       def lookup_asset(context, name)
         assets = context.registers.fetch(:assets) do
-          raise ArgumentError.new("`assets' value was never registered with the template")
+          fail(ArgumentError, "`assets' value was never registered with the template")
         end
 
         assets.fetch(name) do
-          raise ArgumentError.new("No `#{name}' asset available in #{assets.inspect}")
+          fail(ArgumentError, "No `#{name}' asset available in #{assets.inspect}")
         end
       end
 
@@ -62,7 +61,7 @@ module Landable
     class AssetAttributeTag < AssetTag
       def render(context)
         asset = lookup_asset context, asset_name
-        attribute = tag_name.sub /^asset_/, ''
+        attribute = tag_name.sub(/^asset_/, '')
 
         if attribute == 'url'
           asset.public_url
@@ -71,6 +70,5 @@ module Landable
         end
       end
     end
-
   end
 end

data/lib/landable/liquid/drops.rb

@@ -4,7 +4,6 @@
 
 module Landable
   module Liquid
-
     # CategoryProxy gives us these:
     #
     # {{ categories.size }}
@@ -20,8 +19,7 @@ module Landable
     #   {% endfor %}
     # </ul>
     class CategoriesDrop < ::Liquid::Drop
-
-      def before_method method_name
+      def before_method(method_name)
         category_cache[method_name] ||= ::Landable::Category.find_by_slug method_name
       end
 
@@ -29,18 +27,15 @@ module Landable
         @size ||= Category.count
       end
 
-      def each &block
-        ::Landable::Category.all.each &block
+      def each(&block)
+        ::Landable::Category.all.each(&block)
       end
 
-
       protected
 
       def category_cache
         @category_cache ||= {}
       end
-
     end
-
   end
 end

data/lib/landable/liquid/filters.rb

@@ -1,11 +1,9 @@
 module Landable
   module Liquid
-
     module DefaultFilter
-      def default(input, default_output=nil)
+      def default(input, default_output = nil)
         input.presence ? input : default_output
       end
     end
-
   end
 end

data/lib/landable/liquid/tags.rb

@@ -2,14 +2,14 @@ require 'action_view'
 
 module Landable
   module Liquid
-
     class Tag < ::Liquid::Tag
       include ActionView::Helpers::TagHelper
 
       protected
+
       def lookup_page(context)
         context.registers.fetch(:page) do
-          raise ArgumentError.new("`page' value was never registered with the template")
+          fail(ArgumentError, "`page' value was never registered with the template")
         end
       end
     end
@@ -26,9 +26,9 @@ module Landable
         page = lookup_page context
         tags = page.meta_tags || {}
 
-        tags.map { |name, value|
+        tags.map do |name, value|
           tag(:meta, name: name, content: value)
-        }.join("\n")
+        end.join("\n")
       end
     end
 
@@ -42,14 +42,14 @@ module Landable
 
     class Head < Tag
       def render(context)
-        page = lookup_page context
+        lookup_page context
 
         head = []
 
-        ['title_tag', 'meta_tags', 'head_content'].each do |tag_name|
-           tag = eval("Landable::Liquid::#{tag_name.classify}").new(tag_name, nil, nil)
-           head << tag.render(context) if tag.render(context).present?
-         end
+        %w(title_tag meta_tags head_content).each do |tag_name|
+          tag = "Landable::Liquid::#{tag_name.classify}".safe_constantize.new(tag_name, nil, nil)
+          head << tag.render(context) if tag.render(context).present?
+        end
 
         head.join("\n")
       end
@@ -64,7 +64,7 @@ module Landable
     class TemplateTag < Tag
       attr_accessor :template_slug
 
-      def initialize(tag, param, tokens)
+      def initialize(_tag, param, _tokens)
         param_tokens = param.split(/\s+/)
         @template_slug = param_tokens.shift
         @variables = Hash[param_tokens.join(' ').scan(/([\w_]+):\s+"([^"]*)"/)]

data/lib/landable/migration.rb

@@ -1,40 +1,40 @@
-class Landable::Migration < ActiveRecord::Migration
-  class << self
-    def connection_search_path(conn)
-      conn.execute("SHOW SEARCH_PATH")[0]["search_path"]
-    end
-
-    def models
-      @models ||= begin
-        c = Landable.constants.map { |c| "Landable::#{c.to_s}".constantize }
-        c += Landable::Traffic.constants.map { |c| "Landable::Traffic::#{c.to_s}".constantize }
-        c.select { |c| c.kind_of? Class and c.ancestors.include? ActiveRecord::Base }
+module Landable
+  class Migration < ActiveRecord::Migration
+    class << self
+      def connection_search_path(conn)
+        conn.execute('SHOW SEARCH_PATH')[0]['search_path']
       end
-    end
 
-    def clear_cache!
-      models.each &:reset_primary_key
-      ActiveRecord::Base.connection.schema_cache.clear!
-    end
-  end
+      def models
+        @models ||= begin
+                      classes = Landable.constants.map { |c| "Landable::#{c}".constantize }
+                      classes += Landable::Traffic.constants.map { |c| "Landable::Traffic::#{c}".constantize }
+                      classes.select { |c| c.is_a?(Class) && c.ancestors.include?(ActiveRecord::Base) }
+                    end
+      end
 
-  def exec_migration(conn, direction)
-    # come what may, keep the connection's schema search path intact
-    with_clean_connection(conn) do
-      super
+      def clear_cache!
+        models.each(&:reset_primary_key)
+        ActiveRecord::Base.connection.schema_cache.clear!
+      end
     end
 
-    # reset a few things, lest we pollute the way for those who follow
-    self.class.clear_cache!
-  end
+    def exec_migration(conn, direction)
+      # come what may, keep the connection's schema search path intact
+      with_clean_connection(conn) do
+        super
+      end
 
+      # reset a few things, lest we pollute the way for those who follow
+      self.class.clear_cache!
+    end
 
-  protected
+    protected
 
-  def with_clean_connection(conn)
-    original_search_path = self.class.connection_search_path conn
-    yield
-    conn.schema_search_path = original_search_path
+    def with_clean_connection(conn)
+      original_search_path = self.class.connection_search_path conn
+      yield
+      conn.schema_search_path = original_search_path
+    end
   end
-
 end

data/lib/landable/mime_types.rb

@@ -1,6 +1,6 @@
 # Re-register application/json, adding our own vendored mime types as aliases
 
-# TODO Be more generous about accepting version constraints. Currently,
+# TODO: Be more generous about accepting version constraints. Currently,
 # requesting v1.5 when we're running v1.5.2 will return a 406.
 
 api_mime_types = %W(

data/lib/landable/partial.rb

@@ -5,7 +5,7 @@ module Landable
     end
 
     def process
-      @name        = @file.gsub('/',' ').titlecase
+      @name        = @file.gsub('/', ' ').titlecase
       @description = "The Code for this template can be seen at #{@file} in the source code"
       @slug        = @file.gsub(/[^\w]/, '_')
 
@@ -22,7 +22,7 @@ module Landable
       template.description     = @description
       template.editable        = false
       template.is_layout       = false
-      template.thumbnail_url ||= "http://placehold.it/300x200"
+      template.thumbnail_url ||= 'http://placehold.it/300x200'
 
       # Save!
       template.save!

data/lib/landable/seeds.rb

@@ -2,13 +2,12 @@
 # accessible. Not too thrilled about it; refactor away.
 module Landable
   module Seeds
-
-    def self.seed key
+    def self.seed(key)
       method_key = "seed_#{key}".to_sym
       if respond_to? method_key
         send method_key if ActiveRecord::Base.connection.schema_exists? "#{Landable.configuration.database_schema_prefix}landable"
       else
-        raise NotImplementedError, "No seeds for key '#{key}'"
+        fail NotImplementedError, "No seeds for key '#{key}'"
       end
     end
 
@@ -29,7 +28,7 @@ module Landable
       Landable::Theme.where(name: 'Blank').first_or_create!(
         body: '',
         description: 'A completely blank theme; only the page body will be rendered.',
-        thumbnail_url: 'http://placehold.it/300x200',
+        thumbnail_url: 'http://placehold.it/300x200'
       )
     end
   end

data/lib/landable/traffic.rb

@@ -10,16 +10,14 @@ require 'landable/traffic/event_publisher'
 module Landable
   module Traffic
     def track_with_landable!
-      yield and return if untracked?
+      yield && return if untracked?
 
       begin
         @tracker = Tracker.for self
         @tracker.track
       rescue => e
         Rails.logger.error e
-        if respond_to? :newrelic_notice_error
-          newrelic_notice_error e
-        end
+        newrelic_notice_error e if respond_to? :newrelic_notice_error
       end
 
       yield
@@ -28,9 +26,7 @@ module Landable
         @tracker.save
       rescue => e
         Rails.logger.error e
-        if respond_to? :newrelic_notice_error
-          newrelic_notice_error e
-        end
+        newrelic_notice_error e if respond_to? :newrelic_notice_error
       end
     end
 
@@ -39,7 +35,7 @@ module Landable
     end
 
     def untracked_user?
-      Landable.configuration.dnt_enabled && request.headers["DNT"] == "1"
+      Landable.configuration.dnt_enabled && request.headers['DNT'] == '1'
     end
 
     def untracked_path?