brightcontent-pages 2.0.33 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e852b578f63e5ca7873c1d786f9a0a796f31813
-  data.tar.gz: 3df2f46ace5a26979aaa7361c607c962690a400e
+  metadata.gz: fce00f1da51773d10d82d547a0cac73e00965af5
+  data.tar.gz: e3819eb119baf8a62004b701c1c96ece8d7994d0
 SHA512:
-  metadata.gz: 8aaf74cd4563675ae7f42a89a8e64957ed8ef12a9fdbae1d033a62acc60fa6d8d6a7a9a37a615e94abb5586e8c21185cfdb9b6f5bb24ae800fa6a49ff40e147f
-  data.tar.gz: bdc5859f125da58bd9efa8c501f68b01a79c5fc6cf004aed345e6946ff068756bb10f6c9e26f35d184a15dcfcf796537665cca98b217097d2e60d2511589cbd7
+  metadata.gz: ebb8e5d9427bd83d768da06cc5a628360dbc5390b1bbea2309d026ac17ed847c39214425ce5ad609aa14fc2739486c81ff4483452bd0f9558d53aff66ba24445
+  data.tar.gz: 70784aa91cd3d3f763ea95664f082b4353abaa49c555caa710c60d312656e1ebdf0eb2023570f49c2e6a218c8b8140c8f27c0acbd1b26a26fd4b107396c66979

data/app/assets/javascripts/brightcontent/pages.js

@@ -1,4 +1,3 @@
+//= require jquery.ui.sortable
 //= require jquery.ui.nestedSortable
 //= require sortable_tree/initializer
-//= require brightcontent/wysithtml5-parser-rules
-

data/app/assets/stylesheets/brightcontent/pages.css.scss

@@ -33,7 +33,7 @@
   }
 
   .handle{
-    background: url(/assets/brightcontent/move.png) no-repeat;
+    background: image-url("brightcontent/move.png") no-repeat;
 
     width: 10px;
     height: 10px;

data/app/helpers/render_sortable_tree_helper.rb

@@ -1,62 +1,7 @@
-# DOC:
-# We use Helper Methods for tree building,
-# because it's faster than View Templates and Partials
-
-# SECURITY note
-# Prepare your data on server side for rendering
-# or use h.html_escape(node.content)
-# for escape potentially dangerous content
 module RenderSortableTreeHelper
-  module Render 
-    class << self
-      attr_accessor :h, :options
-
-      def render_node(h, options)
-        @h, @options = h, options
-
-        node = options[:node]
-
-        "
-          <li id='#{ node.id }_#{ options[:klass] }'>
-            <div class='item #{"page-hidden" if node.hidden? }'>
-              <i class='handle'></i>
-              #{show_link}
-              #{controls}
-            </div>
-            #{children}
-          </li>
-        "
-      end
-
-      def show_link
-        node = options[:node]
-        ns   = options[:namespace]
-        url  = h.url_for(ns + [node])
-        title_field = options[:title]
-
-        h.link_to(node.send(title_field), url, class: 'link')
-      end
-
-      def controls
-        node = options[:node]
-
-        edit_path = h.url_for(:controller => options[:klass].pluralize, :action => :edit, :id => node)
-        show_path = h.url_for(:controller => options[:klass].pluralize, :action => :show, :id => node)
-
-        "
-          <div class='controls'>
-            #{ h.link_to 'Edit', edit_path, :class => 'btn btn-mini btn-primary btn-edit' }
-            #{ h.link_to 'Delete', show_path, :class => 'btn btn-mini btn-delete', :method => :delete, :data => { :confirm => 'Are you sure?' } }
-          </div>
-        "
-      end
-
-      def children
-        unless options[:children].blank?
-          "<ol class='nested_set'>#{ options[:children] }</ol>"
-        end
-      end
-
+  module Render
+    def self.render_node(h, options)
+      h.render("page", item: options[:node], children: options[:children], klass: options[:klass])
     end
   end
 end

data/app/models/brightcontent/page_core.rb

@@ -3,18 +3,30 @@ module Brightcontent
     extend ActiveSupport::Concern
 
     included do
-      acts_as_nested_set
-      has_attached_files Brightcontent.page_attachment_styles
-      include Brightcontent::Attachable
       include TheSortableTree::Scopes
+
+      has_attached_files Brightcontent.page_attachment_styles
+      acts_as_nested_set
+
       validates_presence_of :name
-      after_save :update_slug
-      after_move :update_slug
+
+      after_save :update_slug, :expire_path_cache
+      after_move :update_slug, :expire_path_cache
+
+      default_scope { order(:lft) }
     end
 
     module ClassMethods
-      def default_scope
-        order(:lft)
+      def find_by_path(path)
+        find_by(slug: sanitize_path(path))
+      end
+
+      def find_by_path!(path)
+        find_by!(slug: sanitize_path(path))
+      end
+
+      def sanitize_path(path)
+        path[1..-1]
       end
     end
 
@@ -26,19 +38,20 @@ module Brightcontent
       "/" + slug
     end
 
-    def root_parent_children
-      root? ? children : ancestors.first.children
-    end
-
     private
 
     def update_slug
-      self.update_column(:slug, slug_name)
+      update_column(:slug, slug_name.to_s)
     end
 
     def slug_name
-      homepage? ? "" : self_and_ancestors.map { |p| p.name.parameterize }.join("/")
+      unless homepage?
+        self_and_ancestors.map { |p| p.name.parameterize }.join("/")
+      end
+    end
+
+    def expire_path_cache
+      Pages::PathConstraint.expire
     end
   end
 end
-

data/app/views/brightcontent/pages/_form_field_body.html.erb

@@ -1 +1 @@
-<%= form.input :body, input_html: { id: 'insertable' } %>
+<%= form.input :body, input_html: { id: 'insertable', rows: 20, data: {wysihtml5: true} } %>

data/app/views/brightcontent/pages/_list_field_name.html.erb

@@ -1 +1 @@
-<%= "—" * item.depth %> <%= item.name %> <% if item.hidden? %><span class="badge">Hidden</span><% end %>
+<%= item.name %> <% if item.hidden? %><span class="badge"><%= t('brightcontent.hidden') %></span><% end %>

data/app/views/brightcontent/pages/_page.html.erb

@@ -0,0 +1,15 @@
+<li id="<%= item.id %>_brightcontent/page">
+  <div class='item'>
+    <i class='handle'></i>
+    <%= link_to item, class: 'link' do %>
+      <%= render_list_field(item, :name) %>
+    <% end %>
+    <div class='controls'>
+      <%= link_to t('brightcontent.edit'), [:edit, item], class: "btn btn-xs btn-primary" %>
+      <%= link_to t('brightcontent.delete'), item, class: "btn btn-xs btn-danger", data: {confirm: 'Are you sure?'}, method: :delete %>
+    </div>
+  </div>
+  <% unless children.blank? %>
+    <ol class='nested_set'><%= raw children %></ol>
+  <% end %>
+</li>

data/app/views/brightcontent/pages/index.html.erb

@@ -1,10 +1,12 @@
-<div id="overview">
+<div class="page-header">
+  <%= link_to "#{I18n.t('brightcontent.create_new', model: resource_class.model_name.human).humanize}", polymorphic_url([parent, resource_class], action: :new), class: "btn btn-primary pull-right" %>
+  <h1><%= nominative_plural(resource_class).capitalize %></h1>
+</div>
 
-  <%= link_to "Create new #{resource_instance_name.to_s.humanize}", polymorphic_url([parent, resource_class], action: :new), class: "btn btn-primary btn-right" %>
-  <h1><%= resource_collection_name.to_s.humanize %></h1>
-  <%= render "index_top" %>
+<%= render_if_exists "index_top" %>
 
-  <%= content_tag("ol", class:"sortable_tree", :"data-rebuild_url" => rebuild_pages_url, :"data-max_levels" => 5 ) do -%>
-    <%= sortable_tree @pages, title:"name" -%>
-  <% end -%>
+<div class="panel-body">
+  <ol class="sortable_tree" data-rebuild_url="<%=rebuild_pages_url%>" data-max_levels="5">
+    <%= sortable_tree collection %>
+  </ol>
 </div>

data/brightcontent-pages.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency "brightcontent-core", version
   s.add_dependency "brightcontent-attachments", version
-  s.add_dependency "awesome_nested_set"
+  s.add_dependency "awesome_nested_set", ">= 3.0.0.rc.3"
+  s.add_dependency "jquery-ui-rails", ">= 2.3.0"
   s.add_dependency "the_sortable_tree", "~> 2.3.0"
 
   s.add_development_dependency "sqlite3"

data/config/locales/brightcontent_pages.nl.yml

@@ -0,0 +1,10 @@
+nl:
+  activerecord:
+    models:
+      brightcontent/page: Pagina
+    attributes:
+      brightcontent/page:
+        name: Naam
+        body: Inhoud
+        hidden: Verborgen
+        parent_id: Bovenliggende pagina

data/config/routes.rb

@@ -1,9 +1,2 @@
 Brightcontent::Engine.routes.draw do
-  resources :pages do
-    collection do
-      get :index
-      post :rebuild
-    end
-  end
-  root to: "pages#index"
 end

data/lib/brightcontent/pages/methods.rb

@@ -2,7 +2,7 @@ module Brightcontent
   module Pages
     module Methods
       def current_page
-        @current_page ||= Page.find_by_slug!(request.fullpath[1..-1])
+        @current_page ||= Page.find_by_path!(request.path)
       end
     end
   end

data/lib/brightcontent/pages/path_constraint.rb

@@ -0,0 +1,26 @@
+module Brightcontent
+  module Pages
+    class PathConstraint
+      CACHE_KEY = :brightcontent_page_slugs
+
+      def self.expire
+        Rails.cache.delete(CACHE_KEY)
+      end
+
+      def matches?(request)
+        slug = Page.sanitize_path(request.path)
+        cached_page_slugs.include?(slug)
+      end
+
+      private
+
+      def cached_page_slugs
+        Rails.cache.fetch(CACHE_KEY) { page_slugs }
+      end
+
+      def page_slugs
+        Page.pluck(:slug)
+      end
+    end
+  end
+end

data/lib/brightcontent/pages/routes.rb

@@ -0,0 +1,13 @@
+module ActionDispatch::Routing
+  class Mapper
+    def pages_resources(&block)
+      resources :pages do
+        collection do
+          get :index
+          post :rebuild
+        end
+        instance_eval &block if block_given?
+      end
+    end
+  end
+end

data/lib/brightcontent/pages.rb

@@ -1,16 +1,20 @@
 require "brightcontent-core"
 require "brightcontent-attachments"
 require "awesome_nested_set"
+require "jquery-ui-rails"
 require "the_sortable_tree"
 
+require "brightcontent/pages/routes"
 require "brightcontent/pages/engine"
 
 module Brightcontent
+  register_extension 'pages'
 
   mattr_accessor :page_attachment_styles
   @@page_attachment_styles = {}
 
   module Pages
     autoload :Methods, 'brightcontent/pages/methods'
+    autoload :PathConstraint, 'brightcontent/pages/path_constraint'
   end
 end

data/lib/generators/brightcontent/pages/install_generator.rb

@@ -9,6 +9,10 @@ module Brightcontent
           rake "brightcontent_pages_engine:install:migrations"
         end
 
+        def add_routes
+          inject_into_file 'config/routes.rb', "\n    pages_resources", { :after => "brightcontent_resources do" }
+        end
+
       end
     end
   end

data/script/rails

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/brightcontent/pages/engine', __FILE__)
+ENGINE_ROOT = File.expand_path('../../../core', __FILE__)
+ENGINE_PATH = File.expand_path('../../../core/lib/brightcontent/engine', __FILE__)
 
 require 'rails/all'
 require 'rails/engine/commands'

data/spec/dummy/config/application.rb

@@ -43,15 +43,11 @@ module Dummy
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = false
-
     # Enable the asset pipeline
     config.assets.enabled = true
 
+    # config.i18n.enforce_available_locales = true
+
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
   end

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

@@ -1,14 +1,12 @@
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
+  config.eager_load = false
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -22,13 +20,6 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Do not compress assets
   config.assets.compress = false
 

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

@@ -60,8 +60,4 @@ Dummy::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

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

@@ -1,5 +1,6 @@
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
+  config.eager_load = false
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
@@ -11,9 +12,6 @@ Dummy::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -29,9 +27,6 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end

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

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '1582af16879d84e4319aa02ea51964c7c27576e6468838ea1bcadf1286623d44e9117613a747386fde1bc2253a9a49c291a2c100fec64ae5c2cc5c75efa553ef'
+Dummy::Application.config.secret_key_base = '1582af16879d84e4319aa02ea51964c7c27576e6468838ea1bcadf1286623d44e9117613a747386fde1bc2253a9a49c291a2c100fec64ae5c2cc5c75efa553ef'

data/spec/dummy/config/routes.rb

@@ -1,6 +1,7 @@
 Rails.application.routes.draw do
   brightcontent_resources do
+    pages_resources
   end
   root to: "pages#index"
-  get "*path" => "pages#show"
+  get "*path" => "pages#show", constraints: Brightcontent::Pages::PathConstraint.new
 end

data/spec/dummy/db/migrate/20121206121725_create_brightcontent_admin_users.rb

@@ -7,6 +7,6 @@ class CreateBrightcontentAdminUsers < ActiveRecord::Migration
       t.timestamps
     end
 
-    Brightcontent::AdminUser.create!(:email => 'admin@example.com', :password => 'password')
+    Brightcontent::AdminUser.create!(:email => 'admin@example.com', :password => 'password', :password_confirmation => 'password')
   end
 end

data/spec/dummy/db/migrate/20140227110824_add_position_to_attachments.brightcontent_attachments_engine.rb

@@ -0,0 +1,6 @@
+# This migration comes from brightcontent_attachments_engine (originally 20140203140819)
+class AddPositionToAttachments < ActiveRecord::Migration
+  def change
+    add_column :brightcontent_attachments, :position, :integer
+  end
+end

data/spec/dummy/db/schema.rb

@@ -9,32 +9,33 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130105142936) do
+ActiveRecord::Schema.define(version: 20140227110824) do
 
-  create_table "brightcontent_admin_users", :force => true do |t|
+  create_table "brightcontent_admin_users", force: true do |t|
     t.string   "email"
     t.string   "password_digest"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+    t.datetime "created_at",      null: false
+    t.datetime "updated_at",      null: false
   end
 
-  create_table "brightcontent_attachments", :force => true do |t|
+  create_table "brightcontent_attachments", force: true do |t|
     t.integer  "attachable_id"
     t.string   "attachable_type"
     t.string   "asset_file_name"
     t.string   "asset_content_type"
     t.integer  "asset_file_size"
     t.datetime "asset_updated_at"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
+    t.datetime "created_at",         null: false
+    t.datetime "updated_at",         null: false
+    t.integer  "position"
   end
 
-  add_index "brightcontent_attachments", ["attachable_id"], :name => "index_brightcontent_attachments_on_attachable_id"
-  add_index "brightcontent_attachments", ["attachable_type"], :name => "index_brightcontent_attachments_on_attachable_type"
+  add_index "brightcontent_attachments", ["attachable_id"], name: "index_brightcontent_attachments_on_attachable_id"
+  add_index "brightcontent_attachments", ["attachable_type"], name: "index_brightcontent_attachments_on_attachable_type"
 
-  create_table "brightcontent_pages", :force => true do |t|
+  create_table "brightcontent_pages", force: true do |t|
     t.string   "name"
     t.text     "body"
     t.string   "slug"
@@ -42,11 +43,11 @@ ActiveRecord::Schema.define(:version => 20130105142936) do
     t.integer  "lft"
     t.integer  "rgt"
     t.integer  "parent_id"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.boolean  "hidden",     :default => false, :null => false
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
+    t.boolean  "hidden",     default: false, null: false
   end
 
-  add_index "brightcontent_pages", ["slug"], :name => "index_brightcontent_pages_on_slug"
+  add_index "brightcontent_pages", ["slug"], name: "index_brightcontent_pages_on_slug"
 
 end

data/spec/features/menu_spec.rb

@@ -1,16 +1,14 @@
 require 'spec_helper'
 
 feature "Menu" do
-
   scenario "Shows menu for extra resources" do
     sign_in
     menu_should_have_link "Pages"
   end
 
   def menu_should_have_link(link_name)
-    within "#menu" do
+    within ".js-menu" do
       page.should have_link link_name
     end
   end
-
 end

data/spec/features/pages_index_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 feature "Pages index" do
-
   background do
     sign_in
     create(:page, name: "Test page")
@@ -9,13 +8,13 @@ feature "Pages index" do
 
   scenario "click on edit page" do
     click_link "Pages"
-    page.find(:css, '.controls .btn-edit').click
-    page.should have_content "Edit Page"
+    page.find(:css, '.controls .btn-primary').click
+    page.should have_content "Edit page"
   end
 
   scenario "click on delete page" do
     click_link "Pages"
-    page.find(:css, '.controls .btn-delete').click
+    page.find(:css, '.controls .btn-danger').click
     page.should_not have_content "Test page"
     page.should have_content "successfully"
   end
@@ -25,5 +24,4 @@ feature "Pages index" do
     click_link "Pages"
     page.should have_css(".sortable_tree li", :count => 41)
   end
-
 end

data/spec/lib/brightcontent/pages/path_constraint_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+module Brightcontent
+  module Pages
+    describe PathConstraint do
+      describe "#expire" do
+        it 'clear the cache' do
+          expect(Rails.cache).to receive(:delete)
+          PathConstraint.expire
+        end
+      end
+
+      describe ".matches?" do
+        before do
+          PathConstraint.expire
+          allow(Page).to receive(:pluck) { ['existing'] }
+        end
+
+        it 'returns true if path is existing' do
+          request = double(:request, path: '/existing')
+          expect(subject.matches?(request)).to be_true
+        end
+        it 'returns false if path is non-existing' do
+          request = double(:request, path: '/nonexisting')
+          expect(subject.matches?(request)).to be_false
+        end
+      end
+    end
+  end
+end

data/spec/models/brightcontent/page_spec.rb

@@ -8,6 +8,27 @@ module Brightcontent
       end
     end
 
+    describe "callbacks" do
+      it 'expires path cache after commit' do
+        expect(Pages::PathConstraint).to receive(:expire)
+        create(:page)
+      end
+    end
+
+    describe "#find_by_path" do
+      it 'finds the page by path' do
+        create(:page)
+        page = create(:page, name: "About us")
+        expect(Page.find_by_path('/about-us')).to eq page
+      end
+    end
+
+    describe '#sanitize_path' do
+      it 'removes the leading slash' do
+        expect(Page.sanitize_path('/path')).to eq 'path'
+      end
+    end
+
     describe "slugs" do
       context "first page" do
         subject { create(:page, name: "Homepage") }
@@ -55,29 +76,5 @@ module Brightcontent
         it { should_not be_homepage }
       end
     end
-
-    describe "root_parent_children" do
-      it "returns the children if page is root element" do
-        root, child = build(:page), build(:page)
-        root.children << child
-        root.root_parent_children.should == [child]
-      end
-
-      it "returns the children of parent if page has parent" do
-        root, page, child = create(:page), create(:page), create(:page)
-        root.children << page
-        page.children << child
-        page.root_parent_children.should == [page]
-      end
-
-      it "returns the children of root parent if page has multiple parent" do
-        root1, root2, page = create(:page), create(:page), create(:page)
-        root1.children << root2
-        root2.children << page
-        page.root_parent_children.should == [root2]
-      end
-
-    end
-
   end
 end