storytime 1.2.0 → 2.0.0

data/spec/dummy/config/environments/test.rb

@@ -19,6 +19,7 @@ Rails.application.configure do
   config.assets.debug = true
 
   config.assets.precompile << %r(storytime/bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff)$)
+  config.assets.precompile << %w(phantom_js_bind_polyfill.js disable-transitions-for-test-env.css)
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/dummy/config/initializers/devise.rb

@@ -4,7 +4,7 @@ Devise.setup do |config|
   # The secret key used by Devise. Devise uses this key to generate
   # random tokens. Changing this key will render invalid all existing
   # confirmation, reset password and unlock tokens in the database.
-  # config.secret_key = '6ddb7b0fdefdf873e82d00d546b308945e95fc6384d00983b9d2ef9d90b9af4bdaa8f2cf815df7c2d469021f5c7b1e9202f3cee7856e1299550296bd858f1cbd'
+  config.secret_key = Rails.application.secrets.secret_key_base
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,

data/spec/dummy/config/initializers/session_store.rb

@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :cookie_store, key: '_dummy_session'
+Rails.application.config.session_store :cookie_store, key: '_dummy_session', domain: :all

data/spec/dummy/config/initializers/storytime.rb

@@ -1,9 +1,4 @@
 Storytime.configure do |config|
-  # Name of the layout to be used. e.g. the 'application'
-  # layout uses /app/views/layout/application, in your
-  # host app, as the layout.
-  # config.layout = 'application'
-
   # Name of the model you're using for Storytime users.
   config.user_class = 'User'
 
@@ -11,14 +6,10 @@ Storytime.configure do |config|
   # Storytime's mount point within the host app.
   # config.dashboard_namespace_path = "/storytime"
 
-  # Path of Storytime's home page, relative to
-  # Storytime's mount point within the host app.
-  # config.home_page_path = "/"
-
   # Add custom post types to use within Storytime.
   # Make sure that the custom post types inherit the
   # from the Storytime::Post class.
-  # config.post_types += ['CustomPostType']
+  config.post_types += ['VideoPost']
 
   # Character limit for Storytime::Post.title <= 255
   # config.post_title_character_limit = 255
@@ -26,14 +17,16 @@ Storytime.configure do |config|
   # Character limit for Storytime::Post.excerpt
   # config.post_excerpt_character_limit = 500
 
-  # Array of tags to allow from the Summernote WYSIWYG Editor.
-  # An empty array or nil setting will allow all tags.
-  # config.whitelisted_html_tags = %w(p blockquote pre h1 h2 h3 h4 h5 h6 span ul li ol table tbody td br a img iframe hr)
-
   # Enable Disqus comments using your forum's shortname,
   # the unique identifier for your website as registered on Disqus.
   # config.disqus_forum_shortname = ""
 
+  # Enable Discourse comments using your discourse server,
+  # Your discourse server must be configured for embedded comments.
+  # e.g. config.discourse_name = "http://forum.example.com/"
+  # NOTE:  include the '/' suffix at the end of the url
+  # config.discourse_name = ""
+
   # Search adapter to use for searching through Storytime Posts or
   # Post subclasses. Options for the search adapter include:
   # Storytime::PostgresSearchAdapter, Storytime::MysqlSearchAdapter,

data/spec/dummy/db/migrate/20150127172846_create_widgets.rb

@@ -0,0 +1,9 @@
+class CreateWidgets < ActiveRecord::Migration
+  def change
+    create_table :widgets do |t|
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20150206203824_add_video_url_to_storytime_posts.rb

@@ -0,0 +1,5 @@
+class AddVideoUrlToStorytimePosts < ActiveRecord::Migration
+  def change
+    add_column :storytime_posts, :video_url, :string
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,8 +11,12 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150129215308) do
-  create_table "friendly_id_slugs", force: true do |t|
+ActiveRecord::Schema.define(version: 20150402161427) do
+
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "friendly_id_slugs", force: :cascade do |t|
     t.string   "slug",                      null: false
     t.integer  "sluggable_id",              null: false
     t.string   "sluggable_type", limit: 50
@@ -25,54 +29,76 @@ ActiveRecord::Schema.define(version: 20150129215308) do
   add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id"
   add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type"
 
-  create_table "storytime_actions", force: true do |t|
+  create_table "storytime_actions", force: :cascade do |t|
     t.string   "name"
     t.string   "guid"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "storytime_autosaves", force: true do |t|
+  add_index "storytime_actions", ["guid"], name: "index_storytime_actions_on_guid"
+
+  create_table "storytime_autosaves", force: :cascade do |t|
     t.text     "content"
     t.integer  "autosavable_id"
     t.string   "autosavable_type"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "site_id"
   end
 
   add_index "storytime_autosaves", ["autosavable_type", "autosavable_id"], name: "autosavable_index"
+  add_index "storytime_autosaves", ["site_id"], name: "index_storytime_autosaves_on_site_id"
 
-  create_table "storytime_comments", force: true do |t|
+  create_table "storytime_comments", force: :cascade do |t|
     t.text     "content"
     t.integer  "user_id"
     t.integer  "post_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "site_id"
   end
 
   add_index "storytime_comments", ["post_id"], name: "index_storytime_comments_on_post_id"
+  add_index "storytime_comments", ["site_id"], name: "index_storytime_comments_on_site_id"
   add_index "storytime_comments", ["user_id"], name: "index_storytime_comments_on_user_id"
 
-  create_table "storytime_media", force: true do |t|
+  create_table "storytime_media", force: :cascade do |t|
     t.string   "file"
     t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "site_id"
   end
 
+  add_index "storytime_media", ["site_id"], name: "index_storytime_media_on_site_id"
   add_index "storytime_media", ["user_id"], name: "index_storytime_media_on_user_id"
 
-  create_table "storytime_permissions", force: true do |t|
+  create_table "storytime_memberships", force: :cascade do |t|
+    t.integer  "user_id"
+    t.integer  "storytime_role_id"
+    t.integer  "site_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "storytime_memberships", ["site_id"], name: "index_storytime_memberships_on_site_id"
+  add_index "storytime_memberships", ["storytime_role_id"], name: "index_storytime_memberships_on_storytime_role_id"
+  add_index "storytime_memberships", ["user_id"], name: "index_storytime_memberships_on_user_id"
+
+  create_table "storytime_permissions", force: :cascade do |t|
     t.integer  "role_id"
     t.integer  "action_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "site_id"
   end
 
   add_index "storytime_permissions", ["action_id"], name: "index_storytime_permissions_on_action_id"
   add_index "storytime_permissions", ["role_id"], name: "index_storytime_permissions_on_role_id"
+  add_index "storytime_permissions", ["site_id"], name: "index_storytime_permissions_on_site_id"
 
-  create_table "storytime_posts", force: true do |t|
+  create_table "storytime_posts", force: :cascade do |t|
     t.integer  "user_id"
     t.string   "type"
     t.string   "title"
@@ -81,40 +107,58 @@ ActiveRecord::Schema.define(version: 20150129215308) do
     t.text     "excerpt"
     t.datetime "published_at"
     t.integer  "featured_media_id"
-    t.boolean  "featured",           default: false
+    t.boolean  "featured",              default: false
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "video_url"
     t.integer  "secondary_media_id"
+    t.integer  "site_id"
+    t.boolean  "notifications_enabled", default: false
+    t.datetime "notifications_sent_at"
+    t.integer  "blog_id"
   end
 
+  add_index "storytime_posts", ["blog_id"], name: "index_storytime_posts_on_blog_id"
+  add_index "storytime_posts", ["slug"], name: "index_storytime_posts_on_slug"
   add_index "storytime_posts", ["user_id"], name: "index_storytime_posts_on_user_id"
 
-  create_table "storytime_roles", force: true do |t|
+  create_table "storytime_roles", force: :cascade do |t|
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "storytime_sites", force: true do |t|
+  add_index "storytime_roles", ["name"], name: "index_storytime_roles_on_name"
+
+  create_table "storytime_sites", force: :cascade do |t|
     t.string   "title"
-    t.integer  "post_slug_style",   default: 0
+    t.integer  "post_slug_style",         default: 0
     t.string   "ga_tracking_id"
-    t.integer  "root_page_content", default: 0
     t.integer  "root_post_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "subscription_email_from"
+    t.string   "layout"
+    t.string   "disqus_forum_shortname"
+    t.integer  "user_id"
+    t.string   "custom_domain"
+    t.string   "discourse_name"
   end
 
   add_index "storytime_sites", ["root_post_id"], name: "index_storytime_sites_on_root_post_id"
+  add_index "storytime_sites", ["user_id"], name: "index_storytime_sites_on_user_id"
 
-  create_table "storytime_snippets", force: true do |t|
+  create_table "storytime_snippets", force: :cascade do |t|
     t.string   "name"
     t.text     "content"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "site_id"
   end
 
-  create_table "storytime_subscriptions", force: true do |t|
+  add_index "storytime_snippets", ["name"], name: "index_storytime_snippets_on_name"
+
+  create_table "storytime_subscriptions", force: :cascade do |t|
     t.string   "email"
     t.boolean  "subscribed", default: true
     t.string   "token"
@@ -123,35 +167,42 @@ ActiveRecord::Schema.define(version: 20150129215308) do
     t.integer  "site_id"
   end
 
-  create_table "storytime_taggings", force: true do |t|
+  add_index "storytime_subscriptions", ["token"], name: "index_storytime_subscriptions_on_token"
+
+  create_table "storytime_taggings", force: :cascade do |t|
     t.integer  "tag_id"
     t.integer  "post_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "site_id"
   end
 
   add_index "storytime_taggings", ["post_id"], name: "index_storytime_taggings_on_post_id"
+  add_index "storytime_taggings", ["site_id"], name: "index_storytime_taggings_on_site_id"
   add_index "storytime_taggings", ["tag_id"], name: "index_storytime_taggings_on_tag_id"
 
-  create_table "storytime_tags", force: true do |t|
+  create_table "storytime_tags", force: :cascade do |t|
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "site_id"
   end
 
-  create_table "storytime_versions", force: true do |t|
+  create_table "storytime_versions", force: :cascade do |t|
     t.text     "content"
     t.integer  "user_id"
     t.integer  "versionable_id"
     t.string   "versionable_type"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "site_id"
   end
 
+  add_index "storytime_versions", ["site_id"], name: "index_storytime_versions_on_site_id"
   add_index "storytime_versions", ["user_id"], name: "index_storytime_versions_on_user_id"
   add_index "storytime_versions", ["versionable_type", "versionable_id"], name: "versionable_index"
 
-  create_table "users", force: true do |t|
+  create_table "users", force: :cascade do |t|
     t.string   "email",                  default: "", null: false
     t.string   "encrypted_password",     default: "", null: false
     t.string   "reset_password_token"
@@ -164,12 +215,16 @@ ActiveRecord::Schema.define(version: 20150129215308) do
     t.string   "last_sign_in_ip"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "storytime_role_id"
     t.string   "storytime_name"
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true
   add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
-  add_index "users", ["storytime_role_id"], name: "index_users_on_storytime_role_id"
+
+  create_table "widgets", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
 
 end

data/spec/factories/comment_factories.rb

@@ -3,5 +3,6 @@ FactoryGirl.define do
     user
     post
     sequence(:content) { |i| "Comment ##{i}" }
+    site
   end
 end

data/spec/factories/membership_factories.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :membership, class: Storytime::Membership do
+    association :user, factory: :user
+    association :site, factory: :site
+    storytime_role { Storytime::Role.find_by(name: "writer") }
+  end
+end

data/spec/factories/site_factories.rb

@@ -1,7 +1,8 @@
 FactoryGirl.define do
   factory :site, class: Storytime::Site do
     sequence(:title) {|i| "Site Title #{i}"}
+    subscription_email_from "notifications@site.com"
+    sequence(:custom_domain){|i| "site-#{i}.lvh.me" } 
     post_slug_style 0
-    root_page_content 0
   end
-end
+end

data/spec/factories/user_factories.rb

@@ -5,15 +5,15 @@ FactoryGirl.define do
     sequence(:storytime_name) { |i| "user name #{i}" }
 
     factory :writer do
-      before(:create){|user| user.storytime_role = Storytime::Role.find_by(name: "writer") }
+      after(:create){|user| user.storytime_memberships.create(site: @current_site, storytime_role: Storytime::Role.find_by(name: "writer")) }
     end
 
     factory :editor do
-      before(:create){|user| user.storytime_role = Storytime::Role.find_by(name: "editor") }
+      after(:create){|user| user.storytime_memberships.create(site: @current_site, storytime_role: Storytime::Role.find_by(name: "editor")) }
     end
 
     factory :admin do
-      before(:create){|user| user.storytime_role = Storytime::Role.find_by(name: "admin") }
+      after(:create){|user| user.storytime_memberships.create(site: @current_site, storytime_role: Storytime::Role.find_by(name: "admin")) }
     end
   end
 end

data/spec/factories/widget_factories.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :widget do
+    name "Widget Name"
+  end
+end

data/spec/features/blogs_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe "Blogs" do
+  before do
+    setup_site(FactoryGirl.create(:admin))
+  end
+  
+  it "lists posts belonging to that blog" do
+    3.times{ FactoryGirl.create(:post, blog: @current_site.blogs.first, site: @current_site) }
+    other_blog_post = FactoryGirl.create(:post, site: @current_site)
+    static_page = FactoryGirl.create(:page, site: @current_site)
+    visit url_for([@current_site.blogs.first, only_path: true])
+
+    within ".post-list" do
+      @current_site.blogs.first.posts.each do |p|
+        page.should have_content(p.title)
+        page.should have_content(p.excerpt)
+        page.should_not have_content(p.content)
+      end
+
+      expect(page).not_to have_content(static_page.title)
+      expect(page).not_to have_content(static_page.excerpt)
+
+      expect(page).not_to have_content(other_blog_post.title)
+      expect(page).not_to have_content(other_blog_post.excerpt)
+    end
+  end
+end

data/spec/features/comments_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe "Comments" do
   before do
-    setup_site
+    # setup_site
     login
   end
   
   it "lists comments on a post" do
-    post = FactoryGirl.create(:post)
-    3.times{ FactoryGirl.create(:comment, post: post) }
-    other_post_comment = FactoryGirl.create(:comment)
+    post = FactoryGirl.create(:post, site: @current_site, blog: @current_site.blogs.first)
+    3.times{ FactoryGirl.create(:comment, post: post, site: @current_site) }
+    other_post_comment = FactoryGirl.create(:comment, site: @current_site)
 
     visit url_for([post, only_path: true])
 
@@ -22,7 +22,7 @@ describe "Comments" do
   end
 
   it "creates a comment" do
-    post = FactoryGirl.create(:post)
+    post = FactoryGirl.create(:post, site: @current_site, blog: @current_site.blogs.first)
     comment_count = post.comments.count
 
     visit url_for([post, only_path: true])
@@ -38,14 +38,13 @@ describe "Comments" do
   end
 
   it "deletes a comment", js: true do
-    post = FactoryGirl.create(:post)
-    other_persons_comment = FactoryGirl.create(:comment, post: post)
-    comment_to_delete = FactoryGirl.create(:comment, post: post, user: current_user)
+    post = FactoryGirl.create(:post, site: @current_site, blog: @current_site.blogs.first)
+    other_persons_comment = FactoryGirl.create(:comment, post: post, site: @current_site)
+    comment_to_delete = FactoryGirl.create(:comment, post: post, user: current_user, site: @current_site)
 
     visit url_for([post, only_path: true])
 
     expect(page).to have_content(other_persons_comment.content)
-    expect(page).to_not have_link("delete_comment_#{other_persons_comment.id}")
 
     expect(page).to have_content(comment_to_delete.content)
     click_link "delete_comment_#{comment_to_delete.id}"

data/spec/features/dashboard/media_spec.rb

@@ -3,30 +3,19 @@ require 'spec_helper'
 describe "In the dashboard, Media" do
   include Storytime::Dashboard::MediaHelper
 
-  # needed because our wysiwyg text area is hidden
-  def wait_until
-    require "timeout"
-    Timeout.timeout(Capybara.default_wait_time + 5) do
-      sleep(0.1) until value = yield
-      value
-    end
-  end
-
-  before{ login }
+  before{ login_admin }
   
   it "creates media", js: true do
     visit dashboard_media_index_path
 
     attach_file('media_file', "./spec/support/images/success-kid.jpg")
-
-    page.should have_selector("#media_gallery img")
-    media = Storytime::Media.last
-    page.should have_image(media.file_url(:thumb))
+    
+    expect(find("#media_gallery").find("img")['src']).to have_content('success-kid.jpg')
   end
 
   it "shows a gallery of the user's images" do
-    m1 = FactoryGirl.create(:media)
-    m2 = FactoryGirl.create(:media)
+    m1 = FactoryGirl.create(:media, site: @current_site)
+    m2 = FactoryGirl.create(:media, site: @current_site)
 
     visit dashboard_media_index_path
     
@@ -35,7 +24,7 @@ describe "In the dashboard, Media" do
   end
 
   it "deletes an image", js: true do
-    image = FactoryGirl.create(:media)
+    image = FactoryGirl.create(:media, site: @current_site)
     
     visit dashboard_media_index_path
     page.should have_image(image.file_url(:thumb))
@@ -43,25 +32,20 @@ describe "In the dashboard, Media" do
     click_link "delete_media_#{image.id}"
 
     page.should_not have_image(image)
-
-    expect{ image.reload }.to raise_error
   end
 
   it "inserts media into post", js: true do
-    media = FactoryGirl.create(:media)
-
-    visit url_for([:new, :dashboard, :post, type: Storytime::BlogPost.type_name, only_path: true])
-
-    page.should have_selector("button[data-event='showImageDialog']")
-    find("button[data-event='showImageDialog']").click
+    media = FactoryGirl.create(:media, site: @current_site)
 
-    page.should have_selector(".note-image-dialog")
-    find(".insert-image-button").click
+    visit url_for([:new, :dashboard, @current_site.blogs.first, :blog_post, only_path: true])
 
-    page.should_not have_selector(".note-image-dialog")
+    find(".insert-media-button").click
+    
+    within "#media_#{media.id}" do
+      find(".insert-image-button").click
+    end
 
-    summernote_html = page.evaluate_script("$('.note-editable').html()")
-    summernote_html.should =~ /#{media.file_url}/
+    expect(page).to have_image(media.file_url)
   end
   
 end

data/spec/features/dashboard/memberships_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe "In the dashboard, Users" do
+  context "as Admin" do
+    before{ login_admin }
+
+    it "provides links to all the sites where the user has a membership", js: true do
+      other_site = FactoryGirl.create(:site)
+      membership = FactoryGirl.create(:membership, user: @current_user, site: other_site)
+
+      visit storytime.dashboard_path
+
+      click_link @current_site.title
+      
+      expect(page).to have_link(@current_site.title, href: "")
+      expect(page).to have_link(other_site.title, href: storytime.dashboard_url(host: other_site.custom_domain, port: Capybara.current_session.server.port))
+    end
+
+    it "lists users for a site", js: true do
+      FactoryGirl.create_list(:user, 3)
+
+      Storytime.user_class.all.each do |user|
+        user.storytime_memberships.create(site: @current_site, storytime_role: Storytime::Role.find_by(name: "writer"))
+      end
+
+      visit storytime.dashboard_path
+      click_link "utility-menu-toggle"
+      click_link "users-link"
+
+      Storytime.user_class.all.each do |u|
+        expect(page).to have_content u.storytime_name
+      end
+    end
+
+    it "deletes a user from the site", js: true do
+      user = FactoryGirl.create(:user)
+      membership = user.storytime_memberships.create(site: @current_site, storytime_role: Storytime::Role.find_by(name: "writer"))
+
+      user_count = Storytime.user_class.count
+      membership_count = Storytime::Membership.count
+
+      visit storytime.dashboard_path
+      click_link "utility-menu-toggle"
+      click_link "users-link"
+
+      expect(page).to have_content(user.storytime_name)
+
+      find("#membership_#{membership.id}").hover
+      click_link("delete_membership_#{membership.id}")
+      
+      expect(page).to_not have_content(user.storytime_name)
+
+      expect(Storytime.user_class.count).to eq(user_count)
+      expect(Storytime::Membership.count).to eq(membership_count-1)
+    end
+
+  end
+end