landable 1.13.1 → 1.13.2

data/db/migrate/20130909182713_landable_pages__add_updated_by.rb

@@ -3,8 +3,8 @@ class LandablePagesAddUpdatedBy < Landable::Migration
     add_column "#{Landable.configuration.database_schema_prefix}landable.pages", :updated_by_author_id, :uuid
 
     execute <<-SQL
-      ALTER TABLE #{Landable.configuration.database_schema_prefix}landable.pages 
-      ADD CONSTRAINT updated_author_fk FOREIGN KEY(updated_by_author_id) 
+      ALTER TABLE #{Landable.configuration.database_schema_prefix}landable.pages
+      ADD CONSTRAINT updated_author_fk FOREIGN KEY(updated_by_author_id)
       REFERENCES #{Landable.configuration.database_schema_prefix}landable.authors(author_id)
     SQL
   end

data/db/migrate/20130909182715_landable_page_revisions__break_out_snapshot.rb

@@ -1,12 +1,10 @@
 require_dependency 'landable/page_revision'
 class LandablePageRevisionsBreakOutSnapshot < Landable::Migration
-
   class Landable::PageRevision < ActiveRecord::Base
     store :snapshot_attributes, accessors: [:body]
   end
 
   def up
-
     # Setup new columns
     add_column "#{Landable.configuration.database_schema_prefix}landable.page_revisions", :theme_id,                  :uuid
     add_column "#{Landable.configuration.database_schema_prefix}landable.page_revisions", :status_code_id,            :uuid
@@ -19,18 +17,18 @@ class LandablePageRevisionsBreakOutSnapshot < Landable::Migration
     add_column "#{Landable.configuration.database_schema_prefix}landable.page_revisions", :head_tags,                 :hstore
 
     execute <<-SQL
-      ALTER TABLE #{Landable.configuration.database_schema_prefix}landable.page_revisions 
-        ADD CONSTRAINT theme_id_fk FOREIGN KEY(theme_id) 
+      ALTER TABLE #{Landable.configuration.database_schema_prefix}landable.page_revisions
+        ADD CONSTRAINT theme_id_fk FOREIGN KEY(theme_id)
         REFERENCES #{Landable.configuration.database_schema_prefix}landable.themes(theme_id);
-      
-      ALTER TABLE #{Landable.configuration.database_schema_prefix}landable.page_revisions 
-        ADD CONSTRAINT status_code_id_fk FOREIGN KEY(status_code_id) 
+
+      ALTER TABLE #{Landable.configuration.database_schema_prefix}landable.page_revisions
+        ADD CONSTRAINT status_code_id_fk FOREIGN KEY(status_code_id)
         REFERENCES #{Landable.configuration.database_schema_prefix}landable.status_codes(status_code_id);
 
-      ALTER TABLE #{Landable.configuration.database_schema_prefix}landable.page_revisions 
-        ADD CONSTRAINT category_id_fk FOREIGN KEY(category_id) 
+      ALTER TABLE #{Landable.configuration.database_schema_prefix}landable.page_revisions
+        ADD CONSTRAINT category_id_fk FOREIGN KEY(category_id)
         REFERENCES #{Landable.configuration.database_schema_prefix}landable.categories(category_id);
-      SQL
+    SQL
 
     # Go through each record and copy snapshot into new, broken-out columns
     Landable::PageRevision.all.each do |rev|
@@ -63,10 +61,9 @@ class LandablePageRevisionsBreakOutSnapshot < Landable::Migration
             ON #{Landable.configuration.database_schema_prefix}landable.page_revisions
             FOR EACH STATEMENT EXECUTE PROCEDURE #{Landable.configuration.database_schema_prefix}landable.tg_disallow();
     SQL
-
   end
 
   def down
-    raise ActiveRecord::IrreversibleMigration
+    fail ActiveRecord::IrreversibleMigration
   end
 end

data/db/migrate/20131002220041_file_based_themes.rb

@@ -1,12 +1,12 @@
 class FileBasedThemes < Landable::Migration
   def up
     change_table "#{Landable.configuration.database_schema_prefix}landable.themes" do |t|
-      t.text    :file
-      t.text    :extension
+      t.text :file
+      t.text :extension
       t.boolean :editable, null: false, default: true
     end
 
-    execute "CREATE UNIQUE INDEX #{Landable.configuration.database_schema_prefix}landable_themes__u_file 
+    execute "CREATE UNIQUE INDEX #{Landable.configuration.database_schema_prefix}landable_themes__u_file
               ON #{Landable.configuration.database_schema_prefix}landable.themes(lower(file))"
   end
 end

data/db/migrate/20131008164204_create_head_tag_on_page.rb

@@ -1,13 +1,13 @@
 class CreateHeadTagOnPage < Landable::Migration
   def up
-    execute "DROP TRIGGER #{Landable.configuration.database_schema_prefix}landable_page_revisions__no_update 
+    execute "DROP TRIGGER #{Landable.configuration.database_schema_prefix}landable_page_revisions__no_update
               ON #{Landable.configuration.database_schema_prefix}landable.page_revisions"
 
-    drop_table    "#{Landable.configuration.database_schema_prefix}landable.head_tags"
+    drop_table "#{Landable.configuration.database_schema_prefix}landable.head_tags"
     remove_column "#{Landable.configuration.database_schema_prefix}landable.page_revisions", :head_tags
 
-    add_column    "#{Landable.configuration.database_schema_prefix}landable.pages",          :head_content, :text
-    add_column    "#{Landable.configuration.database_schema_prefix}landable.page_revisions", :head_content, :text
+    add_column "#{Landable.configuration.database_schema_prefix}landable.pages",          :head_content, :text
+    add_column "#{Landable.configuration.database_schema_prefix}landable.page_revisions", :head_content, :text
 
     execute "CREATE TRIGGER #{Landable.configuration.database_schema_prefix}landable_page_revisions__no_update
             BEFORE UPDATE OF notes, is_minor, page_id, author_id, created_at, ordinal

data/db/migrate/20131008193544_drop_status_codes_model.rb

@@ -1,6 +1,5 @@
 require_dependency 'landable/page'
 class DropStatusCodesModel < Landable::Migration
-
   class Landable::StatusCode < ActiveRecord::Base
     self.table_name = "#{Landable.configuration.database_schema_prefix}landable.status_codes"
   end
@@ -26,7 +25,7 @@ class DropStatusCodesModel < Landable::Migration
     execute <<-SQL
       ALTER TABLE #{Landable.configuration.database_schema_prefix}landable.pages DROP CONSTRAINT status_code_fk;
       ALTER TABLE #{Landable.configuration.database_schema_prefix}landable.page_revisions DROP CONSTRAINT status_code_id_fk;
-      DROP TRIGGER #{Landable.configuration.database_schema_prefix}landable_page_revisions__no_update 
+      DROP TRIGGER #{Landable.configuration.database_schema_prefix}landable_page_revisions__no_update
                     ON #{Landable.configuration.database_schema_prefix}landable.page_revisions;
       CREATE TRIGGER #{Landable.configuration.database_schema_prefix}landable_page_revisions__no_update
             BEFORE UPDATE OF notes, is_minor, page_id, author_id, created_at, ordinal

data/db/migrate/20131028145652_add_traffic_schema.rb

@@ -4,7 +4,7 @@ class AddTrafficSchema < Landable::Migration
 
   OWNER_TYPE = 'INTEGER'
 
-  QUERY_PARAMS = %w[
+  QUERY_PARAMS = %w(
     ad_type
     ad_group
     bid_match_type
@@ -22,7 +22,7 @@ class AddTrafficSchema < Landable::Migration
     search_term
     source
     target
-  ]
+  )
 
   def up
     # Resources
@@ -46,10 +46,10 @@ class AddTrafficSchema < Landable::Migration
       t.create_lookup_tables :domains, :paths, :query_strings
       t.create_lookup_tables :http_methods, :mime_types
 
-      t.create_lookup_table  :event_types
+      t.create_lookup_table :event_types
 
       # IP / Geolocation
-      t.create_lookup_table  :ip_addresses, lookup_type: :inet
+      t.create_lookup_table :ip_addresses, lookup_type: :inet
       t.create_lookup_tables :countries, :regions, :cities
     end
 
@@ -94,7 +94,7 @@ class AddTrafficSchema < Landable::Migration
       CREATE TABLE attributions (
           attribution_id     SERIAL      PRIMARY KEY
 
-        , #{QUERY_PARAMS.map { |name| "%s INTEGER REFERENCES %s" % [name.foreign_key, name.pluralize] }.join(',') }
+        , #{QUERY_PARAMS.map { |name| format('%s INTEGER REFERENCES %s', name.foreign_key, name.pluralize) }.join(',')}
 
         , created_at         TIMESTAMPTZ NOT NULL    DEFAULT NOW()
 

data/db/migrate/20131101213623_add_dnt_column_to_visits.rb

@@ -4,4 +4,4 @@ class AddDntColumnToVisits < Landable::Migration
       t.column :do_not_track, :boolean
     end
   end
-end
+end

data/db/migrate/20131106185946_add_index_on_page_revisions_path.rb

@@ -1,6 +1,6 @@
 class AddIndexOnPageRevisionsPath < Landable::Migration
   def up
-    execute "CREATE INDEX #{Landable.configuration.database_schema_prefix}landable_page_revisions__path 
+    execute "CREATE INDEX #{Landable.configuration.database_schema_prefix}landable_page_revisions__path
               ON #{Landable.configuration.database_schema_prefix}landable.page_revisions(path)"
   end
 end

data/db/migrate/20131106193021_page_revisisons__path_status_code_index.rb

@@ -2,7 +2,7 @@ class PageRevisisonsPathStatusCodeIndex < Landable::Migration
   def up
     execute <<-SQL
       DROP INDEX #{Landable.configuration.database_schema_prefix}landable.#{Landable.configuration.database_schema_prefix}landable_page_revisions__path;
-      CREATE INDEX #{Landable.configuration.database_schema_prefix}landable_page_revisions__path_status_code 
+      CREATE INDEX #{Landable.configuration.database_schema_prefix}landable_page_revisions__path_status_code
               ON #{Landable.configuration.database_schema_prefix}landable.page_revisions(path, status_code);
     SQL
   end

data/db/migrate/20131121150902_add_attribution_id_to_unique_index.rb

@@ -1,9 +1,9 @@
 class AddAttributionIdToUniqueIndex < Landable::Migration
   def up
     execute <<-SQL
-      ALTER TABLE #{Landable.configuration.database_schema_prefix}landable_traffic.referers 
+      ALTER TABLE #{Landable.configuration.database_schema_prefix}landable_traffic.referers
               DROP CONSTRAINT referers_domain_id_path_id_query_string_id_key;
-      CREATE UNIQUE INDEX referers_domain_id_path_id_query_string_id_attribution_id 
+      CREATE UNIQUE INDEX referers_domain_id_path_id_query_string_id_attribution_id
               ON #{Landable.configuration.database_schema_prefix}landable_traffic.referers(domain_id, path_id, query_string_id, attribution_id);
     SQL
   end

data/db/migrate/20131216214027_drop_browser_screenshot_tables.rb

@@ -1,6 +1,6 @@
 class DropBrowserScreenshotTables < ActiveRecord::Migration
   def up
-    drop_table    "#{Landable.configuration.database_schema_prefix}landable.screenshots"
-    drop_table    "#{Landable.configuration.database_schema_prefix}landable.browsers"
+    drop_table "#{Landable.configuration.database_schema_prefix}landable.screenshots"
+    drop_table "#{Landable.configuration.database_schema_prefix}landable.browsers"
   end
-end
+end

data/db/migrate/20140128170659_file_backed_templates.rb

@@ -1,7 +1,7 @@
 class FileBackedTemplates < Landable::Migration
   def change
     change_table "#{Landable.configuration.database_schema_prefix}landable.templates" do |t|
-      t.text    :file
+      t.text :file
       t.boolean :editable, default: true
     end
   end

data/db/migrate/20140205193757_fix_status_codes.rb

@@ -1,16 +1,16 @@
 class FixStatusCodes < ActiveRecord::Migration
   def up
-    execute "DROP TRIGGER #{Landable.configuration.database_schema_prefix}landable_page_revisions__no_update 
+    execute "DROP TRIGGER #{Landable.configuration.database_schema_prefix}landable_page_revisions__no_update
               ON #{Landable.configuration.database_schema_prefix}landable.page_revisions"
 
     # Find Pages with 404s, switch to 410s, publish the page!
-    Landable::Page.where(status_code: 404).find_each do |page| 
+    Landable::Page.where(status_code: 404).find_each do |page|
       page.status_code = 410
       page.save!
     end
 
     # Find Remaining PageRevisions with 404s, switch to 410s!
-    Landable::PageRevision.where(status_code: 404).find_each do |page| 
+    Landable::PageRevision.where(status_code: 404).find_each do |page|
       page.status_code = 410
       page.save!
     end

data/db/migrate/20140220170324_add_slug_to_categories.rb

@@ -3,7 +3,7 @@ class AddSlugToCategories < Landable::Migration
     add_column "#{Landable.configuration.database_schema_prefix}landable.categories", :slug, :text, unique: true
 
     Landable::Category.reset_column_information
-    Landable::Category.all.each &:save!
+    Landable::Category.all.each(&:save!)
 
     change_column "#{Landable.configuration.database_schema_prefix}landable.categories", :slug, :text, null: false
   end

data/db/migrate/20140224205516_rename_traffic_schema.rb

@@ -1,11 +1,10 @@
 class RenameTrafficSchema < Landable::Migration
-
   def traffic_schema
     "#{Landable.configuration.database_schema_prefix}landable_traffic"
   end
 
   def schema_exists(schema)
-    execute("SELECT COUNT(*) FROM pg_namespace WHERE nspname = '#{schema}'")[0]["count"] == "1"
+    execute("SELECT COUNT(*) FROM pg_namespace WHERE nspname = '#{schema}'")[0]['count'] == '1'
   end
 
   def move_objects(from_schema, to_schema, relkind, object_type)
@@ -21,20 +20,19 @@ class RenameTrafficSchema < Landable::Migration
     ")
 
     objects.each do |object|
-      sql = %{
+      sql = %(
         ALTER #{object_type} #{from_schema}.#{object['relname']}
           SET SCHEMA #{to_schema}
-      }
+            )
       puts "Moving #{from_schema}.#{object['relname']} TO #{to_schema}"
       execute sql
     end
   end
 
   def up
-    if schema_exists('traffic')
-      execute("CREATE SCHEMA #{traffic_schema}")
-      move_objects('traffic',"#{traffic_schema}",'r','TABLE')
-      move_objects('traffic',"#{traffic_schema}",'S','SEQUENCE')
-    end
+    return unless schema_exists('traffic')
+    execute("CREATE SCHEMA #{traffic_schema}")
+    move_objects('traffic', "#{traffic_schema}", 'r', 'TABLE')
+    move_objects('traffic', "#{traffic_schema}", 'S', 'SEQUENCE')
   end
 end

data/db/migrate/20140509190128_create_template_revisions.rb

@@ -1,18 +1,18 @@
 class CreateTemplateRevisions < ActiveRecord::Migration
   def change
     create_table "#{Landable.configuration.database_schema_prefix}landable.template_revisions", id: :uuid, primary_key: :template_revision_id do |t|
-      t.integer   :ordinal
-      t.text      :notes
-      t.boolean   :is_minor,      default: false
-      t.boolean   :is_published,  default: true
+      t.integer :ordinal
+      t.text :notes
+      t.boolean :is_minor,      default: false
+      t.boolean :is_published,  default: true
 
-      t.uuid      :template_id,   null: false
-      t.uuid      :author_id,     null: false
+      t.uuid :template_id,   null: false
+      t.uuid :author_id,     null: false
 
-      t.text      :name
-      t.text      :slug
-      t.text      :body
-      t.text      :description
+      t.text :name
+      t.text :slug
+      t.text :body
+      t.text :description
 
       t.timestamps
     end
@@ -59,9 +59,9 @@ class CreateTemplateRevisions < ActiveRecord::Migration
        $TRIGGER$
        LANGUAGE plpgsql;"
 
-      execute "CREATE TRIGGER #{Landable.configuration.database_schema_prefix}landable_template_revisions__bfr_insert
-              BEFORE INSERT ON #{Landable.configuration.database_schema_prefix}landable.template_revisions
-              FOR EACH ROW EXECUTE PROCEDURE #{Landable.configuration.database_schema_prefix}landable.template_revision_ordinal();"
+    execute "CREATE TRIGGER #{Landable.configuration.database_schema_prefix}landable_template_revisions__bfr_insert
+            BEFORE INSERT ON #{Landable.configuration.database_schema_prefix}landable.template_revisions
+            FOR EACH ROW EXECUTE PROCEDURE #{Landable.configuration.database_schema_prefix}landable.template_revision_ordinal();"
 
     # Trigger disallowing deletes on template_revisions
     execute "CREATE TRIGGER #{Landable.configuration.database_schema_prefix}landable_template_revisions__no_delete
@@ -71,7 +71,5 @@ class CreateTemplateRevisions < ActiveRecord::Migration
     execute "CREATE TRIGGER #{Landable.configuration.database_schema_prefix}landable_template_revisions__no_update
             BEFORE UPDATE OF notes, is_minor, template_id, author_id, created_at, ordinal ON #{Landable.configuration.database_schema_prefix}landable.template_revisions
             FOR EACH STATEMENT EXECUTE PROCEDURE #{Landable.configuration.database_schema_prefix}landable.tg_disallow();"
-
-
   end
 end

data/db/migrate/20140509192856_create_audits.rb

@@ -6,11 +6,11 @@ class CreateAudits < ActiveRecord::Migration
 
     # Audit Model
     create_table "#{Landable.configuration.database_schema_prefix}landable.audits" do |t|
-      t.uuid   :auditable_id
+      t.uuid :auditable_id
       t.string :auditable_type
 
-      t.text   :notes
-      t.text   :approver
+      t.text :notes
+      t.text :approver
       t.string :flags, array: true, default: []
 
       t.timestamps

data/db/migrate/20140602213937_path_response_time_view.rb

@@ -1,25 +1,26 @@
 class PathResponseTimeView < ActiveRecord::Migration
   def up
-  	execute <<-SQL
-  	DROP VIEW IF EXISTS #{Landable.configuration.database_schema_prefix}landable_traffic.path_response_time__by_time;
-	CREATE OR REPLACE VIEW #{Landable.configuration.database_schema_prefix}landable_traffic.path_response_time__by_time
-	AS
-	SELECT *
-	FROM
-	(
-		SELECT
-		 p.path_id as path_id
-		, p.path as path
-		,round(avg(pv.response_time), 3) as "average response time (ms)"
-		FROM #{Landable.configuration.database_schema_prefix}landable_traffic.page_views pv
-		  JOIN #{Landable.configuration.database_schema_prefix}landable_traffic.paths p
-		    on p.path_id = pv.path_id
-		group by p.path_id, p.path
-	) agg1
-	order by agg1."average response time (ms)" desc
-	;
+    execute <<-SQL
+    DROP VIEW IF EXISTS #{Landable.configuration.database_schema_prefix}landable_traffic.path_response_time__by_time;
+  CREATE OR REPLACE VIEW #{Landable.configuration.database_schema_prefix}landable_traffic.path_response_time__by_time
+  AS
+  SELECT *
+  FROM
+  (
+    SELECT
+     p.path_id as path_id
+    , p.path as path
+    ,round(avg(pv.response_time), 3) as "average response time (ms)"
+    FROM #{Landable.configuration.database_schema_prefix}landable_traffic.page_views pv
+      JOIN #{Landable.configuration.database_schema_prefix}landable_traffic.paths p
+        on p.path_id = pv.path_id
+    group by p.path_id, p.path
+  ) agg1
+  order by agg1."average response time (ms)" desc
+  ;
 
-	COMMENT ON VIEW #{Landable.configuration.database_schema_prefix}landable_traffic.path_response_time__by_time IS $$ The view path_response_time__by_time returns the paths displayed and the average reponse time (in ms) for each page of the site.  This list is ordered by response time, decending.$$;
+  COMMENT ON VIEW #{Landable.configuration.database_schema_prefix}landable_traffic.path_response_time__by_time IS $$
+  The view path_response_time__by_time returns the paths displayed and the average reponse time (in ms) for each page of the site.  This list is ordered by response time, decending.$$;
   SQL
   end
 end

data/features/step_definitions/asset_steps.rb

@@ -18,24 +18,22 @@ When 'I POST an asset to "$path" with both $assoc IDs' do |path, assoc|
   ary = instance_variable_get("@#{assoc}s")
   key = :"#{assoc}_ids"
 
-  post path, asset: attributes_for(:asset).merge({
-    key => ary.map(&:id)
-  })
+  post path, asset: attributes_for(:asset).merge(key => ary.map(&:id))
 end
 
 Then 'the response should contain an "asset"' do
   last_json.should have_key('asset')
-  last_json['asset']['mime_type'].should == 'image/png'
+  last_json['asset']['mime_type'].should eq 'image/png'
 end
 
-Then 'the response should contain the $version "asset"' do |version|
+Then 'the response should contain the $version "asset"' do |_|
   # version is intentionally ignored; it just reads better in the steps.
 
   @asset ||= Landable::Asset.order('created_at DESC').first
-  at_json('asset/id').should == @asset.id
+  at_json('asset/id').should eq @asset.id
 end
 
-Then /^the asset ID should( not)? be in the array at "([^"]+)"$/ do |negative, json_path|
+Then(/^the asset ID should( not)? be in the array at "([^"]+)"$/) do |negative, json_path|
   array = at_json json_path
   if negative
     array.should_not include(@asset.id)
@@ -45,16 +43,16 @@ Then /^the asset ID should( not)? be in the array at "([^"]+)"$/ do |negative, j
 end
 
 Then 'both $assoc IDs should be in the array at "$json_path"' do |assoc, json_path|
-  ids = instance_variable_get("@#{assoc}s").map &:id
+  ids = instance_variable_get("@#{assoc}s").map(&:id)
   at_json(json_path).should include(*ids)
 end
 
 Then 'the rendered body should be the correct assets' do
   <<-eos
-    <link href="/assets/application-/#{/./}.css" media="screen" rel="stylesheet" />
-    <script src="/assets/application-#{/./}.js"></script>
-    <img alt="Foo" src="/assets/foo-#{/./}.jpg" />
-    <img alt="Foo" src="/assets/foo-#{/./}.jpg" />
+    <link href="/assets/application-//./.css" media="screen" rel="stylesheet" />
+    <script src="/assets/application-/./.js"></script>
+    <img alt="Foo" src="/assets/foo-/./.jpg" />
+    <img alt="Foo" src="/assets/foo-/./.jpg" />
     <img alt="Baz!" src="https://landable.dev/_assets//uploads/panda.png" />
   eos
 end