storytime 0.0.4 → 1.0.0

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

@@ -21,6 +21,14 @@ module Storytime
 
       def edit
         authorize @post
+
+        if params[:autosave]
+          if @post.autosave
+            @post.draft_content = @post.autosave.content
+          else
+            redirect_to url_for([:edit, :dashboard, @post])
+          end
+        end
       end
 
       def create
@@ -29,7 +37,9 @@ module Storytime
         authorize @post
 
         if @post.save
-          redirect_to url_for([:edit, :dashboard, @post]), notice: I18n.t('flash.posts.create.success')
+          @post.create_autosave(post_params.slice(:draft_content)) if params[:preview] == "true"
+          opts = params[:preview] == "true" ? { preview: true } : {}
+          redirect_to url_for([:edit, :dashboard, @post, opts]), notice: I18n.t('flash.posts.create.success')
         else
           load_media
           render :new
@@ -39,7 +49,9 @@ module Storytime
       def update
         authorize @post
         @post.draft_user_id = current_user.id
+        
         if @post.update(post_params)
+          @post.autosave.destroy unless @post.autosave.nil?
           redirect_to url_for([:edit, :dashboard, @post]), notice: I18n.t('flash.posts.update.success')
         else
           load_media

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

@@ -40,7 +40,7 @@ module Storytime
 
       # Only allow a trusted parameter "white list" through.
       def site_params
-        params.require(:site).permit(:title, :post_slug_style, :ga_tracking_id, :root_page_content, :header, :footer, :root_post_id)
+        params.require(:site).permit(:title, :post_slug_style, :ga_tracking_id, :root_page_content, :root_post_id)
       end
 
       def redirect_if_site_exists

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

@@ -0,0 +1,76 @@
+require_dependency "storytime/application_controller"
+
+module Storytime
+  module Dashboard
+    class SnippetsController < DashboardController
+      before_action :set_snippet, only: [:edit, :update, :destroy]
+      before_action :load_snippets
+      before_action :load_media, only: [:new, :edit]
+      
+      respond_to :json, only: :destroy
+      respond_to :html, only: :destroy
+
+      def index
+        authorize @snippets
+      end
+
+      def new
+        @snippet = Storytime::Snippet.new
+        authorize @snippet
+      end
+
+      def edit
+        authorize @snippet
+      end
+
+      def create
+        @snippet = Storytime::Snippet.new(snippet_params)
+        authorize @snippet
+
+        if @snippet.save
+          redirect_to url_for([:edit, :dashboard, @snippet]), notice: I18n.t('flash.snippets.create.success')
+        else
+          load_media
+          render :new
+        end
+      end
+
+      def update
+        authorize @snippet
+        
+        if @snippet.update(snippet_params)
+          redirect_to url_for([:edit, :dashboard, @snippet]), notice: I18n.t('flash.snippets.update.success')
+        else
+          load_media
+          render :edit
+        end
+      end
+
+      def destroy
+        authorize @snippet
+        @snippet.destroy
+        flash[:notice] = I18n.t('flash.snippets.destroy.success') unless request.xhr?
+        
+        respond_with [:dashboard, @snippet] do |format|
+          format.html{ redirect_to url_for([:dashboard, Storytime::Snippet]) }
+        end
+      end
+
+    private
+
+      def set_snippet
+        @snippet = Storytime::Snippet.find(params[:id])
+      end
+
+      def snippet_params
+        permitted_attrs = policy(@snippet || Storytime::Snippet.new).permitted_attributes
+        params.require(:snippet).permit(*permitted_attrs)
+      end
+
+      def load_snippets
+        @snippets = Storytime::Snippet.order(created_at: :desc).page(params[:page_number]).per(10)
+      end
+
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Storytime
       respond_to :json, only: :destroy
 
       def index
-        @users = Storytime.user_class.all
+        @users = Storytime.user_class.page(params[:page]).per(20)
         authorize @users
       end
 

data/app/controllers/storytime/dashboard_controller.rb

@@ -17,6 +17,7 @@ module Storytime
   
     def load_media
       @media = Media.order("created_at DESC").page(1).per(10)
+      @large_gallery = false
     end
 
   end

data/app/controllers/storytime/pages_controller.rb

@@ -7,11 +7,16 @@ module Storytime
     def show
       @page = if request.path == "/"
         Page.published.find @site.root_post_id 
+      elsif params[:preview]
+        page = Page.find_preview(params[:id])
+        page.content = page.autosave.content
+        page.preview = true
+        page
       else
         Page.published.friendly.find(params[:id])
       end
       
-      if params[:id] != @page.slug && request.path != "/"
+      if params[:preview].nil? && ((params[:id] != @page.slug) && (request.path != "/"))
         return redirect_to @page, :status => :moved_permanently
       end
 

data/app/controllers/storytime/posts_controller.rb

@@ -5,10 +5,15 @@ module Storytime
     before_action :ensure_site, unless: ->{ params[:controller] == "storytime/dashboard/sites" }
 
     def index
-      @posts = Post.primary_feed
+      @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 = @posts.tagged_with(params[:tag]) if params[:tag]
-      @posts = @posts.published.order(created_at: :desc).page(params[:page]).per(10)
+      @posts = @posts.published.order(published_at: :desc).page(params[:page])
       
       respond_to do |format|
         format.atom
@@ -17,20 +22,28 @@ module Storytime
     end
 
     def show
-      @post = if request.path == "/"
-        Post.published.find @site.root_post_id  # page being used on root path
+      @post = if params[:preview]
+        post = Post.find_preview(params[:id])
+        post.content = post.autosave.content if post.autosave
+        post.preview = true
+        post
       else
         Post.published.friendly.find(params[:id])
       end
+
+      authorize @post
       
-      if params[:id] != @post.slug && request.path != "/"
+      if params[:preview].nil? && ((@site.post_slug_style != "post_id") && (params[:id] != @post.slug))
         return redirect_to @post, :status => :moved_permanently
       end
 
       @comments = @post.comments.order("created_at DESC")
-
       #allow overriding in the host app
-      render @post.slug if lookup_context.template_exists?("storytime/posts/#{@post.slug}")
+      if lookup_context.template_exists?("storytime/posts/#{@post.slug}")
+        render @post.slug 
+      elsif lookup_context.template_exists?("storytime/#{@post.type_name.pluralize}/show")
+        render "storytime/#{@post.type_name.pluralize}/show"
+      end
     end
 
   end

data/app/helpers/storytime/application_helper.rb

@@ -13,11 +13,13 @@ module Storytime
     end
 
     def delete_resource_link(resource, href = nil, remote = true)
+      humanized_resource_name = resource.class.to_s.split('::').last.underscore.humanize(capitalize: false)
       resource_name = resource.class.to_s.downcase.split("::").last
+
       opts = {
         id: "delete_#{resource_name}_#{resource.id}", 
         class: "btn btn-danger btn-xs btn-delete-resource delete-#{resource_name}-button", 
-        data: { confirm: I18n.t('common.are_you_sure_you_want_to_delete', resource_name: resource_name), resource_id: resource.id, resource_type: resource_name },
+        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
       }
 
@@ -36,6 +38,13 @@ module Storytime
       end
     end
 
+    def render_comments
+      if Storytime.disqus_forum_shortname.blank?
+        render "storytime/comments/comments"
+      else
+        render "storytime/comments/disqus"
+      end
+    end
 
     def method_missing method, *args, &block
       if method.to_s.end_with?('_path') or method.to_s.end_with?('_url')

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

@@ -0,0 +1,9 @@
+module Storytime
+  module Dashboard
+    module AutosavesHelper
+      def autosave_info(autosavable)
+        render 'storytime/dashboard/autosaves/autosave_info', autosavable: autosavable
+      end
+    end
+  end
+end

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

@@ -2,15 +2,32 @@ module Storytime
   module Dashboard
     module MediaHelper
       def show_media_insert_button?
+        !show_large_gallery?
+      end
+
+      def show_large_gallery?
+        return false if @large_gallery == false
+
+        referrer_action = request.referrer.nil? ? nil : request.referrer.split("/").last
         controller = params[:controller].split("/").last
-        %w{pages posts}.include?(controller) || (request.referrer && (request.referrer.include?("pages") || request.referrer.include?("posts")))
+        action = params[:action]
+
+        controller == "media" && action == "index" || controller == "media" && action == "create" && referrer_action == "media"
+      end
+
+      def gallery_type
+        if show_large_gallery?
+          "col-md-4 thumb_gallery"
+        else
+          "tiny_gallery"
+        end
       end
 
       def full_media_file_url(media, size = nil)
         if media.file_url.starts_with?("http")
           media.file_url(size)
         else
-          storytime_root_url[0..-2]+media.file_url(size)
+          storytime_root_post_url[0..-2]+media.file_url(size)
         end
       end
     end

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

@@ -3,10 +3,10 @@ module Storytime
     module SitesHelper
       def post_slug_style_options
         [
-          ["Default - e.g. /posts/123", :default], 
+          ["Default - e.g. /posts/post-title", :default],
           ["Day and Name - e.g. /1985/06/09/post-title", :day_and_name], 
           ["Month and Name - e.g. /1985/06/post-title", :month_and_name], 
-          ["Post Name - e.g. /post-title", :post_name]
+          ["Post ID - e.g. /posts/123", :post_id], 
         ]
       end
 

data/app/inputs/date_time_picker_input.rb

@@ -0,0 +1,39 @@
+class DateTimePickerInput < SimpleForm::Inputs::Base
+  def input
+    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)
+    end
+  end
+
+  def date_input_html_options
+    options = {
+      id: "#{attribute_name}_date",
+      class: 'form-control datepicker',
+      name: "#{object_name}[#{attribute_name}_date]",
+      readonly: true,
+      style: 'margin-right: 10px; width: auto; display: inline-block;'
+    }
+
+    options[:value] = @builder.object[attribute_name].strftime("%B %e, %Y") unless @builder.object[attribute_name].nil?
+    options
+  end
+
+  def time_input_html_options
+    options = {
+      id: "#{attribute_name}_time",
+      class: 'form-control timepicker',
+      name: "#{object_name}[#{attribute_name}_time]",
+      readonly: true,
+      style: 'width: auto; display: inline-block;'
+    }
+
+    if @builder.object[attribute_name].nil?
+      options[:value] = "12:00 AM"
+    else
+      options[:value] = @builder.object[attribute_name].strftime("%I:%M %p")
+    end
+
+    options
+  end
+end

data/app/models/storytime/action.rb

@@ -7,10 +7,11 @@ module Storytime
     validates :name, uniqueness: true
 
     def self.seed
-      create(guid: "d8a1b1", name: "Manage Other People's Posts/Pages")
-      create(guid: "5030ed", name: "Publish Own Posts/Pages")
-      create(guid: "47342a", name: "Manage Site Settings")
-      create(guid: "1f7d47", name: "Manage Users")
+      find_by(guid: "d8a1b1") || create(guid: "d8a1b1", name: "Manage Other People's Posts/Pages")
+      find_by(guid: "5030ed") || create(guid: "5030ed", name: "Publish Own Posts/Pages")
+      find_by(guid: "47342a") || create(guid: "47342a", name: "Manage Site Settings")
+      find_by(guid: "1f7d47") || create(guid: "1f7d47", name: "Manage Users")
+      find_by(guid: "5qg25i") || create(guid: "5qg25i", name: "Manage Text Snippets")
     end
   end
 end

data/app/models/storytime/autosave.rb

@@ -0,0 +1,14 @@
+module Storytime
+  class Autosave < ActiveRecord::Base
+    belongs_to Storytime.user_class_symbol
+    belongs_to :autosavable, polymorphic: true
+
+    attr_accessor :draft_content
+
+    before_save :update_autosave_content
+
+    def update_autosave_content
+      self.content = @draft_content
+    end
+  end
+end

data/app/models/storytime/permission.rb

@@ -12,6 +12,7 @@ module Storytime
       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")
 
       create(role: writer, action: publish_own)
       create(role: editor, action: publish_own)
@@ -22,6 +23,9 @@ module Storytime
 
       create(role: admin, action: manage_site)
       create(role: admin, action: manage_users)
+
+      create(role: editor, action: manage_snippets)
+      create(role: admin, action: manage_snippets)
     end
   end
 end

data/app/models/storytime/post.rb

@@ -1,90 +1,114 @@
 module Storytime
   class Post < ActiveRecord::Base
     include Storytime::Concerns::HasVersions
+    include ActionView::Helpers::SanitizeHelper
 
     extend FriendlyId
-    friendly_id :title, use: [:history]
+    friendly_id :slug_candidates, use: [:history]
 
     belongs_to Storytime.user_class_symbol
     belongs_to :featured_media, class_name: "Media"
+    belongs_to :secondary_media, class_name: "Media"
 
     has_many :taggings, dependent: :destroy
     has_many :tags, through: :taggings
     has_many :comments
 
-    validates_presence_of :title, :excerpt, :draft_content
-    validates :title, length: { in: 1..200 }
-    validates :excerpt, length: { in: 1..400 }
+    has_one :autosave, as: :autosavable, dependent: :destroy, class_name: "Autosave"
+
+    attr_accessor :preview, :published_at_date, :published_at_time
+
+    validates_presence_of :title, :draft_content
+    validates :title, length: { in: 1..Storytime.post_title_character_limit }
+    validates :excerpt, length: { in: 0..Storytime.post_excerpt_character_limit }
     validates :user, presence: true
     validates :type, inclusion: { in: Storytime.post_types }
 
     before_validation :populate_excerpt_from_content
+    before_save :sanitize_content
+    before_save :set_published_at
 
     scope :primary_feed, ->{ where(type: primary_feed_types) }
 
-    def self.policy_class
-      Storytime::PostPolicy
-    end
+    class << self
+      def policy_class
+        Storytime::PostPolicy
+      end
 
-    def self.primary_feed_types
-      Storytime.post_types.map{|post_type| post_type.constantize }.select do |post_type|
-        post_type.included_in_primary_feed?
+      def primary_feed_types
+        Storytime.post_types.map{|post_type| post_type.constantize }.select do |post_type|
+          post_type.included_in_primary_feed?
+        end
       end
-    end
 
-    def self.human_name
-      @human_name ||= type_name.humanize.split(" ").map(&:capitalize).join(" ")
-    end
+      def human_name
+        @human_name ||= type_name.humanize.split(" ").map(&:capitalize).join(" ")
+      end
 
-    def human_name
-      self.class.human_name
-    end
+      def find_preview(id)
+        Post.friendly.find(id)
+      end
 
-    def self.type_name
-      to_s.split("::").last.underscore
-    end
+      def type_name
+        to_s.split("::").last.underscore
+      end
 
-    def type_name
-      self.class.type_name
-    end
+      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
+
+      def included_in_primary_feed?
+        true
+      end
 
-    def self.tagged_with(name)
-      if t = Storytime::Tag.find_by(name: name)
-        joins(:taggings).where(storytime_taggings: { tag_id: t.id }) 
-      else
-        none
+      def model_name
+        ActiveModel::Name.new(self, nil, "Post")
       end
     end
 
-    def self.tag_counts
-      Tag.select("storytime_tags.*, count(storytime_taggings.tag_id) as count").joins(:taggings).group("storytime_tags.id")
+    def human_name
+      self.class.human_name
+    end
 
-      #Tagging.group("storytime_taggings.tag_id").includes(:tag)
+    def type_name
+      self.class.type_name
     end
 
     def tag_list
       tags.map(&:name).join(", ")
     end
 
-    def tag_list=(names)
-      self.taggings.destroy_all
-      self.tags = names.split(",").map do |n|
-        Tag.where(name: n.strip).first_or_create!
-      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!
+        else
+          Storytime::Tag.find(n)
+        end
+      end.delete_if { |x| x == "" }
     end
 
     def populate_excerpt_from_content
-      self.excerpt = (content || draft_content).slice(0..300) if excerpt.blank?
+      self.excerpt = (content || draft_content).slice(0..Storytime.post_excerpt_character_limit) if excerpt.blank?
+      self.excerpt = strip_tags(self.excerpt)
     end
 
     def show_comments?
       true
     end
 
-    def self.included_in_primary_feed?
-      true
-    end
-
     def included_in_primary_feed?
       self.class.included_in_primary_feed
     end
@@ -93,8 +117,29 @@ module Storytime
       user.storytime_name.blank? ? user.email : user.storytime_name
     end
 
-    def self.model_name
-      ActiveModel::Name.new(self, nil, "Post")
+    def slug_candidates
+      if slug.nil? then [:title] elsif slug_changed? then [:slug] end
+    end
+
+    def should_generate_new_friendly_id?
+      self.slug = nil if slug == ""
+      slug_changed? || (slug.nil? && published_at_changed? && published_at_change.first.nil?)
+    end
+
+    def sanitize_content
+      self.draft_content = sanitize(self.draft_content, tags: Storytime.whitelisted_post_html_tags) unless Storytime.whitelisted_post_html_tags.blank?
+    end
+
+    def set_published_at
+      if self.published_at_date || self.published_at_time
+        self.published_at = if self.published_at_time.nil?
+          DateTime.parse "#{self.published_at_date}"
+        elsif self.published_at_date.nil?
+          DateTime.parse "#{Date.today} #{self.published_at_time}"
+        else
+          DateTime.parse "#{self.published_at_date} #{self.published_at_time}"
+        end
+      end
     end
   end
 end

data/app/models/storytime/role.rb

@@ -11,9 +11,9 @@ module Storytime
     end
 
     def self.seed
-      create(name: "writer")
-      create(name: "editor")
-      create(name: "admin")
+      find_or_create_by(name: "writer")
+      find_or_create_by(name: "editor")
+      find_or_create_by(name: "admin")
     end
   end
 end

data/app/models/storytime/site.rb

@@ -1,18 +1,18 @@
 module Storytime
   class Site < ActiveRecord::Base
-    enum post_slug_style: [:default, :day_and_name, :month_and_name, :post_name]
+    enum post_slug_style: [:default, :day_and_name, :month_and_name, :post_id]
     enum root_page_content: [:posts, :page]
 
     validates :root_post_id, presence: true, if: ->(site){ site.root_page_content == "page" }
     validates :title, length: { in: 1..200 }
 
     def save_with_seeds(user)
-      setup_seeds
+      self.class.setup_seeds
       user.update_attributes(storytime_role: Storytime::Role.find_by(name: "admin"))
       save
     end
 
-    def setup_seeds
+    def self.setup_seeds
       Storytime::Role.seed
       Storytime::Action.seed
       Storytime::Permission.seed

data/app/models/storytime/snippet.rb

@@ -0,0 +1,6 @@
+module Storytime
+  class Snippet < ActiveRecord::Base
+    validates :name, length: { in: 1..255 }
+    validates :content, length: { in: 1..5000 }
+  end
+end

data/app/models/storytime/tagging.rb

@@ -2,12 +2,5 @@ module Storytime
   class Tagging < ActiveRecord::Base
     belongs_to :tag
     belongs_to :post
-
-    after_destroy :remove_unused_tags
-
-  private
-    def remove_unused_tags
-      tag.destroy if tag.taggings.count == 0
-    end
   end
 end