storytime 1.2.0 → 2.0.0

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

@@ -0,0 +1,51 @@
+module Storytime
+  module Dashboard
+    class CustomPostsController < BlogPostsController
+
+    def new
+      @post = current_post_type.new
+      @post.blog = Storytime::Blog.friendly.find(params[:blog_id])
+      @post.user = current_user
+      authorize @post
+    end
+
+    def create
+      @post = current_post_type.new(post_params)
+      @post.blog = Storytime::Blog.friendly.find(params[:blog_id])
+      @post.user = current_user
+      @post.draft_user_id = current_user.id
+
+      authorize @post
+
+      if @post.save
+        @post.create_autosave(post_params.slice(:draft_content)) if params[:preview] == "true"
+
+        send_subscriber_notifications if @post.published? && post_params[:notifications_enabled] == "1"
+
+        opts = params[:preview] == "true" ? { preview: true } : {}
+
+        redirect_to [:edit, :dashboard, @post, opts], notice: I18n.t('flash.posts.create.success')
+      else
+        load_media
+        render :new
+      end
+    end
+      
+    private
+      def current_post_type
+        @current_post_type ||= request.path.split("/")[4].classify.constantize
+      end
+      helper_method :current_post_type
+
+      def load_posts
+        @posts = policy_scope(Storytime::Post).page(params[:page_number]).per(10).where(type: current_post_type)
+        
+        @posts = if params[:published].present? && params[:published] == 'true'
+          @posts.published.order(published_at: :desc)
+        else
+          @posts.draft.order(updated_at: :desc)
+        end
+      end
+    end
+  end
+end

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

@@ -17,14 +17,16 @@ module Storytime
       end
 
       def create
-        @media = Media.new(media_params)
-        @media.user = current_user
+        @upload_media = Media.new(media_params)
+        @upload_media.user = current_user
 
-        authorize @media
-        @media.save
-        respond_with :dashboard, @media do |format|
-          format.json{ render :show }
-        end
+        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
       end
       
       def destroy

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

@@ -0,0 +1,49 @@
+module Storytime
+  module Dashboard
+    class MembershipsController < DashboardController
+      before_action :load_memberships, only: :index
+      before_action :load_membership, only: [:destroy]
+      respond_to :json
+
+      def index
+        authorize @memberships
+        respond_with @memberships
+      end
+      
+      def create
+        @membership = Membership.new(membership_params)
+        authorize @membership
+
+        respond_with @membership do |format|
+          load_memberships
+          if @membership.save
+            format.json { render :save }
+          else
+            format.json { render :save, status: :unprocessable_entity }
+          end
+        end
+      end
+
+      def destroy
+        authorize @membership
+        @membership.destroy
+        respond_with @membership
+      end
+
+    private
+
+      def membership_params
+        permitted_attrs = policy(@membership || Storytime::Membership.new).permitted_attributes
+        params.require(:membership).permit(*permitted_attrs)
+      end
+
+      def load_membership
+        @membership = Storytime::Membership.find(params[:id])
+      end
+
+      def load_memberships
+        @memberships = current_storytime_site.memberships.includes(:user).page(params[:page]).per(20)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Storytime
+  module Dashboard
+    class PagesController < PostsController
+
+      
+    private
+      def current_post_type
+        @current_post_type ||= Storytime::Page
+      end
+      helper_method :current_post_type
+
+      def load_posts
+        @posts = policy_scope(Storytime::Post).page(params[:page_number]).per(10)
+        @posts = @posts.where(type: "Storytime::Page")
+
+        @posts = if params[:published].present? && params[:published] == 'true'
+          @posts.published.order(published_at: :desc)
+        else
+          @posts.draft.order(updated_at: :desc)
+        end
+      end
+    end
+  end
+end

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

@@ -3,13 +3,16 @@ require_dependency "storytime/application_controller"
 module Storytime
   module Dashboard
     class PostsController < DashboardController
+      before_action :hide_nav, only: [:new, :create, :edit, :update]
       before_action :set_post, only: [:edit, :update, :destroy]
-      before_action :load_posts
+      before_action :load_posts, only: :index
       before_action :load_media, only: [:new, :edit]
       
       respond_to :json, only: :destroy
       respond_to :html, only: :destroy
 
+      set_tab :blog_posts
+
       def index
         authorize @posts
       end
@@ -26,7 +29,7 @@ module Storytime
           if @post.autosave
             @post.draft_content = @post.autosave.content
           else
-            redirect_to url_for([:edit, :dashboard, @post])
+            redirect_to [:edit, :dashboard, @post]
           end
         end
       end
@@ -39,11 +42,11 @@ module Storytime
         if @post.save
           @post.create_autosave(post_params.slice(:draft_content)) if params[:preview] == "true"
 
-          publish if post_params['published'] == "1"
+          send_subscriber_notifications if @post.published? && post_params[:notifications_enabled] == "1"
 
           opts = params[:preview] == "true" ? { preview: true } : {}
 
-          redirect_to edit_dashboard_post_path(@post, opts), notice: I18n.t('flash.posts.create.success')
+          redirect_to [:edit, :dashboard, @post, opts], notice: I18n.t('flash.posts.create.success')
         else
           load_media
           render :new
@@ -53,11 +56,11 @@ module Storytime
       def update
         authorize @post
         @post.draft_user_id = current_user.id
-
-        if @post.update(post_params)
+        
+        if @post.update_attributes(post_params)
           @post.autosave.destroy unless @post.autosave.nil?
 
-          publish if post_params['published'] == "1"
+          send_subscriber_notifications if @post.published? && post_params[:notifications_enabled] == "1"
 
           redirect_to [:edit, :dashboard, @post], notice: I18n.t('flash.posts.update.success')
         else
@@ -72,11 +75,24 @@ module Storytime
         flash[:notice] = I18n.t('flash.posts.destroy.success') unless request.xhr?
         
         respond_with [:dashboard, @post] do |format|
-          format.html{ redirect_to [:dashboard, Storytime::Post], type: @post.type_name }
+          format.html{ redirect_to [:dashboard, current_post_type], type: @post.type_name }
         end
       end
 
     private
+      def hide_nav
+        @hide_nav = true
+      end
+
+      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)
+        else
+          @posts = @posts.draft.order(updated_at: :desc)
+        end
+      end
 
       def set_post
         @post = Storytime::Post.friendly.find(params[:id])
@@ -98,41 +114,16 @@ module Storytime
         post = @post || current_post_type.new(user: current_user)
         permitted_attrs = policy(post).permitted_attributes
         permitted_attrs = permitted_attrs.append(storytime_post_param_additions) if respond_to?(:storytime_post_param_additions)
-        params.require(:post).permit(*permitted_attrs)
+        params.require(current_post_type.type_name.tableize.singularize.to_sym).permit(*permitted_attrs)
       end
 
-      def publish
-        unless @post.published?
-          @post.publish!
-
-          if post_params[:send_subscriber_email] == "1"
-            @site.active_email_subscriptions.each do |subscription|
-              Storytime::SubscriptionMailer.new_post_email(@post, subscription).deliver
-            end
-          end
-        end
-      end
-
-      def current_post_type
-        @current_post_type ||= begin
-          type_param = params[:type] || (params[:post] && params[:post].delete(:type))
-          matching_type = Storytime.post_types.find{|post_type| post_type.constantize.type_name == type_param }
-          matching_type.nil? ? Storytime::BlogPost : matching_type.constantize
-        end
-      end
-      helper_method :current_post_type
-
-      def load_posts
-        @posts = policy_scope(Storytime::Post).order(created_at: :desc).page(params[:page_number]).per(10)
-        
-        @posts = if current_post_type.included_in_primary_feed?
-          @posts.primary_feed
+      def send_subscriber_notifications
+        if Storytime.on_publish_with_notifications.nil?
+          Storytime::PostNotifier.send_notifications_for(@post.id) if @post.published_at <= Time.now
         else
-          @posts.where(type: current_post_type)
+          Storytime.on_publish_with_notifications.call(@post)
         end
       end
-
-      
     end
   end
 end

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

@@ -3,10 +3,24 @@ require_dependency "storytime/application_controller"
 module Storytime
   module Dashboard
     class RolesController < DashboardController
+      before_action :load_roles
+      respond_to :json
+
+      def edit_multiple
+        authorize @current_storytime_site, :update?
+        render :edit
+      end
+
       def update_multiple
-        authorize @site, :update?
+        authorize @current_storytime_site, :update?
         @roles = Storytime::Role.update(params[:roles].keys, params[:roles].values)
-        redirect_to storytime.edit_dashboard_site_path(@site), notice: I18n.t("flash.roles.update.success")
+        render :edit
+      end
+
+    private
+      def load_roles
+        @roles = Storytime::Role.all
+        @actions = Storytime::Action.all
       end
     end
   end

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

@@ -3,9 +3,13 @@ require_dependency "storytime/application_controller"
 module Storytime
   module Dashboard
     class SitesController < DashboardController
-      before_action :set_site, only: [:edit, :update]
-      before_action :redirect_if_site_exists, only: :new
-      
+      skip_before_action :ensure_site_exists, only: [:new, :create]
+      skip_around_action :scope_current_site, only: [:new, :create]
+      around_action :scope_current_site, unless: :skip_scope_current_site?
+
+      before_action :set_site, only: [:edit, :update, :destroy]
+      respond_to :json, only: [:edit, :update]
+
       def new
         @site = Site.new
         authorize @site
@@ -13,6 +17,7 @@ module Storytime
 
       def edit
         authorize @site
+        render :site
       end
 
       def create
@@ -20,7 +25,7 @@ module Storytime
         authorize @site
 
         if @site.save_with_seeds(current_user)
-          redirect_to edit_dashboard_site_url(@site), notice: I18n.t('flash.sites.create.success')
+          redirect_to storytime.dashboard_url(host: @site.custom_domain), notice: I18n.t('flash.sites.create.success')
         else
           render :new
         end
@@ -28,11 +33,24 @@ module Storytime
 
       def update
         authorize @site
-        flash[:notice] = I18n.t('flash.sites.update.success') if @site.update(site_params)
-        render :edit
+        if @site.update(site_params)
+          render :site
+        else
+          render :site, status: 422
+        end
+      end
+
+      def destroy
+        authorize @site
+        @site.destroy
+        redirect_to storytime.dashboard_url(host: Storytime::Site.first.custom_domain), notice: t('flash.sites.destroy.success')
       end
 
     private
+      def skip_scope_current_site?
+        %w[new create].include?(params[:action]) && Storytime::Site.count == 0
+      end
+
       # Use callbacks to share common setup or constraints between actions.
       def set_site
         @site = Site.find(params[:id])
@@ -40,11 +58,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, :root_post_id)
-      end
-
-      def redirect_if_site_exists
-        redirect_to edit_dashboard_site_url(Site.first) if Site.first
+        params.require(:site).permit(:title, :post_slug_style, :ga_tracking_id, :root_post_id, :custom_domain, :subscription_email_from, :layout, :disqus_forum_shortname, :discourse_name)
       end
 
     end

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

@@ -5,44 +5,49 @@ module Storytime
     class SnippetsController < DashboardController
       before_action :set_snippet, only: [:edit, :update, :destroy]
       before_action :load_snippets
-      before_action :load_media, only: [:new, :edit]
+      before_action :load_media, only: [:new, :edit, :update, :create]
       
-      respond_to :json, only: :destroy
+      respond_to :json
       respond_to :html, only: :destroy
 
       def index
         authorize @snippets
+        respond_with @snippets
       end
 
       def new
         @snippet = Storytime::Snippet.new
         authorize @snippet
+        respond_with @snippet
       end
 
       def edit
         authorize @snippet
+        respond_with @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
+        respond_with @snippet do |format|
+          if @snippet.save
+            format.json { render :index }
+          else
+            format.json { render :new, status: :unprocessable_entity }
+          end
         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
+
+        respond_with @snippet do |format|
+          if @snippet.update(snippet_params)
+            format.json { render :index }
+          else
+            format.json { render :edit, status: :unprocessable_entity }
+          end
         end
       end
 
@@ -68,7 +73,7 @@ module Storytime
       end
 
       def load_snippets
-        @snippets = Storytime::Snippet.order(created_at: :desc).page(params[:page_number]).per(10)
+        @snippets = Storytime::Snippet.order(created_at: :desc).page(params[:page_number]).per(20)
       end
 
     end

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

@@ -11,7 +11,7 @@ module Storytime
 
       skip_after_action :verify_authorized, only: [:unsubscribe]
 
-      respond_to :json, only: :destroy
+      respond_to :json, only: [:index, :new, :create, :edit, :update, :destroy]
 
       def index
         authorize @subscriptions
@@ -20,6 +20,7 @@ module Storytime
       def new
         @subscription = Storytime::Subscription.new
         authorize @subscription
+        render :form
       end
 
       def create
@@ -27,23 +28,26 @@ module Storytime
         authorize @subscription
 
         if @subscription.save
-          redirect_to dashboard_subscriptions_path, notice: I18n.t('flash.subscriptions.create.success')
+          load_subscriptions
+          render :index
         else
-          render :new
+          render :form, status: 422
         end
       end
 
       def edit
         authorize @subscription
+        render :form
       end
 
       def update
         authorize @subscription
 
         if @subscription.update(subscription_params)
-          redirect_to dashboard_subscriptions_path, notice: I18n.t('flash.subscriptions.update.success')
+          load_subscriptions
+          render :index
         else
-          render :edit
+          render :form, status: 422
         end
       end
 

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

@@ -3,53 +3,55 @@ require_dependency "storytime/application_controller"
 module Storytime
   module Dashboard
     class UsersController < DashboardController
-      before_action :load_user, only: [:edit, :update, :destroy]
+      before_action :load_user, only: [:edit, :update]
 
-      respond_to :json, only: :destroy
-
-      def index
-        @users = Storytime.user_class.page(params[:page]).per(20)
-        authorize @users
-      end
+      respond_to :json
 
       def new
         @user = Storytime.user_class.new
+        @membership = @user.storytime_memberships.new
         authorize @user
+        respond_with @user
       end
 
       def create
+        membership_attrs = params[:user].delete(:storytime_memberships_attributes)["0"]
         @user = Storytime.user_class.new(user_params)
         authorize @user
 
-        if @user.save
-          redirect_to dashboard_users_path, notice: I18n.t('flash.users.create.success')
-        else
-          render :new
+        respond_to do |format|
+          if @user.save
+            @user.storytime_memberships.create(storytime_role_id: membership_attrs[:storytime_role_id])
+            @memberships = current_storytime_site.memberships.includes(:user).page(params[:page]).per(20)
+            format.json { render "storytime/dashboard/memberships/index" }
+          else
+            @membership = @user.storytime_memberships.new
+            format.json { render :new, status: :unprocessable_entity }
+          end
         end
       end
 
       def edit
         authorize @user
+        respond_with @user
       end
 
       def update
         authorize @user
-        if @user.update(user_params)
-          redirect_to dashboard_users_path, notice: I18n.t('flash.users.update.success')
-        else
-          render :edit
-        end
-      end
 
-      def destroy
-        authorize @user
-        @user.destroy
-        respond_with @user
+        respond_with @user do |format|
+          if @user.update(user_params)
+            load_user
+            format.json { render :index }
+          else
+            format.json { render :edit, status: :unprocessable_entity }
+          end
+        end
       end
 
     private
       def user_params
-        params.require(Storytime.user_class_symbol).permit(:email, :storytime_role_id, :storytime_name, :password, :password_confirmation)
+        params.require(Storytime.user_class_symbol).permit(:email, :storytime_name, :password, :password_confirmation, memberships_attributes: [:id, :storytime_role_id, :_destroy])
       end
 
       def load_user

data/app/controllers/storytime/dashboard_controller.rb

@@ -4,15 +4,14 @@ module Storytime
   class DashboardController < ApplicationController
     before_action :authenticate_user!
     before_action :verify_storytime_user, unless: ->{ Storytime::Site.count == 0 }
-    before_action :ensure_site, unless: ->{ params[:controller] == "storytime/dashboard/sites" }
     layout "storytime/dashboard"
     
-    after_action :verify_authorized
+    after_action :verify_authorized, unless: :admin_controller?
 
   private
 
     def verify_storytime_user
-      raise Pundit::NotAuthorizedError if current_user.storytime_role.nil?
+      raise Pundit::NotAuthorizedError if current_user.storytime_memberships.count == 0
     end
   
     def load_media
@@ -20,5 +19,12 @@ module Storytime
       @large_gallery = false
     end
 
+    def dashboard_controller
+      true
+    end
+
+    def admin_controller?
+      false
+    end
   end
 end

data/app/controllers/storytime/homepage_controller.rb

@@ -0,0 +1,10 @@
+require_dependency "storytime/application_controller"
+
+module Storytime
+  class HomepageController < PagesController
+  private
+    def load_page
+      @page = @current_storytime_site.homepage
+    end
+  end
+end

data/app/controllers/storytime/pages_controller.rb

@@ -2,26 +2,43 @@ require_dependency "storytime/application_controller"
 
 module Storytime
   class PagesController < ApplicationController
-    before_action :ensure_site, unless: ->{ params[:controller] == "storytime/dashboard/sites" }
+    before_action :load_page
 
     def show
-      @page = if request.path == "/"
-        Page.published.find @site.root_post_id 
-      elsif params[:preview]
-        page = Page.find_preview(params[:id])
+      if params[:preview].nil? && @page && ((params[:id] != @page.slug) && (request.path != "/"))
+        return redirect_to @page, :status => :moved_permanently
+      end
+
+      #allow overriding in the host app
+      slug = @page.nil? ? ActionController::Base.helpers.sanitize(params[:id]) : @page.slug
+      
+      potential_templates = [
+        "storytime/#{@current_storytime_site.custom_view_path}/pages/#{slug}",
+        "storytime/#{@current_storytime_site.custom_view_path}/pages/show",
+        "storytime/pages/#{slug}",
+        "storytime/pages/show",
+      ].each do |template|
+        if lookup_context.template_exists?(template)
+          render template 
+          return
+        end
+      end
+    end
+
+  private
+
+    def load_page
+      @page = if params[:preview]
+        page = Post.find_preview(params[:id])
         page.content = page.autosave.content
         page.preview = true
         page
+      elsif Post.friendly.exists? params[:id]
+        Post.published.friendly.find(params[:id])
       else
-        Page.published.friendly.find(params[:id])
+        nil
       end
-      
-      if params[:preview].nil? && ((params[:id] != @page.slug) && (request.path != "/"))
-        return redirect_to @page, :status => :moved_permanently
-      end
-
-      #allow overriding in the host app
-      render @page.slug if lookup_context.template_exists?("storytime/pages/#{@page.slug}")
+      redirect_to "/", status: :moved_permanently if @page == current_storytime_site(request).homepage
     end
   end
 end