trusty-cms 3.1.8 → 3.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c8f794788bb92cd413c051dff1f51a89d5ac607
-  data.tar.gz: b2d512c2d27fe693032f0a9ab3c1316addde0718
+  metadata.gz: 18b54542b314cc9d51fb925e10da972c5c68fbbd
+  data.tar.gz: ba928a6b156faf29ffa585f9105230b579e0d7c4
 SHA512:
-  metadata.gz: c59fc9e709a7abdc0146fe7c2357a171509388ea51222be38d37b78acf1f6ea32ac1fe4f81436b5fce419f58019c11c8b4b767f12d9a0ec523d227e8e3e4a5b8
-  data.tar.gz: 38ac76f3671665956504bd5fe8b7e6fc314e1d401eb9051b63c88075b8a942dc16441287694e7a1c8495086d0d4324491ced754753f907d598ea9b97af81b5a0
+  metadata.gz: 051a933ff4cdd4f2c16f8d9775bdc391cc418c2ec90ad4530ff9854b904b4522b042632de7dd422716ba4141221fbe4a6ea112308f2d916882bb23c04080893c
+  data.tar.gz: c97576470adce60e37d1a2afd406ebbe56e38d54f8e88a76e4f3810637ce30ace0782af6f24a9771a06aa674bbb0f398897246bc8b6f75b62f01502da4ecee78

data/Gemfile

@@ -16,7 +16,7 @@ group :development, :test do
   gem 'capybara',         '~> 2.13.0'
   gem 'rspec-rails'
   gem 'launchy',          '~> 2.4.2'
-  gem 'database_cleaner', '~> 1.5.3'
+  gem 'database_cleaner'
   gem 'poltergeist',      '~> 1.14.0'
   gem 'factory_girl_rails', '~> 4.6.0'
   gem 'rails-observers', :git => 'https://github.com/rails/rails-observers'
@@ -25,6 +25,7 @@ group :development, :test do
   gem 'pry-byebug'
   gem 'simplecov'
   gem 'codeclimate-test-reporter'
+  gem 'acts_as_list'
 end
 
 gem 'nokogiri', '>= 1.7.1'

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    trusty-cms (3.1.8)
+    trusty-cms (3.1.9)
       RedCloth (~> 4.3.2)
       acts_as_tree (~> 2.6.1)
       bundler (~> 1.7)
@@ -75,6 +75,8 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+    acts_as_list (0.9.10)
+      activerecord (>= 3.0)
     acts_as_tree (2.6.1)
       activerecord (>= 3.0.0)
     addressable (2.5.2)
@@ -120,7 +122,7 @@ GEM
     crass (1.0.3)
     css_parser (1.6.0)
       addressable
-    database_cleaner (1.5.3)
+    database_cleaner (1.6.2)
     delocalize (0.4.0)
       rails (>= 3.0)
     diff-lcs (1.3)
@@ -151,7 +153,7 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    i18n (0.9.1)
+    i18n (0.9.3)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     launchy (2.4.3)
@@ -168,11 +170,11 @@ GEM
     mime-types-data (3.2016.0521)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
-    minitest (5.11.1)
+    minitest (5.11.3)
     multi_json (1.13.1)
     mysql2 (0.4.10)
     nio4r (2.2.0)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
     poltergeist (1.14.0)
@@ -189,8 +191,8 @@ GEM
     pry-rails (0.3.6)
       pry (>= 0.10.4)
     public_suffix (3.0.1)
-    puma (3.11.0)
-    rack (2.0.3)
+    puma (3.11.2)
+    rack (2.0.4)
     rack-cache (1.7.1)
       rack (>= 0.4)
     rack-test (0.8.2)
@@ -247,7 +249,7 @@ GEM
       rspec-expectations (~> 3.7.0)
       rspec-mocks (~> 3.7.0)
       rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
+    rspec-support (3.7.1)
     ruby_parser (3.10.1)
       sexp_processor (~> 4.9)
     sass (3.4.25)
@@ -296,9 +298,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  acts_as_list
   capybara (~> 2.13.0)
   codeclimate-test-reporter
-  database_cleaner (~> 1.5.3)
+  database_cleaner
   factory_girl_rails (~> 4.6.0)
   launchy (~> 2.4.2)
   mysql2 (~> 0.4.2)
@@ -314,5 +317,6 @@ DEPENDENCIES
   trusty-cms!
   trustygems (~> 0.2.0)
 
+
 BUNDLED WITH
    1.16.0

data/app/assets/stylesheets/admin/_multi_site_main.scss

@@ -0,0 +1,85 @@
+//fonts
+$font_0: Georgia;
+$font_1: Palatino;
+$font_2: Times New Roman;
+$font_3: Times;
+$font_4: serif;
+
+#content {
+  table.index {
+    tr.node {
+      td {
+        padding: .5em;
+      }
+    }
+    &.node {
+      &.site {
+        small {
+          color: #666;
+          font-size: 90%;
+          font-style: italic;
+          font-weight: normal;
+          margin-left: .5em;
+        }
+        a {
+          &:visited {
+            font-size: 115%;
+            font-weight: bold;
+            color: black;
+            text-decoration: none;
+          }
+        }
+      }
+    }
+  }
+  .form-area {
+    p {
+      &.domain {
+        float: left;
+        width: 40%;
+        margin: 1em 1em 0 0;
+        overflow: hidden;
+        label {
+          
+        }
+      }
+      &.subtitle {
+        margin: 1em 0 0 0;
+      }
+    }
+  }
+}
+
+
+#content {
+	div.form-area p.homepage {
+		float: right;
+		width: 16%;
+		margin: 1em 0 0;
+		overflow: hidden;
+	}
+	.form-area p {
+		&.domain label {
+			display: block;
+			position: relative;
+		}
+		&.homepage label {
+			display: block;
+			position: relative;
+		}
+	}
+}
+p.formnote {
+	clear: both;
+	padding: 2em 0;
+}
+
+
+//@extend-elements
+//original selectors
+//#content div.form-area p.domain .textbox, #content div.form-area p.homepage .textbox, #content div.form-area p.subtitle .textbox, #content div.form-area p.subtitle select
+%extend_1 {
+	font-family: $font_0, $font_1, $font_2, $font_3, $font_4;
+	font-size: 140%;
+	width: 100%;
+}

data/app/assets/stylesheets/admin/_site_chooser.scss

@@ -0,0 +1,76 @@
+//colors
+$color_turquoise_blue_approx: #66d9e0;
+$white: #fff;
+$black: #000;
+
+#site_chooser {
+	width: 20%;
+	border-collapse: collapse;
+	float: right;
+}
+#nav {
+	list-style: none;
+	font-weight: bold;
+	margin-bottom: 10px;
+	width: 100%;
+	padding-top: 10px;
+	padding-bottom: 10px;
+	padding-left: 5px;
+	margin: 0;
+	cursor: pointer;
+	li {
+		margin-right: 10px;
+		position: relative;
+		color: $color_turquoise_blue_approx;
+		&:hover {
+			a {
+				background: $black;
+				text-decoration: underline;
+			}
+			ul a {
+				text-decoration: none;
+			}
+		}
+	}
+	a {
+		display: block;
+		padding: 5px;
+		color: $white;
+		background: $black;
+		text-decoration: none;
+		&:hover {
+			color: $white;
+			background: $black;
+			text-decoration: underline;
+		}
+		&.site-link:hover {
+			color: $color_turquoise_blue_approx;
+			//Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10)
+			transition: all 0.2s;
+		}
+	}
+	ul {
+		background: $white;
+		background: rgba(255,255,255,0);
+		list-style: none;
+		position: absolute;
+		margin-top: 10px;
+		visibility: hidden;
+		opacity: 0;
+		//Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10)
+		transition: opacity 0.2s;
+		li {
+			float: none;
+		}
+		a {
+			white-space: nowrap; 
+		}
+	}
+	&:hover ul {
+		visibility: visible;
+		opacity: 1;
+		//Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10)
+		transition: opacity 0.2s;
+		z-index: 99999;
+	}
+}

data/app/assets/stylesheets/admin/main.scss

@@ -25,6 +25,9 @@
 @import "partials/validations";
 @import "partials/treetable";
 
+@import "multi_site_main";
+@import "site_chooser";
+
 // JQueryUI Partials
 @import "partials/jquery-ui";
 @import "partials/jquery-ui-structure";

data/app/controllers/admin/sites_controller.rb

@@ -0,0 +1,14 @@
+class Admin::SitesController < Admin::ResourceController
+  helper :sites
+  only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
+    :when => :admin,
+    :denied_url => { :controller => 'pages', :action => 'index' },
+    :denied_message => 'You must have administrative privileges to perform this action.'
+  
+  %w(move_higher move_lower move_to_top move_to_bottom).each do |action|
+    define_method action do
+      model.send(action)
+      response_for :update
+    end
+  end
+end

data/app/helpers/scoped_helper.rb

@@ -0,0 +1,19 @@
+module ScopedHelper
+  def self.included(base)
+
+    base.module_eval do
+      def title
+        t = current_site.name 
+        t = TrustyCms::Config['admin.title'] || 'Radiant CMS' if t.blank?
+        t
+      end
+
+      def subtitle
+        st = current_site.subtitle
+        st = TrustyCms::Config['admin.subtitle'] || 'publishing for small teams' if st.blank?
+        st
+      end
+
+    end
+  end
+end

data/app/helpers/sites_helper.rb

@@ -0,0 +1,10 @@
+module SitesHelper
+  def order_links(site)
+    String.new.tap do |output|
+      output << link_to(image("move_to_top.png", :alt => "Move to top"), move_to_top_admin_site_path(site), :method => :put)
+      output << link_to(image("move_higher.png", :alt => "Move up"), move_higher_admin_site_path(site), :method => :post)
+      output << link_to(image("move_lower.png", :alt => "Move down"), move_lower_admin_site_path(site), :method => :post)
+      output << link_to(image("move_to_bottom.png", :alt => "Move to bottom"), move_to_bottom_admin_site_path(site), :method => :put)
+    end
+  end
+end

data/app/models/site.rb

@@ -0,0 +1,86 @@
+# The site class includes - in find_for_host - some key retrieval and creation logic that is called from ApplicationController to set the current site context.
+# Otherwise it's just another Trusty data model.
+
+class Site < ActiveRecord::Base
+  acts_as_list
+  belongs_to :created_by, :class_name => 'User'
+  belongs_to :updated_by, :class_name => 'User'
+  belongs_to :production_homepage , :class_name => 'ProductionPage'
+
+  default_scope {order('position ASC')}
+
+  class << self
+    attr_accessor :several
+
+    # I've added one or two sql queries here for the sake of a separate default method
+
+    def find_for_host(hostname = '')
+      return default if hostname.blank?
+      sites = where("domain IS NOT NULL")
+      site = sites.find { |site| hostname == site.base_domain || hostname =~ Regexp.compile(site.domain) }
+      site || default
+    end
+
+    # Site.default returns the the first site it can find with an empty domain pattern.
+
+    def default
+      find_by_domain('') || find_by_domain(nil) || catchall
+    end
+
+    # If none is found, we are probably brand new, so a workable default site is created.
+
+    def catchall
+       create({
+        :domain => '',
+        :name => 'default_site',
+        :base_domain => 'localhost',
+        :homepage => Page.find_by_parent_id(nil)
+      })
+    end
+
+    # Returns true if more than one site is present. This is normally only used to make interface decisions, eg whether to show the site-chooser dropdown.
+
+    def several?
+      several = (count > 1) if several.nil?
+    end
+  end
+
+  belongs_to :homepage, :class_name => "Page", :foreign_key => "homepage_id"
+  validates_presence_of :name, :base_domain
+  validates_uniqueness_of :domain
+
+  after_create :create_homepage
+  after_save :reload_routes
+  
+  # Returns the fully specified web address for the supplied path, or the root of this site if no path is given.
+
+  def url(path = "/")
+    uri = URI.join("http://#{self.base_domain}", path)
+    uri.to_s
+  end
+
+  # Returns the fully specified web address for the development version of this site and the supplied path, or the root of this site if no path is given.
+
+  def dev_url(path = "/")
+    uri = URI.join("http://#{TrustyCms::Config['dev.host'] || 'dev'}.#{self.base_domain}", path)
+    uri.to_s
+  end
+
+  def create_homepage
+    if self.homepage_id.blank?
+      self.homepage = self.build_homepage(:title => "#{self.name} Homepage",
+                         :slug => "#{self.name.to_slug}", :breadcrumb => "Home")
+      default_status = TrustyCms::Config['defaults.page.status']
+      self.homepage.status = Status[default_status] if default_status
+      default_parts = TrustyCms::Config['defaults.page.parts'].to_s.strip.split(/\s*,\s*/)
+      default_parts.each do |name|
+        self.homepage.parts << PagePart.new(:name => name, :filter_id => TrustyCms::Config['defaults.page.filter'])
+      end
+      save
+    end
+  end
+
+  def reload_routes
+    TrustyCms::Application.reload_routes!
+  end
+end

data/app/models/snippet.rb

@@ -0,0 +1,23 @@
+class Snippet < ActiveRecord::Base
+
+  # Default Order
+  default_scope {order('name')}
+
+  # Associations
+  belongs_to :created_by, :class_name => 'User'
+  belongs_to :updated_by, :class_name => 'User'
+
+  # Validations
+  validates_presence_of :name
+  validates_length_of :name, :maximum => 100
+  validates_length_of :filter_id, :maximum => 25, :allow_nil => true
+  validates_format_of :name, :with => %r{\A\S*\z}
+  validates_uniqueness_of :name
+
+  object_id_attr :filter, TextFilter
+
+  def after_initialize
+    self.filter_id ||= TrustyCms::Config['defaults.snippet.filter'] if new_record?
+  end
+
+end

data/app/models/snippet_finder.rb

@@ -0,0 +1,24 @@
+class SnippetFinder
+  class << self
+    def find(id)
+      find_map('find',id)
+    end
+
+    def find_by_name(name)
+      find_map('find_by_name', name)
+    end
+
+    def finder_types
+      [Snippet]
+    end
+
+    private
+
+    def find_map(meth, *args)
+      finder_types.find{|type|
+        found = type.send(meth, *args)
+        return found if found
+      }
+    end
+  end
+end

data/app/models/snippet_tags.rb

@@ -0,0 +1,80 @@
+module SnippetTags
+  include TrustyCms::Taggable
+  
+  class TagError < StandardError; end
+  
+  desc %{
+    Renders the snippet specified in the @name@ attribute within the context of a page.
+
+    *Usage:*
+
+    <pre><code><r:snippet name="snippet_name" /></code></pre>
+
+    When used as a double tag, the part in between both tags may be used within the
+    snippet itself, being substituted in place of @<r:yield/>@.
+
+    *Usage:*
+
+    <pre><code><r:snippet name="snippet_name">Lorem ipsum dolor...</r:snippet></code></pre>
+  }
+  tag 'snippet' do |tag|
+    required_attr(tag, 'name')
+    name = tag['name']
+
+    snippet = snippet_cache(name.strip)
+    
+    if snippet
+      tag.locals.yield = tag.expand if tag.double?
+      tag.globals.page.render_snippet(snippet)
+    else
+      raise TagError.new("snippet '#{name}' not found")
+    end
+  end
+
+  def snippet_cache(name)
+    @snippet_cache ||= {}
+
+    snippet = @snippet_cache[name]
+    unless snippet
+      snippet = SnippetFinder.find_by_name(name)
+      @snippet_cache[name] = snippet
+    end
+    snippet
+  end
+  private :snippet_cache
+
+  desc %{
+    Used within a snippet as a placeholder for substitution of child content, when
+    the snippet is called as a double tag.
+
+    *Usage (within a snippet):*
+    
+    <pre><code>
+    <div id="outer">
+      <p>before</p>
+      <r:yield/>
+      <p>after</p>
+    </div>
+    </code></pre>
+
+    If the above snippet was named "yielding", you could call it from any Page,
+    Layout or Snippet as follows:
+
+    <pre><code><r:snippet name="yielding">Content within</r:snippet></code></pre>
+
+    Which would output the following:
+
+    <pre><code>
+    <div id="outer">
+      <p>before</p>
+      Content within
+      <p>after</p>
+    </div>
+    </code></pre>
+
+    When called in the context of a Page or a Layout, @<r:yield/>@ outputs nothing.
+  }
+  tag 'yield' do |tag|
+    tag.locals.yield
+  end
+end

data/app/users/_choose_site.html.haml

@@ -0,0 +1,8 @@
+- unless current_user.site
+  %tr
+    %th.label
+      %label{:for=>"user_admin"} Can edit site
+    %td.field{:style => 'text-align: left;'}
+      = select :user, :site_id, [['<any>', '']] + Site.all.map { |s| [s.name, s.id] }
+    %td.help
+      A user with no site is able to act (to whatever extent their status allows) on any site.

data/app/views/admin/layouts/_choose_site.html.haml

@@ -0,0 +1,8 @@
+- unless current_user.site
+  %p{:style => 'float: left; margin-right: 32px'}
+    %label{:for=>"layout_site_id", :Class => "admin_only"}
+      Site
+    - sites = Site.all.map { |s| [s.name, s.id] }
+    - selection = {:include_blank => Layout.is_shareable?}
+    - selection[:selected] = current_site.id if @layout.new_record? && ! Layout.is_shareable?
+    = select :layout, :site_id, sites, selection

data/app/views/admin/layouts/_site_chooser.html.haml

@@ -0,0 +1,11 @@
+= stylesheet_link_tag 'admin/multi_site'
+
+- if admin? && defined?(Site) && defined?(controller) && controller.sited_model? && controller.template_name == 'index' && Site.several?
+  %nav#site_chooser
+    %ul#nav
+      %li
+        = "Current Site: #{current_site.name}"
+        %ul.expansion
+          - Site.all.each do |site|
+            %li
+              = link_to( site.name, "#{request.path}?site_id=#{site.id}", :class => site == current_site ? 'fg site-link' : 'site-link')

data/app/views/admin/sites/_form.haml

@@ -0,0 +1,50 @@
+= render_region :form_top
+.form-area
+  - render_region :form do |form|
+
+    - form.edit_name do
+      %fieldset.title
+        %h1
+          %i.fa.fa-sitemap
+          Site Information
+        %label{:for => "site_name"} Site title
+        = f.text_field :name, :class => "textbox", :size => 50
+        %br
+        %label{:for => "site_subtitle"} and subtitle
+        = f.text_field :subtitle, :class => "textbox"
+
+    - form.edit_domain do
+      %fieldset.domain
+        %h1
+          %i.fa.fa-lightbulb-o
+          Domain Information
+        %label{:for => "site_domain"}
+          Domain pattern
+        = f.text_field :domain, :class => "textbox", :size => 50
+        %br
+        %label{:for => "site_base_domain"}
+          Base domain name
+        = f.text_field :base_domain, :class => "textbox", :size => 50
+
+    - form.edit_homepage do
+      %fieldset.homepage
+        %h1
+          %i.fa.fa-home
+          Homepage ID
+        %label{:for => "site_homepage_id"} Homepage ID
+        = f.text_field :homepage_id, :class => "textbox"
+
+  %p.formnote
+    - if f.object.new_record?
+      A new homepage will be created automatically if none is specified.
+    - else
+      If you change the site homepage ID, be sure it is to a page with no parents.
+  
+  - render_region :form_bottom do |form_bottom|
+    - form_bottom.edit_timestamp do
+      = updated_stamp @site  
+      - form_bottom.edit_buttons do
+        %p.buttons
+          = save_model_button(@site)
+          or
+          = link_to "cancel", admin_sites_path

data/app/views/admin/sites/edit.haml

@@ -0,0 +1,7 @@
+= stylesheet_link_tag 'admin/multi_site'
+- render_region :main do |main|
+  - main.edit_header do
+    %h1 Edit Site
+  - main.edit_form do
+    = form_for @site, :url => admin_site_path(@site), :html => {:method => :put} do |f|
+      = render :partial => "form", :locals => {:f => f}