storytime 1.0.7 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91d49457b192f13b7c8bcd673c56032d66391651
-  data.tar.gz: 0d86828ad2e793852463fa1ac999cb1aa0000d65
+  metadata.gz: 06f4a653cab5a07931cdc7c80d0892bd5a7daa12
+  data.tar.gz: 3fb261085ce26f70bf249ce1724a3005afa3c6f7
 SHA512:
-  metadata.gz: 2126e2e0e4b39b13e779683e21974382c9d8084791f8a4c6f0771739ab034405bada3235ab3856bd63ec96b141ad0e0e70767fc22b08ca07a0683e1267bde95a
-  data.tar.gz: 75a7c2fb54395a4e660d0a862b9dd29209bd862765108b5101c7502d4906a72e2a6faa3c0cf31884846354a265300775dab7c54a46e2c1696e70208ac3198b2a
+  metadata.gz: 3d35eeeb18f0d289a16f3a7b312d2e76f17220dfd57b0c6077cea8de1012dc9a0227cdac33c8a05a444e5d819cd5b03e70b8e79138d8e14490ca959314cfe4e0
+  data.tar.gz: 5b5621d9c72c07e3ede66912eefc1c06a629ffca917075915e153bdf0e4a7f7aee85d14c262f8670654c520aea03fec3c435544f79384e06c724c540d3eb47a7

data/app/assets/javascripts/storytime/subscriptions.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

data/app/assets/javascripts/storytime/subscriptions.js.coffee

@@ -0,0 +1,2 @@
+class Storytime.Dashboard.Subscriptions
+  

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

@@ -1,7 +1,3 @@
-/*
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-*/
 .row.page-admin {
   padding: 10px;
   &:hover {
@@ -26,4 +22,9 @@
 
 .post_field {
   margin: 15px 0px;
+}
+
+.notify_subscribers_checkbox {
+  margin-right: 30px;
+  margin-top: -3px;
 }

data/app/assets/stylesheets/storytime/sites.css.scss

@@ -1,4 +0,0 @@
-/*
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-*/

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

@@ -38,7 +38,9 @@ module Storytime
 
         if @post.save
           @post.create_autosave(post_params.slice(:draft_content)) if params[:preview] == "true"
-          
+
+          publish if post_params['published'] == "1"
+
           opts = params[:preview] == "true" ? { preview: true } : {}
 
           redirect_to edit_dashboard_post_path(@post, opts), notice: I18n.t('flash.posts.create.success')
@@ -51,9 +53,12 @@ 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?
+
+          publish if post_params['published'] == "1"
+
           redirect_to [:edit, :dashboard, @post], notice: I18n.t('flash.posts.update.success')
         else
           load_media
@@ -96,6 +101,18 @@ module Storytime
         params.require(:post).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))

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

@@ -0,0 +1,83 @@
+require_dependency "storytime/application_controller"
+
+module Storytime
+  module Dashboard
+    class SubscriptionsController < DashboardController
+      skip_before_action :authenticate_user!, only: [:unsubscribe]
+      skip_before_action :verify_storytime_user, only: [:unsubscribe]
+      
+      before_action :load_subscriptions, only: [:index]
+      before_action :set_subscription, only: [:edit, :update, :destroy]
+
+      skip_after_action :verify_authorized, only: [:unsubscribe]
+
+      respond_to :json, only: :destroy
+
+      def index
+        authorize @subscriptions
+      end
+
+      def new
+        @subscription = Storytime::Subscription.new
+        authorize @subscription
+      end
+
+      def create
+        @subscription = Storytime::Subscription.new(subscription_params)
+        authorize @subscription
+
+        if @subscription.save
+          redirect_to dashboard_subscriptions_path, notice: I18n.t('flash.subscriptions.create.success')
+        else
+          render :new
+        end
+      end
+
+      def edit
+        authorize @subscription
+      end
+
+      def update
+        authorize @subscription
+
+        if @subscription.update(subscription_params)
+          redirect_to dashboard_subscriptions_path, notice: I18n.t('flash.subscriptions.update.success')
+        else
+          render :edit
+        end
+      end
+
+      def destroy
+        authorize @subscription
+        @subscription.destroy
+        respond_with @subscription
+      end
+
+      def unsubscribe
+        @subscription = Storytime::Subscription.find_by(token: params[:t])
+
+        if @subscription.nil?
+          redirect_to main_app.storytime_path, alert: I18n.t('flash.subscriptions.unsubscribe.not_found')
+        else
+          @subscription.update_attributes(subscribed: false)
+        end
+      end
+
+    private
+
+      def subscription_params
+        subscription = @subscription || Storytime::Subscription.new
+        permitted_attrs = policy(subscription).permitted_attributes
+        params.require(:subscription).permit(*permitted_attrs)
+      end
+
+      def set_subscription
+        @subscription = Storytime::Subscription.find(params[:id])
+      end
+
+      def load_subscriptions
+        @subscriptions = Storytime::Subscription.order(created_at: :desc).page(params[:page_number]).per(10)
+      end
+    end
+  end
+end

data/app/controllers/storytime/posts_controller.rb

@@ -12,6 +12,8 @@ module Storytime
         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])
       
@@ -48,5 +50,28 @@ module Storytime
       end
     end
 
+    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
+          end
+        rescue NameError
+          Storytime::Post
+        end
+      end
   end
 end

data/app/controllers/storytime/subscriptions_controller.rb

@@ -4,19 +4,35 @@ module Storytime
   class SubscriptionsController < ApplicationController
     before_action :set_subscription, only: [:destroy]
 
-    def index
-      @subscriptions = Storytime::Subscription.all
-      render json: {subscriptions: @subscriptions}
+    def create
+      @subscription = Storytime::Subscription.new(permitted_attributes)
+    
+      if @subscription.save
+        flash[:notice] = I18n.t('flash.subscriptions.create.success')
+      else
+        flash[:error] = I18n.t('flash.subscriptions.create.fail')
+      end
+
+      redirect_to :back
     end
 
     def destroy
-      
+      if params[:t] == @subscription.token
+        flash[:notice] = I18n.t('flash.subscriptions.destroy.success') if @subscription.unsubscribe!
+      else
+        flash[:error] = I18n.t('flash.subscriptions.destroy.fail')
+      end
+
+      redirect_to Storytime.home_page_path
     end
 
     private
 
+      def permitted_attributes
+        params.require(:subscription).permit(:email, :t, :site_id)
+      end
+
       def set_subscription
-        binding.pry
         @subscription = Storytime::Subscription.find_by(email: params[:email])
       end
   end

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

@@ -24,11 +24,7 @@ module Storytime
       end
 
       def full_media_file_url(media, size = nil)
-        if media.file_url.starts_with?("http")
-          media.file_url(size)
-        else
-          storytime_root_post_url[0..-2]+media.file_url(size)
-        end
+        media.file_url(size)
       end
     end
   end

data/app/helpers/storytime/subscriptions_helper.rb

@@ -0,0 +1,16 @@
+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
+      
+      render "storytime/subscriptions/form"
+    end
+  end
+end

data/app/mailers/storytime/subscription_mailer.rb

@@ -0,0 +1,13 @@
+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}")
+    end
+  end
+end

data/app/models/storytime/action.rb

@@ -12,6 +12,7 @@ module Storytime
       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")
+      find_by(guid: "d29d76") || create(guid: "d29d76", name: "Manage Email Subscriptions")
     end
   end
 end

data/app/models/storytime/permission.rb

@@ -13,19 +13,22 @@ module Storytime
       manage_site   = Action.find_by(guid: "47342a")
       manage_users  = Action.find_by(guid: "1f7d47")
       manage_snippets = Action.find_by(guid: "5qg25i")
+      manage_subscriptions = Action.find_by(guid: "d29d76")
 
-      create(role: writer, action: publish_own)
-      create(role: editor, action: publish_own)
-      create(role: admin, action: publish_own)
+      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)
 
-      create(role: editor, action: manage_others)
-      create(role: admin, action: manage_others)
+      find_or_create_by(role: editor, action: manage_others)
+      find_or_create_by(role: admin, action: manage_others)
 
-      create(role: admin, action: manage_site)
-      create(role: admin, action: manage_users)
+      find_or_create_by(role: admin, action: manage_site)
+      find_or_create_by(role: admin, action: manage_users)
 
-      create(role: editor, action: manage_snippets)
-      create(role: admin, action: manage_snippets)
+      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)
     end
   end
 end

data/app/models/storytime/post.rb

@@ -16,7 +16,7 @@ module Storytime
 
     has_one :autosave, as: :autosavable, dependent: :destroy, class_name: "Autosave"
 
-    attr_accessor :preview, :published_at_date, :published_at_time
+    attr_accessor :preview, :published_at_date, :published_at_time, :send_subscriber_email
 
     validates_presence_of :title, :draft_content
     validates :title, length: { in: 1..Storytime.post_title_character_limit }
@@ -118,11 +118,11 @@ module Storytime
     end
 
     def slug_candidates
-      if slug.nil? then [:title] elsif slug_changed? then [:slug] end
+      if slug.blank? then [:title] elsif slug_changed? then [:slug] end
     end
 
     def should_generate_new_friendly_id?
-      self.slug = nil if slug == ""
+      slug = nil if slug == ""
       slug_changed? || (slug.nil? && published_at_changed? && published_at_change.first.nil?)
     end
 

data/app/models/storytime/site.rb

@@ -5,9 +5,20 @@ module Storytime
     enum post_slug_style: [:default, :day_and_name, :month_and_name, :post_id]
     enum root_page_content: [:posts, :page]
 
+    has_many :subscriptions, dependent: :destroy
+
     validates :root_post_id, presence: true, if: ->(site){ site.root_page_content == "page" }
     validates :title, length: { in: 1..200 }
 
+    after_create :ensure_routes_updated
+    after_update :ensure_routes_updated
+
+    def ensure_routes_updated
+      if id_changed? || root_post_id_changed? || post_slug_style_changed? || root_page_content_changed?
+        Rails.application.reload_routes!
+      end
+    end
+
     def save_with_seeds(user)
       self.class.setup_seeds
       user.update_attributes(storytime_role: Storytime::Role.find_by(name: "admin"))
@@ -23,5 +34,9 @@ module Storytime
     def root_post_options
       Storytime::Page.published
     end
+
+    def active_email_subscriptions
+      subscriptions.active
+    end
   end
 end

data/app/models/storytime/subscription.rb

@@ -0,0 +1,24 @@
+module Storytime
+  class Subscription < ActiveRecord::Base
+    belongs_to :site
+
+    scope :active, -> { where(subscribed: true) }
+
+    validates_presence_of :email
+    validates_format_of :email, with: Storytime.email_regexp
+    validates :email, uniqueness: true
+
+    before_create :generate_token
+
+    def generate_token
+      key = Rails.application.secrets.secret_key_base
+      digest = OpenSSL::Digest.new('sha1')
+
+      self.token = OpenSSL::HMAC.hexdigest(digest, key, self.email)
+    end
+
+    def unsubscribe!
+      update_attributes(subscribed: false)
+    end
+  end
+end

data/app/policies/storytime/post_policy.rb

@@ -79,7 +79,7 @@ module Storytime
     end
 
     def permitted_attributes
-      attrs = [:title, :draft_content, :draft_version_id, :excerpt, :featured_media_id, :secondary_media_id, :slug, :published_at_date, :published_at_time, {:tag_list => []}]
+      attrs = [:title, :draft_content, :draft_version_id, :excerpt, :featured_media_id, :secondary_media_id, :slug, :published_at_date, :send_subscriber_email, :published_at_time, {:tag_list => []}]
       attrs << :published if publish?
       attrs
     end

data/app/policies/storytime/subscription_policy.rb

@@ -0,0 +1,43 @@
+module Storytime
+  class SubscriptionPolicy
+    attr_reader :user, :record
+
+    def initialize(user, record)
+      @user = user
+      @post = record
+    end
+
+    def index?
+      manage?
+    end
+
+    def new?
+      manage?
+    end
+
+    def create?
+      manage?
+    end
+
+    def edit?
+      manage?
+    end
+
+    def update?
+      manage?
+    end
+
+    def destroy?
+      manage?
+    end
+
+    def manage?
+      action = Storytime::Action.find_by(guid: "d29d76")
+      user.storytime_role.allowed_actions.include?(action)
+    end
+
+    def permitted_attributes
+      [:email, :subscribed, :site_id]
+    end
+  end
+end

data/app/views/storytime/application/storytime/_header.html.erb

@@ -18,6 +18,9 @@
           <li><%= link_to "Blog", storytime.url_for(Storytime::BlogPost.type_name.pluralize) %></li>
         </ul>
         <ul class="nav navbar-nav navbar-right">
+          <li>
+            <%= link_to "#{t 'layout.subscribe_to', site_name: @site.title}", "#", data: {target: "#addSubscriptionModal", toggle: "modal"} %>
+          </li>
           <% unless user_signed_in? %>
             <li><%= link_to "Sign In", main_app.new_user_session_path %></li>
           <% end %>
@@ -25,4 +28,5 @@
       </div>
     </div>
   </div>
-</header>
+</header>
+<%= render partial: "storytime/subscriptions/modal" %>

data/app/views/storytime/dashboard/_navigation.html.erb

@@ -26,6 +26,8 @@
         <li <%= active_nav_item_class("media") %>><%= link_to "Media", storytime.url_for([:dashboard, Storytime::Media]) %></li>
       <% end %>
 
+      <li <%= active_nav_item_class("Subscriptions") %>><%= link_to "Subscriptions", dashboard_subscriptions_path %></li>
+
       <% if Pundit.policy(current_user, Storytime.user_class).index? %>
         <li <%= active_nav_item_class("users") %>><%= link_to "Users", storytime.url_for([:dashboard, :users]) %></li>
       <% end %>

data/app/views/storytime/dashboard/posts/_form.html.erb

@@ -143,6 +143,12 @@
       <%= f.submit "Publish", class: "btn btn-primary publish", publish: true unless @post.published? %>
       <%= f.submit "Update", class: "btn btn-default save" if @post.published? %>
     </div>
+
+
+    <div class="notify_subscribers_checkbox pull-right">
+      <%= f.input :send_subscriber_email, as: :boolean, label: "Notify subscribers of new post" unless @post.published? %>
+    </div>
+
   </div>
 <% end %>
 

data/app/views/storytime/dashboard/subscriptions/_subscription.html.erb

@@ -0,0 +1,10 @@
+<tr id="subscription_<%= subscription.id %>">
+  <td><%= subscription.email %></td>
+  <td><%= subscription_label(subscription) %></td>
+  <td class="right">
+    <div class="btn-group">
+      <%= link_to "Edit", edit_polymorphic_url([:dashboard, subscription]), class: "btn btn-xs btn-default" %>
+      <%= delete_resource_link subscription, polymorphic_url([:dashboard, subscription]) %>
+    </div>
+  </td>
+</tr>

data/app/views/storytime/dashboard/subscriptions/edit.html.erb

@@ -0,0 +1,10 @@
+<div class="container">
+  <h2>Edit Subscription</h2>
+
+  <%= simple_form_for [:dashboard, @subscription] do |f| %>
+    <%= f.input :site_id, as: :hidden, input_html: { value: @site.id }  %>
+    <%= f.input :email %>
+    <%= f.input :subscribed, as: :boolean %>
+    <%= f.submit class: "btn btn-info" %>
+  <% end %>
+</div>

data/app/views/storytime/dashboard/subscriptions/index.html.erb

@@ -0,0 +1,19 @@
+<div class="container">
+  <h2>
+    Subscriptions
+    <%= link_to "New Subscription", new_dashboard_subscription_path, class: "btn btn-default pull-right" %>
+  </h2>
+
+  <table class="table">
+    <thead>
+      <tr>
+        <th>Email</th>
+        <th>Subscription Status</th>
+        <th class="right">Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      <%= render partial: 'subscription', collection: @subscriptions %>
+    </tbody>
+  </table>
+</div>

data/app/views/storytime/dashboard/subscriptions/new.html.erb

@@ -0,0 +1,9 @@
+<div class="container">
+  <h2>New Subscription</h2>
+  
+  <%= simple_form_for [:dashboard, @subscription] do |f| %>
+    <%= f.input :site_id, as: :hidden, input_html: { value: @site.id } %>
+    <%= f.input :email %>
+    <%= f.submit class: "btn btn-info" %>
+  <% end %>
+</div>

data/app/views/storytime/subscription_mailer/new_post_email.html.erb

@@ -4,9 +4,10 @@
     <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
   </head>
   <body>
-    <h1>There is some new post...</h1>
+    <h4>A new post was published on <%= @site.title %></h4>
     <p>
-      Yay, that's so awesome... Check it out here?
+      We published a new post, "<%= link_to @post.title, post_url(@post) %>", on our blog.
     </p>
   </body>
+  <footer>If you no longer want to receive these emails, <%= link_to "click here", unsubscribe_mailing_list_url(email: @subscription.email, t: @subscription.token) %>.</footer>
 </html>

data/app/views/storytime/subscription_mailer/new_post_email.text.erb

@@ -0,0 +1,7 @@
+A new post was published on <%= @site.title %>
+
+We published a new post, "<%= link_to @post.title, post_url(@post) %>", on our blog.
+
+----------
+
+If you no longer want to receive these emails, go to <%= unsubscribe_mailing_list_url(email: @subscription.email, t: @subscription.token) %>.

data/app/views/storytime/subscriptions/_form.html.erb

@@ -0,0 +1,5 @@
+<%= simple_form_for Storytime::Subscription.new do |f| %>
+  <%= f.input :site_id, as: :hidden, input_html: { value: @storytime_site.id }  %>
+  <div class="storytime-subscription-input"><%= f.input :email %></div>
+  <div class="storytime-subscription-submit"><%= f.submit %></div>
+<% end %>

data/app/views/storytime/subscriptions/_modal.html.erb

@@ -0,0 +1,16 @@
+<div id="addSubscriptionModal" class='modal fade'>
+  <div class='modal-dialog'>
+    <div class='modal-content'>
+      <div class='modal-header'>
+        <a class='close' data-dismiss='modal'>&times;</a>
+        <h4><%= t 'layout.subscribe_to', site_name: @site.title %></h4>
+      </div>
+      <div class='modal-body'>
+        <p><%= t 'layout.subscribe_modal_msg', site_name: @site.title %></p>
+
+        <br>
+        <%= storytime_email_subscription_form %>
+      </div>
+    </div>
+  </div>
+</div>

data/config/locales/en.yml

@@ -27,6 +27,17 @@ en:
         success: "Text snippet successfully updated."
       destroy:
         success: "Text snippet successfully deleted."
+    subscriptions:
+      create:
+        success: "Subscription successfully created."
+        fail: "Could not create a subscription."
+      update:
+        success: "Subscription successfully updated."
+      destroy:
+        success: >
+          You have been successfully removed form this subscriber list.
+          You will no longer hear from us.
+        fail: "Could not unsubscribe email."
     users:
       create:
         success: "User successfully created."
@@ -87,6 +98,7 @@ en:
       new:
         header: "New %{resource}"
 
-
   layout:
     title: "Storytime"
+    subscribe_to: "Subscribe to %{site_name}"
+    subscribe_modal_msg: "Stay up-to-date with %{site_name} by signing up for our mailing list!"