storytime 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf39a31891a15bcee7b10824400ad71d55dada8c
-  data.tar.gz: 6827ab5ce70be645b272de46062d7ceaf991f726
+  metadata.gz: 91d49457b192f13b7c8bcd673c56032d66391651
+  data.tar.gz: 0d86828ad2e793852463fa1ac999cb1aa0000d65
 SHA512:
-  metadata.gz: c3f251310c2b7af9a815b214d7b42df3b458756db96df5868a959c0b43c2ea5f676d5c87f666401014388d9809ba9fe97d00760f2847bc44877af6436f943061
-  data.tar.gz: 1cc0d64fee3ab5721d9a32c046a7f54cd211d7bee13de96d64c0da4ecee2f60643e227cffccf4e1155f34b631aa5d3ab9b5b163e4c0f07f582a68a5e95aaf315
+  metadata.gz: 2126e2e0e4b39b13e779683e21974382c9d8084791f8a4c6f0771739ab034405bada3235ab3856bd63ec96b141ad0e0e70767fc22b08ca07a0683e1267bde95a
+  data.tar.gz: 75a7c2fb54395a4e660d0a862b9dd29209bd862765108b5101c7502d4906a72e2a6faa3c0cf31884846354a265300775dab7c54a46e2c1696e70208ac3198b2a

data/app/assets/javascripts/storytime/subscriptions.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/storytime/admin.css.scss

@@ -43,7 +43,6 @@
     padding: 0;
     list-style: none;
     li {
-      padding: 20px;
       border-bottom: 1px solid #ccc;
       border-left: 4px solid transparent;
       background: #fff;
@@ -52,6 +51,8 @@
       }
       a {
         text-decoration: none;
+        display: block;
+        padding: 20px;
       }
       &:hover {
         border-left: 4px solid #ccc;

data/app/controllers/storytime/posts_controller.rb

@@ -24,7 +24,7 @@ module Storytime
     def show
       @post = if params[:preview]
         post = Post.find_preview(params[:id])
-        # post.content = post.autosave.content if post.autosave
+        post.content = post.autosave.content
         post.preview = true
         post
       else
@@ -41,8 +41,8 @@ module Storytime
 
       @comments = @post.comments.order("created_at DESC")
       #allow overriding in the host app
-      if lookup_context.template_exists?("storytime/posts/#{@post.slug}")
-        render @post.slug 
+      if lookup_context.template_exists?("storytime/#{@post.type_name.pluralize}/#{@post.slug}")
+        render "storytime/#{@post.type_name.pluralize}/#{@post.slug}"
       elsif lookup_context.template_exists?("storytime/#{@post.type_name.pluralize}/show")
         render "storytime/#{@post.type_name.pluralize}/show"
       end

data/app/controllers/storytime/subscriptions_controller.rb

@@ -0,0 +1,23 @@
+require_dependency "storytime/application_controller"
+
+module Storytime
+  class SubscriptionsController < ApplicationController
+    before_action :set_subscription, only: [:destroy]
+
+    def index
+      @subscriptions = Storytime::Subscription.all
+      render json: {subscriptions: @subscriptions}
+    end
+
+    def destroy
+      
+    end
+
+    private
+
+      def set_subscription
+        binding.pry
+        @subscription = Storytime::Subscription.find_by(email: params[:email])
+      end
+  end
+end

data/app/views/storytime/dashboard/posts/_list.html.erb

@@ -7,19 +7,14 @@
     <ul class="dashboard-list">
       <% @posts.each do |post| %>
         <li id="<%= post.class.to_s.downcase.split("::").last %>_<%= post.id %>" class="<%= 'active' if current_page?(url_for([:edit, :dashboard, post])) %>">
-          <div class="row">
-            <div class="col-md-8">
-              <%= link_to post.title, [:edit, :dashboard, post], page_number: params[:page_number] %>    
-            </div>
-            <div class="col-md-4">
-              <span class="pull-right">
-                <% unless post.published? %>
-                  <span class="label label-warning">Draft</span>
-                <% end %>
-                <%= delete_resource_link post, url_for([:dashboard, post]), !current_page?(url_for([:edit, :dashboard, post])) %>
-              </span>
-            </div>
-          </div>
+          <%= link_to [:edit, :dashboard, post], page_number: params[:page_number] do %>
+            <%= post.title %>
+            <span class="pull-right">
+              <% unless post.published? %>
+                <span class="label label-warning">Draft</span>
+              <% end %>
+            </span>
+          <% end %>
         </li>
       <% end %>
     </ul>

data/app/views/storytime/dashboard/snippets/_form.html.erb

@@ -4,6 +4,8 @@
   <%= f.input :content, as: :text, input_html: { rows: 20, class: "summernote" } %>
 
   <div class="actions">
+    <%= link_to "Delete", [:dashboard, @snippet], method: :delete, data: { confirm: t('common.are_you_sure_you_want_to_delete', resource_name: "Snippet") }, class: "btn btn-danger" unless @snippet.new_record? %>
+
     <div class="pull-right">
       <%= f.submit class: "btn #{@snippet.persisted? ? 'btn-default' : 'btn-primary'} save" %>
     </div>

data/app/views/storytime/dashboard/snippets/_list.html.erb

@@ -10,16 +10,7 @@
     <ul class="dashboard-list">
       <% @snippets.each do |snippet| %>
         <li id="snippet_<%= snippet.id %>" class="<%= 'active' if current_page?(url_for([:edit, :dashboard, snippet])) %>">
-          <div class="row">
-            <div class="col-md-8">
-              <%= link_to snippet.name, [:edit, :dashboard, snippet], page_number: params[:page_number] %>
-            </div>
-            <div class="col-md-4">
-              <span class="pull-right">
-                <%= delete_resource_link snippet, url_for([:dashboard, snippet]), !current_page?(url_for([:edit, :dashboard, snippet])) %>
-              </span>
-            </div>
-          </div>
+          <%= link_to snippet.name, [:edit, :dashboard, snippet], page_number: params[:page_number] %>
         </li>
       <% end %>
     </ul>

data/config/initializers/simple_form_bootstrap.rb

@@ -9,17 +9,14 @@ inputs = %w[
   StringInput
   TextInput
 ]
- 
+
 inputs.each do |input_type|
-  superclass = "SimpleForm::Inputs::#{input_type}".constantize
- 
-  new_class = Class.new(superclass) do
-    def input_html_classes
-      super.push('form-control')
+  "SimpleForm::Inputs::#{input_type}".constantize.class_eval do
+    alias_method :__input_html_classes, :input_html_classes
+    define_method(:input_html_classes) do
+      __input_html_classes.push('form-control')
     end
   end
- 
-  Object.const_set(input_type, new_class)
 end
  
 # Use this setup block to configure all options available in SimpleForm.

data/lib/storytime/version.rb

@@ -1,3 +1,3 @@
 module Storytime
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/spec/features/dashboard/pages_spec.rb

@@ -64,15 +64,17 @@ describe "In the dashboard, Pages" do
 
   it "deletes a page", js: true do
     3.times{|i| FactoryGirl.create(:page) }
-    visit url_for([:dashboard, Storytime::Post, type: Storytime::Page.type_name, only_path: true])
-    p1 = Storytime::Page.first
-    p2 = Storytime::Page.last
-    click_link("delete_page_#{p1.id}")
+    expect(Storytime::Page.count).to eq(3)
 
-    page.should_not have_content(p1.title)
-    page.should have_content(p2.title)
+    storytime_page = Storytime::Page.first
+    visit url_for([:edit, :dashboard, storytime_page, type: Storytime::Page.type_name, only_path: true])
+    
+    click_link "Delete"
+
+    expect { storytime_page.reload }.to raise_error
 
-    expect{ p1.reload }.to raise_error
+    expect(page).to_not have_content(storytime_page.title)
+    expect(Storytime::Page.count).to eq(2)
   end
   
 end

data/spec/features/dashboard/posts_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'pry'
+
 describe "In the dashboard, Posts" do
   before{ login_admin }
 
@@ -48,6 +48,7 @@ describe "In the dashboard, Posts" do
     fill_in "post_title", with: "Snow Crash"
     fill_in "post_excerpt", with: "The Deliverator belongs to an elite order, a hallowed sub-category."
 
+    # Use find(".note-editable").set instead of fill_in "post_draft_content" because of Summernote (js)
     find(".note-editable").set "The Deliverator belongs to an elite order, a hallowed sub-category."
     click_button "Preview"
     
@@ -105,16 +106,17 @@ describe "In the dashboard, Posts" do
 
   it "deletes a post", js: true do
     3.times{|i| FactoryGirl.create(:post) }
-    visit url_for([:dashboard, Storytime::BlogPost, only_path: true])
-    p1 = Storytime::BlogPost.first
-    p2 = Storytime::BlogPost.last
+    expect(Storytime::BlogPost.count).to eq(3)
+
+    post = Storytime::BlogPost.first
+    visit url_for([:edit, :dashboard, post, only_path: true])
     
-    click_link("delete_blogpost_#{p1.id}")
+    click_link "Delete"
 
-    page.should_not have_content(p1.title)
-    page.should have_content(p2.title)
+    expect { post.reload }.to raise_error
 
-    expect{ p1.reload }.to raise_error
+    expect(page).to_not have_content(post.title)
+    expect(Storytime::Post.count).to eq(2)
   end
   
 end

data/spec/features/dashboard/snippets_spec.rb

@@ -49,17 +49,19 @@ describe "In the dashboard, Snippets" do
     expect(snippet.content).to eq("It was a dark and stormy night...")
   end
 
-  it "deletes a snippet", js: true do
+  it "deletes a snippet" do
     3.times{|i| FactoryGirl.create(:snippet) }
-    visit url_for([:dashboard, Storytime::Snippet, only_path: true])
-    s1 = Storytime::Snippet.first
-    s2 = Storytime::Snippet.last
-    click_link("delete_snippet_#{s1.id}")
+    expect(Storytime::Snippet.count).to eq(3)
 
-    expect(page).to_not have_content(s1.name)
-    expect(page).to have_content(s2.name)
+    snippet = Storytime::Snippet.first
+    visit url_for([:edit, :dashboard, snippet, only_path: true])
 
-    expect{ s1.reload }.to raise_error
+    click_link "Delete"
+
+    expect { snippet.reload }.to raise_error
+
+    expect(page).to_not have_content(snippet.name)
+    expect(Storytime::Snippet.count).to eq(2)
   end
   
 end

data/spec/features/dashboard/subscription_spec.rb

@@ -10,7 +10,7 @@
 #     visit url_for([:dashboard, Storytime::Subscription])
 
 #     Storytime::Subscription.all.each do |s|
-#       expect(page).to have_link("Edit", href: url_for([:edit, :dashboard, s, only_path: true]))  
+#       expect(page).to have_link("Edit", href: url_for([:edit, :dashboard, s]))  
 #     end
 #   end
 
@@ -60,6 +60,4 @@
 #       expect(page).to have_content(I18n.t('dashboard.subscriptions.unsubscribe.message'))
 #     end
 #   end
-
-#   it
 # end

data/spec/features/subscription_spec.rb

@@ -0,0 +1,19 @@
+# require 'spec_helper'
+
+# describe "Subscriptions" do
+#   before do
+#     setup_site
+#   end
+
+#   it "allows users to subscribe to a site" do
+#     pending "test if user can find a link to subscribe, click the link, enter their email, and then get a confirmation"
+#   end
+
+#   it "allows users to unsubscribe from a site through a link" do
+#     pending "test if user can goto a link and unsubscribe from a site"
+#   end
+
+#   it "only allows users to unsubscribe with a proper token" do
+#     pending "test if user can unsubscribe with incorrect token"
+#   end
+# end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storytime
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Ben Roesch, David Van Der Beek, Brandon Robins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -474,6 +474,7 @@ files:
 - 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
 - app/assets/javascripts/storytime/utilities.js
 - app/assets/stylesheets/storytime/admin.css.scss
 - app/assets/stylesheets/storytime/application.css.scss
@@ -497,6 +498,7 @@ files:
 - app/controllers/storytime/dashboard_controller.rb
 - app/controllers/storytime/pages_controller.rb
 - app/controllers/storytime/posts_controller.rb
+- app/controllers/storytime/subscriptions_controller.rb
 - app/helpers/storytime/application_helper.rb
 - app/helpers/storytime/dashboard/autosaves_helper.rb
 - app/helpers/storytime/dashboard/media_helper.rb
@@ -683,6 +685,7 @@ files:
 - spec/features/dashboard/users_spec.rb
 - spec/features/pages_spec.rb
 - spec/features/posts_spec.rb
+- spec/features/subscription_spec.rb
 - spec/importers/wordpress_spec.rb
 - spec/lib/storytime_spec.rb
 - spec/models/post_spec.rb
@@ -800,6 +803,7 @@ test_files:
 - spec/features/dashboard/users_spec.rb
 - spec/features/pages_spec.rb
 - spec/features/posts_spec.rb
+- spec/features/subscription_spec.rb
 - spec/importers/wordpress_spec.rb
 - spec/lib/storytime_spec.rb
 - spec/models/post_spec.rb