storytime 2.0.0 → 2.1.0

data/spec/spec_helper.rb

@@ -44,15 +44,15 @@ RSpec.configure do |config|
     Storytime::Permission.seed
   end
 
-  # config.after(type: :feature) do 
-  #   page.driver.reset! 
+  # config.after(type: :feature) do
+  #   page.driver.reset!
   #   Capybara.reset_sessions!
   # end
 
   # config.after(:suite) do
   #   Capybara.reset_sessions!
   # end
-  
+
   # ## Mock Framework
   #
   # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
@@ -69,7 +69,7 @@ RSpec.configure do |config|
   # If true, the base class of anonymous controllers will be inferred
   # automatically. This will be the default behavior in future versions of
   # rspec-rails.
-  config.infer_base_class_for_anonymous_controllers = false
+  config.infer_base_class_for_anonymous_controllers = true
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
@@ -87,4 +87,4 @@ end
 
 def have_image(url)
   have_xpath("//img[@src='#{url}']")
-end
+end

data/spec/support/feature_macros.rb

@@ -6,7 +6,7 @@ module FeatureMacros
       set_domain(@current_site.custom_domain)
     end
     
-    visit main_app.new_user_session_path
+    visit Storytime.login_path
 
     fill_in "user_email", :with => user.email
     fill_in "user_password", :with => user.password

data/storytime.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = "A simple cms and blogging engine for rails apps."
   s.license     = "MIT"
 
-  s.files = `git ls-files -z`.split("\x0")
+  s.files = `git ls-files -z`.split("\x0") - Dir["screenshots/*"]
   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"]
@@ -35,11 +35,13 @@ Gem::Specification.new do |s|
   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 "leather", ">= 3.5"
   s.add_dependency "codemirror-rails", "~> 4.8"
-  s.add_dependency "storytime-admin", "~> 0.1.0"
+  s.add_dependency "storytime-admin", "~> 0.2.0"
   s.add_dependency "devise", ">= 3.2"
-  
+  s.add_dependency "cocoon"
+  s.add_dependency "acts_as_list"
+
   s.add_development_dependency "pg"
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "capybara"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storytime
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Ben Roesch, David Van Der Beek, Brandon Robins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2016-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -252,16 +252,16 @@ dependencies:
   name: leather
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.3.2
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.3.2
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +282,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +304,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: cocoon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: acts_as_list
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -559,13 +587,14 @@ files:
 - app/assets/javascripts/storytime/custom_posts.js.coffee
 - app/assets/javascripts/storytime/editor.js.coffee
 - app/assets/javascripts/storytime/media.js.coffee
+- app/assets/javascripts/storytime/memberships.js.coffee
+- app/assets/javascripts/storytime/navigations.js.coffee
 - app/assets/javascripts/storytime/pages.js.coffee
 - app/assets/javascripts/storytime/posts.js.coffee
 - app/assets/javascripts/storytime/sites.js.coffee
 - app/assets/javascripts/storytime/snippets.js.coffee
 - app/assets/javascripts/storytime/subscriptions.js.coffee
 - app/assets/javascripts/storytime/tags.js.coffee
-- app/assets/javascripts/storytime/users.js.coffee
 - app/assets/javascripts/storytime/utilities.js
 - app/assets/javascripts/storytime/wysiwyg.js.coffee
 - app/assets/stylesheets/storytime/_buttons.scss
@@ -580,6 +609,7 @@ files:
 - app/assets/stylesheets/storytime/admin.scss
 - app/assets/stylesheets/storytime/application.scss
 - app/assets/stylesheets/storytime/comments.scss
+- app/assets/stylesheets/storytime/dashboard_overrides.scss
 - app/assets/stylesheets/storytime/icons.scss
 - app/assets/stylesheets/storytime/layout.scss
 - app/assets/stylesheets/storytime/media.scss
@@ -599,8 +629,10 @@ files:
 - app/controllers/storytime/dashboard/blogs_controller.rb
 - app/controllers/storytime/dashboard/custom_posts_controller.rb
 - app/controllers/storytime/dashboard/imports_controller.rb
+- app/controllers/storytime/dashboard/links_controller.rb
 - app/controllers/storytime/dashboard/media_controller.rb
 - app/controllers/storytime/dashboard/memberships_controller.rb
+- app/controllers/storytime/dashboard/navigations_controller.rb
 - app/controllers/storytime/dashboard/pages_controller.rb
 - app/controllers/storytime/dashboard/posts_controller.rb
 - app/controllers/storytime/dashboard/roles_controller.rb
@@ -633,8 +665,10 @@ files:
 - app/models/storytime/blog.rb
 - app/models/storytime/blog_post.rb
 - app/models/storytime/comment.rb
+- app/models/storytime/link.rb
 - app/models/storytime/media.rb
 - app/models/storytime/membership.rb
+- app/models/storytime/navigation.rb
 - app/models/storytime/page.rb
 - app/models/storytime/permission.rb
 - app/models/storytime/post.rb
@@ -698,11 +732,23 @@ files:
 - app/views/storytime/dashboard/media/_modal.html.erb
 - app/views/storytime/dashboard/media/index.html.erb
 - app/views/storytime/dashboard/media/show.json.jbuilder
+- app/views/storytime/dashboard/memberships/_edit.html.erb
 - app/views/storytime/dashboard/memberships/_form.html.erb
 - app/views/storytime/dashboard/memberships/_index.html.erb
 - app/views/storytime/dashboard/memberships/_membership.html.erb
+- app/views/storytime/dashboard/memberships/_new.html.erb
+- app/views/storytime/dashboard/memberships/edit.json.jbuilder
 - app/views/storytime/dashboard/memberships/index.json.jbuilder
+- app/views/storytime/dashboard/memberships/new.json.jbuilder
 - app/views/storytime/dashboard/memberships/save.json.jbuilder
+- app/views/storytime/dashboard/navigations/_blog_link_fields.html.erb
+- app/views/storytime/dashboard/navigations/_external_link_fields.html.erb
+- app/views/storytime/dashboard/navigations/_form.html.erb
+- app/views/storytime/dashboard/navigations/_navigation.html.erb
+- app/views/storytime/dashboard/navigations/_page_link_fields.html.erb
+- app/views/storytime/dashboard/navigations/edit.html.erb
+- app/views/storytime/dashboard/navigations/index.html.erb
+- app/views/storytime/dashboard/navigations/new.html.erb
 - app/views/storytime/dashboard/pages/_form.html.erb
 - app/views/storytime/dashboard/pages/_index_title.html.erb
 - app/views/storytime/dashboard/pages/_new_button.html.erb
@@ -732,12 +778,9 @@ files:
 - app/views/storytime/dashboard/subscriptions/_subscription.html.erb
 - app/views/storytime/dashboard/subscriptions/form.json.jbuilder
 - app/views/storytime/dashboard/subscriptions/index.json.jbuilder
-- app/views/storytime/dashboard/users/_edit.html.erb
-- app/views/storytime/dashboard/users/_new.html.erb
-- app/views/storytime/dashboard/users/edit.json.jbuilder
-- app/views/storytime/dashboard/users/new.json.jbuilder
 - app/views/storytime/dashboard/versions/_version.html.erb
 - app/views/storytime/dashboard/versions/_versions_info.html.erb
+- app/views/storytime/navigations/_navigation.html.erb
 - app/views/storytime/pages/show.html.erb
 - app/views/storytime/posts/_post.html.erb
 - app/views/storytime/posts/_tags.html.erb
@@ -813,6 +856,10 @@ files:
 - db/migrate/20150302192759_seed_permissions.rb
 - db/migrate/20150331162329_add_discourse_name_to_storytime_sites.rb
 - db/migrate/20150402161427_remove_subdomain_from_storytime_site.rb
+- db/migrate/20150520181115_create_storytime_navigations.rb
+- db/migrate/20150520185227_create_storytime_links.rb
+- db/migrate/20150520190700_add_position_to_storytime_links.rb
+- db/migrate/20150529192058_add_url_to_storytime_links.rb
 - db/seeds.rb
 - lib/generators/storytime/install_generator.rb
 - lib/generators/storytime/views_generator.rb
@@ -845,13 +892,6 @@ files:
 - lib/storytime/version.rb
 - lib/tasks/storytime_tasks.rake
 - lib/templates/erb/scaffold/_form.html.erb
-- screenshots/admin.png
-- screenshots/media.png
-- screenshots/page-list.png
-- screenshots/post-editor.png
-- screenshots/site-settings.png
-- screenshots/text-snippets.png
-- screenshots/user-management.png
 - spec/controllers/dashboard_controller_spec.rb
 - spec/controllers/subscriptions_controller_spec.rb
 - spec/dummy/README.rdoc
@@ -913,6 +953,7 @@ files:
 - spec/factories/comment_factories.rb
 - spec/factories/media_factories.rb
 - spec/factories/membership_factories.rb
+- spec/factories/navigation_factories.rb
 - spec/factories/permission_factories.rb
 - spec/factories/post_factories.rb
 - spec/factories/role_factories.rb
@@ -925,12 +966,12 @@ files:
 - spec/features/comments_spec.rb
 - spec/features/dashboard/media_spec.rb
 - spec/features/dashboard/memberships_spec.rb
+- spec/features/dashboard/navigations_spec.rb
 - spec/features/dashboard/pages_spec.rb
 - spec/features/dashboard/posts_spec.rb
 - spec/features/dashboard/sites_spec.rb
 - spec/features/dashboard/snippets_spec.rb
 - spec/features/dashboard/subscription_spec.rb
-- spec/features/dashboard/users_spec.rb
 - spec/features/pages_spec.rb
 - spec/features/posts_spec.rb
 - spec/features/subscription_spec.rb
@@ -939,6 +980,8 @@ files:
 - spec/lib/mysql_search_adapter_spec.rb
 - spec/lib/postgres_search_adapter_spec.rb
 - spec/lib/sqlite3_search_adapter_spec.rb
+- spec/lib/storytime_helpers_spec.rb
+- spec/models/navigation_spec.rb
 - spec/models/post_spec.rb
 - spec/models/subscription_spec.rb
 - spec/models/tagging_spec.rb
@@ -999,7 +1042,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple cms and blogging engine for rails apps.
@@ -1058,6 +1101,7 @@ test_files:
 - spec/factories/comment_factories.rb
 - spec/factories/media_factories.rb
 - spec/factories/membership_factories.rb
+- spec/factories/navigation_factories.rb
 - spec/factories/permission_factories.rb
 - spec/factories/post_factories.rb
 - spec/factories/role_factories.rb
@@ -1070,12 +1114,12 @@ test_files:
 - spec/features/comments_spec.rb
 - spec/features/dashboard/media_spec.rb
 - spec/features/dashboard/memberships_spec.rb
+- spec/features/dashboard/navigations_spec.rb
 - spec/features/dashboard/pages_spec.rb
 - spec/features/dashboard/posts_spec.rb
 - spec/features/dashboard/sites_spec.rb
 - spec/features/dashboard/snippets_spec.rb
 - spec/features/dashboard/subscription_spec.rb
-- spec/features/dashboard/users_spec.rb
 - spec/features/pages_spec.rb
 - spec/features/posts_spec.rb
 - spec/features/subscription_spec.rb
@@ -1084,6 +1128,8 @@ test_files:
 - spec/lib/mysql_search_adapter_spec.rb
 - spec/lib/postgres_search_adapter_spec.rb
 - spec/lib/sqlite3_search_adapter_spec.rb
+- spec/lib/storytime_helpers_spec.rb
+- spec/models/navigation_spec.rb
 - spec/models/post_spec.rb
 - spec/models/subscription_spec.rb
 - spec/models/tagging_spec.rb

data/app/views/storytime/dashboard/users/edit.json.jbuilder

@@ -1,2 +0,0 @@
-json.(@user)
-json.html(render partial: "edit.html.erb")

data/app/views/storytime/dashboard/users/new.json.jbuilder

@@ -1,2 +0,0 @@
-json.(@user)
-json.html(render partial: "new.html.erb")

data/spec/features/dashboard/users_spec.rb

@@ -1,66 +0,0 @@
-require 'spec_helper'
-
-describe "In the dashboard, Users" do
-  context "as Admin" do
-    before{ login_admin }
-
-    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 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", 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 "Save"
-      
-      within "#storytime-modal" do
-        expect(page).to have_content "New Storytime Username"
-      end
-    end
-
-  end
-end