landable 1.13.2 → 1.14.0

data/.rubocop.yml

@@ -1,3 +1,8 @@
+AllCops:
+  Exclude:
+    - 'lib/landable/layout.rb'
+    - 'lib/landable/partial.rb'
+
 Lint/AmbiguousOperator:
   Enabled: true
 

data/CHANGELOG.md

@@ -2,7 +2,13 @@
 
 See README.md before updating this file.
 
-## Unreleased [#](https://github.com/enova/landable/compare/v1.13.2...master)
+## Unreleased [#](https://github.com/enova/landable/compare/v1.14.0...master)
+
+## 1.14.0 [#](https://github.com/enova/landable/compare/v1.13.2...v1.14.0)
+* Feature: Support permissions for an author
+* Feature: Support Figgy configuration options
+* Add Figgy and Responders gems
+* Database updates
 
 ## 1.13.2 [#](https://github.com/enova/landable/compare/v1.13.1...v1.13.2)
 * Bugfix: Fix landable traffic errors

data/Gemfile

@@ -7,6 +7,9 @@ gemspec
 # concerned only with compatibility (see bin/test)
 gem 'rails', ENV['RAILS_VERSION'] if ENV.key? 'RAILS_VERSION'
 
+# handle configurations!
+gem 'figgy', '~> 1.1.0'
+
 # development/test dependencies, and anything else that doesn't belong or fit
 # in the gemspec
 group :test do

data/app/controllers/landable/api/access_tokens_controller.rb

@@ -11,9 +11,12 @@ module Landable
 
       def create
         ident  = AuthenticationService.call(asset_token_params[:username], asset_token_params[:password])
+
         author = RegistrationService.call(ident)
 
-        respond_with AccessToken.create!(author: author), status: :created
+        permissions = determine_permissions(ident[:groups])
+
+        respond_with AccessToken.create!(author: author, permissions: permissions), status: :created
       rescue Landable::AuthenticationFailedError
         head :unauthorized
       end
@@ -42,6 +45,21 @@ module Landable
       def asset_token_params
         params.require(:access_token).permit(:username, :password)
       end
+
+      def determine_permissions(user_groups)
+        yaml_groups = Landable.configuration['ldap'][:permissions]
+        permissions_groups = user_groups.select { |group| yaml_groups.include?(group) }
+
+        user_permissions = {}
+        permissions_groups.each do |group|
+          group_permissions = yaml_groups[group].keys
+          group_permissions.each do |perm|
+            user_permissions[perm] ||= yaml_groups[group][perm]
+          end
+        end
+
+        user_permissions
+      end
     end
   end
 end

data/app/controllers/landable/api/pages_controller.rb

@@ -53,7 +53,7 @@ module Landable
       end
 
       def preview
-        page  = Page.where(page_id: page_params[:id]).first_or_initialize
+        page = Page.where(page_id: page_params[:id]).first_or_initialize
         page.attributes = page_params
 
         # run the validators and render

data/app/controllers/landable/api/templates_controller.rb

@@ -51,9 +51,9 @@ module Landable
       # custom methods
       def preview
         template = Template.new(template_params)
-        theme  = Theme.most_used_on_pages
+        theme = Theme.most_used_on_pages
 
-        page  = Page.example(theme: theme, body: template.body)
+        page = Page.example(theme: theme, body: template.body)
 
         content = generate_preview_for(page)
 
@@ -72,7 +72,7 @@ module Landable
 
       def template_params
         params.require(:template).permit(:id, :name, :body, :description, :thumbnail_url,
-                                         :slug, :is_layout, :is_publishable,
+                                         :slug, :is_layout, :is_publishable, :category_id,
                                          audit_flags: [])
       end
 

data/app/models/landable/access_token.rb

@@ -2,19 +2,42 @@ module Landable
   class AccessToken < ActiveRecord::Base
     include Landable::TableName
 
+    # Maximum token age, in hours
+    MAX_AGE = ((Landable.configuration['ldap'] &&
+                Landable.configuration['ldap'][:access_token_max_age]) || 8).hours
+
     belongs_to :author
     validates_presence_of :author_id
     validates_presence_of :expires_at
+    validates_presence_of :permissions
 
     before_validation do |token|
-      token.expires_at ||= 8.hours.from_now
+      token.expires_at ||= expiration
     end
 
     scope :fresh,   -> { where('expires_at > ?',  Time.zone.now) }
     scope :expired, -> { where('expires_at <= ?', Time.zone.now) }
 
     def refresh!
-      update_column :expires_at, 8.hours.from_now
+      update_column :expires_at, expiration
+    end
+
+    def can_publish?
+      permissions['publish'] == 'true'
+    end
+
+    def can_edit?
+      permissions['edit'] == 'true'
+    end
+
+    def can_read?
+      permissions['read'] == 'true'
+    end
+
+    private
+
+    def expiration
+      MAX_AGE.from_now
     end
   end
 end

data/app/models/landable/author.rb

@@ -5,9 +5,23 @@ module Landable
 
     def self.authenticate!(username, token_id)
       author = where(username: username).first
-      return unless author
-      return unless author.access_tokens.fresh.exists?(token_id)
+      return unless author && author.access_tokens.fresh.exists?(token_id)
       author
     end
+
+    def can_read
+      token = access_tokens.fresh.last
+      token.present? && token.can_read?
+    end
+
+    def can_edit
+      token = access_tokens.fresh.last
+      token.present? && token.can_edit?
+    end
+
+    def can_publish
+      token = access_tokens.fresh.last
+      token.present? && token.can_publish?
+    end
   end
 end

data/app/models/landable/page.rb

@@ -30,7 +30,7 @@ module Landable
     validates :redirect_url, url: true, allow_blank: true
     validate :hero_asset_existence
 
-    belongs_to :theme,                class_name: 'Landable::Theme',        inverse_of: :pages, counter_cache: true
+    belongs_to :theme,                class_name: 'Landable::Theme', inverse_of: :pages, counter_cache: true
     belongs_to :published_revision,   class_name: 'Landable::PageRevision'
     belongs_to :category,             class_name: 'Landable::Category'
     belongs_to :updated_by_author,    class_name: 'Landable::Author'

data/app/models/landable/template.rb

@@ -13,14 +13,15 @@ module Landable
     before_save :slug_has_no_spaces
 
     belongs_to :published_revision,   class_name: 'Landable::TemplateRevision'
+    belongs_to :category,             class_name: 'Landable::Category'
     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
+    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 lambda  { |template|
+    before_save lambda { |template|
       template.is_publishable = true unless template.published_revision_id_changed?
     }
 
@@ -61,6 +62,7 @@ module Landable
       self.name          = revision.name
       self.body          = revision.body
       self.description   = revision.description
+      self.category_id   = revision.category_id
       self.slug          = revision.slug
 
       save!

data/app/models/landable/template_revision.rb

@@ -18,6 +18,7 @@ module Landable
       self.name          = template.name
       self.body          = template.body
       self.description   = template.description
+      self.category_id   = template.category_id
       self.slug          = template.slug
     end
 

data/app/responders/landable/page_render_responder.rb

@@ -4,9 +4,7 @@ module Landable
       page = resource
 
       case page.status_code
-      when 200      then render text: RenderService.call(page, preview: options[:preview], responder: self),
-                                content_type: page.content_type,
-                                layout: (page.theme.try(:file) || false)
+      when 200 then render text: RenderService.call(page, preview: options[:preview], responder: self), 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          fail page.error
       end

data/app/serializers/landable/access_token_serializer.rb

@@ -1,6 +1,6 @@
 module Landable
   class AccessTokenSerializer < ActiveModel::Serializer
-    attributes :id, :expires_at
+    attributes :id, :expires_at, :permissions
     has_one :author, embed: :object
   end
 end

data/app/serializers/landable/author_serializer.rb

@@ -1,5 +1,5 @@
 module Landable
   class AuthorSerializer < ActiveModel::Serializer
-    attributes :id, :username, :email, :first_name, :last_name
+    attributes :id, :username, :email, :first_name, :last_name, :can_read, :can_edit, :can_publish
   end
 end

data/app/serializers/landable/template_serializer.rb

@@ -12,5 +12,10 @@ module Landable
     has_one :published_revision
 
     has_many :pages
+    has_one :category
+
+    def category
+      object.category || Landable::Category.where(name: 'Uncategorized').first
+    end
   end
 end

data/app/services/landable/authentication_service.rb

@@ -37,7 +37,7 @@ module Landable
 
       def echo_author(username)
         { username: username, email: "#{username}@example.com",
-          first_name: 'Trogdor', last_name: 'McBurninator' }
+          first_name: 'Trogdor', last_name: 'McBurninator', groups: ['Publisher'] }
       end
     end
   end

data/db/migrate/20130510221424_create_landable_schema.rb

@@ -25,8 +25,8 @@ class CreateLandableSchema < Landable::Migration
 
     create_table "#{Landable.configuration.database_schema_prefix}landable.status_codes", id: :uuid, primary_key: :status_code_id do |t|
       t.uuid :status_code_category_id, null: false
-      t.integer :code,                    null: false, limit: 2 # Creates as smallint
-      t.text :description,             null: false
+      t.integer :code, null: false, limit: 2 # Creates as smallint
+      t.text :description, null: false
     end
 
     execute "CREATE UNIQUE INDEX #{Landable.configuration.database_schema_prefix}landable_status_codes__u_code ON #{Landable.configuration.database_schema_prefix}landable.status_codes(code)"
@@ -56,7 +56,7 @@ class CreateLandableSchema < Landable::Migration
       t.text :body,           null: false
       t.text :description,    null: false
       t.text :thumbnail_url
-      t.boolean :is_layout,   null: false, default: false
+      t.boolean :is_layout, null: false, default: false
       t.timestamps
     end
 
@@ -123,7 +123,7 @@ class CreateLandableSchema < Landable::Migration
     ## access_tokens
 
     create_table "#{Landable.configuration.database_schema_prefix}landable.access_tokens", id: :uuid, primary_key: :access_token_id do |t|
-      t.uuid :author_id,  null: false
+      t.uuid :author_id, null: false
       t.timestamp :expires_at, null: false
       t.timestamps
     end
@@ -235,8 +235,8 @@ class CreateLandableSchema < Landable::Migration
     ## asset associations table
 
     create_table "#{Landable.configuration.database_schema_prefix}landable.page_assets", id: :uuid, primary_key: :page_asset_id do |t|
-      t.uuid :page_id,    null: false
-      t.uuid :asset_id,         null: false
+      t.uuid :page_id, null: false
+      t.uuid :asset_id, null: false
     end
 
     execute "CREATE UNIQUE INDEX #{Landable.configuration.database_schema_prefix}landable_page_assets__u_page_id_asset_id ON #{Landable.configuration.database_schema_prefix}landable.page_assets (page_id, asset_id)"
@@ -244,8 +244,8 @@ class CreateLandableSchema < Landable::Migration
     execute "ALTER TABLE #{Landable.configuration.database_schema_prefix}landable.page_assets ADD CONSTRAINT asset_id_fk FOREIGN KEY (asset_id) REFERENCES #{Landable.configuration.database_schema_prefix}landable.assets(asset_id)"
 
     create_table "#{Landable.configuration.database_schema_prefix}landable.page_revision_assets", id: :uuid, primary_key: :page_revision_asset_id do |t|
-      t.uuid :page_revision_id,    null: false
-      t.uuid :asset_id,         null: false
+      t.uuid :page_revision_id, null: false
+      t.uuid :asset_id, null: false
     end
 
     execute "CREATE UNIQUE INDEX #{Landable.configuration.database_schema_prefix}landable_page_revision_assets__u_page_revision_id_asset_id ON #{Landable.configuration.database_schema_prefix}landable.page_revision_assets (page_revision_id, asset_id)"
@@ -253,8 +253,8 @@ class CreateLandableSchema < Landable::Migration
     execute "ALTER TABLE #{Landable.configuration.database_schema_prefix}landable.page_revision_assets ADD CONSTRAINT asset_id_fk FOREIGN KEY (asset_id) REFERENCES #{Landable.configuration.database_schema_prefix}landable.assets(asset_id)"
 
     create_table "#{Landable.configuration.database_schema_prefix}landable.theme_assets", id: :uuid, primary_key: :theme_asset_id do |t|
-      t.uuid :theme_id,    null: false
-      t.uuid :asset_id,         null: false
+      t.uuid :theme_id, null: false
+      t.uuid :asset_id, null: false
     end
 
     execute "CREATE UNIQUE INDEX #{Landable.configuration.database_schema_prefix}landable_theme_assets__u_theme_id_asset_id ON #{Landable.configuration.database_schema_prefix}landable.theme_assets (theme_id, asset_id)"

data/db/migrate/20150610999999_add_permissions_to_access_tokens.rb

@@ -0,0 +1,6 @@
+class AddPermissionsToAccessTokens < ActiveRecord::Migration
+  def change
+    enable_extension 'hstore' unless extension_enabled?('hstore')
+    add_column "#{Landable.configuration.database_schema_prefix}landable.access_tokens", :permissions, :hstore
+  end
+end

data/db/migrate/20150728195345_add_category_column_to_templates.rb

@@ -0,0 +1,13 @@
+class AddCategoryColumnToTemplates < ActiveRecord::Migration
+  def change
+    schema_name = "#{Landable.configuration.database_schema_prefix}landable"
+
+    # add category_id to our templates table.
+    add_column "#{schema_name}.templates", :category_id, :uuid
+    execute "ALTER TABLE #{schema_name}.templates ADD FOREIGN KEY (category_id) REFERENCES #{schema_name}.categories(category_id)"
+
+    # add category_id to our template_revisions table.
+    add_column "#{schema_name}.template_revisions", :category_id, :uuid
+    execute "ALTER TABLE #{schema_name}.template_revisions ADD FOREIGN KEY (category_id) REFERENCES #{schema_name}.categories(category_id)"
+  end
+end

data/doc/schema/access_token.json

@@ -17,6 +17,10 @@
 
     "author": {
       "$ref": "author.json"
+    },
+
+    "permissions": {
+      "$ref": "permissions.json"
     }
   }
 }

data/doc/schema/author.json

@@ -25,6 +25,18 @@
 
     "last_name": {
       "type": "string"
+    },
+
+    "can_read": {
+      "type": "boolean"
+    },
+
+    "can_edit": {
+      "type": "boolean"
+    },
+
+    "can_publish": {
+      "type": "boolean"
     }
   }
 }

data/doc/schema/permissions.json

@@ -0,0 +1,21 @@
+{
+  "title": "Permissions",
+  "description": "Permissions for authors",
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["read", "edit", "publish"],
+
+  "properties": {
+    "read": {
+      "type": "string"
+    },
+
+    "edit": {
+      "type": "string"
+    },
+
+    "publish": {
+      "type": "string"
+    }
+  }
+}

data/doc/schema/template.json

@@ -47,6 +47,10 @@
       "items": { "$ref": "uuid.json" }
     },
 
+    "category_id": {
+      "type": [{ "$ref": "uuid.json" }, "null"]
+    },
+
     "thumbnail_url": {
       "type": ["string", "null"]
     },

data/doc/schema/template_revision.json

@@ -18,6 +18,10 @@
       "type": "string"
     },
 
+    "category_id": {
+      "type": "uuid.json"
+    },
+
     "notes": {
       "type": ["string", "null"]
     },

data/features/api/access_tokens.feature

@@ -2,7 +2,7 @@
 Feature: Access Tokens API
 
   Scenario: Responding with a fresh access token
-    Given an author "someone"
+    Given an author "someone" without access tokens
     And   "someone" has an unexpired access token
     When I POST to "/api/access_tokens" with:
       """
@@ -29,7 +29,7 @@ Feature: Access Tokens API
     And  the author "someone" should have 1 access token
 
   Scenario: Reusing a pre-existing author record
-    Given an author "someone"
+    Given an author "someone" without access tokens
     When I POST to "/api/access_tokens" with:
       """
       { "access_token": { "username": "someone", "password": "anything" } }

data/features/step_definitions/core_api_steps.rb

@@ -15,7 +15,7 @@ module Landable
     end
 
     def current_author
-      @current_author ||= create :author
+      @current_author ||= create :author_without_access_tokens
     end
 
     def current_access_token
@@ -46,11 +46,11 @@ Before '@api', '~@no-api-auth' do
 end
 
 Given 'I accept HTML' do
-  header 'Accept',      'text/html'
+  header 'Accept', 'text/html'
 end
 
 Given 'I accept JSON' do
-  header 'Accept',      'application/json'
+  header 'Accept', 'application/json'
 end
 
 Given 'my API requests include a valid access token' do

data/features/step_definitions/factory_steps.rb

@@ -18,6 +18,10 @@ Given(/^an author "([^"]+)"$/) do |username|
   create :author, username: username
 end
 
+Given(/^an author "([^"]+)" without access tokens$/) do |username|
+  create :author_without_access_tokens, username: username
+end
+
 Given '"$username" has an unexpired access token' do |username|
   create :access_token, author: Landable::Author.where(username: username).first!
 end

data/features/support/env.rb

@@ -8,7 +8,7 @@ ENV['RAILS_ENV'] ||= 'test'
 require 'simplecov'
 SimpleCov.start 'rails'
 
-require File.expand_path('../../../spec/dummy/config/environment.rb',  __FILE__)
+require File.expand_path('../../../spec/dummy/config/environment.rb', __FILE__)
 ENV['RAILS_ROOT'] ||= File.dirname(__FILE__) + '../../../spec/dummy'
 
 require 'cucumber/rails'

data/landable.gemspec

@@ -31,19 +31,20 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rack-cors', '>= 0.2.7'
   gem.add_dependency 'active_model_serializers', '0.8.3'
   gem.add_dependency 'carrierwave'
-  gem.add_dependency 'liquid',    '~> 2.6.1'
+  gem.add_dependency 'liquid', '~> 2.6.1'
   gem.add_dependency 'fog'
   gem.add_dependency 'rest-client'
   gem.add_dependency 'builder'
   gem.add_dependency 'lookup_by', '> 0.4.0'
   gem.add_dependency 'highline'
+  gem.add_dependency 'figgy', '~> 1.1.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 'cucumber', '= 1.3.14'
   gem.add_development_dependency 'database_cleaner'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'valid_attribute'

data/lib/landable.rb

@@ -20,10 +20,12 @@ module Landable
   autoload :Seeds,         'landable/seeds'
 
   def self.configuration
-    @configuration ||= Configuration.new
+    @configuration ||= Configuration.new(@file_path)
   end
 
-  def self.configure
+  def self.configure(path = nil)
+    @file_path = path
+
     yield configuration if block_given?
     configuration
   end

data/lib/landable/configuration.rb

@@ -1,5 +1,7 @@
+require 'figgy'
+
 module Landable
-  class Configuration
+  class Configuration < HashWithIndifferentAccess
     attr_accessor :api_url, :public_url, :amqp_configuration, :sitemap_host
     attr_writer :api_namespace, :public_namespace
     attr_writer :api_host, :public_host
@@ -13,6 +15,24 @@ module Landable
     attr_writer :dnt_enabled, :amqp_event_mapping, :amqp_site_segment
     attr_writer :amqp_service_enabled, :amqp_messaging_service
 
+    def initialize(config_path = nil)
+      begin
+        # let's keep this feature optional. Not all apps
+        # will be using external configs for landable
+        app_config = Figgy.build do |config_data|
+          config_data.root = config_path
+
+          config_data.define_overlay :default, nil
+          config_data.define_overlay(:environment) { Rails.env }
+        end
+
+        # map our new configs into our local object.
+        config_keys(config_path).each do |key|
+          self[key] = app_config[key] unless app_config[key].nil?
+        end
+      end unless config_path.nil?
+    end
+
     def amqp_configuration
       @amqp_configuration ||= {}
     end
@@ -172,5 +192,42 @@ module Landable
         @autorun = true
       end
     end
+
+    private
+
+    DOTFILE_MATCHER_REGEXP = /^\.[[[:alnum:]]\.]*$/
+    EXPECTED_FILETYPES = ['yml', 'yaml', 'json']
+    EXPECTED_FILETYPES_REGEXP = /\.(#{ EXPECTED_FILETYPES.join('|') })\z/
+
+    def config_keys(base_path)
+      files = Dir.entries(base_path)
+      keys = []
+
+      files = remove_dotfiles(files)
+
+      files.each do |filename|
+        filename = File.join(base_path, filename)
+        new_key = filename_to_key(filename)
+
+        if File.file?(filename)
+          keys.push(new_key)
+        elsif File.directory?(filename) && new_key == Rails.env
+          # only folders matching our environment!
+          keys = keys.concat(config_keys(filename))
+        end
+      end
+
+      keys.uniq
+    end
+
+    def filename_to_key(filename)
+      File.basename(filename).sub(EXPECTED_FILETYPES_REGEXP, '')
+    end
+
+    def remove_dotfiles(filelist)
+      filelist.delete_if do |filename|
+        !DOTFILE_MATCHER_REGEXP.match(File.basename(filename)).nil?
+      end
+    end
   end
 end

data/lib/landable/traffic/tracker.rb

@@ -29,29 +29,29 @@ module Landable
       ATTRIBUTION_KEYS = TRACKING_PARAMS.except('click_id').keys
 
       TRACKING_PARAMS_TRANSFORM = {
-        'ad_type'        => { 'pe'  => 'product_extensions',
-                              'pla' => 'product_listing' },
+        'ad_type' => { 'pe'  => 'product_extensions',
+                       'pla' => 'product_listing' },
 
         'bid_match_type' => { 'bb'  => 'bidded broad',
                               'bc'  => 'bidded content',
                               'be'  => 'bidded exact',
                               'bp'  => 'bidded phrase' },
 
-        'device_type'    => { 'c'   => 'computer',
-                              'm'   => 'mobile',
-                              't'   => 'tablet' },
-
-        'match_type'     => { 'b'   => 'broad',
-                              'c'   => 'content',
-                              'e'   => 'exact',
-                              'p'   => 'phrase',
-                              'std' => 'standard',
-                              'adv' => 'advanced',
-                              'cnt' => 'content' },
-
-        'network'        => { 'g'   => 'google_search',
-                              's'   => 'search_partner',
-                              'd'   => 'display_network' }
+        'device_type' => { 'c'   => 'computer',
+                           'm'   => 'mobile',
+                           't'   => 'tablet' },
+
+        'match_type' => { 'b'   => 'broad',
+                          'c'   => 'content',
+                          'e'   => 'exact',
+                          'p'   => 'phrase',
+                          'std' => 'standard',
+                          'adv' => 'advanced',
+                          'cnt' => 'content' },
+
+        'network' => { 'g'   => 'google_search',
+                       's'   => 'search_partner',
+                       'd'   => 'display_network' }
       }.freeze
 
       UUID_REGEX       = /\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\Z/

data/lib/landable/version.rb

@@ -1,8 +1,8 @@
 module Landable
   module VERSION
     MAJOR = 1
-    MINOR = 13
-    PATCH = 2
+    MINOR = 14
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/spec/controllers/landable/api/configuration_controller_spec.rb

@@ -13,6 +13,12 @@ module Landable
         end
 
         it 'renders the page as JSON' do
+          # pending 'This broken test requires refactoring.'
+          # this test cannot possibly pass given the state of the configuration object and controller.
+          #   * The controller returns a json version of an object that wasn't initially even a Hash.
+          #   * The new configuration object inherits Hash but 'audit_flags' gets lost in conversion
+          #     to a JSON object because it is a static attribute of the Landable.configuration object.
+
           make_request
           # defined in Landable Dummy Initalizer
           last_json['configurations'][0]['audit_flags'].should eq %w(loans apr)

data/spec/controllers/landable/api_controller_spec.rb

@@ -162,7 +162,7 @@ describe Landable::ApiController, json: true do
       controller.instance_variable_set :@resource, resource
     end
 
-    let(:resource) { build :author }
+    let(:resource) { create :author }
 
     it 'should set X-Landable-Media-Type' do
       get :responder

data/spec/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'

data/spec/dummy/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Rails.application

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_files  = true
+  config.serve_static_files = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

data/spec/dummy/config/initializers/landable.rb

@@ -1,7 +1,7 @@
 require 'landable'
 require Rails.root.join('lib', 'bunny_messaging_service.rb')
 
-Landable.configure do |config|
+Landable.configure(File.join(File.dirname(__FILE__), '..', '..', 'etc')) do |config|
   config.api_namespace = '/api'
   config.cors.origins  = ['http://cors.test']
 

data/spec/dummy/etc/audit_flags.yml

@@ -0,0 +1 @@
+['loans', 'apr']

data/spec/dummy/etc/ldap.yml

@@ -0,0 +1,17 @@
+:host: adds.enova.com
+:port: 636
+:encryption: :simple_tls
+:base: 'DC=enova,DC=com'
+:permissions:
+  Read-Only:
+    read: 'true'
+    edit: 'false'
+    publish: 'false'
+  Editor:
+    read: 'true'
+    edit: 'true'
+    publish: 'false'
+  Publisher:
+    read: 'true'
+    edit: 'true'
+    publish: 'true'

data/spec/dummy/etc/sandiego.yml

@@ -0,0 +1,85 @@
+enabled: true
+rescue_errors: true
+brand_code: 'US'
+
+clients:
+  cnuapp_proxy:
+    domain: "www-us-trogdor-cnuapp.dev.enova.com" # For Trogdor AWS box
+    secure: true
+    ping: true
+    session_cookies:
+      - cnuwww_session_id
+      - _us_account_home_session
+  cnuapp:
+    domain: "api-us-trogdor-cnuapp.dev.enova.com" # For Trogdor AWS box
+    secure: true
+  identity:
+    default_base_url: "http://portal-us-trogdor-cnuapp.dev.enova.com" # For Trogdor AWS box
+  portfolio:
+    default_base_url: "http://portal-us-trogdor-cnuapp.dev.enova.com" # For Trogdor AWS box
+
+features:
+  registration:
+    enabled: true
+    redirects:
+      new:
+        "/registration-step1.html": "/registration"
+        "/secure/customers/new2": "/registration/step2"
+      old:
+        "/registration": "/registration-step1.html"
+        "/registration/step2": "/secure/customers/new2"
+
+filter_errors:
+  "is invalid": "Unfortunately there seems to be an issue with the information you've provided.  For assistance, please contact our customer support team at"
+  "Could not save customer.  Potential fraud; lead email does not match form email": "Unfortunately there seems to be an issue with the information you've provided.  For assistance, please contact our customer support team at"
+  "Could not save customer": "Unfortunately there seems to be an issue with the information you've provided.  For assistance, please contact our customer support team at"
+
+pings:
+  "/registration": "/registration-step1.html"
+  "/registration/step2": "/secure/customers/new2"
+
+registration:
+  title_options:
+    mr: Mr.
+    mrs: Mrs.
+    miss: Miss
+    ms: Ms.
+    other: Other
+
+  payment_frequency_options:
+    weekly: Weekly (e.g. Every Friday)
+    biweekly: Biweekly (e.g. Every other Friday)
+    twice_monthly: Twice monthly (ex. The 1st and 15th of each month)
+    specific_date: Monthly on a specific date (ex. 1st of the Month)
+    last_working_day: Monthly last day (ex. Last business day or last calendar day)
+    specific_day: Monthly on a specific weekday (ex. 3rd Wednesday of each month)
+    last_day: Monthly last weekday (ex. Last Tuesday of each month)
+
+  repayment_options:
+    ach_debit: bank_account_ach
+    remotely_created_checks: ecld
+
+  acquisition_source_options:
+    - TV Advert
+    - Radio Advert
+    - Moneysupermarket, Gocompare or Similar
+    - Google Results
+    - Friends/Family
+    - Facebook/Twitter
+    - Online Image/Video Ad
+    - Football Stadium
+    - Email
+    - SMS
+    - Other...
+
+  website_message:
+    header: "message"
+    body: "Due to the upcoming banking holiday, all requests to make changes for loans due on <span class='nobreak'>Nov 28 2014</span> must be received by 3:00 PM CST on <span class='nobreak'>Nov 25 2014.</span><br />All loans approved on Nov 26 2014 will generally be funded on Nov 28 2014."
+    start_date: 2014-11-20 00:00:01 -0600
+    end_date:   2014-11-27 23:59:59 -0600
+
+ldap:
+  host: ldap.cashnetusa.com
+  port: 389
+  ssl:  start_tls
+  base: 'ou=user,ou=jabber,ou=auth,dc=cashnetusa,dc=com'

data/spec/dummy/etc/sitemap_extra.yml

@@ -0,0 +1,12 @@
+# Add extra URLs which aren't in publicist but should be included in sitemap.xml
+# This file is replaced from cnu_config overlay so make changes there
+
+- /
+- /blog
+- /forgot_password.html
+- /login
+- /new-customer-registration
+- /newsroom
+- /registration-step1.html
+- /secure/auth/forgot_email
+- /secure/auth/forgot_password

data/spec/factories/authors.rb

@@ -1,12 +1,28 @@
 FactoryGirl.define do
+  factory :access_token, class: 'Landable::AccessToken' do
+    association :author, strategy: :create
+    permissions { { 'read' => 'true', 'edit' => 'true', 'publish' => 'true' } }
+  end
+
   factory :author, class: 'Landable::Author' do
     sequence(:username) { |n| "trogdor#{n}" }
     sequence(:email)    { |n| "trogdor#{n}@example.com" }
     first_name 'Marley'
     last_name 'Pants'
+
+    ignore do
+      tokens_count 1
+    end
+
+    after(:create) do |author, evaluator|
+      create_list(:access_token, evaluator.tokens_count, author: author)
+    end
   end
 
-  factory :access_token, class: 'Landable::AccessToken' do
-    association :author, strategy: :build
+  factory :author_without_access_tokens, class: 'Landable::Author' do
+    sequence(:username) { |n| "trogdor#{n}" }
+    sequence(:email)    { |n| "trogdor#{n}@example.com" }
+    first_name 'Marley'
+    last_name 'Pants'
   end
 end

data/spec/models/landable/access_token_spec.rb

@@ -6,7 +6,8 @@ module Landable
 
     it 'generates an expiration timestamp before creation' do
       author = create :author
-      token  = AccessToken.create!(author: author)
+      permissions = { 'read' => 'true', 'edit' => 'true', 'publish' => 'true' }
+      token = AccessToken.create!(author: author, permissions: permissions)
       expect(token.expires_at).not_to be_nil
     end
   end

data/spec/models/landable/page_spec.rb

@@ -365,7 +365,7 @@ module Landable
 
     describe '::by_path' do
       it 'returns first page with path name' do
-        page  = create :page, path: '/seo'
+        page = create :page, path: '/seo'
         Landable::Page.by_path('/seo').should eq page
       end
     end

data/spec/services/landable/authentication_service_spec.rb

@@ -4,7 +4,7 @@ describe Landable::AuthenticationService do
   let(:simple_auth) do
     proc do |username, password|
       if username == 'simple' && password == 'authenticator'
-        { username: 'simple', email: 'simple@example.com', first_name: 'Simple', last_name: 'Ton' }
+        { username: 'simple', email: 'simple@example.com', first_name: 'Simple', last_name: 'Ton', groups: ['CreditMe Read-only', 'QuickQuid Editor', 'Netcredit Publisher'] }
       end
     end
   end

data/spec/services/landable/render_service_spec.rb

@@ -45,7 +45,7 @@ module Landable
     end
 
     context 'for a redirect' do
-      let(:page)  { build :page, :redirect  }
+      let(:page) { build :page, :redirect }
 
       context 'previewing' do
         let(:rendered) { render(preview: true) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: landable
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -171,6 +171,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: figgy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -510,6 +526,8 @@ files:
 - db/migrate/20140602213937_path_response_time_view.rb
 - db/migrate/20141211200012_add_page_name_to_page.rb
 - db/migrate/20141217171816_add_counter_for_themes_pages.rb
+- db/migrate/20150610999999_add_permissions_to_access_tokens.rb
+- db/migrate/20150728195345_add_category_column_to_templates.rb
 - db/test/landable.access_tokens.sql
 - db/test/landable.assets.sql
 - db/test/landable.authors.sql
@@ -526,6 +544,7 @@ files:
 - doc/schema/directory.json
 - doc/schema/page.json
 - doc/schema/page_revision.json
+- doc/schema/permissions.json
 - doc/schema/template.json
 - doc/schema/template_revision.json
 - doc/schema/theme.json
@@ -664,6 +683,10 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/.keep
 - spec/dummy/db/structure.sql
+- spec/dummy/etc/audit_flags.yml
+- spec/dummy/etc/ldap.yml
+- spec/dummy/etc/sandiego.yml
+- spec/dummy/etc/sitemap_extra.yml
 - spec/dummy/lib/assets/.keep
 - spec/dummy/lib/bunny_messaging_service.rb
 - spec/dummy/log/.keep
@@ -730,7 +753,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 953659550368963873
+      hash: -154968153976918238
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -739,7 +762,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 953659550368963873
+      hash: -154968153976918238
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -832,6 +855,10 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/.keep
 - spec/dummy/db/structure.sql
+- spec/dummy/etc/audit_flags.yml
+- spec/dummy/etc/ldap.yml
+- spec/dummy/etc/sandiego.yml
+- spec/dummy/etc/sitemap_extra.yml
 - spec/dummy/lib/assets/.keep
 - spec/dummy/lib/bunny_messaging_service.rb
 - spec/dummy/log/.keep