storytime 1.2.0 → 2.0.0

data/app/controllers/storytime/posts_controller.rb

@@ -2,76 +2,45 @@ require_dependency "storytime/application_controller"
 
 module Storytime
   class PostsController < ApplicationController
-    before_action :ensure_site, unless: ->{ params[:controller] == "storytime/dashboard/sites" }
-
-    def index
-      @posts = if params[:post_type]
-        klass = Storytime.post_types.find{|post_type| post_type.constantize.type_name == params[:post_type].singularize }
-        klass.constantize.all
-      else
-        Post.primary_feed
-      end
-      
-      @posts = Storytime.search_adapter.search(params[:search], get_search_type) if (params[:search] && params[:search].length > 0)
-
-      @posts = @posts.tagged_with(params[:tag]) if params[:tag]
-      @posts = @posts.published.order(published_at: :desc).page(params[:page])
-      
-      respond_to do |format|
-        format.atom
-        format.html
-      end
-    end
-
     def show
+      params[:id] = params[:id].split("/").last
+
       @post = if params[:preview]
-        post = Post.find_preview(params[:id])
-        post.content = post.autosave.content
-        post.preview = true
-        post
+        Post.find_preview(params[:id])
       else
         Post.published.friendly.find(params[:id])
       end
 
       authorize @post
       
-      content_for :title, "#{@site.title} | #{@post.title}"
-      
-      if params[:preview].nil? && ((@site.post_slug_style != "post_id") && (params[:id] != @post.slug))
-        return redirect_to @post, :status => :moved_permanently
-      end
+      content_for :title, "#{@current_storytime_site.title} | #{@post.title}"
 
       @comments = @post.comments.order("created_at DESC")
       #allow overriding in the host app
-      if lookup_context.template_exists?("storytime/#{@post.type_name.pluralize}/#{@post.slug}")
-        render "storytime/#{@post.type_name.pluralize}/#{@post.slug}"
-      elsif lookup_context.template_exists?("storytime/#{@post.type_name.pluralize}/show")
-        render "storytime/#{@post.type_name.pluralize}/show"
+      if params[:preview].nil? && !view_context.current_page?(storytime.post_path(@post))
+        redirect_to storytime.post_path(@post), :status => :moved_permanently
+      elsif lookup_context.template_exists?("storytime/#{@current_storytime_site.custom_view_path}/#{@post.type_name.pluralize}/#{@post.slug}")
+        render "storytime/#{@current_storytime_site.custom_view_path}/#{@post.type_name.pluralize}/#{@post.slug}"
+      elsif !lookup_show_template_override.nil?
+        render lookup_show_template_override
       end
     end
 
-    private
+  private 
 
-      def get_search_type
-        if params[:type]
-          legal_search_types(params[:type])
-        else
-          Storytime::Post
-        end
-      end
-
-      def legal_search_types(type)
-        begin
-          if Object.const_defined?("Storytime::#{type.camelize}")
-            "Storytime::#{type.camelize}".constantize
-          elsif Object.const_defined?("#{type.camelize}")
-            type.camelize.constantize
-          else
-            Storytime::Post
+    def lookup_show_template_override
+      @lookup_show_template_override ||= begin
+        @post.post_ancestor_klasses.each do |klass|
+          template_path = "storytime/#{@current_storytime_site.custom_view_path}/#{klass.type_name.pluralize}/show"
+          if lookup_context.template_exists?(template_path)
+            @lookup_show_template_override = template_path
+            return template_path
           end
-        rescue NameError
-          Storytime::Post
         end
+
+        nil
       end
+    end
+
   end
 end

data/app/controllers/storytime/subscriptions_controller.rb

@@ -5,8 +5,9 @@ module Storytime
     before_action :set_subscription, only: [:destroy]
 
     def create
-      @subscription = Storytime::Subscription.new(permitted_attributes)
-    
+      @subscription = Storytime::Subscription.find_by(permitted_attributes) || Storytime::Subscription.new(permitted_attributes)
+      @subscription.subscribed = true unless @subscription.subscribed
+
       if @subscription.save
         flash[:notice] = I18n.t('flash.subscriptions.create.success')
       else
@@ -23,13 +24,13 @@ module Storytime
         flash[:error] = I18n.t('flash.subscriptions.destroy.fail')
       end
 
-      redirect_to Storytime.home_page_path
+      redirect_to "/"
     end
 
     private
 
       def permitted_attributes
-        params.require(:subscription).permit(:email, :t, :site_id)
+        params.require(:subscription).permit(:email, :t)
       end
 
       def set_subscription

data/app/helpers/storytime/application_helper.rb

@@ -1,16 +1,34 @@
 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
 
+    def dashboard_nav_class
+      if @hide_nav
+        "off-canvas-left"
+      elsif dashboard_controller
+        "off-canvas-left-sm absolute"
+      else
+        "off-canvas-left"
+      end
+    end
+
     def active_nav_item_class(controller, type = nil)
       return if ["storytime/pages", "storytime/posts"].include? params[:controller]
       
       current_controller = params[:controller].split("/").last
 
-      'class="active"'.html_safe if controller == current_controller && (type.nil? or type == params[:type])
+      'class="active"'.html_safe if controller == current_controller
+    end
+
+    def active_admin_model_class(model)
+      'active' if params[:controller] == 'storytime/dashboard/admin' && model_name == model
     end
 
     def delete_resource_link(resource, href = nil, remote = true)
@@ -19,7 +37,7 @@ module Storytime
 
       opts = {
         id: "delete_#{resource_name}_#{resource.id}", 
-        class: "btn btn-danger btn-xs btn-delete-resource delete-#{resource_name}-button", 
+        class: "btn btn-danger btn-outline btn-xs btn-delete-resource delete-#{resource_name}-button", 
         data: { confirm: I18n.t('common.are_you_sure_you_want_to_delete', resource_name: humanized_resource_name), resource_id: resource.id, resource_type: resource_name },
         method: :delete
       }
@@ -28,7 +46,7 @@ module Storytime
         opts[:remote] = true
       end
       
-      link_to content_tag(:span, "", class: "glyphicon glyphicon-trash"), href || resource, opts
+      link_to content_tag(:i, "", class: "icon-st-icons-trash"), href || resource, opts
     end
     
     def tag_cloud(tags, classes)
@@ -40,10 +58,12 @@ module Storytime
     end
 
     def render_comments
-      if Storytime.disqus_forum_shortname.blank?
-        render "storytime/comments/comments"
-      else
+      if @current_storytime_site.disqus_forum_shortname.present?
         render "storytime/comments/disqus"
+      elsif @current_storytime_site.discourse_name.present?
+        render "storytime/comments/discourse"
+      else
+        render "storytime/comments/comments"
       end
     end
 
@@ -59,7 +79,8 @@ module Storytime
       end
     end
 
-    def respond_to?(method)
+    def respond_to?(*args)
+      method = args.first
       if method.to_s.end_with?('_path') or method.to_s.end_with?('_url')
         if main_app.respond_to?(method)
           true

data/app/helpers/storytime/dashboard/sites_helper.rb

@@ -10,11 +10,8 @@ module Storytime
         ]
       end
 
-      def root_page_content_options
-        [
-          ["Blog Posts", :posts], 
-          ["Page", :page]
-        ]
+      def application_layouts
+        Dir.glob(Rails.root.join("app", "views", "layouts", "**/*")).map{|layout| layout.split("/").last.split(".")[0]}
       end
     end
   end

data/app/helpers/storytime/subscriptions_helper.rb

@@ -1,12 +1,5 @@
 module Storytime
   module SubscriptionsHelper
-    def subscription_label(subscription)
-      status_label = subscription.subscribed ? "label-info" : "label-warning" 
-      status = subscription.subscribed ? "Subscribed" : "Unsubscribed" 
-
-      "<label class='label #{status_label}'>#{status}</label>".html_safe
-    end
-
     def storytime_email_subscription_form(site=Storytime::Site.last)
       @storytime_site = site
       

data/app/inputs/date_time_picker_input.rb

@@ -1,5 +1,5 @@
 class DateTimePickerInput < SimpleForm::Inputs::Base
-  def input
+  def input(wrapper_options)
     template.content_tag(:div, class: 'form-group date time form_datetime') do
       template.concat @builder.text_field(attribute_name, date_input_html_options)
       template.concat @builder.text_field(attribute_name, time_input_html_options)

data/app/mailers/storytime/subscription_mailer.rb

@@ -1,13 +1,11 @@
 module Storytime
   class SubscriptionMailer < ActionMailer::Base
-    default from: Storytime.subscription_email_from
-
     def new_post_email(post, subscription)
       @post = post
       @subscription = subscription
       @site = subscription.site
 
-      mail(to: @subscription.email, subject: "New Post from #{@site.title}")
+      mail(to: @subscription.email, from: @site.subscription_email_from, subject: "New Post from #{@site.title}")
     end
   end
 end

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

@@ -0,0 +1,17 @@
+module Storytime::PostComments
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :comments, class_name: "Storytime::Comment", foreign_key: "post_id"
+
+    def show_comments?
+      true
+    end
+  end
+
+  module ClassMethods
+    def show_comments?
+      true
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Storytime::PostExcerpt
+  extend ActiveSupport::Concern
+
+  included do
+    validates :excerpt, length: { in: 0..Storytime.post_excerpt_character_limit }
+
+    before_validation :populate_excerpt_from_content
+
+    def populate_excerpt_from_content
+      self.excerpt = (content || draft_content).slice(0..Storytime.post_excerpt_character_limit) if excerpt.blank?
+      self.excerpt = strip_tags(self.excerpt)
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Storytime::PostFeaturedImages
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :featured_media, class_name: "Storytime::Media"
+    belongs_to :secondary_media, class_name: "Storytime::Media"
+  end
+end

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

@@ -0,0 +1,29 @@
+module Storytime::PostPartialInheritance
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+
+    # Tries to render the appropriate partial, respecting inheritance and per-site overrides
+    # Order of preference (lowest is last) looks something like:
+    # storytime/views/site-name/blog_posts/blog_post
+    # storytime/views/blog_posts/blog_post
+    # storytime/views/site-name/posts/post
+    # storytime/views/post/post
+    def _to_partial_path(site)
+      @_to_partial_path ||= begin
+        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"))
+          "storytime/#{site.custom_view_path}/#{collection.sub("storytime/", "")}/#{element}"
+        elsif File.exists?(Rails.root.join('app', 'views', collection, "_#{element}.html.erb")) ||
+              self.superclass == ActiveRecord::Base
+          "#{collection}/#{element}"
+        else
+          self.superclass._to_partial_path(site)
+        end
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,41 @@
+module Storytime::PostTags
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :taggings, dependent: :destroy, foreign_key: "post_id", class_name: "Storytime::Tagging"
+    has_many :tags, through: :taggings, class_name: "Storytime::Tag"
+
+    def tag_list
+      tags.map(&:name).join(", ")
+    end
+
+    def tag_list=(names_or_ids)
+      self.tags = names_or_ids.map do |n|
+        if n.empty? || n == "nv__"
+          ""
+        elsif n.include?("nv__") || n.to_i == 0
+          Storytime::Tag.where(name: n.sub("nv__", "").strip).first_or_create do |tag|
+            tag.site_id = self.site_id
+          end
+        else
+          Storytime::Tag.find(n)
+        end
+      end.delete_if { |x| x == "" }
+    end
+  end
+
+  module ClassMethods
+    def tagged_with(name)
+      if t = Storytime::Tag.find_by(name: name)
+        joins(:taggings).where(storytime_taggings: { tag_id: t.id }) 
+      else
+        none
+      end
+    end
+
+    def tag_counts
+      Storytime::Tag.select("storytime_tags.*, count(storytime_taggings.tag_id) as count").joins(:taggings).group("storytime_tags.id")
+      #Tagging.group("storytime_taggings.tag_id").includes(:tag)
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Storytime::ScopedToSite
+  extend ActiveSupport::Concern
+
+  included do
+    default_scope do 
+      if Storytime::Site.current_id.present? 
+        where(site_id: Storytime::Site.current_id)
+      end
+    end
+  end
+end

data/app/models/storytime/action.rb

@@ -13,6 +13,7 @@ module Storytime
       find_by(guid: "1f7d47") || create(guid: "1f7d47", name: "Manage Users")
       find_by(guid: "5qg25i") || create(guid: "5qg25i", name: "Manage Text Snippets")
       find_by(guid: "d29d76") || create(guid: "d29d76", name: "Manage Email Subscriptions")
+      find_by(guid: "3fj09k") || create(guid: "3fj09k", name: "Access Admin Section")
     end
   end
 end

data/app/models/storytime/autosave.rb

@@ -1,5 +1,7 @@
 module Storytime
   class Autosave < ActiveRecord::Base
+    include Storytime::ScopedToSite
+    
     belongs_to :user, class_name: Storytime.user_class
     belongs_to :autosavable, polymorphic: true
 
@@ -8,7 +10,11 @@ module Storytime
     before_save :update_autosave_content
 
     def update_autosave_content
-      self.content = @draft_content
+      self.content = if Storytime.post_sanitizer.blank?
+        @draft_content
+      else
+        Storytime.post_sanitizer.call(@draft_content)
+      end
     end
   end
 end

data/app/models/storytime/blog.rb

@@ -0,0 +1,16 @@
+module Storytime
+  class Blog < Page
+    has_many :posts, dependent: :destroy
+
+    def self.seed(site, user)
+      blog = site.blogs.new
+      blog.title = "Blog"
+      blog.slug = "blog"
+      blog.draft_content = "test"
+      blog.published_at = Time.now
+      blog.user = user
+      blog.save
+      blog
+    end
+  end
+end

data/app/models/storytime/blog_post.rb

@@ -1,4 +1,15 @@
 module Storytime
-  class BlogPost < Post    
+  class BlogPost < Post
+    include Storytime::PostComments
+    include Storytime::PostExcerpt
+    include Storytime::PostFeaturedImages
+    belongs_to :blog, class_name: "Storytime::Blog"
+
+    def blog_post_types
+      Storytime.post_types.map{|post_type| post_type.constantize }.select do |post_type|
+        post_type.is_a?(Storytime::BlogPost)
+      end
+    end
+
   end
 end

data/app/models/storytime/comment.rb

@@ -1,13 +1,16 @@
 module Storytime
   class Comment < ActiveRecord::Base
+    include Storytime::ScopedToSite
+
     belongs_to :user, class_name: Storytime.user_class
     belongs_to :post
+    belongs_to :site
 
     validates :user, presence: true
     validates :post_id, presence: true
 
     def commenter_name
-      user.nil? ? "" : (user.storytime_name || user.email)
+      user.nil? ? "" : user.storytime_name
     end
   end
 end

data/app/models/storytime/media.rb

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

data/app/models/storytime/membership.rb

@@ -0,0 +1,17 @@
+module Storytime
+  class Membership < ActiveRecord::Base
+    include Storytime::ScopedToSite
+    belongs_to :user, class_name: Storytime.user_class
+    belongs_to :storytime_role, class_name: "Storytime::Role"
+    belongs_to :site, class_name: "Storytime::Site"
+
+    validates :storytime_role, :user, presence: true
+    validates_uniqueness_of :user_id, scope: :site_id
+
+    delegate :storytime_name, to: :user, allow_nil: true
+
+    def self.all_for_user(user)
+      unscoped.where(user: user).includes(:site).where.not(site_id: nil)
+    end
+  end
+end

data/app/models/storytime/page.rb

@@ -3,10 +3,5 @@ module Storytime
     def show_comments?
       false
     end
-
-    def self.included_in_primary_feed?
-      false
-    end
-
   end
 end

data/app/models/storytime/permission.rb

@@ -1,5 +1,6 @@
 module Storytime
   class Permission < ActiveRecord::Base
+    include Storytime::ScopedToSite
     belongs_to :role
     belongs_to :action
 
@@ -8,27 +9,32 @@ module Storytime
       editor = Role.find_by(name: "editor")
       admin  = Role.find_by(name: "admin")
 
-      publish_own   = Action.find_by(guid: "5030ed")
-      manage_others = Action.find_by(guid: "d8a1b1")
-      manage_site   = Action.find_by(guid: "47342a")
-      manage_users  = Action.find_by(guid: "1f7d47")
-      manage_snippets = Action.find_by(guid: "5qg25i")
+      publish_own          = Action.find_by(guid: "5030ed")
+      manage_others        = Action.find_by(guid: "d8a1b1")
+      manage_site          = Action.find_by(guid: "47342a")
+      manage_users         = Action.find_by(guid: "1f7d47")
+      manage_snippets      = Action.find_by(guid: "5qg25i")
+      manage_admin_models  = Action.find_by(guid: "3fj09k")
       manage_subscriptions = Action.find_by(guid: "d29d76")
 
-      find_or_create_by(role: writer, action: publish_own)
-      find_or_create_by(role: editor, action: publish_own)
-      find_or_create_by(role: admin, action: publish_own)
-
-      find_or_create_by(role: editor, action: manage_others)
-      find_or_create_by(role: admin, action: manage_others)
-
-      find_or_create_by(role: admin, action: manage_site)
-      find_or_create_by(role: admin, action: manage_users)
-
-      find_or_create_by(role: editor, action: manage_snippets)
-      find_or_create_by(role: admin, action: manage_snippets)
-
-      find_or_create_by(role: admin, action: manage_subscriptions)
+      Storytime::Site.find_each do |site|
+        [
+          {role: writer, action: publish_own},
+          {role: editor, action: publish_own},
+          {role: admin, action: publish_own},
+          {role: editor, action: manage_others},
+          {role: admin, action: manage_others},
+          {role: admin, action: manage_site},
+          {role: admin, action: manage_users},
+          {role: editor, action: manage_snippets},
+          {role: admin, action: manage_snippets},
+          {role: admin, action: manage_subscriptions},
+          {role: admin, action: manage_admin_models}
+        ].each do |perm_attrs|
+          perm_attrs[:site_id] = site.id if ActiveRecord::Base.connection.column_exists?(:storytime_permissions, :site_id)
+          find_or_create_by(perm_attrs)
+        end
+      end
     end
   end
-end
+end