landable 1.13.1 → 1.13.2

data/features/step_definitions/core_api_steps.rb

@@ -2,33 +2,35 @@
 
 expand_mustache = lambda do |context, str|
   if str.respond_to?(:gsub)
-    str.gsub(/\{\{([^ ].+?)\}\}/) { context.eval($1) }
+    str.gsub(/\{\{([^ ].+?)\}\}/) { context.eval(Regexp.last_match(1)) }
   else
     str
   end
 end
 
-module Landable::FeatureHelper
-  def basic_authorize!(author = current_author, token = current_access_token)
-    basic_authorize author.username, token.id
-  end
+module Landable
+  module FeatureHelper
+    def basic_authorize!(author = current_author, token = current_access_token)
+      basic_authorize author.username, token.id
+    end
 
-  def current_author
-    @current_author ||= create :author
-  end
+    def current_author
+      @current_author ||= create :author
+    end
 
-  def current_access_token
-    @current_access_token ||= create :access_token, author: @current_author
-  end
+    def current_access_token
+      @current_access_token ||= create :access_token, author: @current_author
+    end
 
-  def last_json(body = last_response.body)
-    JSON.parse body
-  end
+    def last_json(body = last_response.body)
+      JSON.parse body
+    end
 
-  def latest(model)
-    model = model.to_s.classify
-    klass = "Landable::#{model}".constantize
-    klass.order('created_at DESC').first!
+    def latest(model)
+      model = model.to_s.classify
+      klass = "Landable::#{model}".constantize
+      klass.order('created_at DESC').first!
+    end
   end
 end
 
@@ -68,11 +70,11 @@ Given 'my access token expired 2 minutes ago' do
   current_access_token.update_attributes!(expires_at: 2.minutes.ago)
 end
 
-When /^I (HEAD|GET|POST|PUT|PATCH|DELETE|OPTIONS)(?: to)? "(.+?)"$/ do |http_method, path|
+When(/^I (HEAD|GET|POST|PUT|PATCH|DELETE|OPTIONS)(?: to)? "(.+?)"$/) do |http_method, path|
   request expand_mustache[binding, path], method: http_method
 end
 
-When /^I (POST|PUT|PATCH|DELETE|OPTIONS)(?: to)? "(.+?)"(?: with)?:$/ do |http_method, path, body|
+When(/^I (POST|PUT|PATCH|DELETE|OPTIONS)(?: to)? "(.+?)"(?: with)?:$/) do |http_method, path, body|
   request expand_mustache[binding, path], method: http_method, params: body
 end
 
@@ -93,7 +95,7 @@ Then 'my access token should not expire for at least 2 hours' do
   token.expires_at.should be >= 2.hours.from_now
 end
 
-Then /^the response(?: status)? should(?: (not))? be (\d{3})(?: "[A-Za-z ]+")?$/ do |negate, code|
+Then(/^the response(?: status)? should(?: (not))? be (\d{3})(?: "[A-Za-z ]+")?$/) do |negate, code|
   code = Integer(code)
   if negate == 'not'
     last_response.status.should_not eq(code)
@@ -102,13 +104,13 @@ Then /^the response(?: status)? should(?: (not))? be (\d{3})(?: "[A-Za-z ]+")?$/
   end
 end
 
-Then /^the response should contain (?:a|an) "([^"]+)"$/ do |model|
+Then(/^the response should contain (?:a|an) "([^"]+)"$/) do |model|
   last_json.should have_key(model)
   last_json[model].should have_key('id')
 end
 
-Then /^the response should contain (\d+) "([^"]+)"$/ do |count, kind|
-  last_json[kind].length.should == Integer(count)
+Then(/^the response should contain (\d+) "([^"]+)"$/) do |count, kind|
+  last_json[kind].length.should eq Integer(count)
 end
 
 Then 'the response body should be empty' do
@@ -116,11 +118,11 @@ Then 'the response body should be empty' do
 end
 
 Then 'the response body should be "$body"' do |body|
-  last_response.body.should == body
+  last_response.body.should eq body
 end
 
 Then 'I should have been redirected to "$url"' do |url|
-  last_response.headers['Location'].should == url
+  last_response.headers['Location'].should eq url
 end
 
 Then 'the response headers should include:' do |table|
@@ -131,7 +133,7 @@ Then 'the response headers should include:' do |table|
 end
 
 Then 'the JSON at "$path" should be "$value"' do |json_path, value|
-  at_json(json_path).should == value
+  at_json(json_path).should eq value
 end
 
 Then 'the response header "$header" should be "$content_type"' do |header, content_type|

data/features/step_definitions/factory_steps.rb

@@ -1,4 +1,4 @@
-Given /^(\d+) ([\w\s]+)$/ do |count, kind|
+Given(/^(\d+) ([\w\s]+)$/) do |count, kind|
   klass = kind.gsub(/\s+/, '_').singularize.classify.gsub(/^/, 'Landable::').constantize
   klass.destroy_all
 
@@ -14,7 +14,7 @@ Given 'there are 3 templates' do
   FactoryGirl.create_list(:template, number_needed)
 end
 
-Given /^an author "([^"]+)"$/ do |username|
+Given(/^an author "([^"]+)"$/) do |username|
   create :author, username: username
 end
 
@@ -30,33 +30,33 @@ Given "there is another author's access token in the database" do
   @foreign_access_token = create :access_token, author: create(:author)
 end
 
-Given /^an? (page|theme|asset|template)$/ do |model|
+Given(/^an? (page|theme|asset|template)$/) do |model|
   instance_variable_set :"@#{model}", create(model.to_sym)
 end
 
-Given /^a (page|theme) with an asset attached$/ do |model|
+Given(/^a (page|theme) with an asset attached$/) do |model|
   record = create model.to_sym
   @asset = create :asset
   record.assets.push @asset
   instance_variable_set :"@#{model}", record
 end
 
-Given /^a page "([^"]+)"$/ do |path|
-  create :page, path: path, body: "<HTML>BODY</HTML>"
+Given(/^a page "([^"]+)"$/) do |path|
+  create :page, path: path, body: '<HTML>BODY</HTML>'
 end
 
-Given /^a page "([^"]+)" with title "(.+)"$/ do |path, title|
-  create :page, path: path, title: title, body: "<HTML>BODY</HTML>"
+Given(/^a page "([^"]+)" with title "(.+)"$/) do |path, title|
+  create :page, path: path, title: title, body: '<HTML>BODY</HTML>'
 end
 
-Given /^a "(\w+)" page with title "(.+)" and category "(.+)"$/ do |published, title, category|
+Given(/^a "(\w+)" page with title "(.+)" and category "(.+)"$/) do |published, title, category|
   category_obj = Landable::Category.where('lower(name) = ?', category.downcase).first
   @page = create :page, title: title, category: category_obj
   @page.publish! author: create(:author) if published == 'published'
 end
 
 Given 'page "$path" redirects to "$url" with status $code' do |path, url, code|
-  page = create :page, :redirect, path: path, redirect_url: url, status_code: code, body: "BODY"
+  page = create :page, :redirect, path: path, redirect_url: url, status_code: code, body: 'BODY'
   page.publish! author: create(:author)
 end
 
@@ -68,9 +68,9 @@ end
 Given 'a published page "$path" with status $code' do |path, code|
   code = Integer(code)
   page = case code
-         when 301, 302 then create :page, :redirect, path: path, status_code: code, body: "BODY"
-         when 410 then create :page, :gone, path: path, body: "BODY"
-         else create :page, path: path, body: "BODY"
+         when 301, 302 then create :page, :redirect, path: path, status_code: code, body: 'BODY'
+         when 410 then create :page, :gone, path: path, body: 'BODY'
+         else create :page, path: path, body: 'BODY'
          end
   page.publish! author: create(:author)
 end
@@ -105,7 +105,7 @@ When(/^I change the page to a (\d+)$/) do |code|
   @page.save!
 end
 
-Then /^there should be (\d+) ([\w\s]+) in the database$/ do |count, kind|
+Then(/^there should be (\d+) ([\w\s]+) in the database$/) do |count, kind|
   name  = kind.gsub(/\s+/, '_').classify
   klass = "Landable::#{name}".constantize
   klass.count.should eql(Integer(count))
@@ -119,9 +119,9 @@ Given 'an author "$username" does not exist' do |username|
   Landable::Author.where(username: username).present?.should be_false
 end
 
-Then /^the author "(.+?)" should have (\d+) access tokens?$/ do |username, n|
+Then(/^the author "(.+?)" should have (\d+) access tokens?$/) do |username, n|
   author = Landable::Author.where(username: username).first!
-  author.access_tokens.count.should == Integer(n)
+  author.access_tokens.count.should eq Integer(n)
 end
 
 Then 'the response body should include the body of page "$path"' do |path|

data/features/step_definitions/html_steps.rb

@@ -5,5 +5,5 @@ end
 
 Then 'the element "$css" should have inner text "$text"' do |css, text|
   doc = Nokogiri::HTML(last_response.body)
-  doc.at(css).text.should == text
+  doc.at(css).text.should eq text
 end

data/features/step_definitions/liquid_steps.rb

@@ -1,15 +1,15 @@
 Given 'the asset URI prefix is "$uri"' do |uri|
   # Kinda bogus, but makes explicit tests significantly easier
   Landable::Asset.stub(:url_generator) do
-    proc { |asset|
+    proc do |asset|
       uri = "#{uri}/" unless uri.ends_with?('/')
       "#{uri}#{asset.data}"
-    }
+    end
   end
 end
 
-Given /^a page under test$/ do
-  @page = Landable::Page.new(title: "Page Under Test")
+Given(/^a page under test$/) do
+  @page = Landable::Page.new(title: 'Page Under Test')
 end
 
 Given "the page's body is \"$body\"" do |body|
@@ -31,13 +31,13 @@ Given "the page's head tag is \"$tag\"" do |tag|
   @page.head_content = tag
 end
 
-Given "the page uses a theme with the body:" do |body|
+Given 'the page uses a theme with the body:' do |body|
   @page.theme ||= Landable::Theme.new
   @theme ||= @page.theme
   @page.theme.body = body
 end
 
-Given "these assets:" do |table|
+Given 'these assets:' do |table|
   table.hashes.each do |attrs|
     create :asset, attrs
   end
@@ -59,7 +59,7 @@ Given 'the template "$template_slug" with the body:' do |template_slug, template
   @template = Landable::Template.create! name: template_slug, slug: template_slug, body: template_body, description: template_slug
 end
 
-When  'the template "$published_variable" been published' do |published_variable|
+When 'the template "$published_variable" been published' do |published_variable|
   if published_variable == 'has'
     @template.publish! author: create(:author), notes: 'initial revision', is_minor: true
   end
@@ -86,5 +86,5 @@ end
 Then 'the rendered content should be:' do |body|
   @responder ||= nil
   @rendered_content ||= Landable::RenderService.call(@page, responder: @responder)
-  @rendered_content.strip.should == body.strip
+  @rendered_content.strip.should eq body.strip
 end

data/features/step_definitions/theme_steps.rb

@@ -18,22 +18,22 @@ When 'I change the theme to contain "$body"' do |body|
   @page.save
 end
 
-And  "I GET '/pubbed'" do
+And "I GET '/pubbed'" do
   make_request
 end
 
-Then 'I should see "$body"' do |body|
+Then 'I should see "$body"' do |_body|
   @page.reload
   last_response.body.should include(@page.theme.body)
 end
 
-When "I publish the page with another theme" do
+When 'I publish the page with another theme' do
   @page.theme = @new_theme
   @page.save
   @page.publish! author: create(:author)
 end
 
-When /^I publish the page$/ do
+When(/^I publish the page$/) do
   @page.publish! author: create(:author)
 end
 

data/features/support/env.rb

@@ -4,12 +4,12 @@
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
-ENV["RAILS_ENV"] ||= "test"
+ENV['RAILS_ENV'] ||= 'test'
 require 'simplecov'
 SimpleCov.start 'rails'
 
-require File.expand_path("../../../spec/dummy/config/environment.rb",  __FILE__)
-ENV["RAILS_ROOT"] ||= File.dirname(__FILE__) + "../../../spec/dummy"
+require File.expand_path('../../../spec/dummy/config/environment.rb',  __FILE__)
+ENV['RAILS_ROOT'] ||= File.dirname(__FILE__) + '../../../spec/dummy'
 
 require 'cucumber/rails'
 require 'cucumber/rspec/doubles'
@@ -42,14 +42,14 @@ ActionController::Base.allow_rescue = false
 begin
   DatabaseCleaner.strategy = :transaction
 rescue NameError
-  raise "You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it."
+  raise 'You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it.'
 end
 
 # You may also want to configure DatabaseCleaner to use different strategies for certain features and scenarios.
 # See the DatabaseCleaner documentation for details. Example:
 #
 #   Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
-#     # { :except => [:widgets] } may not do what you expect here
+#     # { except: [:widgets] } may not do what you expect here
 #     # as tCucumber::Rails::Database.javascript_strategy overrides
 #     # this setting.
 #     DatabaseCleaner.strategy = :truncation

data/landable.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 lib = File.expand_path('../lib', __FILE__)
-$:.unshift(lib) unless $:.include?(lib)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 # Maintain your gem's version:
 require 'landable/version'
@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.summary       = 'Mountable CMS engine for Rails'
   gem.description   = 'Landing page storage, rendering, tracking, and management API'
 
-  gem.files         = `git ls-files`.split($/)
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
 

data/lib/generators/landable/landable_generator.rb

@@ -10,11 +10,11 @@ module Landable
         end
 
         def source_root
-          @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), "landable", generator_name, "templates"))
+          @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'landable', generator_name, 'templates'))
         end
 
         def target_root
-          File.expand_path(Rails.root.join("app", "assets"))
+          File.expand_path(Rails.root.join('app', 'assets'))
         end
       end
     end

data/lib/generators/templates/landable.rb

@@ -77,6 +77,6 @@ end
 
 # Configure asset uploads. Assets will be uploaded to public/uploads by default.
 # More configuration options: https://github.com/carrierwaveuploader/carrierwave#using-amazon-s3
-CarrierWave.configure do |config|
+CarrierWave.configure do |_config|
   # config.asset_host = 'http://cdn.myapp.com'
 end

data/lib/landable.rb

@@ -1,15 +1,15 @@
 require 'landable/version'
-require "landable/engine"
+require 'landable/engine'
 require 'landable/liquid'
-require "landable/error"
+require 'landable/error'
 require 'landable/mime_types'
-require "landable/inflections"
-require "landable/traffic"
-require "landable/migration"
+require 'landable/inflections'
+require 'landable/traffic'
+require 'landable/migration'
 
-require "landable/core_ext/ipaddr"
+require 'landable/core_ext/ipaddr'
 
-require "lookup_by"
+require 'lookup_by'
 
 module Landable
   # This absurd configuration loading code is not intended to live long.

data/lib/landable/configuration.rb

@@ -1,12 +1,12 @@
 module Landable
   class Configuration
-    attr_accessor :api_url, :public_url, :amqp_configuration
+    attr_accessor :api_url, :public_url, :amqp_configuration, :sitemap_host
     attr_writer :api_namespace, :public_namespace
     attr_writer :api_host, :public_host
     attr_writer :categories
     attr_writer :screenshots_enabled
     attr_writer :traffic_enabled
-    attr_writer :sitemap_exclude_categories, :sitemap_protocol, :sitemap_host, :sitemap_additional_paths
+    attr_writer :sitemap_exclude_categories, :sitemap_protocol, :sitemap_additional_paths
     attr_writer :reserved_paths, :partials_to_templates, :database_schema_prefix
     attr_writer :publicist_url, :audit_flags
     attr_writer :blank_user_agent_string, :untracked_paths
@@ -18,23 +18,21 @@ module Landable
     end
 
     def authenticators
-      @authenticators || raise("No Landable authenticator configured.")
+      @authenticators || fail('No Landable authenticator configured.')
     end
 
     def authenticators=(authenticators)
       @authenticators = Array(authenticators)
     end
 
-    alias :authenticator= :authenticators=
+    alias_method :authenticator=, :authenticators=
 
     def publicist_url
       @publicist_url ||= 'publicist.dev'
     end
 
     def api_uri
-      if api_url.present?
-        @api_uri ||= URI(api_url)
-      end
+      @api_uri ||= URI(api_url) if api_url.present?
     end
 
     def api_host
@@ -46,9 +44,7 @@ module Landable
     end
 
     def public_uri
-      if public_url.present?
-        @public_uri ||= URI(public_url)
-      end
+      @public_uri ||= URI(public_url) if public_url.present?
     end
 
     def public_host
@@ -79,7 +75,7 @@ module Landable
         'SEO' => 'Search engine optimization',
         'Social' => '',
         'Email' => '',
-        'Traditional' => '',
+        'Traditional' => ''
       }
     end
 
@@ -100,11 +96,7 @@ module Landable
     end
 
     def sitemap_protocol
-      @sitemap_protocol ||= "http"
-    end
-
-    def sitemap_host
-      @sitemap_host
+      @sitemap_protocol ||= 'http'
     end
 
     def screenshots_enabled
@@ -116,7 +108,7 @@ module Landable
     end
 
     def traffic_enabled=(val)
-      raise ArgumentError.new("Landable::Configuration#traffic_enabled accepts false, true, :all or :html") unless [true, false, :all, :html].include? val
+      fail(ArgumentError, 'Landable::Configuration#traffic_enabled accepts false, true, :all or :html') unless [true, false, :all, :html].include? val
       @traffic_enabled = val
     end
 
@@ -125,7 +117,7 @@ module Landable
     end
 
     def cors=(bool)
-      raise ArgumentError.new("Landable::Configuration#cors should be assigned 'false' to disable CORS support") if bool != false
+      fail(ArgumentError, "Landable::Configuration#cors should be assigned 'false' to disable CORS support") if bool != false
       cors.origins = []
     end
 
@@ -172,7 +164,6 @@ module Landable
       amqp_configuration[:enabled] && amqp_configuration[:messaging_service]
     end
 
-
     class Screenshots
       attr_accessor :autorun
       attr_accessor :browserstack_username, :browserstack_password