landable 1.7.1.rc1 → 1.8.0

data/config/routes.rb

@@ -8,7 +8,7 @@ Landable::Engine.routes.draw do
       id: /[%a-zA-Z0-9\/_.~-]*/
     }
 
-    resources :assets, only: [:index, :show, :create, :update]
+    resources :assets, only: [:index, :show, :create, :update, :deactivate, :destroy]
 
     concern :has_assets do
       resources :assets, only: [:index, :update, :destroy]
@@ -18,12 +18,14 @@ Landable::Engine.routes.draw do
       post 'screenshots', on: :member
     end
 
-    resources :themes, only: [:index, :show, :create, :update], concerns: :has_assets do
+    resources :themes, only: [:index, :show, :create, :update, :destroy], concerns: :has_assets do
       post 'preview', on: :collection
+      put 'reactivate', on: :member
     end
 
-    resources :templates, only: [:index, :show, :create, :update] do
+    resources :templates, only: [:index, :show, :create, :update, :destroy, :reactivate] do
       post 'publish', on: :member
+      put 'reactivate', on: :member
     end
 
     resources :template_revisions, only: [:index, :show] do
@@ -33,6 +35,7 @@ Landable::Engine.routes.draw do
     resources :pages, concerns: [:has_assets, :has_screenshots] do
       post 'preview', on: :collection
       post 'publish', on: :member
+      put 'reactivate', on: :member
     end
 
     resources :page_revisions, only: [:index, :show], concerns: [:has_screenshots] do

data/db/migrate/20140501171345_add_deleted_at_to_pages.rb

@@ -0,0 +1,5 @@
+class AddDeletedAtToPages < ActiveRecord::Migration
+  def change
+    add_column "#{Landable.configuration.database_schema_prefix}landable.pages", :deleted_at, :timestamp
+  end
+end

data/db/migrate/20140501171352_add_deleted_at_to_themes.rb

@@ -0,0 +1,5 @@
+class AddDeletedAtToThemes < ActiveRecord::Migration
+  def change
+    add_column "#{Landable.configuration.database_schema_prefix}landable.themes", :deleted_at, :timestamp
+  end
+end

data/db/migrate/20140501171359_add_deleted_at_to_assets.rb

@@ -0,0 +1,5 @@
+class AddDeletedAtToAssets < ActiveRecord::Migration
+  def change
+    add_column "#{Landable.configuration.database_schema_prefix}landable.assets", :deleted_at, :timestamp
+  end
+end

data/db/migrate/20140501171406_add_deleted_at_to_templates.rb

@@ -0,0 +1,5 @@
+class AddDeletedAtToTemplates < ActiveRecord::Migration
+  def change
+    add_column "#{Landable.configuration.database_schema_prefix}landable.templates", :deleted_at, :timestamp
+  end
+end

data/db/migrate/20140515164543_add_screenshot_to_page_revisions.rb

@@ -0,0 +1,5 @@
+class AddScreenshotToPageRevisions < ActiveRecord::Migration
+  def change
+    add_column "#{Landable.configuration.database_schema_prefix}landable.page_revisions", :screenshot, :text
+  end
+end

data/db/test/landable.general.sql

@@ -0,0 +1,9 @@
+BEGIN;
+
+SELECT plan(1);
+
+SELECT functions_are('dummy_landable', ARRAY['pages_revision_ordinal', 'tg_disallow', 'template_revision_ordinal'], 'dummy_Landable schema should have funcitons');
+
+SELECT finish();
+
+ROLLBACK;

data/db/test/landable.page_revisions.sql

@@ -4,7 +4,6 @@ SELECT PLAN(18);
 
 --Verify existence of triggers and functions for page revisions
 SELECT triggers_are('dummy_landable', 'page_revisions', ARRAY['dummy_landable_page_revisions__bfr_insert', 'dummy_landable_page_revisions__no_delete', 'dummy_landable_page_revisions__no_update'], 'dummy_landable.page_revisions should have triggers');
-SELECT functions_are('dummy_landable', ARRAY['pages_revision_ordinal', 'tg_disallow'], 'dummy_Landable schema should have funcitons');
 
 --Verify existence of foreign keys
 SELECT col_is_fk('dummy_landable', 'page_revisions', 'page_id', 'page_revisions has page_id foreign key');
@@ -15,16 +14,19 @@ SELECT col_is_fk('dummy_landable', 'page_revisions', 'category_id', 'page_revisi
 --Verify primary key
 SELECT col_is_pk('dummy_landable', 'page_revisions', 'page_revision_id', 'page_revisions has primary key');
 
+--Verify page revisions is empty
+SELECT results_eq($$SELECT COUNT(*)::INTEGER FROM dummy_landable.page_revisions$$, $$SELECT 0$$, 'No revision records should exist');
+
 --Insert test data
 SELECT lives_ok($$INSERT INTO dummy_landable.pages (is_publishable, path, status_code) VALUES ('true', '/foo/bar', 200)$$);
 SELECT lives_ok($$INSERT INTO dummy_landable.authors (email, username, first_name, last_name) VALUES ('jdoe@test.com', 'jdoe', 'john', 'doe')$$);
-SELECT lives_ok($$INSERT INTO dummy_landable.page_revisions(page_id, author_id) SELECT page_id, author_id FROM dummy_landable.pages, dummy_landable.authors$$);
+SELECT lives_ok($$INSERT INTO dummy_landable.page_revisions(page_id, author_id) SELECT page_id, author_id FROM dummy_landable.pages, dummy_landable.authors LIMIT 1$$);
 
 --Verify ordinal is generated and populated automatically
 SELECT results_eq($$SELECT max(ordinal) FROM dummy_landable.page_revisions$$, $$SELECT 1$$);
 
 --Verify ordinal is incremented automatically
-SELECT lives_ok($$INSERT INTO dummy_landable.page_revisions(page_id, author_id) SELECT page_id, author_id FROM dummy_landable.pages, dummy_landable.authors$$);
+SELECT lives_ok($$INSERT INTO dummy_landable.page_revisions(page_id, author_id) SELECT page_id, author_id FROM dummy_landable.pages, dummy_landable.authors LIMIT 1$$);
 SELECT results_eq($$SELECT max(ordinal) FROM dummy_landable.page_revisions$$, $$SELECT 2$$);
 
 --Verify ordinals cannot be supplied in insert

data/db/test/landable.templates.sql

@@ -1,6 +1,9 @@
 BEGIN;
 
-SELECT PLAN(6);
+SELECT PLAN(18);
+
+--Verify existence of triggers and functions for page revisions
+SELECT triggers_are('dummy_landable', 'template_revisions', ARRAY['dummy_landable_template_revisions__bfr_insert', 'dummy_landable_template_revisions__no_delete', 'dummy_landable_template_revisions__no_update'], 'dummy_landable.template_revisions should have triggers');
 
 SELECT col_is_pk('dummy_landable', 'templates', 'template_id', 'Template_id is pk');
 SELECT col_not_null('dummy_landable', 'templates', 'name', 'name is NOT NULL');
@@ -10,6 +13,30 @@ SELECT col_not_null('dummy_landable', 'templates', 'description', 'description i
 SELECT has_index('dummy_landable', 'templates', 'dummy_landable_templates__u_name', 'Index on name');
 SELECT index_is_unique('dummy_landable', 'templates', 'dummy_landable_templates__u_name', 'name index is unique');
 
+--Insert test data
+SELECT lives_ok($$INSERT INTO dummy_landable.templates (name, slug, body, description) VALUES ('template1', 'template1', 'body1', 'test_body')$$);
+SELECT lives_ok($$INSERT INTO dummy_landable.authors (email, username, first_name, last_name) VALUES ('jtemplate@test.com', 'jtemplate', 'john', 'template')$$);
+SELECT lives_ok($$INSERT INTO dummy_landable.template_revisions(template_id, author_id, name) SELECT template_id, author_id, a.name FROM dummy_landable.templates a, dummy_landable.authors b WHERE a.name = 'template1' AND b.email = 'jtemplate@test.com' LIMIT 1$$);
+
+--Verify ordinal is generated and populated automatically
+SELECT results_eq($$SELECT max(ordinal) FROM dummy_landable.template_revisions WHERE name = 'template1' $$, $$SELECT 1$$);
+
+--Verify ordinal is incremented automatically
+SELECT lives_ok($$INSERT INTO dummy_landable.template_revisions(template_id, author_id, name) SELECT template_id, author_id, a.name FROM dummy_landable.templates a, dummy_landable.authors b WHERE a.name = 'template1' AND b.email = 'jtemplate@test.com' LIMIT 1$$);
+SELECT results_eq($$SELECT max(ordinal) FROM dummy_landable.template_revisions WHERE name = 'template1'$$, $$SELECT 2$$);
+
+--Verify ordinals cannot be supplied in insert
+SELECT throws_matching($$INSERT INTO dummy_landable.template_revisions(ordinal, template_id, author_id) SELECT 1, template_id, author_id FROM dummy_landable.templates, dummy_landable.authors$$, 'ordinal');
+
+--Verify cannot delete from template_revisions
+SELECT throws_matching($$DELETE FROM dummy_landable.template_revisions$$, 'DELETEs are not allowed');
+
+--Verify cannot update fields others than is_published, updated_atfor template_revisions
+SELECT throws_matching($$UPDATE dummy_landable.template_revisions SET notes = 'blah'$$, 'UPDATEs are not allowed', 'Cannot update notes');
+SELECT lives_ok($$UPDATE dummy_landable.template_revisions SET updated_at = now()$$, 'Can update updated_at');
+SELECT lives_ok($$UPDATE dummy_landable.template_revisions SET is_published = 'true'$$, 'Can update is_published');
+
+
 SELECT * FROM finish();
 
-ROLLBACK;
+ROLLBACK;

data/db/test/landable.themes.sql

@@ -1,6 +1,6 @@
 BEGIN;
 
-  SELECT PLAN(12);
+  SELECT PLAN(14);
 
   SELECT col_is_pk('dummy_landable', 'themes', 'theme_id', 'Theme_id is PK');
 
@@ -18,7 +18,10 @@ BEGIN;
 
   SELECT index_is_unique('dummy_landable', 'themes', 'dummy_landable_themes__u_file', $$Unique index on file column.$$);
   SELECT lives_ok($$INSERT INTO dummy_landable.themes (file, name, body, description, editable) VALUES ('filename', 'test1', 'body', 'test body', true)$$);
-  SELECT throws_matching($$INSERT INTO dummy_landable.themes (file, name, body, description) VALUES ('FILENAME', 'test1', 'body', 'test body')$$, '__u_file');
+  SELECT throws_matching($$INSERT INTO dummy_landable.themes (file, name, body, description) VALUES ('FILENAME', 'test2', 'body', 'test body')$$, '__u_file');
+
+  SELECT lives_ok($$INSERT INTO dummy_landable.themes (file, name, body, description, editable) VALUES ('filename2', 'test3', 'body', 'test body', true)$$);
+  SELECT throws_matching($$INSERT INTO dummy_landable.themes (file, name, body, description) VALUES ('FILENAME3', 'test3', 'body', 'test body')$$, '__u_name');
 
   SELECT * FROM finish();
 

data/doc/schema/asset.json

@@ -60,6 +60,11 @@
     "updated_at": {
       "type": "string",
       "format": "date-time"
+    },
+
+    "deleted_at": {
+      "type": "date",
+      "format": "date-time"
     }
   }
 }

data/doc/schema/page.json

@@ -65,6 +65,11 @@
       "type": ["null", {"$ref": "uuid.json"}]
     },
 
+    "deleted_at": {
+      "type": "date",
+      "format": "date-time"
+    },
+
     "meta_tags": {
       "type": "object",
       "additionalProperties": false,

data/doc/schema/page_revision.json

@@ -3,7 +3,7 @@
   "description": "A particular snapshot of a page which has, at some point, been published.",
   "type": "object",
   "additionalProperties": false,
-  "required": ["id", "page_id", "author_id", "notes", "is_published", "is_minor", "preview_path", "ordinal", "created_at", "updated_at"],
+  "required": ["id", "page_id", "author_id", "notes", "is_published", "is_minor", "preview_path", "ordinal", "screenshot_url", "created_at", "updated_at"],
 
   "properties": {
     "id": {
@@ -57,6 +57,11 @@
       "minimum": 1
     },
 
+    "screenshot_url": {
+      "type": ["string", "null"],
+      "format": "uri"
+    },
+
     "created_at": {
       "type": "string",
       "format": "date-time"

data/doc/schema/template.json

@@ -56,6 +56,11 @@
 
     "updated_by_author_id": {
       "type": ["null", {"$ref": "uuid.json"}]
+    },
+
+    "deleted_at": {
+      "type": "date",
+      "format": "date-time"
     }
 
   }

data/doc/schema/template_revision.json

@@ -43,6 +43,11 @@
     "updated_at": {
       "type": "string",
       "format": "date-time"
+    },
+
+    "deleted_at": {
+      "type": "date",
+      "format": "date-time"
     }
   }
 }

data/doc/schema/theme.json

@@ -32,6 +32,11 @@
 
     "editable": {
       "type": "boolean"
+    },
+
+    "deleted_at": {
+      "type": "date",
+      "format": "date-time"
     }
   }
 }

data/landable.gemspec

@@ -4,50 +4,48 @@ lib = File.expand_path('../lib', __FILE__)
 $:.unshift(lib) unless $:.include?(lib)
 
 # Maintain your gem's version:
-require "landable/version"
+require 'landable/version'
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |gem|
-  gem.name          = "landable"
+  gem.name          = 'landable'
   gem.version       = Landable::VERSION::STRING
 
-  gem.authors       = ["Team Trogdor"]
-  gem.email         = ["trogdor@enova.com"]
+  gem.authors       = ['Team Trogdor']
+  gem.email         = ['trogdor@enova.com']
 
-  gem.homepage      = "https://github.com/enova/landable"
+  gem.homepage      = 'https://github.com/enova/landable'
 
-  gem.license       = "MIT-LICENSE"
+  gem.license       = 'MIT-LICENSE'
 
-  gem.summary       = "Mountable CMS engine for Rails"
-  gem.description   = "Landing page storage, rendering, tracking, and management API"
+  gem.summary       = 'Mountable CMS engine for Rails'
+  gem.description   = 'Landing page storage, rendering, tracking, and management API'
 
   gem.files         = `git ls-files`.split($/)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
 
-  gem.require_paths = ["lib"]
-
-  gem.add_dependency "rails",     "~> 4.0.0"
-  gem.add_dependency "rack-cors", ">= 0.2.7"
-  gem.add_dependency "active_model_serializers", "~> 0.8"
-  gem.add_dependency "carrierwave"
-  gem.add_dependency "liquid"
-  gem.add_dependency "fog"
-  gem.add_dependency "rest-client"
-  gem.add_dependency "builder"
-  gem.add_dependency "lookup_by", "> 0.4.0"
-
-  gem.add_development_dependency "pg"
-  gem.add_development_dependency "rspec-rails",        '~> 2.13.0'
-  gem.add_development_dependency "shoulda-matchers",   '~> 2.2.0'
-  gem.add_development_dependency "factory_girl_rails", '~> 4.2.0'
-  gem.add_development_dependency "json-schema",        '= 2.1.3'
-  gem.add_development_dependency "rack-schema"
-  gem.add_development_dependency "cucumber",           '= 1.3.2'
-  gem.add_development_dependency "database_cleaner"
-  gem.add_development_dependency "simplecov"
-  gem.add_development_dependency "valid_attribute"
-  gem.add_development_dependency "pry"
-  gem.add_development_dependency "faker"
-  gem.add_development_dependency "bundler_geminabox"
+  gem.require_paths = ['lib']
+
+  gem.add_dependency 'rails',     '~> 4.0'
+  gem.add_dependency 'rack-cors', '>= 0.2.7'
+  gem.add_dependency 'active_model_serializers', '~> 0.8'
+  gem.add_dependency 'carrierwave'
+  gem.add_dependency 'liquid'
+  gem.add_dependency 'fog'
+  gem.add_dependency 'rest-client'
+  gem.add_dependency 'builder'
+  gem.add_dependency 'lookup_by', '> 0.4.0'
+
+  gem.add_development_dependency 'pg'
+  gem.add_development_dependency 'rspec-rails',        '~> 2.14.2'
+  gem.add_development_dependency 'factory_girl_rails', '~> 4.2.0'
+  gem.add_development_dependency 'json-schema',        '= 2.1.3'
+  gem.add_development_dependency 'rack-schema'
+  gem.add_development_dependency 'cucumber',           '= 1.3.14'
+  gem.add_development_dependency 'database_cleaner'
+  gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'valid_attribute'
+  gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'faker'
 end

data/lib/generators/templates/landable.rb

@@ -25,6 +25,12 @@ Landable.configure do |config|
   # Uncomment to enable tracking of all requests.
   # Set to :html to track only HTML requests.
   # config.traffic_enabled = true
+
+  # If you're using Landable with Publicist, add its url here. (required for screenshots)
+  # config.publicist_url = 'http://publicist.dev/'
+
+  # Where is your site deployed? (required for screenshots)
+  # config.public_url = 'http://myapp.dev/'
 end
 
 # Configure asset uploads. Assets will be uploaded to public/uploads by default.

data/lib/landable/configuration.rb

@@ -1,8 +1,14 @@
 module Landable
   class Configuration
-    attr_writer :api_namespace, :public_namespace, :categories, :traffic_enabled
-    attr_writer :sitemap_exclude_categories, :sitemap_protocol, :sitemap_host
-    attr_writer :sitemap_additional_paths, :reserved_paths, :partials_to_templates, :database_schema_prefix
+    attr_accessor :api_url, :public_url
+    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 :reserved_paths, :partials_to_templates, :database_schema_prefix
+    attr_writer :publicist_url
 
     def authenticators
       @authenticators || raise("No Landable authenticator configured.")
@@ -14,13 +20,36 @@ module Landable
 
     alias :authenticator= :authenticators=
 
+    def publicist_url
+      @publicist_url ||= 'publicist.dev'
+    end
+
+    def api_uri
+      if api_url.present?
+        @api_uri ||= URI(api_url)
+      end
+    end
+
+    def api_host
+      @api_host ||= api_uri.try(:host)
+    end
+
     def api_namespace
-      @api_namespace ||= '/api/landable'
+      @api_namespace ||= (api_uri.try(:path).presence || '/api/landable')
+    end
+
+    def public_uri
+      if public_url.present?
+        @public_uri ||= URI(public_url)
+      end
+    end
+
+    def public_host
+      @public_host ||= public_uri.try(:host)
     end
 
     def public_namespace
-      raise NotImplementedError
-      @public_namespace ||= '/'
+      @public_namespace ||= (public_uri.try(:path).presence || '')
     end
 
     def database_schema_prefix
@@ -67,6 +96,10 @@ module Landable
       @sitemap_host
     end
 
+    def screenshots_enabled
+      @screenshots_enabled ||= false
+    end
+
     def traffic_enabled
       @traffic_enabled ||= false
     end

data/lib/landable/version.rb

@@ -1,9 +1,9 @@
 module Landable
   module VERSION
     MAJOR = 1
-    MINOR = 7
-    PATCH = 1
-    PRE   = 'rc1'
+    MINOR = 8
+    PATCH = 0
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end

data/lib/tasks/landable/pgtap.rake

@@ -16,8 +16,7 @@ namespace :landable do
       else
         # Load pgtap functions into database.  Will not complain if already loaded.
         ActiveRecord::Base.connection.execute(IO.read("#{dbdir}/pgtap/pgtap.sql"))
-
-        sh "cd #{dbdir}/test && pg_prove -d #{ActiveRecord::Base.connection.current_database} #{tests}"
+        sh "cd #{Rails.root}/../../script && ./pgtap"
       end
     end
   end