storytime 1.2.0 → 2.0.0

data/spec/features/dashboard/users_spec.rb

@@ -4,44 +4,63 @@ describe "In the dashboard, Users" do
   context "as Admin" do
     before{ login_admin }
 
-    it "lists users" do
-      FactoryGirl.create_list(:user, 3)
-      visit dashboard_users_path
-      
-      Storytime.user_class.all.each do |u|
-        page.should have_content u.email
+    it "edits own profile", js: true do
+      u = User.last
+      visit storytime.dashboard_path
+      click_link "utility-menu-toggle"
+      click_link "profile-link"
+      fill_in "user_email", with: "new_email@example.com"
+      click_button "Save"
+
+      within "#storytime-modal" do
+        storytime_name_field = find_field('user_storytime_name').value
+        storytime_email_field = find_field('user_email').value
+
+        expect(storytime_name_field).to eq u.storytime_name
+        expect(storytime_email_field).to eq "new_email@example.com"
       end
     end
 
-    it "edits a user" do
-      u = FactoryGirl.create :user
-      visit edit_dashboard_user_path(u)
-      fill_in "user_email", with: "new_email@example.com"
-      click_button "Update"
-      page.should have_content "new_email@example.com"
+    it "edits another user's profile", js: true do
+      FactoryGirl.create :membership, site: @current_site 
+      u = User.last
+
+      visit storytime.dashboard_path
+      click_link "utility-menu-toggle"
+      click_link "users-link"
+
+      click_link u.storytime_name
+
+      fill_in "user_email", with: "change_email@example.com"
+      click_button "Save"
+
+      within "#storytime-modal" do
+        storytime_name_field = find_field('user_storytime_name').value
+        storytime_email_field = find_field('user_email').value
+
+        expect(storytime_name_field).to eq u.storytime_name
+        expect(storytime_email_field).to eq "change_email@example.com"
+      end
     end
 
-    it "creates a user" do
-      visit new_dashboard_user_path
+    it "creates a user", js: true do
+      visit storytime.dashboard_path
+      click_link "utility-menu-toggle"
+      click_link "users-link"
+      
+      click_link "new-user-link"
+
+      fill_in "user_storytime_name", with: "New Storytime Username"
       fill_in "user_email", with: "new_user@example.com"
+      select "Editor", from: "Storytime role"
       fill_in "user_password", with: "password"
       fill_in "user_password_confirmation", with: "password"
-      click_button "Create"
-      page.should have_content I18n.t("flash.users.create.success")
-      page.should have_content "new_user@example.com"
+      click_button "Save"
+      
+      within "#storytime-modal" do
+        expect(page).to have_content "New Storytime Username"
+      end
     end
 
-    it "deletes a user", js: true do
-      FactoryGirl.create_list(:user, 3)
-      visit dashboard_users_path
-      p1 = Storytime.user_class.first
-      p2 = Storytime.user_class.last
-      click_link("delete_user_#{p2.id}")
-
-      page.should_not have_content(p2.email)
-      page.should have_content(p1.email)
-
-      expect{ p2.reload }.to raise_error
-    end
   end
 end

data/spec/features/pages_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe "Pages" do
   before do
-    setup_site
+    setup_site(FactoryGirl.create(:admin))
   end
 
   it "shows a page" do
-    pg = FactoryGirl.create(:page)
+    pg = FactoryGirl.create(:page, site: @current_site)
     visit url_for([pg, only_path: true])
     page.should have_content(pg.content)
   end

data/spec/features/posts_spec.rb

@@ -1,30 +1,12 @@
 require 'spec_helper'
-require 'pry'
 
 describe "Posts" do
   before do
-    setup_site
-  end
-  
-  it "lists posts" do
-    3.times{ FactoryGirl.create(:post) }
-    static_page = FactoryGirl.create(:page)
-    visit url_for([Storytime::BlogPost, only_path: true])
-
-    within ".post-list" do
-      Storytime::Post.primary_feed.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)
-    end
+    setup_site(FactoryGirl.create(:admin))
   end
 
   it "shows a post" do
-    post = FactoryGirl.create(:post)
+    post = FactoryGirl.create(:post, blog: @current_site.blogs.first, site: @current_site)
     visit url_for([post, only_path: true])
 
     expect(page).to have_content(post.title)

data/spec/features/subscription_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Subscriptions" do
   before do
-    setup_site
+    setup_site(FactoryGirl.create(:admin))
   end
 
   it "allows users to subscribe to a site" do
@@ -14,7 +14,7 @@ describe "Subscriptions" do
     visit "/"
     click_link "#{I18n.t('layout.subscribe_to', site_name: site.title)}"
     fill_in "subscription_email", with: email_address
-    click_button "Create Subscription"
+    click_button "Subscribe"
 
     expect(Storytime::Subscription.count).to eq(1)
     subscription = Storytime::Subscription.first
@@ -25,10 +25,10 @@ describe "Subscriptions" do
   end
 
   it "only allows users to unsubscribe with a proper token" do
-    subscription_1 = FactoryGirl.create(:subscription)
+    subscription_1 = FactoryGirl.create(:subscription, site: @current_site)
     token_1 = subscription_1.token
 
-    subscription_2 = FactoryGirl.create(:subscription)
+    subscription_2 = FactoryGirl.create(:subscription, site: @current_site)
     token_2 = subscription_2.token
 
     visit url_for([:unsubscribe_mailing_list, {:email => subscription_1.email, :t => token_2}])

data/spec/models/post_spec.rb

@@ -1,6 +1,32 @@
 require 'spec_helper'
 
 describe Storytime::Post do
+
+  describe "#to_partial_path" do
+    before{ Storytime::BlogPost.instance_variable_set "@_to_partial_path", nil }
+    after{ Storytime::BlogPost.instance_variable_set "@_to_partial_path", nil }
+
+    it "includes site in the path" do
+      allow(File).to receive(:exists?).and_return(true)
+
+      site = FactoryGirl.create(:site, title: "Test Site")
+      blog_post = FactoryGirl.create(:post, site: site)
+      
+      partial_path = blog_post.to_partial_path
+      expect(partial_path).to eq("storytime/test-site/blog_posts/blog_post")
+      Storytime::BlogPost.instance_variable_set "@_to_partial_path", nil
+    end
+
+    it "looks up the inheritance chain" do
+      allow(File).to receive(:exists?).and_return(false)
+
+      site = FactoryGirl.build(:site, title: "Test Site")
+      video_post = VideoPost.new(site: site)
+      partial_path = video_post.to_partial_path
+      expect(partial_path).to eq("storytime/posts/post")
+    end
+  end
+
   it "sets the page slug on create" do
     post = FactoryGirl.create(:post)
     post.slug.should == post.title.parameterize
@@ -58,21 +84,4 @@ describe Storytime::Post do
     Storytime::Post.tag_counts.find_by(name: "tag1").count.should == 2
     Storytime::Post.tag_counts.find_by(name: "tag2").count.should == 1
   end
-
-  context "#primary_feed" do
-    it "shows posts where post type is not excluded from the main feed" do
-      post_1 = FactoryGirl.create(:post)
-      post_2 = FactoryGirl.create(:post)
-
-      post_3 = FactoryGirl.create(:page)
-      post_4 = FactoryGirl.create(:page)
-
-      feed = Storytime::Post.primary_feed
-      expect(feed).to include(post_1)
-      expect(feed).to include(post_2)
-
-      expect(feed).to_not include(post_3)
-      expect(feed).to_not include(post_4)
-    end
-  end
 end

data/spec/policies/comment_policy_spec.rb

@@ -2,20 +2,27 @@ require 'spec_helper'
 
 describe Storytime::CommentPolicy do
   subject { Storytime::CommentPolicy.new(user, comment) }
+  let(:site) { FactoryGirl.create(:site) }
   let(:post) { FactoryGirl.create(:post) }
 
   context "as a normal user" do
+    before do
+      allow_any_instance_of(Storytime.user_class).to receive(:storytime_admin?).and_return(false)
+      allow_any_instance_of(Storytime.user_class).to receive(:storytime_editor?).and_return(false)
+    end
+
     let(:user) { FactoryGirl.create(:user) }
 
     context "a comment owned by the user" do
-      let(:comment) { FactoryGirl.build(:comment, user: user, post: post) }
+      let(:comment) { FactoryGirl.build(:comment, user: user, post: post, site: site) }
 
       it { should permit!(:create)  }
       it { should permit!(:destroy)  }
     end
 
+
     context "a comment not owned by the user" do
-      let(:comment) { FactoryGirl.build(:comment, post: post) }
+      let(:comment) { FactoryGirl.build(:comment, post: post, site: site) }
 
       it { should_not permit!(:create)  }
       it { should_not permit!(:destroy)  }
@@ -23,17 +30,22 @@ describe Storytime::CommentPolicy do
   end
 
   context "as an editor" do
+    before do
+      allow_any_instance_of(Storytime.user_class).to receive(:storytime_admin?).and_return(false)
+      allow_any_instance_of(Storytime.user_class).to receive(:storytime_editor?).and_return(true)
+    end
+
     let(:user){ FactoryGirl.create(:editor) }
 
     context "a comment owned by the user" do
-      let(:comment) { FactoryGirl.build(:comment, user: user, post: post) }
+      let(:comment) { FactoryGirl.build(:comment, user: user, post: post, site: site) }
 
       it { should permit!(:create)  }
       it { should permit!(:destroy)  }
     end
 
     context "a comment not owned by the user" do
-      let(:comment) { FactoryGirl.build(:comment, post: post) }
+      let(:comment) { FactoryGirl.build(:comment, post: post, site: site) }
 
       it { should_not permit!(:create)  }
       it { should permit!(:destroy)  }
@@ -41,17 +53,21 @@ describe Storytime::CommentPolicy do
   end
 
   context "as an admin" do
+    before do
+      allow_any_instance_of(Storytime.user_class).to receive(:storytime_admin?).and_return(true)
+      allow_any_instance_of(Storytime.user_class).to receive(:storytime_editor?).and_return(false)
+    end
     let(:user){ FactoryGirl.create(:admin) }
 
     context "a comment owned by the user" do
-      let(:comment) { FactoryGirl.build(:comment, user: user, post: post) }
+      let(:comment) { FactoryGirl.build(:comment, user: user, post: post, site: site) }
 
       it { should permit!(:create)  }
       it { should permit!(:destroy)  }
     end
 
     context "a comment not owned by the user" do
-      let(:comment) { FactoryGirl.build(:comment, post: post) }
+      let(:comment) { FactoryGirl.build(:comment, post: post, site: site) }
 
       it { should_not permit!(:create)  }
       it { should permit!(:destroy)  }

data/spec/policies/post_policy_spec.rb

@@ -5,8 +5,18 @@ require 'spec_helper'
 describe Storytime::PostPolicy do
   subject { Storytime::PostPolicy.new(user, post) }
 
+  let(:site) { FactoryGirl.create(:site) }
+  before do
+    site.save_with_seeds(user)
+    allow(Storytime::Site).to receive(:current).and_return(site)
+  end
+
   context "for a writer" do
-    before{ Storytime.user_class.any_instance.stub(:assign_first_admin).and_return(true) }
+    before do 
+      allow_any_instance_of(Storytime.user_class).to receive(:assign_first_admin).and_return(true)
+      allow_any_instance_of(Storytime.user_class).to receive(:storytime_role_in_site).and_return(Storytime::Role.find_by(name: "writer"))
+    end
+
     let(:user) { FactoryGirl.create(:writer) }
 
     context "creating a new post" do
@@ -33,7 +43,11 @@ describe Storytime::PostPolicy do
     end
   end
 
-  context "for an editor" do    
+  context "for an editor" do
+    before do
+      allow_any_instance_of(Storytime.user_class).to receive(:storytime_role).and_return(Storytime::Role.find_by(name: "editor"))
+    end
+
     let(:user) { FactoryGirl.create(:editor) }
 
     context "creating a new post" do
@@ -60,7 +74,11 @@ describe Storytime::PostPolicy do
     end
   end
 
-  context "for an admin" do    
+  context "for an admin" do
+    before do
+      allow_any_instance_of(Storytime.user_class).to receive(:storytime_role).and_return(Storytime::Role.find_by(name: "admin"))
+    end
+
     let(:user) { FactoryGirl.create(:admin) }
 
     context "creating a new post" do

data/spec/requests/routings_spec.rb

@@ -1,20 +1,29 @@
 require "spec_helper"
 
 describe "Root path" do
-  it "routes to posts#index when site#root_page_content is posts" do
-    FactoryGirl.create(:site, root_page_content: :posts)
+  it "routes to blog_homepage#show when site homepage is a blog" do
+    site = FactoryGirl.create(:site)
+    user = FactoryGirl.create(:admin)
+    site.save_with_seeds(user)
+    site.homepage = site.blogs.first
+
     get "/"
 
-    expect(request.params[:controller]).to eq("storytime/posts")
-    expect(request.params[:action]).to eq("index")
+    expect(request.params[:controller]).to eq("storytime/blog_homepage")
+    expect(request.params[:action]).to eq("show")
   end
 
-  it "routes to pages#show when site#root_page_content is page" do
-    home_page = FactoryGirl.create(:page)
-    FactoryGirl.create(:site, root_page_content: :page, root_post_id: home_page.id)
+  it "routes to pages#show when site homepage is page" do
+    site = FactoryGirl.create(:site)
+    user = FactoryGirl.create(:admin)
+    home_page = FactoryGirl.create(:page, site: site)
+    site.save_with_seeds(user)
+    site.homepage = home_page
+    site.save
+
     get "/"
     
-    expect(request.params[:controller]).to eq("storytime/pages")
+    expect(request.params[:controller]).to eq("storytime/homepage")
     expect(request.params[:action]).to eq("show")
     expect(response.body).to match(home_page.title)
   end
@@ -22,9 +31,9 @@ end
 
 describe "Post path" do
   it "uses /posts/post-slug when site#post_slug_style is default" do
-    FactoryGirl.create(:site, post_slug_style: :default)
-    post = FactoryGirl.create(:post)
-    expect(url_for([post, only_path: true])).to  eq("/posts/#{post.slug}")
+    site = FactoryGirl.create(:site, post_slug_style: :default, custom_domain: "www.example.com")
+    post = FactoryGirl.create(:post, site: site)
+    expect(storytime.post_path(post)).to  eq("/posts/#{post.slug}")
 
     get url_for([post, only_path: true])
     
@@ -34,9 +43,10 @@ describe "Post path" do
   end
 
   it "uses /year/month/day/post-slug when site#post_slug_style is day_and_name" do
-    FactoryGirl.create(:site, post_slug_style: :day_and_name)
-    post = FactoryGirl.create(:post)
+    site = FactoryGirl.create(:site, post_slug_style: :day_and_name, custom_domain: "www.example.com")
+    post = FactoryGirl.create(:post, site: site)
     date = post.created_at.to_date
+    
     expect(url_for([post, only_path: true])).to  eq("/#{date.year}/#{date.strftime('%m')}/#{date.strftime('%d')}/#{post.slug}")
 
     get url_for([post, only_path: true])
@@ -47,8 +57,8 @@ describe "Post path" do
   end
 
   it "uses /year/month/post-slug when site#post_slug_style is month_and_name" do
-    FactoryGirl.create(:site, post_slug_style: :month_and_name)
-    post = FactoryGirl.create(:post)
+    site = FactoryGirl.create(:site, post_slug_style: :month_and_name, custom_domain: "www.example.com")
+    post = FactoryGirl.create(:post, site: site)
     date = post.created_at.to_date
     expect(url_for([post, only_path: true])).to  eq("/#{date.year}/#{date.strftime('%m')}/#{post.slug}")
 
@@ -60,8 +70,8 @@ describe "Post path" do
   end
 
   it "uses /post-id when site#post_slug_style is post_id" do
-    FactoryGirl.create(:site, post_slug_style: :post_id)
-    post = FactoryGirl.create(:post)
+    site = FactoryGirl.create(:site, post_slug_style: :post_id, custom_domain: "www.example.com")
+    post = FactoryGirl.create(:post, site: site)
     expect(url_for([post, only_path: true])).to eq("/posts/#{post.id}")
 
     get url_for([post, only_path: true])

data/spec/spec_helper.rb

@@ -15,8 +15,16 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.maintain_test_schema!
 
+poltergeist_options = {
+  phantomjs_logger: Logger.new('/dev/null'),
+  # inspector: true,
+  # debug: true,
+  phantomjs_options: ['--load-images=no', '--ignore-ssl-errors=yes', '--ssl-protocol=TLSv1'],
+  js_errors: false
+}
+
 Capybara.register_driver :poltergeist_st do |app|
-  Capybara::Poltergeist::Driver.new(app, phantomjs_logger: Logger.new('/dev/null'), phantomjs_options: ['--proxy-type=socks5', '--proxy=0.0.0.0:0', '--load-images=no', '--ignore-ssl-errors=yes'])
+  Capybara::Poltergeist::Driver.new(app, poltergeist_options)
 end
 
 Capybara.javascript_driver = :poltergeist_st
@@ -72,6 +80,9 @@ RSpec.configure do |config|
   config.include FeatureMacros, type: :feature
   config.include Storytime::Engine.routes.url_helpers
   config.include Devise::TestHelpers, type: :controller
+
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
 end
 
 def have_image(url)

data/spec/support/database_cleaner.rb

@@ -6,19 +6,19 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    DatabaseCleaner.strategy = :transaction
-  end
-
-  config.before(:each, :js => true) do
     DatabaseCleaner.strategy = :deletion
   end
 
+  # config.before(:each, :js => true) do
+  #   DatabaseCleaner.strategy = :deletion
+  # end
+
   config.before(:each) do
     DatabaseCleaner.start
   end
 
   config.after(:each) do
-    Capybara.reset_sessions!
+    # Capybara.reset_sessions!
     DatabaseCleaner.clean
   end
 end

data/spec/support/domains.rb

@@ -0,0 +1,18 @@
+RSpec.configure do |config|
+  Capybara.always_include_port = true
+
+  config.before(type: :feature) do
+    @current_site ||= FactoryGirl.build(:site)
+    set_domain @current_site.custom_domain
+  end
+
+  config.before(type: :controller) do
+    @request.env["devise.mapping"] = Devise.mappings[:user]
+    @current_site ||= FactoryGirl.create(:site)
+    @request.host = @current_site.custom_domain
+  end
+end
+
+def set_domain(domain)
+  default_url_options[:host] = Capybara.app_host = "http://#{domain}"
+end

data/spec/support/feature_macros.rb

@@ -1,14 +1,19 @@
 module FeatureMacros
   def login(user = nil, skip_site = false)
-    setup_site unless skip_site
-    user ||= FactoryGirl.create(:writer)
-    visit main_app.new_user_session_path
+    user ||= FactoryGirl.create(:user)
+    unless skip_site
+      setup_site(user)
+      set_domain(@current_site.custom_domain)
+    end
     
+    visit main_app.new_user_session_path
+
     fill_in "user_email", :with => user.email
     fill_in "user_password", :with => user.password
     
-    click_on "Sign in"
-    page.should have_content("Signed in successfully.")
+    click_on "Log in"
+
+    expect(page).to have_content("Signed in successfully.")
     @current_user = user
   end
 
@@ -32,11 +37,15 @@ module FeatureMacros
     @current_site
   end
 
-  def setup_site
-    @current_site = FactoryGirl.create(:site)
+  def setup_site(user)
+    @current_site ||= FactoryGirl.create(:site)
+    @current_site.save_with_seeds(user)
+    @current_site.homepage = @current_site.blogs.first
+    @current_site.save
   end
 
-  def base_url
-    "http://#{Capybara.current_session.server.host}:#{Capybara.current_session.server.port}"
+  def have_link_to_post(post)
+    have_link(post.title, href: url_for([:edit, :dashboard, post, only_path: true]))
   end
+
 end

data/storytime.gemspec

@@ -0,0 +1,59 @@
+$:.push File.expand_path("../lib", __FILE__)
+
+# Maintain your gem's version:
+require "storytime/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.name        = "storytime"
+  s.version     = Storytime::VERSION
+  s.authors     = ["Ben Roesch, David Van Der Beek, Brandon Robins"]
+  s.email       = ["ben@flyoverworks.com, david@flyoverworks.com, brandon@flyoverworks.com"]
+  s.summary     = "A simple cms and blogging engine for rails apps."
+  s.description = "A simple cms and blogging engine for rails apps."
+  s.license     = "MIT"
+
+  s.files = `git ls-files -z`.split("\x0")
+  s.executables << 'storytime'
+  s.test_files = Dir["spec/**/*"] - Dir["spec/dummy/tmp/**/*"] - Dir["spec/dummy/log/*"] - Dir["spec/dummy/public/uploads/**/*"]
+  s.require_paths = ["lib"]
+
+  s.add_dependency "rails", ">= 4.0"
+  s.add_dependency "pundit", ">= 0.2"
+  s.add_dependency "kaminari", ">= 0.15"
+  s.add_dependency "jbuilder", ">= 1.5"
+  s.add_dependency "sass-rails", ">= 4.0"
+  s.add_dependency "bootstrap-sass", ">= 3.1"
+  s.add_dependency "coffee-rails", ">= 4.0"
+  s.add_dependency "jquery-rails", ">= 3.0"
+  s.add_dependency "simple_form", ">= 3.0"
+  s.add_dependency "friendly_id", ">= 5.0"
+  s.add_dependency "fog", ">= 1.18"
+  s.add_dependency "carrierwave", ">= 0.9"
+  s.add_dependency "mini_magick", ">= 3.7"
+  s.add_dependency "nokogiri", ">= 1.6"
+  s.add_dependency "font-awesome-sass", ">= 4.0.3"
+  s.add_dependency "jquery-ui-rails", "~> 5.0"
+  s.add_dependency "thor", "~> 0.19.1"
+  s.add_dependency "leather", "~> 3.3.3.2"
+  s.add_dependency "codemirror-rails", "~> 4.8"
+  s.add_dependency "storytime-admin", "~> 0.1.0"
+  s.add_dependency "devise", ">= 3.2"
+  
+  s.add_development_dependency "pg"
+  s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "capybara"
+  s.add_development_dependency "poltergeist", "~>1.5"
+  s.add_development_dependency "factory_girl_rails"
+  s.add_development_dependency "guard-rspec", "~> 4.2.8"
+  s.add_development_dependency "spring-commands-rspec"
+  s.add_development_dependency "spring", "1.1.3"
+  s.add_development_dependency "rb-fsevent"
+  s.add_development_dependency "pry-nav"
+  s.add_development_dependency "pry-stack_explorer"
+  s.add_development_dependency "database_cleaner"
+  s.add_development_dependency "better_errors"
+  s.add_development_dependency "binding_of_caller"
+  s.add_development_dependency "launchy"
+  s.add_development_dependency "thin"
+end