storytime 1.2.0 → 2.0.0

data/config/locales/en.yml

@@ -1,8 +1,16 @@
 en:
   common:
     are_you_sure_you_want_to_delete: "Are you sure you want to delete this %{resource_name}?"
-    
+
   flash:
+    admin:
+      create:
+        success: "%{resource_name} successfully created."
+      update:
+        success: "%{resource_name} successfully updated."
+    blogs:
+      destroy:
+        success: "Blog successfully deleted."
     comments:
       create:
         success: "Comment successfully created."
@@ -20,6 +28,8 @@ en:
         success: "Site successfully created."
       update:
         success: "Site successfully updated."
+      destroy:
+        success: "Site successfully deleted."
     snippets:
       create:
         success: "Text snippet successfully created."
@@ -46,34 +56,38 @@ en:
     roles:
       update:
         success: "Permissions successfully updated."
-  
+
   simple_form:
     labels:
       site:
         post_slug_style: "Post URL Style"
-        root_page_content: "Home Page Content"
         ga_tracking_id: "Google Analytics Tracking ID"
       comment:
         content: "Comment Content"
       user:
         storytime_name: "Name"
-  
+
   footer:
     attribute: 'Powered by <a href="http://www.github.com/FlyoverWorks/storytime" target="_blank">Storytime</a>.'
-  
+
   dashboard:
+    admin:
+      unconfigured_model: "You are attempting to access an admin page for a model that has not been configured in Storytime."
     sites:
-      new: "New Storytime Site"
-      root_page_content_hint: "Select whether to show users an index of blog posts or a static page when they land on the Storytime route."
-      root_post_id_label: "Home Page"
-      root_post_id_hint: "Select a page to direct users to when they land on the Storytime route."
+      new: "Set Up Your Site"
+      root_post_id_label: "Homepage"
+      root_post_id_hint: "Select a page or blog to display at the path where Storytime is mounted. Leave blank to use a view from the host app."
+      subscription_email_from_label: "Email address to send subscription emails from"
       edit: "Site Settings"
       basic_info: "Basic Info"
       permissions: "Permissions"
-      save_permissions: "Save Permissions"
+      save_permissions: "Save"
+      save_button: "Save"
+      layout_hint: "Leave blank to use the default Storytime site layout"
+      domain_hint: "Enter the full domain of your site (e.g. www.example.com)"
     users:
       users_header: "Users"
-      create_new_user: "New User"
+      create_new_user: "New"
       edit_user_button: "Edit"
       edit_user_header: "Edit User"
       email: "Email"
@@ -87,8 +101,8 @@ en:
       select_media_from_file: "Select"
     posts:
       autosaves:
-        available: "There is an autosave of this %{resource} that may be different than the version below."
-        view_autosave: "View the autosave."
+        available: "There is an autosave of this %{resource} that is newer than the version below."
+        view_autosave: "View the autosave"
       select_or_create: "Select a %{resource} to Edit"
       create_post: "Create One"
       additional_fields: "Additional Fields"
@@ -102,3 +116,9 @@ en:
     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!"
+
+  pagination:
+    first: "<i class='fa fa-caret-left'></i><i class='fa fa-caret-left'></i>"
+    previous: "<i class='fa fa-caret-left'></i>"
+    next: "<i class='fa fa-caret-right'></i>"
+    last: "<i class='fa fa-caret-right'></i><i class='fa fa-caret-right'></i>"

data/config/routes.rb

@@ -1,43 +1,71 @@
- Storytime::Engine.routes.draw do
+Storytime::Engine.routes.draw do
   resources :comments
   resources :subscriptions, only: [:create]
   get "subscriptions/unsubscribe", to: "subscriptions#destroy", as: "unsubscribe_mailing_list"
 
+  concern :autosavable do
+    resources :autosaves, only: :create
+  end
+
+  concern :commentable do
+    resources :comments, only: [:create, :destroy]
+  end
+
   namespace :dashboard, :path => Storytime.dashboard_namespace_path do
-    get "/", to: "posts#index"
-    resources :sites, only: [:new, :edit, :update, :create]
-    resources :posts, except: [:show] do
-      resources :autosaves, only: [:create]
+    get "/", to: "pages#index"
+    resources :sites, only: [:new, :edit, :update, :create, :destroy]
+
+    resources :pages, except: :show, concerns: :autosavable
+    resources :blogs, except: [:index, :show], concerns: :autosavable do
+      # override route names so they don't conflict with resources :blog_posts
+      resources :posts, as: :blog_page_post, only: [:index]
+
+      resources :blog_posts, shallow: true, except: :show, concerns: :autosavable
+      Storytime.post_types.reject{|type| %w[Storytime::Page Storytime::Blog Storytime::BlogPost].include?(type) }.each do |post_type|
+        resources post_type.tableize.to_sym, controller: "custom_posts", only: [:new, :create]
+      end
+    end
+    
+    # Create / Update / Delete pages, blog_posts, custom_post_types
+    Storytime.post_types.reject{|type| %w[Storytime::Page Storytime::Blog Storytime::BlogPost].include?(type) }.each do |post_type|
+      resources post_type.tableize.to_sym, controller: "custom_posts", only: [:edit, :update, :destroy], concerns: :autosavable
     end
+
     resources :snippets, except: [:show]
     resources :media, except: [:show, :edit, :update]
     resources :imports, only: [:new, :create]
     resources :subscriptions
-    resources :users, path: Storytime.user_class_underscore.pluralize
-    resources :roles do 
+    resources :users, path: Storytime.user_class_underscore.pluralize, only: [:new, :create, :edit, :update]
+    resources :memberships, only: [:index, :create, :destroy]
+    resources :roles do
       collection do
+        get :edit_multiple
         patch :update_multiple
       end
     end
   end
 
+  mount StorytimeAdmin::Engine => Storytime.dashboard_namespace_path
+
+  # TODO: HOW DO WE DEAL WITH THIS WHEN THERE ARE MULTIPLE BLOG PAGES?
   get 'tags/:tag', to: 'posts#index', as: :tag
 
-  get Storytime.home_page_path, Storytime.home_page_route_options
-  resources :posts, { only: :index }.merge(Storytime.post_index_path_options)
+  get "/", to: "blog_homepage#show", constraints: Storytime::Constraints::BlogHomepageConstraint.new
+  get "/", to: "homepage#show", constraints: Storytime::Constraints::PageHomepageConstraint.new
 
-  # index page for post types that are excluded from primary feed
-  constraints ->(request){ Storytime.post_types.any?{|type| type.constantize.type_name.pluralize == request.path.gsub("/", "") } } do
-    get ":post_type", to: "posts#index"
+  resources :blogs, only: :show, path: "/", constraints: Storytime::Constraints::BlogConstraint.new
+  resources :pages, only: :show, path: "/", constraints: Storytime::Constraints::PageConstraint.new
+  resources :posts, only: [], concerns: :commentable
+  
+  Storytime.post_types.each do |post_type|
+    constraints ->(request){ request.params[:component_1] != "assets" } do
+      resources post_type.split("::").last.tableize, path: "(/:component_1(/:component_2(/:component_3)))/", only: :show, controller: "posts"
+    end
   end
 
-  # pages at routes like /about
-  constraints ->(request){ (request.params[:id] != Storytime.home_page_path) && Storytime::Page.friendly.exists?(request.params[:id]) } do
-    resources :pages, only: :show, path: "/"
+  constraints ->(request){ request.params[:component_1] != "assets" } do
+    resources :posts, path: "(/:component_1(/:component_2(/:component_3)))/", only: :show
   end
 
-  resources :posts, path: "(/:component_1(/:component_2(/:component_3)))/", only: :show, constraints: ->(request){ request.params[:component_1] != "assets" }
-  resources :posts, only: nil do
-    resources :comments, only: [:create, :destroy]
-  end
+  root to: "application#setup"
 end

data/db/migrate/20150128185746_seed_new_actions_and_permissions.rb

@@ -0,0 +1,9 @@
+class SeedNewActionsAndPermissions < ActiveRecord::Migration
+  def up
+    Storytime::Action.seed
+    Storytime::Permission.seed
+  end
+
+  def down
+  end
+end

data/db/migrate/20150206201847_add_site_id_to_storytime_post.rb

@@ -0,0 +1,7 @@
+class AddSiteIdToStorytimePost < ActiveRecord::Migration
+  def change
+    add_column :storytime_posts, :site_id, :integer
+
+    Storytime::Migrators::V1.add_site_id_to_posts
+  end
+end

data/db/migrate/20150206201919_add_site_id_to_storytime_snippet.rb

@@ -0,0 +1,7 @@
+class AddSiteIdToStorytimeSnippet < ActiveRecord::Migration
+  def change
+    add_column :storytime_snippets, :site_id, :integer
+
+    Storytime::Migrators::V1.add_site_id_to_snippets
+  end
+end

data/db/migrate/20150206201931_add_site_id_to_storytime_tag.rb

@@ -0,0 +1,7 @@
+class AddSiteIdToStorytimeTag < ActiveRecord::Migration
+  def change
+    add_column :storytime_tags, :site_id, :integer
+
+    Storytime::Migrators::V1.add_site_id_to_tags
+  end
+end

data/db/migrate/20150206205256_add_notification_fields_to_storytime_post.rb

@@ -0,0 +1,6 @@
+class AddNotificationFieldsToStorytimePost < ActiveRecord::Migration
+  def change
+    add_column :storytime_posts, :notifications_enabled, :boolean, default: false
+    add_column :storytime_posts, :notifications_sent_at, :datetime
+  end
+end

data/db/migrate/20150216211257_add_subdomain_to_storytime_sites.rb

@@ -0,0 +1,5 @@
+class AddSubdomainToStorytimeSites < ActiveRecord::Migration
+  def change
+    add_column :storytime_sites, :subdomain, :string
+  end
+end

data/db/migrate/20150216225045_add_site_to_storytime_media.rb

@@ -0,0 +1,6 @@
+class AddSiteToStorytimeMedia < ActiveRecord::Migration
+  def change
+    add_column :storytime_media, :site_id, :integer
+    add_index :storytime_media, :site_id
+  end
+end

data/db/migrate/20150219210528_remove_root_page_content_from_storytime_sites.rb

@@ -0,0 +1,12 @@
+class RemoveRootPageContentFromStorytimeSites < ActiveRecord::Migration
+  def up
+    Storytime::Migrators::V1.create_default_blog_for_sites
+
+    remove_column :storytime_sites, :root_page_content
+  end
+
+  def down
+    Storytime::Blog.destroy_all
+    add_column :storytime_sites, :root_page_content, :integer, default: 0
+  end
+end

data/db/migrate/20150220184902_add_blog_id_to_posts.rb

@@ -0,0 +1,6 @@
+class AddBlogIdToPosts < ActiveRecord::Migration
+  def change
+    add_column :storytime_posts, :blog_id, :integer
+    add_index :storytime_posts, :blog_id
+  end
+end

data/db/migrate/20150224192138_add_homepage_path_to_storytime_sites.rb

@@ -0,0 +1,5 @@
+class AddHomepagePathToStorytimeSites < ActiveRecord::Migration
+  def change
+    add_column :storytime_sites, :homepage_path, :string
+  end
+end

data/db/migrate/20150224193151_add_subscription_email_from_to_storytime_sites.rb

@@ -0,0 +1,5 @@
+class AddSubscriptionEmailFromToStorytimeSites < ActiveRecord::Migration
+  def change
+    add_column :storytime_sites, :subscription_email_from, :string
+  end
+end

data/db/migrate/20150224193551_add_layout_to_storytime_sites.rb

@@ -0,0 +1,5 @@
+class AddLayoutToStorytimeSites < ActiveRecord::Migration
+  def change
+    add_column :storytime_sites, :layout, :string
+  end
+end

data/db/migrate/20150224194559_add_disqus_forum_shortname_to_storytime_sites.rb

@@ -0,0 +1,5 @@
+class AddDisqusForumShortnameToStorytimeSites < ActiveRecord::Migration
+  def change
+    add_column :storytime_sites, :disqus_forum_shortname, :string
+  end
+end

data/db/migrate/20150224212453_remove_homepage_path_from_storytime_sites.rb

@@ -0,0 +1,5 @@
+class RemoveHomepagePathFromStorytimeSites < ActiveRecord::Migration
+  def change
+    remove_column :storytime_sites, :homepage_path
+  end
+end

data/db/migrate/20150225143516_add_site_id_to_storytime_autosaves.rb

@@ -0,0 +1,6 @@
+class AddSiteIdToStorytimeAutosaves < ActiveRecord::Migration
+  def change
+    add_column :storytime_autosaves, :site_id, :integer
+    add_index :storytime_autosaves, :site_id
+  end
+end

data/db/migrate/20150225143826_add_site_id_to_storytime_comments.rb

@@ -0,0 +1,6 @@
+class AddSiteIdToStorytimeComments < ActiveRecord::Migration
+  def change
+    add_column :storytime_comments, :site_id, :integer
+    add_index :storytime_comments, :site_id
+  end
+end

data/db/migrate/20150225145119_add_site_id_to_storytime_versions.rb

@@ -0,0 +1,6 @@
+class AddSiteIdToStorytimeVersions < ActiveRecord::Migration
+  def change
+    add_column :storytime_versions, :site_id, :integer
+    add_index :storytime_versions, :site_id
+  end
+end

data/db/migrate/20150225145316_add_site_id_to_storytime_taggings.rb

@@ -0,0 +1,6 @@
+class AddSiteIdToStorytimeTaggings < ActiveRecord::Migration
+  def change
+    add_column :storytime_taggings, :site_id, :integer
+    add_index :storytime_taggings, :site_id
+  end
+end

data/db/migrate/20150225145608_update_storytime_site_id_columns.rb

@@ -0,0 +1,11 @@
+class UpdateStorytimeSiteIdColumns < ActiveRecord::Migration
+  def up
+    Storytime::Migrators::V1.add_site_id_to_autosaves
+    Storytime::Migrators::V1.add_site_id_to_comments
+    Storytime::Migrators::V1.add_site_id_to_versions
+    Storytime::Migrators::V1.add_site_id_to_taggings
+  end
+
+  def down
+  end
+end

data/db/migrate/20150225164232_add_site_id_to_storytime_permissions.rb

@@ -0,0 +1,6 @@
+class AddSiteIdToStorytimePermissions < ActiveRecord::Migration
+  def change
+    add_column :storytime_permissions, :site_id, :integer
+    add_index :storytime_permissions, :site_id
+  end
+end

data/db/migrate/20150225212917_create_storytime_memberships.rb

@@ -0,0 +1,11 @@
+class CreateStorytimeMemberships < ActiveRecord::Migration
+  def change
+    create_table :storytime_memberships do |t|
+      t.references :user, index: true
+      t.references :storytime_role, index: true
+      t.references :site, index: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20150225213535_create_memberships_for_storytime_users.rb

@@ -0,0 +1,8 @@
+class CreateMembershipsForStorytimeUsers < ActiveRecord::Migration
+  def change
+    add_column :storytime_sites, :user_id, :integer
+    add_index :storytime_sites, :user_id
+
+    Storytime::Migrators::V1.create_user_memberships
+  end
+end

data/db/migrate/20150226201739_add_custom_domain_to_storytime_sites.rb

@@ -0,0 +1,5 @@
+class AddCustomDomainToStorytimeSites < ActiveRecord::Migration
+  def change
+    add_column :storytime_sites, :custom_domain, :string
+  end
+end

data/db/migrate/20150302171500_add_site_id_to_storytime_media.rb

@@ -0,0 +1,8 @@
+class AddSiteIdToStorytimeMedia < ActiveRecord::Migration
+  def up
+    Storytime::Migrators::V1.add_site_id_to_media
+  end
+
+  def down
+  end
+end

data/db/migrate/20150302171722_set_site_layout.rb

@@ -0,0 +1,8 @@
+class SetSiteLayout < ActiveRecord::Migration
+  def up
+    Storytime::Migrators::V1.set_site_layout
+  end
+
+  def down
+  end
+end

data/db/migrate/20150302185138_remove_storytime_role_id_from_users.rb

@@ -0,0 +1,5 @@
+class RemoveStorytimeRoleIdFromUsers < ActiveRecord::Migration
+  def change
+    remove_column Storytime.user_class.table_name.to_sym, :storytime_role_id
+  end
+end

data/db/migrate/20150302192525_transfer_posts_to_blogs.rb

@@ -0,0 +1,8 @@
+class TransferPostsToBlogs < ActiveRecord::Migration
+  def up
+    Storytime::Migrators::V1.transfer_posts_to_blogs
+  end
+
+  def down
+  end
+end

data/db/migrate/20150302192759_seed_permissions.rb

@@ -0,0 +1,9 @@
+class SeedPermissions < ActiveRecord::Migration
+  def up
+    Storytime::Permission.reset_column_information
+    Storytime::Permission.seed
+  end
+  
+  def down
+  end
+end

data/db/migrate/20150331162329_add_discourse_name_to_storytime_sites.rb

@@ -0,0 +1,5 @@
+class AddDiscourseNameToStorytimeSites < ActiveRecord::Migration
+  def change
+    add_column :storytime_sites, :discourse_name, :string
+  end
+end

data/db/migrate/20150402161427_remove_subdomain_from_storytime_site.rb

@@ -0,0 +1,5 @@
+class RemoveSubdomainFromStorytimeSite < ActiveRecord::Migration
+  def change
+    remove_column :storytime_sites, :subdomain, :string
+  end
+end

data/lib/generators/storytime/install_generator.rb

@@ -7,6 +7,23 @@ module Storytime
 
       desc "Creates a Storytime initializer for your application."
 
+      def set_local_assigns
+        @user_class = 'User'
+        @dashboard_namespace_path = '/storytime'
+        @post_types = ['CustomPostType']
+        @post_title_character_limit = 100
+        @post_excerpt_character_limit = 500
+        @email_regexp = '/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/'
+        @search_adapter = "''"
+        @enable_file_upload = true
+        @aws_region = "ENV['STORYTIME_AWS_REGION']"
+        @aws_access_key_id = "ENV['STORYTIME_AWS_ACCESS_KEY_ID']"
+        @aws_secret_key = "ENV['STORYTIME_AWS_SECRET_KEY']"
+        @s3_bucket = 'my-s3-bucket'
+        @prod_media_storage = ':s3'
+        @dev_media_storage = ':file'
+      end
+
       def copy_initializer
         template "storytime.rb", "config/initializers/storytime.rb"
       end

data/lib/generators/storytime/views_generator.rb

@@ -9,6 +9,8 @@ module Storytime
         argument :scope, :required => false, :default => nil,
                          :desc => "The scope to copy views to"
 
+        class_option :views, aliases: "-v", type: :array, desc: "Select specific view directories to generate (application, blog_posts, blogs, comments, dashboard, pages, posts, sites, snippets, subscription_mailer, subscriptions)"
+
         public_task :copy_views
       end
 
@@ -18,6 +20,25 @@ module Storytime
         end
       end
 
+      def copy_views
+        if options[:views]
+          options[:views].each do |directory|
+            view_directory directory.to_sym
+          end
+        else
+          view_directory :application
+          view_directory :blog_posts
+          view_directory :blogs
+          view_directory :comments
+          view_directory :pages
+          view_directory :posts
+          view_directory :sites
+          view_directory :snippets
+          view_directory :subscription_mailer
+          view_directory :subscriptions
+        end
+      end
+
       protected
 
       def view_directory(name, _target_path=nil)
@@ -39,15 +60,6 @@ module Storytime
 
       argument :scope, :required => false, :default => nil,
                        :desc => "The scope to copy views to"
-
-      def copy_views
-        view_directory :application
-        view_directory :blog_posts
-        view_directory :comments
-        view_directory :pages
-        view_directory :posts
-        view_directory :sites
-      end
     end
   end
 end