storytime 1.2.0 → 2.0.0

data/lib/storytime/engine.rb

@@ -1,45 +1,74 @@
-require 'pundit'
+require 'active_record'
 require 'bootstrap-sass'
+require 'carrierwave'
+require 'fog/aws/storage'
+require 'font-awesome-sass'
+require 'friendly_id'
+require 'jbuilder'
 require 'jquery-rails'
 require 'jquery-ui-rails'
-require 'jbuilder'
 require 'kaminari'
-require 'simple_form'
-require 'friendly_id'
-require 'fog/aws/storage'
-require 'carrierwave'
+require 'leather'
 require 'nokogiri'
-require 'font-awesome-sass'
+require 'pundit'
+require 'simple_form'
+require 'codemirror-rails'
+require 'storytime_admin'
 
 require 'storytime/concerns/has_versions'
 require 'storytime/concerns/storytime_user'
 require 'storytime/concerns/controller_content_for'
+require 'storytime/concerns/current_site'
+require 'storytime/constraints/blog_homepage_constraint'
+require 'storytime/constraints/page_homepage_constraint'
+require 'storytime/constraints/blog_constraint'
+require 'storytime/constraints/page_constraint'
 require 'storytime/controller_helpers'
-
+require 'storytime/post_url_handler'
 require 'storytime/importers/importer'
 require 'storytime/importers/wordpress'
+require 'storytime/migrators/v1'
 
 module Storytime
   class Engine < ::Rails::Engine
     isolate_namespace Storytime
 
+    initializer "storytime.view_helpers" do
+      ActiveSupport.on_load(:action_view) do
+        include Storytime::ApplicationHelper
+        include Storytime::StorytimeHelpers
+      end
+    end
+
     initializer "storytime.controller_helpers" do
       ActiveSupport.on_load(:action_controller) do
         include Storytime::ControllerHelpers
-        
+        include Storytime::Concerns::CurrentSite
+        helper_method :current_storytime_site
+
         helper Storytime::SubscriptionsHelper
       end
     end
 
-    # putting this here rather than config/initializers so that Storytime is configured before getting here
+    # Register all decorators from app/decorators/
+    initializer "storytime.decorators" do
+      config.to_prepare do
+        Dir.glob(Rails.root + "app/decorators/**/*_decorator*.rb").each do |c|
+          require_dependency(c)
+        end
+      end
+    end
+
+    # putting this here rather than config/initializers so that Storytime is configured before getting there
     initializer "storytime.configure_carrierwave" do
       CarrierWave.configure do |config|
         if Storytime.media_storage == :s3
           config.storage = :fog
           config.fog_credentials = {
             :provider               => 'AWS',
-            :aws_access_key_id      => ENV['STORYTIME_AWS_ACCESS_KEY_ID'],
-            :aws_secret_access_key  => ENV['STORYTIME_AWS_SECRET_KEY']
+            :region                 => Storytime.aws_region,
+            :aws_access_key_id      => Storytime.aws_access_key_id,
+            :aws_secret_access_key  => Storytime.aws_secret_key
           }
           config.fog_directory  = Storytime.s3_bucket
           config.fog_public     = true
@@ -47,14 +76,14 @@ module Storytime
         else
           config.storage = :file
         end
-        
+
         config.enable_processing = !Rails.env.test?
       end
     end
 
     initializer "storytime.register_default_post_types" do
       Storytime.configure do |config|
-        config.post_types += ["Storytime::BlogPost", "Storytime::Page"]
+        config.post_types += ["Storytime::BlogPost", "Storytime::Page", "Storytime::Blog"]
       end
     end
   end

data/lib/storytime/generators/initializer.rb

@@ -0,0 +1,45 @@
+require 'thor/group'
+
+module Storytime
+  module Generators
+    class Initializer < Thor::Group
+      include Thor::Actions
+      
+      argument :settings, :type => :hash
+
+      class_option :force, :type => :boolean, :default => false
+
+      source_root File.expand_path('../../../generators/templates', __FILE__)
+
+      def set_local_assigns
+        @user_class = settings[:user_class]
+        @dashboard_namespace_path = settings[:dashboard_namespace_path]
+        @post_types = settings[:post_types]
+        @post_title_character_limit = settings[:post_title_character_limit]
+        @post_excerpt_character_limit = settings[:post_excerpt_character_limit]
+        @whitelisted_html_tags = settings[:whitelisted_html_tags]
+        @email_regexp = settings[:email_regexp]
+        @search_adapter = settings[:search_adapter]
+        @enable_file_upload = settings[:enable_file_upload]
+        @aws_region = settings[:aws_region]
+        @aws_access_key_id = settings[:aws_access_key_id]
+        @aws_secret_key = settings[:aws_secret_key]
+        @s3_bucket = settings[:s3_bucket]
+        @prod_media_storage = settings[:prod_media_storage]
+        @dev_media_storage = settings[:dev_media_storage]
+
+        @enable_user_class = settings[:enable_user_class]
+        @enable_dashboard_namespace_path = settings[:enable_dashboard_namespace_path]
+        @enable_post_types = settings[:enable_post_types]
+        @enable_post_title_character_limit = settings[:enable_post_title_character_limit]
+        @enable_post_excerpt_character_limit = settings[:enable_post_excerpt_character_limit]
+        @enable_email_regexp = settings[:enable_email_regexp]
+        @enable_search_adapter = settings[:enable_search_adapter]
+      end
+
+      def copy_initializer
+        template "storytime.rb", "config/initializers/storytime.rb"
+      end
+    end
+  end
+end

data/lib/storytime/migrators/v1.rb

@@ -0,0 +1,122 @@
+module Storytime
+  module Migrators
+    module V1
+      def self.create_user_memberships
+        Storytime.user_class.find_each do |user|
+          Storytime::Site.find_each do |site|
+            if user.storytime_role_id.present?
+              Storytime::Membership.create(site_id: site.id, user_id: user.id, storytime_role_id: user.storytime_role_id)
+              # set as site creator if site.user_id is blank and role is admin
+              if site.user_id.blank? && user.storytime_role_id == Storytime::Role.find_by(name: "admin").id
+                site.update_column "user_id", user.id
+              end
+            end
+          end
+        end
+      end
+
+      def self.set_site_layout
+        Storytime::Site.find_each do |site|
+          site.update_column "layout", Storytime.layout
+        end
+      end
+
+      def self.add_site_id_to_media
+        Storytime::Media.find_each do |media|
+          if media.site_id.blank?
+            media.update_column("site_id", Storytime::Site.first.id)
+          end
+        end
+      end
+
+      def self.add_site_id_to_autosaves
+        Storytime::Autosave.find_each do |autosave|
+          if autosave.site_id.blank?
+            autosave.update_column("site_id", autosave.autosavable.site_id)
+          end
+        end
+      end
+
+      def self.add_site_id_to_comments
+        Storytime::Comment.find_each do |comment|
+          if comment.site_id.blank?
+            comment.update_column("site_id", comment.post.site_id)
+          end
+        end
+      end
+
+      def self.add_site_id_to_versions
+        Storytime::Version.find_each do |version|
+          if version.site_id.blank?
+            version.update_column("site_id", version.versionable.site_id)
+          end
+        end
+      end
+
+      def self.add_site_id_to_taggings
+        Storytime::Tagging.find_each do |tagging|
+          if tagging.site_id.blank?
+            tagging.update_column("site_id", tagging.post.site_id)
+          end
+        end
+      end
+
+      def self.add_site_id_to_posts
+        site = Storytime::Site.first
+        Storytime::Post.all.each do |post|
+          if post.site_id.blank?
+            post.update_attributes(site_id: site.id)
+          end
+        end
+      end
+
+      def self.add_site_id_to_snippets
+        site = Storytime::Site.first
+        Storytime::Snippet.all.each do |snippet|
+          if snippet.site_id.blank?
+            snippet.update_attributes(site_id: site.id)
+          end
+        end
+      end
+
+      def self.add_site_id_to_tags
+        site = Storytime::Site.first
+        Storytime::Tag.all.each do |tag|
+          if tag.site_id.blank?
+            tag.update_attributes(site_id: site.id)
+          end
+        end
+      end
+
+      def self.create_default_blog_for_sites
+        Storytime::Site.find_each do |site|
+          blog = site.blogs.new
+          blog.published_at = Time.now
+          blog.title = "Blog"
+          blog.draft_content = "Test"
+          blog.slug = "blog"
+          blog.user = Storytime.user_class.first
+          blog.save
+          if site.root_page_content == 0 
+            site.homepage = blog
+            site.save
+          end
+        end
+      end
+
+      def self.transfer_posts_to_blogs
+        Storytime::BlogPost.reset_column_information
+        
+        Storytime::Site.find_each do |site|
+          default_blog = site.blogs.first
+          
+          Storytime::BlogPost.all.find_each do |post|
+            post.blog = default_blog
+            post.save
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/storytime/post_notifier.rb

@@ -0,0 +1,19 @@
+module Storytime
+  class PostNotifier
+    def self.send_notifications_for(post_id)
+      post = Storytime::Post.find_by(id: post_id)
+
+      return if post.nil?
+
+      unless post.notifications_sent_at
+        post.update_attributes(notifications_sent_at: Time.now)
+
+        post.site.active_email_subscriptions.each do |subscription|
+          mail = Storytime::SubscriptionMailer.new_post_email(post, subscription)
+
+          Rails::VERSION::MINOR < 2 ? mail.deliver : mail.deliver_now
+        end
+      end
+    end
+  end
+end

data/lib/storytime/post_url_handler.rb

@@ -0,0 +1,47 @@
+module Storytime
+  module PostUrlHandler
+
+    def self.handle_url(options)
+      return unless options[:controller] == "storytime/posts" && options[:action] == "show"
+
+      key = [:id, :component_1, :component_2, :component_3].detect{|key| options[key].is_a?(Storytime::Post) }
+      post = options[key]
+
+      if post.is_a?(Storytime::Page)
+        options[:component_1] = nil
+        options[:id] = post
+      else
+        case post.site.post_slug_style
+        when "default"
+          options[:component_1] = "posts"
+          options[:id] = post
+        when "day_and_name" 
+          date = post.created_at.to_date
+          options[:component_1] = date.strftime("%Y") # 4 digit year
+          options[:component_2] = date.strftime("%m") # 2 digit month
+          options[:component_3] = date.strftime("%d") # 2 digit day
+          options[:id] = post
+        when "month_and_name"
+          date = post.created_at.to_date
+          options[:component_1] = date.strftime("%Y") # 4 digit year
+          options[:component_2] = date.strftime("%m") # 2 digit month
+          options[:id] = post
+        when "post_id"
+          options[:component_1] = "posts"
+          options[:id] = post.id
+        end
+      end
+    
+    end
+
+    def self.site(options)
+      if Storytime::Site.current_id.present? 
+        Storytime::Site.find(Storytime::Site.current_id)
+      elsif options[:host]
+        Storytime::Site.find_by!(custom_domain: options[:host])
+      end
+    end
+      
+
+  end
+end

data/lib/storytime/storytime_helpers.rb

@@ -0,0 +1,12 @@
+module Storytime
+  module StorytimeHelpers
+    def storytime_snippet(name)
+      snippet = Storytime::Snippet.find_by(name: name)
+      if snippet.nil?
+        ""
+      else
+        render partial: "storytime/snippets/snippet", locals: {snippet: snippet}
+      end
+    end
+  end
+end

data/lib/storytime/version.rb

@@ -1,3 +1,3 @@
 module Storytime
-  VERSION = "1.2.0"
+  VERSION = "2.0.0"
 end

data/lib/storytime.rb

@@ -1,10 +1,14 @@
-require "storytime/engine"
-require "storytime/mysql_search_adapter"
-require "storytime/mysql_fulltext_search_adapter"
-require "storytime/postgres_search_adapter"
-require "storytime/sqlite3_search_adapter"
+require 'rails'
+require 'storytime/engine'
 
 module Storytime
+  autoload :MysqlSearchAdapter,         'storytime/mysql_search_adapter'
+  autoload :MysqlFulltextSearchAdapter, 'storytime/mysql_fulltext_search_adapter'
+  autoload :PostgresSearchAdapter,      'storytime/postgres_search_adapter'
+  autoload :Sqlite3SearchAdapter,       'storytime/sqlite3_search_adapter'
+  autoload :StorytimeHelpers,           'storytime/storytime_helpers'
+  autoload :PostNotifier,               'storytime/post_notifier'
+
   # Model to use for Storytime users.
   mattr_accessor :user_class
   @@user_class = 'User'
@@ -12,21 +16,12 @@ module Storytime
   # Path of Storytime's dashboard, relative to
   # Storytime's mount point within the host app.
   mattr_accessor :dashboard_namespace_path
-  @@dashboard_namespace_path = "/storytime"
-
-  # Path of Storytime's home page, relative to
-  # Storytime's mount point within the host app.
-  mattr_accessor :home_page_path
-  @@home_page_path = "/"
+  @@dashboard_namespace_path = '/storytime'
 
   # Path used to sign users in. 
   mattr_accessor :login_path
   @@login_path = '/users/sign_in'
 
-  # Path used to log users out. 
-  mattr_accessor :logout_path
-  @@logout_path = '/users/sign_out'
-
   # Method used for Storytime user logout path.
   mattr_accessor :logout_method
   @@logout_method = :delete
@@ -35,39 +30,74 @@ module Storytime
   mattr_accessor :enable_file_upload
   @@enable_file_upload = true
 
-  # Character limit for Storytime::Post.title <= 255
+  # Character limit for Storytime::Post.title <= 100
   mattr_accessor :post_title_character_limit
-  @@post_title_character_limit = 255
+  @@post_title_character_limit = 100
 
   # Character limit for Storytime::Post.excerpt
   mattr_accessor :post_excerpt_character_limit
   @@post_excerpt_character_limit = 500
 
-  # Array of tags to allow from the Summernote WYSIWYG
-  # Editor when editing Posts and custom post types.
-  # An empty array, "", or nil setting will permit all tags.
-  mattr_accessor :whitelisted_post_html_tags
-  @@whitelisted_post_html_tags = []
+  # Hook for handling post content sanitization.
+  # Accepts either a Lambda or Proc which can be used to
+  # handle how post content is sanitized (i.e. which tags,
+  # HTML attributes to allow/disallow.
+  mattr_accessor :post_sanitizer
+  @@post_sanitizer = Proc.new do |draft_content|
+    white_list_sanitizer = if Rails::VERSION::MINOR <= 1
+      HTML::WhiteListSanitizer.new
+    else
+      Rails::Html::WhiteListSanitizer.new
+    end
+
+    attributes = %w(
+      id class href style src title width height alt value 
+      target rel align disabled
+    )
+
+    white_list_sanitizer.sanitize(draft_content, attributes: attributes)
+  end
 
   # Enable Disqus comments using your forum's shortname,
   # the unique identifier for your website as registered on Disqus.
   mattr_accessor :disqus_forum_shortname
   @@disqus_forum_shortname = ""
 
+  # Enable Discourse comments using your discourse server,
+  # Your discourse server must be configured for embedded comments.
+  # NOTE:  include the '/' suffix at the end of the url
+  # e.g. config.discourse_name = "http://forum.example.com"
+  mattr_accessor :discourse_name
+  @@discourse_name = ""
+
   # Email regex used to validate email format validity for subscriptions.
   mattr_accessor :email_regexp
   @@email_regexp = /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
 
-  # Email address of the sender of subscription emails.
-  mattr_accessor :subscription_email_from
-  @@subscription_email_from = "no-reply@example.com"
+  # Hook for handling notification delivery when publishing content.
+  # Accepts either a Lambda or Proc which can be setup to schedule
+  # a ActiveJob (Rails 4.2+).
+  mattr_accessor :on_publish_with_notifications
+  @@on_publish_with_notifications = nil
 
   # Search adapter to use for searching through Storytime Posts or
   # Post subclasses. Options for the search adapter include:
   # Storytime::PostgresSearchAdapter, Storytime::MysqlSearchAdapter,
   # Storytime::MysqlFulltextSearchAdapter, Storytime::Sqlite3SearchAdapter
   mattr_accessor :search_adapter
-  @@search_adapter = ''
+  @@search_adapter = nil
+
+  # AWS Region to use for file uploads.
+  mattr_accessor :aws_region
+  @@aws_region = ENV['STORYTIME_AWS_REGION']
+
+  # AWS Access Key ID to use for file uploads.
+  mattr_accessor :aws_access_key_id
+  @@aws_access_key_id = ENV['STORYTIME_AWS_ACCESS_KEY_ID']
+
+  # AWS Secret Key to use for file uploads.
+  mattr_accessor :aws_secret_key
+  @@aws_secret_key = ENV['STORYTIME_AWS_SECRET_KEY']
 
   class << self
     attr_accessor :layout, :media_storage, :s3_bucket, :post_types
@@ -93,34 +123,5 @@ module Storytime
     def user_class_symbol
       @@user_class.underscore.to_sym
     end
-
-    def snippet(name)
-      snippet = Storytime::Snippet.find_by(name: name)
-      snippet.nil? ? "" : snippet.content.html_safe
-    end
-
-    def home_page_route_options
-      site = Storytime::Site.first if ActiveRecord::Base.connection.table_exists? 'storytime_sites'
-
-      if site
-        if site.root_page_content == "page"
-          { to: "pages#show", as: :storytime_root_post }
-        else
-          { to: "posts#index", as: :storytime_root_post }
-        end
-      else
-        { to: "application#setup", as: :storytime_root }
-      end
-    end
-
-    def post_index_path_options
-      site = Storytime::Site.first if ActiveRecord::Base.connection.table_exists? 'storytime_sites'
-
-      if site && site.root_page_content == "posts"
-        { path: Storytime.home_page_path }
-      else
-        {}
-      end
-    end
   end
-end
+end

data/spec/controllers/dashboard_controller_spec.rb

@@ -18,10 +18,12 @@ describe Storytime::DashboardController do
       controller.view_paths.unshift(ActionView::FixtureResolver.new("widgets/index.html.erb" => ""))
       FactoryGirl.create(:site)
       sign_in FactoryGirl.create(:writer)
-      expect{ get :index }.to raise_error(Pundit::AuthorizationNotPerformedError)
+      get :index 
+      expect(flash[:error]).to eq("You are not authorized to perform this action.")
     end
 
     it "redirects to site setup if none exists" do
+      allow(Storytime::Site).to receive(:count).and_return(0)
       sign_in FactoryGirl.create(:writer)
       get :index
       response.should redirect_to(new_dashboard_site_path)

data/spec/dummy/app/assets/javascripts/application.js

@@ -10,4 +10,7 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require_self
+//= require jquery
+//= require jquery_ujs
 //= require_tree .

data/spec/dummy/app/controllers/application_controller.rb

@@ -3,4 +3,8 @@ class ApplicationController < ActionController::Base
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 
-end
+  def storytime_post_param_additions
+    attrs = [:video_url]
+    attrs
+  end
+end

data/spec/dummy/app/controllers/storytime_admin/widgets_controller.rb

@@ -0,0 +1,5 @@
+module StorytimeAdmin
+  class WidgetsController < StorytimeAdmin::ApplicationController
+    set_tab :admin, :widgets
+  end
+end

data/spec/dummy/app/models/user.rb

@@ -5,4 +5,8 @@ class User < ActiveRecord::Base
          :recoverable, :rememberable, :trackable, :validatable
 
   storytime_user
-end
+
+  def admin?
+    Pundit.policy(self, :admin).manage?
+  end
+end

data/spec/dummy/app/models/video_post.rb

@@ -0,0 +1,2 @@
+class VideoPost < Storytime::BlogPost
+end

data/spec/dummy/app/models/widget.rb

@@ -0,0 +1,3 @@
+class Widget < ActiveRecord::Base
+  validates_presence_of :name
+end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -7,7 +7,7 @@
   <%= csrf_meta_tags %>
 </head>
 <body>
-  
+
 <%= yield %>
 
 </body>

data/spec/dummy/app/views/storytime/dashboard/posts/_video_post_fields.html.erb

@@ -0,0 +1 @@
+<%= f.input :video_url %>

data/spec/dummy/app/views/widgets/storytime/dashboard/admin/_headers.html.erb

@@ -0,0 +1 @@
+<th>Name</th>

data/spec/dummy/app/views/widgets/storytime/dashboard/admin/_row.html.erb

@@ -0,0 +1 @@
+<td><%= item.name %></td>

data/spec/dummy/config/database.yml

@@ -5,21 +5,25 @@
 #   gem 'sqlite3'
 #
 default: &default
-  adapter: sqlite3
+  adapter: postgresql
+  encoding: unicode
+  host: localhost
   pool: 5
-  timeout: 5000
+  username: <%= ENV['USER'] %>
+  password:
+  
 
 development:
   <<: *default
-  database: db/development.sqlite3
+  database: storytime_dummy_development
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: db/test.sqlite3
+  database: storytime_dummy_test
 
 production:
   <<: *default
-  database: db/production.sqlite3
+  database: storytime_dummy_production