landable 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33e0d69e6891c96f2d1a009ef58a5a82ddc5f3a6
-  data.tar.gz: d5007db85e84798a12c6abf7e6d1c43548264556
+  metadata.gz: 7eeff5bea21d975e1a609fae486601fd56f01d14
+  data.tar.gz: 5166ca9ae9d0ce55bc358e277f9ecffea37fbd7e
 SHA512:
-  metadata.gz: 8e1199458a3de14521df62769d390e8fbc4fccac423a58903be15af167b99ca9855c2ab7765183d95e7c2b09ae7e0d98fac0aa879c8d7a09dc125eb8438d6594
-  data.tar.gz: f569cbfb3c711e2f2c2453eff742d1b8c4ca7498c9d5bf2ed0fc1b453fdcd5455fc193f9c0eeeb22f5a45bfa8577bcccb8978b4a10239c4e7fa3e3824137d8ff
+  metadata.gz: 7c1cf3cead1831d185ad8054651c6f6caf69e933aa1662a775011857a66e89ec4f337a408ebbe597cbcab12b1ab7fec6df48e457303ad6e337ac5c2990122b90
+  data.tar.gz: fad90831911bae1b77ed361ee0ad66bc1e643316798c92fa9fab99764cce0bb5975b0814933dd62283ed643d6732b7390874221ef5daf3252368f4e50d713d3c

data/CHANGELOG.md

@@ -2,7 +2,11 @@
 
 See README.md before updating this file.
 
-## Unreleased [#](https://github.com/enova/landable/compare/v1.11.0...master)
+## Unreleased [#](https://github.com/enova/landable/compare/v1.11.1...master)
+
+## 1.11.1 [#](https://github.com/enova/landable/compare/v1.11.0...v1.11.1)
+* Adding PageName [#39]
+* Force Template Slug to not have a space [#40]
 
 ## 1.11.0 [#](https://github.com/enova/landable/compare/v1.10.0.rc1...v1.11.0)
 * Make the tracker.user_agent accessible [#33]

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

@@ -112,7 +112,12 @@ module Landable
 
         def page_params
           params[:page][:audit_flags] ||= []
-          params.require(:page).permit(:id, :path, :theme_id, :category_id, :title, :head_content, :body, :status_code, :redirect_url, :lock_version, :abstract, :hero_asset_name, 
+          params.require(:page).permit(:id, :path, :theme_id,
+                                       :category_id, :title,
+                                       :head_content, :body,
+                                       :status_code, :redirect_url,
+                                       :lock_version, :abstract,
+                                       :hero_asset_name, :page_name,
                                        audit_flags: [],
                                        meta_tags: [:description, :keywords, :robots])
         end

data/app/decorators/landable/page_decorator.rb

@@ -15,6 +15,10 @@ module Landable
       page.path
     end
 
+    def page_name
+      page.page_name
+    end
+
     def body
       page.body.try(:html_safe)
     end

data/app/models/landable/page.rb

@@ -22,6 +22,8 @@ module Landable
     validates_uniqueness_of :path
     validates :path, presence: true
 
+    validate :page_name_byte_size
+
     validate :forbid_changing_path, on: :update
 
     validate :body_strip_search
@@ -226,6 +228,12 @@ module Landable
       end
     end
 
+    def page_name_byte_size
+      if page_name.present? && page_name.bytesize > 100
+        errors[:page_name] = 'Invalid PageName, bytesize is too big!'
+      end
+    end
+
     def hero_asset_existence
       return true if @hero_asset_name.blank?
       unless Asset.find_by_name(@hero_asset_name)

data/app/models/landable/page_revision.rb

@@ -16,7 +16,8 @@ module Landable
       'is_publishable',
       'updated_by_author_id',
       'lock_version',
-      'audit_flags'
+      'audit_flags',
+      'page_name'
     ]
 
     cattr_accessor :ignored_page_attributes

data/app/models/landable/template.rb

@@ -10,6 +10,8 @@ module Landable
     validates_uniqueness_of :name, case_sensitive: false
     validates_uniqueness_of :slug, case_sensitive: false
 
+    before_save :slug_has_no_spaces
+
 
     belongs_to :published_revision,   class_name: 'Landable::TemplateRevision'
     has_many   :audits,               class_name: 'Landable::Audit', as: :auditable
@@ -63,6 +65,12 @@ module Landable
       save!
     end
 
+    def slug_has_no_spaces
+      if self.slug =~ /\s/ # check if whitespace
+        self.slug = self.slug.underscore.gsub(/[^\w_]/, '_').gsub(/_{2,}/, '_')
+      end
+    end
+
     class << self
       def create_from_partials!
         Partial.all.map(&:to_template)

data/app/serializers/landable/page_serializer.rb

@@ -5,7 +5,7 @@ module Landable
     attributes :head_content, :meta_tags
     attributes :status_code, :redirect_url
     attributes :is_publishable, :preview_path
-    attributes :audit_flags
+    attributes :audit_flags, :page_name
     attributes :hero_asset_name, :abstract
     attributes :lock_version
     attributes :deleted_at

data/db/migrate/20141211200012_add_page_name_to_page.rb

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

data/doc/schema/page.json

@@ -97,6 +97,10 @@
       "type": ["string", "null"]
     },
 
+    "page_name": {
+      "type": ["string", "null"]
+    },
+
     "audit_flags" : {
       "type" : ["array", "null"],
       "items" : { "type" : "string"}

data/lib/landable/version.rb

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

data/spec/concerns/landable/has_templates_spec.rb

@@ -3,7 +3,10 @@ require 'spec_helper'
 module Landable
   describe HasTemplates do
 
-    before(:each) { create_list :template, 3 }
+    before(:each) do 
+      create_list :template, 2
+      create :template, slug: 'I have a space'
+    end
 
     let(:templates) { Landable::Template.last(3) }
     let(:subject) {

data/spec/models/landable/page_spec.rb

@@ -7,6 +7,9 @@ module Landable
     it { should have_valid(:status_code).when(200, 301, 302, 410) }
     it { should_not have_valid(:status_code).when(201, 303, 405, 500, 404) }
 
+    it { should have_valid(:page_name).when(nil, 'Hello', 'adssad', '212131') }
+    it { should_not have_valid(:page_name).when("#{'hello' * 100}") }
+
     # config.reserved_paths = %w(/reserved_path_set_in_initializer /reject/.* /admin.*)
     context 'PathValidator' do
       it { should_not have_valid(:path).when(nil, '', '/reserved_path_set_in_initializer') }

data/spec/models/landable/template_spec.rb

@@ -119,5 +119,24 @@ module Landable
         template.revert_to! revision
       end
     end
+
+    describe '#slug_has_no_spaces' do
+      it 'should not allow a slug with out underscores' do
+        t = build :template, slug: 'I have no space'
+        t.name = 'No Space'
+        t.save!
+
+        t.slug.should_not == 'I have no space'
+        t.slug.should == 'i_have_no_space'
+      end
+
+      it 'should allow the name to set the slug' do
+        t = build :template, slug: nil
+        t.name = 'I have no space'
+        t.save!
+
+        t.slug.should == 'i_have_no_space'
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: landable
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Team Trogdor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -462,6 +462,7 @@ files:
 - db/migrate/20140515164543_add_screenshot_to_page_revisions.rb
 - db/migrate/20140522202332_join_table_templates_pages.rb
 - db/migrate/20140602213937_path_response_time_view.rb
+- db/migrate/20141211200012_add_page_name_to_page.rb
 - db/test/landable.access_tokens.sql
 - db/test/landable.assets.sql
 - db/test/landable.authors.sql