landable 1.13.1 → 1.13.2

data/app/models/landable/page_revision.rb

@@ -6,21 +6,10 @@ module Landable
     include Landable::HasAssets
     include Landable::TableName
 
-    @@ignored_page_attributes = [
-      'page_id',
-      'imported_at',
-      'created_at',
-      'deleted_at',
-      'updated_at',
-      'published_revision_id',
-      'is_publishable',
-      'updated_by_author_id',
-      'lock_version',
-      'audit_flags',
-      'page_name'
-    ]
-
-    cattr_accessor :ignored_page_attributes
+    class << self
+      attr_accessor :ignored_page_attributes
+    end
+    @ignored_page_attributes = %w(page_id imported_at created_at deleted_at updated_at published_revision_id is_publishable updated_by_author_id lock_version audit_flags page_name)
 
     belongs_to :author
     belongs_to :page, inverse_of: :revisions
@@ -46,17 +35,17 @@ module Landable
     end
 
     def snapshot
-      Page.new(title: self.title,
+      Page.new(title: title,
                meta_tags: page.meta_tags,
                head_content: page.head_content,
-               body: self.body,
-               path: self.path,
-               redirect_url: self.redirect_url,
-               status_code: self.status_code,
-               theme_id: self.theme_id,
-               category_id: self.category_id,
-               abstract: self.abstract,
-               hero_asset_id: self.hero_asset_id)
+               body: body,
+               path: path,
+               redirect_url: redirect_url,
+               status_code: status_code,
+               theme_id: theme_id,
+               category_id: category_id,
+               abstract: abstract,
+               hero_asset_id: hero_asset_id)
     end
 
     def publish!
@@ -69,18 +58,18 @@ module Landable
 
     def republish!(options)
       unpublish!
-      PageRevision.create!(page_id: self.page_id,
-                           title: self.title,
+      PageRevision.create!(page_id: page_id,
+                           title: title,
                            meta_tags: page.meta_tags,
                            head_content: page.head_content,
-                           body: self.body,
-                           path: self.path,
-                           redirect_url: self.redirect_url,
-                           status_code: self.status_code,
-                           theme_id: self.theme_id,
-                           category_id: self.category_id,
-                           abstract: self.abstract,
-                           hero_asset_id: self.hero_asset_id,
+                           body: body,
+                           path: path,
+                           redirect_url: redirect_url,
+                           status_code: status_code,
+                           theme_id: theme_id,
+                           category_id: category_id,
+                           abstract: abstract,
+                           hero_asset_id: hero_asset_id,
                            notes: "Publishing update for template #{options[:template]}: #{options[:notes]}",
                            is_minor: options[:is_minor],
                            author_id: options[:author_id],
@@ -88,12 +77,10 @@ module Landable
     end
 
     def preview_url
-      begin
-        public_preview_page_revision_url(self, host: Landable.configuration.public_host)
-      rescue ArgumentError
-        Rails.logger.warn "Failed to generate preview url for page revision #{id} - missing Landable.configuration.public_host"
-        nil
-      end
+      public_preview_page_revision_url(self, host: Landable.configuration.public_host)
+    rescue ArgumentError
+      Rails.logger.warn "Failed to generate preview url for page revision #{id} - missing Landable.configuration.public_host"
+      nil
     end
 
     def preview_path
@@ -135,5 +122,4 @@ module Landable
       end
     end
   end
-
 end

data/app/models/landable/page_search_engine.rb

@@ -8,13 +8,12 @@ module Landable
     end
 
     def filter_by!(filters)
-      if ids = as_array(filters[:ids])
-        @scope = @scope.where(page_id: ids)
-      end
+      ids = as_array(filters[:ids])
+      @scope = @scope.where(page_id: ids) if ids
 
-      if path = filters[:path].presence
-        @scope = @scope.with_fuzzy_path(path)
-      end
+      path = filters[:path].presence
+      return unless path
+      @scope = @scope.with_fuzzy_path(path)
     end
   end
 end

data/app/models/landable/search_engine.rb

@@ -17,8 +17,8 @@ module Landable
       { search: { total_results: @scope.count(:all) } }
     end
 
-    def filter_by!(filters)
-      raise NotImplementedError
+    def filter_by!(_filters)
+      fail NotImplementedError
     end
 
     def order!(order)

data/app/models/landable/template.rb

@@ -6,32 +6,31 @@ module Landable
     # attributes
     attr_accessor :temp_author
 
-    validates_presence_of   :name, :slug, :description
+    validates_presence_of :name, :slug, :description
     validates_uniqueness_of :name, case_sensitive: false
     validates_uniqueness_of :slug, case_sensitive: false
 
     before_save :slug_has_no_spaces
 
-
     belongs_to :published_revision,   class_name: 'Landable::TemplateRevision'
-    has_many   :audits,               class_name: 'Landable::Audit', as: :auditable
-    has_many   :revisions,            class_name: 'Landable::TemplateRevision'
+    has_many :audits,               class_name: 'Landable::Audit', as: :auditable
+    has_many :revisions,            class_name: 'Landable::TemplateRevision'
 
     has_and_belongs_to_many :pages,   join_table: Page.templates_join_table_name
 
     delegate :count, to: :pages, prefix: true # Returns how many Pages a Template lives in!
 
-    before_save -> template {
+    before_save lambda  { |template|
       template.is_publishable = true unless template.published_revision_id_changed?
     }
 
     def deactivate
-      publish!(author_id: temp_author.id, notes: "This template has been trashed")
+      publish!(author_id: temp_author.id, notes: 'This template has been trashed')
 
       super
     end
 
-    def name= val
+    def name=(val)
       self[:name] = val
       self[:slug] ||= (val && val.underscore.gsub(/[^\w_]/, '_').gsub(/_{2,}/, '_'))
     end
@@ -52,7 +51,7 @@ module Landable
     end
 
     def republish_associated_pages(options)
-      options[:template] = self.name
+      options[:template] = name
       pages.each do |page|
         page.republish!(options) if page.published?
       end
@@ -68,9 +67,8 @@ module Landable
     end
 
     def slug_has_no_spaces
-      if self.slug =~ /\s/ # check if whitespace
-        self.slug = self.slug.underscore.gsub(/[^\w_]/, '_').gsub(/_{2,}/, '_')
-      end
+      return unless slug =~ /\s/ # check if whitespace
+      self.slug = slug.underscore.gsub(/[^\w_]/, '_').gsub(/_{2,}/, '_')
     end
 
     class << self

data/app/models/landable/template_revision.rb

@@ -2,20 +2,10 @@ module Landable
   class TemplateRevision < ActiveRecord::Base
     include Landable::TableName
 
-    @@ignored_template_attributes = [
-      'editable',
-      'created_at',
-      'updated_at',
-      'published_revision_id',
-      'file',
-      'thumbnail_url',
-      'is_layout',
-      'is_publishable',
-      'audit_flags',
-      'deleted_at'
-    ]
-
-    cattr_accessor :ignored_template_attributes
+    @ignored_template_attributes = %w(editable created_at updated_at published_revision_id file thumbnail_url is_layout is_publishable audit_flags deleted_at)
+    class << self
+      attr_accessor :ignored_template_attributes
+    end
 
     belongs_to :template, inverse_of: :revisions
     belongs_to :author

data/app/models/landable/theme.rb

@@ -6,7 +6,7 @@ module Landable
     include Landable::HasAssets
     include Landable::Librarian
 
-    validates_presence_of   :name, :description
+    validates_presence_of :name, :description
     validates_uniqueness_of :name, case_sensitive: false
 
     has_many :pages, inverse_of: :theme

data/app/models/landable/traffic/attribution.rb

@@ -3,7 +3,7 @@ module Landable
     class Attribution < ActiveRecord::Base
       include Landable::TableName
 
-      KEYS = %w[ad_type ad_group bid_match_type campaign content creative device_type experiment keyword match_type medium network placement position search_term source target]
+      KEYS = %w(ad_type ad_group bid_match_type campaign content creative device_type experiment keyword match_type medium network placement position search_term source target)
 
       self.record_timestamps = false
 
@@ -28,6 +28,8 @@ module Landable
 
         def lookup(parameters)
           where(transform(parameters)).first_or_create
+        rescue ActiveRecord::RecordNotUnique
+          retry
         end
 
         def digest(parameters)

data/app/models/landable/traffic/page_view.rb

@@ -16,7 +16,7 @@ module Landable
       protected
 
       def set_page_revision
-        page = Landable::Page.where(path: path).select(:published_revision_id).first
+        page = Landable::Page.find_by(path: path)
         self.page_revision_id = page.try(:published_revision_id)
       end
     end

data/app/models/landable/traffic/user_agent.rb

@@ -4,7 +4,7 @@ module Landable
       include Landable::TableName
       self.record_timestamps = false
 
-      lookup_by  :user_agent, cache: 50, find_or_create: true
+      lookup_by :user_agent, cache: 50, find_or_create: true
 
       lookup_for :user_agent_type, class_name: UserAgentType
       lookup_for :device,          class_name: Device

data/app/models/landable/traffic/visit.rb

@@ -10,7 +10,7 @@ module Landable
       belongs_to :visitor
       belongs_to :referer
 
-      has_many   :page_views
+      has_many :page_views
     end
   end
 end

data/app/responders/landable/api_responder.rb

@@ -3,12 +3,14 @@ module Landable
     def to_format
       controller.response.headers['X-Landable-Media-Type'] = api_media_type
 
-      if serializer = resource_serializer
+      serializer = resource_serializer
+      if serializer
         options[collection_resource? ? :each_serializer : :serializer] = serializer
         controller.response.headers['X-Landable-Serializer'] = serializer.name if leaky?
       end
 
-      if leaky? && format == :json && schema = json_schema
+      schema = json_schema
+      if leaky? && format == :json && schema
         key  = collection_resource? ? resource_name.pluralize : resource_name
         link = "<#{schema}>; rel=\"describedby\"; anchor=\"#/#{key}\""
         link = "#{link}; collection=\"collection\"" if collection_resource?
@@ -32,7 +34,7 @@ module Landable
     end
 
     def collection_resource?
-      Array === resource || ActiveRecord::Relation === resource
+      resource.is_a?(Array) || resource.is_a?(ActiveRecord::Relation)
     end
 
     def json_schema

data/app/responders/landable/page_render_responder.rb

@@ -8,7 +8,7 @@ module Landable
                                 content_type: page.content_type,
                                 layout: (page.theme.try(:file) || false)
       when 301, 302 then redirect_to page.redirect_url, status: page.status_code
-      else          raise page.error
+      else          fail page.error
       end
     end
   end

data/app/serializers/landable/asset_serializer.rb

@@ -8,7 +8,7 @@ module Landable
 
     embed :ids
 
-    has_one  :author, include: true, serializer: AuthorSerializer
+    has_one :author, include: true, serializer: AuthorSerializer
     has_many :pages
     has_many :themes
   end

data/app/serializers/landable/audit_serializer.rb

@@ -4,9 +4,8 @@ module Landable
     attributes :auditable_type, :auditable_id, :created_at
 
     def auditable_type
-      if object.auditable_type.present?
-        object.auditable_type.underscore.gsub(/^landable\//, '')
-      end
+      return unless object.auditable_type.present?
+      object.auditable_type.underscore.gsub(%r{^landable\/}, '')
     end
   end
 end

data/app/serializers/landable/directory_serializer.rb

@@ -2,7 +2,7 @@ module Landable
   class DirectorySerializer < ActiveModel::Serializer
     attributes :id, :path
 
-    has_many   :subdirectories, embed: :ids, embed_key: :path
-    has_many   :pages, embed: :ids
+    has_many :subdirectories, embed: :ids, embed_key: :path
+    has_many :pages, embed: :ids
   end
 end

data/app/serializers/landable/page_revision_serializer.rb

@@ -11,6 +11,5 @@ module Landable
     embed :ids
     has_one :page
     has_one :author, include: true, serializer: AuthorSerializer
-
   end
 end

data/app/serializers/landable/page_serializer.rb

@@ -10,11 +10,11 @@ module Landable
     attributes :lock_version
     attributes :deleted_at
 
-    embed    :ids
-    has_one  :theme
-    has_one  :published_revision
-    has_one  :category
-    has_one  :updated_by_author, root: :authors, include: true, serializer: AuthorSerializer
+    embed :ids
+    has_one :theme
+    has_one :published_revision
+    has_one :category
+    has_one :updated_by_author, root: :authors, include: true, serializer: AuthorSerializer
 
     def category
       object.category || Landable::Category.where(name: 'Uncategorized').first

data/app/serializers/landable/template_serializer.rb

@@ -8,8 +8,8 @@ module Landable
     attributes :audit_flags
     attributes :deleted_at
 
-    embed    :ids
-    has_one  :published_revision
+    embed :ids
+    has_one :published_revision
 
     has_many :pages
   end

data/app/services/landable/authentication_service.rb

@@ -10,7 +10,7 @@ module Landable
         return ident if ident
       end
 
-      raise AuthenticationFailedError
+      fail AuthenticationFailedError
     end
 
     class EchoAuthenticator

data/app/services/landable/registration_service.rb

@@ -1,9 +1,10 @@
-require_dependency "landable/author"
+require_dependency 'landable/author'
 
 module Landable
   class RegistrationService
     def self.call(attributes)
-      if author = Author.where(username: attributes[:username]).first
+      author = Author.where(username: attributes[:username]).first
+      if author
         author
       else
         Author.create!(attributes.slice(:username, :email, :first_name, :last_name))

data/app/services/landable/render_service.rb

@@ -1,4 +1,4 @@
-# TODO Handle layouts-as-themes here
+# TODO: Handle layouts-as-themes here
 
 require_dependency 'landable/liquid'
 
@@ -19,16 +19,16 @@ module Landable
       variables ||= {}
 
       content = render_template(page.body, variables, registers: {
-        page: page,
-        assets: assets_for_page,
-        responder: options[:responder],
-      })
+                                  page: page,
+                                  assets: assets_for_page,
+                                  responder: options[:responder]
+                                })
 
       if layout?
-        content = render_template(theme.body, {'body' => content}, registers: {
-          page: page,
-          assets: assets_for_theme,
-        })
+        content = render_template(theme.body, { 'body' => content }, registers: {
+                                    page: page,
+                                    assets: assets_for_theme
+                                  })
       end
 
       # not completely happy about this
@@ -37,16 +37,14 @@ module Landable
           # fancy!
           preview_template = File.open(Landable::Engine.root.join('app', 'views', 'templates', 'preview.liquid')).read
 
-          content = render_template(preview_template, {
-            'content' => content,
-            'is_redirect' => page.redirect?,
-            'is_html' => page.html?,
-            'status_code' => page.status_code,
-            'redirect_url' => page.redirect_url,
-          })
+          content = render_template(preview_template, 'content' => content,
+                                                      'is_redirect' => page.redirect?,
+                                                      'is_html' => page.html?,
+                                                      'status_code' => page.status_code,
+                                                      'redirect_url' => page.redirect_url)
         else
           # non-html stuff just gets rendered as plaintext for a preview
-          content = '<pre>' + CGI::escapeHTML(content) + '</pre>'
+          content = '<pre>' + CGI.escapeHTML(content) + '</pre>'
         end
       end
 
@@ -77,7 +75,7 @@ module Landable
       @assets_for_theme ||= theme ? theme.assets_as_hash : {}
     end
 
-    def render_template template, variables = {}, liquid_options = {}
+    def render_template(template, variables = {}, liquid_options = {})
       variables['categories'] = Liquid::CategoriesDrop.new
 
       parse(template).render!(variables, liquid_options)