storytime 2.1.6 → 2.1.7

data/app/assets/stylesheets/storytime/leather/_scroll_panels.scss

@@ -0,0 +1,85 @@
+.scroll-panel {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+
+  .scroll-panel-header {
+    position: absolute;
+    top: 0;
+    width: 100%;
+    height: $scroll-panel-header-height;
+    padding: 10px 20px;
+    background: #FFF;
+    border-bottom: 1px solid #F1F1F1;
+
+    .scroll-panel-title {
+      margin-top: 0;
+      margin-bottom: 0;
+      font-size: 18px;
+      line-height: 30px;
+    }
+
+    .btn.pull-left ~ .scroll-panel-title {
+      margin-left: 15px;
+      float: left;
+    }
+    
+    @media (max-width: $screen-xs-max) {
+      .btn.pull-left.visible-xs ~ .scroll-panel-title {
+        margin-left: 15px;
+      }
+    }
+    
+    @media (max-width: $screen-sm-max) {
+      .btn.pull-left.visible-xs.visible-sm ~ .scroll-panel-title {
+        margin-left: 15px;
+      }
+    }
+    
+    @media (min-width: $screen-sm-min) {
+      .btn.pull-left.visible-xs ~ .scroll-panel-title {
+        margin-left: 0;
+      }
+    }
+    
+    @media (min-width: $screen-md-min) {
+      .btn.pull-left.visible-xs.visible-sm ~ .scroll-panel-title {
+        margin-left: 0;
+      }
+    }
+  }
+
+  .scroll-panel-body {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    padding: 20px;
+    overflow-y: auto;
+    -webkit-overflow-scrolling: touch;
+  }
+
+  .scroll-panel-header ~ .scroll-panel-body {
+    top: $scroll-panel-header-height;
+  }
+
+  .scroll-panel-header.visible-xs ~ .scroll-panel-body,
+  .scroll-panel-header.visible-sm ~ .scroll-panel-body  {
+    top: 0;
+  }
+  
+  @media (max-width: $screen-xs-max) {
+    .scroll-panel-header.visible-xs ~ .scroll-panel-body {
+      top: $scroll-panel-header-height;
+    }
+  }
+  
+  @media (max-width: $screen-sm-max) {
+    .scroll-panel-header.visible-sm ~ .scroll-panel-body {
+      top: $scroll-panel-header-height;
+    }
+  }
+}

data/app/assets/stylesheets/storytime/leather/_toggle_columns.scss

@@ -0,0 +1,23 @@
+#left {
+  width: 40%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+}
+
+#right {
+  width: 60%;
+  position: absolute;
+  top: 0;
+  left: 40%;
+  bottom: 0;
+}
+
+@media (max-width: $screen-xs-max) {
+  .full-width-xs {
+    width: 100% !important;
+    left: 0 !important;
+    right: 0 !important;
+  }
+}

data/app/assets/stylesheets/storytime/leather/_typography.scss

@@ -0,0 +1,12 @@
+.text-shadowed {
+  text-shadow: 1px 1px 2px $gray-dark;
+}
+.text-light {
+  font-weight: 200;
+}
+.text-lighter {
+  font-weight: lighter;
+}
+.blog-heading {
+  margin: 30px 0;
+}

data/app/assets/stylesheets/storytime/leather/_utilities.scss

@@ -0,0 +1,54 @@
+.abs-cover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-size: cover !important;
+}
+
+.vertical-center {
+  position: relative; 
+  top: 50%;
+  -webkit-transform: translateY(-50%);
+  -ms-transform: translateY(-50%);
+  transform: translateY(-50%);
+}
+
+.bg-white { background:#FFF; }
+.bg-gray-light { background: $gray-light; }
+.bg-gray-lighter { background: $gray-lighter; }
+.bg-gray-lightest { background: $navbar-default-bg; }
+.bg-gray-radial-light {
+  background: #eeeeee;
+  background: -moz-radial-gradient(center, ellipse cover, #eeeeee 0%, #dddddd 100%) !important;
+  background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%, #eeeeee), color-stop(100%, #dddddd)) !important;
+  background: -webkit-radial-gradient(center, ellipse cover, #eeeeee 0%, #dddddd 100%) !important;
+  background: -o-radial-gradient(center, ellipse cover, #eeeeee 0%, #dddddd 100%) !important;
+  background: -ms-radial-gradient(center, ellipse cover, #eeeeee 0%, #dddddd 100%) !important;
+  background: radial-gradient(ellipse at center, #eeeeee 0%, #dddddd 100%) !important;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=1);
+}
+.bg-gray-radial-dark {
+  background: #333333;
+  background: -moz-radial-gradient(center, ellipse cover, #3b3b3b 0%, #222222 100%) !important;
+  background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%, #3b3b3b), color-stop(100%, #222222)) !important;
+  background: -webkit-radial-gradient(center, ellipse cover, #3b3b3b 0%, #222222 100%) !important;
+  background: -o-radial-gradient(center, ellipse cover, #3b3b3b 0%, #222222 100%) !important;
+  background: -ms-radial-gradient(center, ellipse cover, #3b3b3b 0%, #222222 100%) !important;
+  background: radial-gradient(ellipse at center, #3b3b3b 0%, #222222 100%) !important;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#3b3b3b', endColorstr='#222222', GradientType=1) !important;
+}
+
+.no-margin { margin: 0; }
+.no-padding { padding: 0; }
+.no-overflow { overflow: hidden; }
+.no-radius {
+  @include border-top-radius(0);
+  @include border-bottom-radius(0);
+}
+
+.absolute { position: absolute; }
+.relative {  position: relative; }
+.block { display: block; }
+.inline-block { display: inline-block; }

data/app/assets/stylesheets/storytime/leather/_variables.scss

@@ -0,0 +1,8 @@
+$devise-bg-gradient-start:        #5D76A5 !default;
+$devise-bg-gradient-end:          #425472 !default;
+$devise-box-border-color:         #006699 !default;
+
+$navbar-fixed-width:              300px !default;
+$navbar-fixed-collapsed-width:    75px !default;
+$scroll-panel-header-height:      $navbar-height !default;
+$navbar-tranparent-link-color:    #FFFFFF !default;

data/app/assets/stylesheets/storytime/posts.scss

@@ -1,3 +1,12 @@
+.list-group-button-links .list-group-item .list-group-actions{
+  top: 15px;
+  margin-top: 0;
+}
+
+.post-row-subtext{
+  margin-top: 10px;
+}
+
 .CodeMirror {
   height: auto;
   position: absolute;
@@ -8,7 +17,6 @@
   display: none;
 }
 
-
 .contenteditable {
   cursor: text;
 }

data/app/controllers/storytime/application_controller.rb

@@ -8,7 +8,7 @@ class Storytime::ApplicationController < Storytime.application_controller_superc
   include Storytime::Concerns::CurrentSite
   helper_method :current_storytime_site
 
-  include Pundit
+  include Pundit::Authorization
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
   helper :all

data/app/controllers/storytime/dashboard/blog_posts_controller.rb

@@ -1,3 +1,5 @@
+require_dependency "storytime/dashboard/posts_controller"
+
 module Storytime
   module Dashboard
     class BlogPostsController < PostsController
@@ -34,12 +36,12 @@ module Storytime
         authorize @post
         @post.destroy
         flash[:notice] = I18n.t('flash.posts.destroy.success') unless request.xhr?
-        
+
         respond_with [:dashboard, @post] do |format|
           format.html{ redirect_to [:dashboard, @post.blog, :blog_page_post_index] }
         end
       end
-      
+
     private
       def current_post_type
         @current_post_type ||= Storytime::BlogPost
@@ -57,4 +59,4 @@ module Storytime
       end
     end
   end
-end
+end

data/app/controllers/storytime/dashboard/blogs_controller.rb

@@ -21,7 +21,7 @@ module Storytime
         @blog = @post
 
         respond_with @blog do |format|
-          if @blog.update_attributes(post_params)
+          if @blog.update(post_params)
             format.json { render :index }
           else
             format.json { render :edit, status: :unprocessable_entity }

data/app/controllers/storytime/dashboard/media_controller.rb

@@ -13,7 +13,7 @@ module Storytime
 
         @large_gallery = false if params[:large_gallery] == "false"
 
-        render partial: "gallery", content_type: Mime::HTML if request.xhr?
+        render partial: "gallery", content_type: "text/html" if request.xhr?
       end
 
       def create
@@ -22,13 +22,13 @@ module Storytime
 
         authorize @upload_media
         @upload_media.save
-        
+
         @media = Media.order("created_at DESC").page(params[:page]).per(10)
         @large_gallery = false
 
-        render partial: "gallery", content_type: Mime::HTML
+        render partial: "gallery", content_type: "text/html"
       end
-      
+
       def destroy
         @media = Media.find(params[:id])
         authorize @media

data/app/controllers/storytime/dashboard/memberships_controller.rb

@@ -62,7 +62,7 @@ module Storytime
           membership_user_params = membership_params
           membership_user_params['user_attributes']['id'] = @membership.user.id
 
-          if @membership.update_attributes(membership_user_params)
+          if @membership.update(membership_user_params)
             load_memberships
             format.json { render :index }
           else

data/app/controllers/storytime/dashboard/pages_controller.rb

@@ -4,24 +4,44 @@ module Storytime
   module Dashboard
     class PagesController < PostsController
 
-
     private
+
       def current_post_type
         @current_post_type ||= Storytime::Page
       end
       helper_method :current_post_type
 
+      def current_dir
+        params[:dir]
+      end
+
       def load_posts
-        @posts = policy_scope(Storytime::Post).page(params[:page_number]).per(10)
-        @posts = @posts.where(type: "Storytime::Page")
+        @posts = policy_scope(Storytime::Post).where(type: "Storytime::Page")
 
         @posts = if params[:published].present? && params[:published] == 'true'
-          @posts.published.order(published_at: :desc)
+          @posts.published
         elsif params[:draft].present? && params[:draft] == "true"
-          @posts.draft.order(updated_at: :desc)
+          @posts.draft
+        else
+          @posts
+        end
+
+        vals = if current_dir.blank?
+          ["%", "%/%"]
+        else
+          ["#{current_dir}/%", "#{current_dir}/%/%"]
+        end
+        
+        @directories = if current_dir.blank?
+          @posts.where("slug like ?", vals[0]).pluck(:slug).select{|slug| slug.include?("/") }.map{|slug| slug.split("/").first }.uniq
         else
-          @posts.order(published_at: :desc)
+          @posts.where("slug like ?", vals[1]).pluck(:slug).map{|slug| slug.gsub("#{current_dir}/", "").split("/") }.select{|slug| slug.length > 1 }.map{|slug| slug.first }.uniq
         end
+        
+        @posts = @posts.where("slug like ?", vals[0])
+                       .where.not("slug like ?", vals[1])
+                       .page(params[:page_number])
+                       .per(10)
       end
     end
   end

data/app/controllers/storytime/dashboard/posts_controller.rb

@@ -6,6 +6,7 @@ module Storytime
       before_action :hide_nav, only: [:new, :create, :edit, :update]
       before_action :set_post, only: [:edit, :update, :destroy]
       before_action :load_posts, only: :index
+      before_action :sort_posts, only: :index
       before_action :load_media, only: [:new, :edit]
 
       respond_to :json, only: :destroy
@@ -57,7 +58,7 @@ module Storytime
         authorize @post
         @post.draft_user_id = current_user.id
 
-        if @post.update_attributes(post_params)
+        if @post.update(post_params)
           @post.autosave.destroy unless @post.autosave.nil?
 
           send_subscriber_notifications if @post.published? && post_params[:notifications_enabled] == "1"
@@ -80,6 +81,7 @@ module Storytime
       end
 
     private
+    
       def hide_nav
         @hide_nav = true
       end
@@ -87,12 +89,35 @@ module Storytime
       def load_posts
         @blog = Blog.friendly.find(params[:blog_id])
         @posts = @blog.posts.page(params[:page_number]).per(10)
-        if params[:published].present? && params[:published] == "true"
-          @posts = @posts.published.order(created_at: :desc)
+
+        @posts = if params[:published].present? && params[:published] == "true"
+          @posts.published
         elsif params[:draft].present? && params[:draft] == "true"
-          @posts = @posts.draft.order(updated_at: :desc)
+          @posts.draft
+        else
+          @posts
+        end
+      end
+
+      def sort_posts
+        @posts = if params[:sort].present?
+          if params[:sort] == "title"
+            @posts.order(title: :asc)
+          elsif params[:sort] == "slug"
+            @posts.order(slug: :asc)
+          elsif params[:sort] == "published_at"
+            @posts.order(published_at: :desc)
+          elsif params[:sort] == "created_at"
+            @posts.order(created_at: :desc)
+          else
+            @posts.order(published_at: :desc)
+          end
+        elsif params[:published] == "true"
+          @posts.order(created_at: :desc)
+        elsif params[:draft] == "true"
+          @posts.order(updated_at: :desc)
         else
-          @posts = @posts.order(published_at: :desc)
+          @posts.order(published_at: :desc)
         end
       end
 

data/app/controllers/storytime/dashboard/subscriptions_controller.rb

@@ -63,7 +63,7 @@ module Storytime
         if @subscription.nil?
           redirect_to main_app.storytime_path, alert: I18n.t('flash.subscriptions.unsubscribe.not_found')
         else
-          @subscription.update_attributes(subscribed: false)
+          @subscription.update(subscribed: false)
         end
       end
 

data/app/controllers/storytime/pages_controller.rb

@@ -17,12 +17,18 @@ module Storytime
         "storytime/#{@current_storytime_site.custom_view_path}/pages/show",
         "storytime/pages/#{slug}",
         "storytime/pages/show",
-      ].each do |template|
+      ]
+
+      potential_templates.each do |template|
+        # The /show fallbacks dereference @page, so skip them when no page was loaded.
+        next if @page.nil? && template.end_with?("/show")
         if lookup_context.template_exists?(template)
           render template
           return
         end
       end
+
+      raise ActionController::RoutingError, "No page found for #{params[:id].inspect}"
     end
 
   private
@@ -40,5 +46,29 @@ module Storytime
       end
       redirect_to "/", status: :moved_permanently if @page == current_storytime_site(request).homepage
     end
+
+    def set_layout
+      return super if params[:id].blank?
+      
+      path_segments = params[:id].split("/")
+
+      if path_segments.length > 1
+        path_segments.pop
+
+        potential_layout_dirs = [
+          "storytime/#{@current_storytime_site.custom_view_path}/layouts",
+          "storytime/layouts",
+          "layouts",
+        ].each do |dir|
+          path_segments.map.with_index do |segment, i|
+            potential_layout = "#{dir}/#{path_segments[0..i].join("/")}"
+            return potential_layout if lookup_context.template_exists?(potential_layout)
+          end
+        end
+      end
+
+      super
+    end
+
   end
 end

data/app/controllers/storytime/posts_controller.rb

@@ -15,7 +15,7 @@ module Storytime
       
       content_for :title, "#{@current_storytime_site.title} | #{@post.title}"
 
-      @comments = @post.comments.order("created_at DESC")
+      @comments = @post.comments.order("created_at DESC") if @post.show_comments?
       #allow overriding in the host app
       if params[:preview].nil? && !view_context.current_page?(storytime.post_path(@post))
         redirect_to storytime.post_path(@post), :status => :moved_permanently

data/app/controllers/storytime/subscriptions_controller.rb

@@ -14,7 +14,11 @@ module Storytime
         flash[:error] = I18n.t('flash.subscriptions.create.fail')
       end
 
-      redirect_to :back
+      if respond_to?(:redirect_back)
+        redirect_back(fallback_location: "/")
+      else
+        redirect_to :back
+      end
     end
 
     def destroy

data/app/helpers/storytime/application_helper.rb

@@ -1,10 +1,6 @@
 module Storytime
   module ApplicationHelper
 
-    def logged_in_storytime_user?
-      user_signed_in? && current_user.respond_to?(:storytime_user?) && current_user.storytime_user?(current_storytime_site)
-    end
-
     def dashboard_nav_site_path(site)
       site.nil? || site.new_record? ? storytime.new_dashboard_site_path : storytime.edit_dashboard_site_path(site)
     end

data/app/models/concerns/storytime/post_featured_images.rb

@@ -2,7 +2,7 @@ module Storytime::PostFeaturedImages
   extend ActiveSupport::Concern
 
   included do
-    belongs_to :featured_media, class_name: "Storytime::Media"
-    belongs_to :secondary_media, class_name: "Storytime::Media"
+    belongs_to :featured_media, class_name: "Storytime::Media", optional: true
+    belongs_to :secondary_media, class_name: "Storytime::Media", optional: true
   end
 end

data/app/models/concerns/storytime/post_partial_inheritance.rb

@@ -14,9 +14,9 @@ module Storytime::PostPartialInheritance
         element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self))
         collection = ActiveSupport::Inflector.tableize(self.to_s)
         
-        if site && File.exists?(Rails.root.join('app', 'views', "storytime/#{site.custom_view_path}/#{collection.sub("storytime/", "")}/_#{element}.html.erb"))
+        if site && File.exist?(Rails.root.join('app', 'views', "storytime/#{site.custom_view_path}/#{collection.sub("storytime/", "")}/_#{element}.html.erb"))
           "storytime/#{site.custom_view_path}/#{collection.sub("storytime/", "")}/#{element}"
-        elsif File.exists?(Rails.root.join('app', 'views', collection, "_#{element}.html.erb")) ||
+        elsif File.exist?(Rails.root.join('app', 'views', collection, "_#{element}.html.erb")) ||
               self.superclass == ActiveRecord::Base
           "#{collection}/#{element}"
         else

data/app/models/storytime/autosave.rb

@@ -2,7 +2,7 @@ module Storytime
   class Autosave < ActiveRecord::Base
     include Storytime::ScopedToSite
     
-    belongs_to :user, class_name: Storytime.user_class
+    belongs_to :user, class_name: Storytime.user_class.to_s
     belongs_to :autosavable, polymorphic: true
 
     attr_accessor :draft_content

data/app/models/storytime/comment.rb

@@ -2,7 +2,7 @@ module Storytime
   class Comment < ActiveRecord::Base
     include Storytime::ScopedToSite
 
-    belongs_to :user, class_name: Storytime.user_class
+    belongs_to :user, class_name: Storytime.user_class.to_s
     belongs_to :post
     belongs_to :site
 

data/app/models/storytime/media.rb

@@ -1,7 +1,7 @@
 module Storytime
   class Media < ActiveRecord::Base
     include Storytime::ScopedToSite
-    belongs_to :user, class_name: Storytime.user_class
+    belongs_to :user, class_name: Storytime.user_class.to_s
     has_many :posts # posts where this is the featured media
     belongs_to :site
 

data/app/models/storytime/membership.rb

@@ -1,7 +1,7 @@
 module Storytime
   class Membership < ActiveRecord::Base
     include Storytime::ScopedToSite
-    belongs_to :user, class_name: Storytime.user_class
+    belongs_to :user, class_name: Storytime.user_class.to_s
     belongs_to :storytime_role, class_name: "Storytime::Role"
     belongs_to :site, class_name: "Storytime::Site"
 
@@ -16,4 +16,4 @@ module Storytime
       unscoped.where(user: user).includes(:site).where.not(site_id: nil)
     end
   end
-end
+end

data/app/models/storytime/post.rb

@@ -9,7 +9,7 @@ module Storytime
     extend FriendlyId
     friendly_id :slug_candidates, use: [:history, :scoped], scope: :site
 
-    belongs_to :user, class_name: Storytime.user_class
+    belongs_to :user, class_name: Storytime.user_class.to_s
     belongs_to :site
 
     has_one :autosave, as: :autosavable, dependent: :destroy, class_name: "Autosave"
@@ -72,7 +72,11 @@ module Storytime
     end
 
     def slug_candidates
-      if slug.blank? then [:title] elsif slug_changed? then [:slug] end
+      if slug.blank?
+        [:title]
+      elsif slug_changed? 
+        [:slug]
+      end
     end
 
     def normalize_friendly_id(value)
@@ -81,7 +85,7 @@ module Storytime
 
     def should_generate_new_friendly_id?
       current_slug = self.slug == "" ? nil : self.slug
-      slug_changed? || (current_slug.nil? && published_at_changed? && published_at_change.first.nil?)
+      slug.blank? || slug_changed? || (current_slug.nil? && published_at_changed? && published_at_change.first.nil?)
     end
 
     def sanitize_content

data/app/models/storytime/site.rb

@@ -1,21 +1,19 @@
 module Storytime
   class Site < ActiveRecord::Base
     require 'uri'
-    extend Storytime::Enum if Rails::VERSION::MINOR < 1
 
-    enum post_slug_style: [:default, :day_and_name, :month_and_name, :post_id]
-    enum root_page_content: [:posts, :page]
+    enum :post_slug_style, [:default, :day_and_name, :month_and_name, :post_id]
 
     has_many :memberships, class_name: "Storytime::Membership", dependent: :destroy
-    has_many :users, through: :memberships, class_name: Storytime.user_class
+    has_many :users, through: :memberships, class_name: Storytime.user_class.to_s
     has_many :subscriptions, dependent: :destroy
     has_many :posts, dependent: :destroy
     has_many :blog_posts, dependent: :destroy
     has_many :pages, -> { where(type: "Storytime::Page") }, dependent: :destroy
     has_many :blogs, dependent: :destroy
     has_many :navigations, dependent: :destroy
-    belongs_to :homepage, class_name: "Storytime::Post", foreign_key: "root_post_id"
-    belongs_to :creator, class_name: Storytime.user_class, foreign_key: "user_id"
+    has_one :homepage, class_name: "Storytime::Post", foreign_key: "id", primary_key: "root_post_id", required: false
+    belongs_to :creator, class_name: Storytime.user_class.to_s, foreign_key: "user_id"
 
     validates :subscription_email_from, presence: true
     validates :custom_domain, presence: true, uniqueness: true

data/app/models/storytime/snippet.rb

@@ -4,6 +4,17 @@ module Storytime
     belongs_to :site
 
     validates :name, length: { in: 1..255 }
-    validates :content, length: { in: 1..5000 }
+    validates :content, length: { in: 1..20000 }
+
+    before_save :sanitize_content
+
+    # Snippet content is rendered with `raw` in the front-end (see
+    # app/views/storytime/snippets/_snippet.html.erb), so it must be scrubbed
+    # on write with the same allow-list used for Post/Page content. Otherwise
+    # an editor could store arbitrary HTML/JS (stored XSS).
+    def sanitize_content
+      return if Storytime.post_sanitizer.blank? || content.blank?
+      self.content = Storytime.post_sanitizer.call(content)
+    end
   end
 end

data/app/models/storytime/subscription.rb

@@ -12,14 +12,14 @@ module Storytime
     before_create :generate_token
 
     def generate_token
-      key = Rails.application.secrets.secret_key_base
+      key = Rails.application.secret_key_base
       digest = OpenSSL::Digest.new('sha1')
 
       self.token = OpenSSL::HMAC.hexdigest(digest, key, self.email)
     end
 
     def unsubscribe!
-      update_attributes(subscribed: false)
+      update!(subscribed: false)
     end
   end
 end