storytime 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc621908139c9c5e7f34b65fc9ba7dc1bf744814
-  data.tar.gz: 874adcff7ad44354e9bcafbf9e9334b4fea439c6
+  metadata.gz: cf39a31891a15bcee7b10824400ad71d55dada8c
+  data.tar.gz: 6827ab5ce70be645b272de46062d7ceaf991f726
 SHA512:
-  metadata.gz: f40b232bb112db2fe38d1ba962568976377bcee2b24ea5b67eac98545772d1f3b6359547d1adf0116dbc6142cad1a320c6b0bfbe84079c8bb0c8f044481d68ff
-  data.tar.gz: cccace1f9505433a4f066c5265781f8ebd6801e7ab90d3c43e0b953d55955beb649bb572a668687ce9382b8d57c5ed4acc17f8e96e06e8e63380f31d0a933a28
+  metadata.gz: c3f251310c2b7af9a815b214d7b42df3b458756db96df5868a959c0b43c2ea5f676d5c87f666401014388d9809ba9fe97d00760f2847bc44877af6436f943061
+  data.tar.gz: 1cc0d64fee3ab5721d9a32c046a7f54cd211d7bee13de96d64c0da4ecee2f60643e227cffccf4e1155f34b631aa5d3ab9b5b163e4c0f07f582a68a5e95aaf315

data/app/controllers/storytime/application_controller.rb

@@ -8,6 +8,12 @@ class Storytime::ApplicationController < ApplicationController
   
   helper :all
 
+  if Storytime.user_class_symbol != :user
+    helper_method :authenticate_user!
+    helper_method :current_user
+    helper_method :user_signed_in?
+  end
+
   def setup
     url = if Storytime.user_class.count == 0
       main_app.new_user_registration_url
@@ -22,6 +28,20 @@ class Storytime::ApplicationController < ApplicationController
     redirect_to url
   end
 
+  if Storytime.user_class_symbol != :user
+    def authenticate_user!
+      send("authenticate_#{Storytime.user_class.to_s.downcase}!".to_sym)
+    end
+
+    def current_user
+      send("current_#{Storytime.user_class.to_s.downcase}".to_sym)
+    end
+
+    def user_signed_in?
+      send("#{Storytime.user_class.to_s.downcase}_signed_in?".to_sym)
+    end
+  end
+
 private
   def ensure_site
     redirect_to new_dashboard_site_url unless devise_controller? || @site = Storytime::Site.first

data/app/controllers/storytime/comments_controller.rb

@@ -10,8 +10,10 @@ module Storytime
     respond_to :json, only: :destroy
 
     def create
-      @comment = current_user.storytime_comments.new(comment_params)
+      @comment = Comment.new(comment_params)
+      @comment.user = current_user
       @comment.post = @post
+
       authorize @comment
       opts = { notice: I18n.t('flash.comments.create.success') } if @comment.save
       redirect_to @post, opts
@@ -31,7 +33,7 @@ module Storytime
     end
 
     def comment_params
-      params.require(:comment).permit(*policy(@comment || current_user.storytime_comments.new).permitted_attributes)
+      params.require(:comment).permit(*policy(@comment || Comment.new).permitted_attributes)
     end
 
   end

data/app/controllers/storytime/dashboard/media_controller.rb

@@ -17,7 +17,9 @@ module Storytime
       end
 
       def create
-        @media = current_user.storytime_media.new(media_params)
+        @media = Media.new(media_params)
+        @media.user = current_user
+
         authorize @media
         @media.save
         respond_with :dashboard, @media do |format|

data/app/controllers/storytime/dashboard/users_controller.rb

@@ -49,7 +49,7 @@ module Storytime
 
     private
       def user_params
-        params.require(:user).permit(:email, :storytime_role_id, :storytime_name, :password, :password_confirmation)
+        params.require(Storytime.user_class_symbol).permit(:email, :storytime_role_id, :storytime_name, :password, :password_confirmation)
       end
 
       def load_user

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 if post.autosave
         post.preview = true
         post
       else

data/app/models/storytime/autosave.rb

@@ -1,6 +1,6 @@
 module Storytime
   class Autosave < ActiveRecord::Base
-    belongs_to Storytime.user_class_symbol
+    belongs_to :user, class_name: Storytime.user_class.to_s
     belongs_to :autosavable, polymorphic: true
 
     attr_accessor :draft_content

data/app/models/storytime/comment.rb

@@ -1,9 +1,9 @@
 module Storytime
   class Comment < ActiveRecord::Base
-    belongs_to Storytime.user_class_symbol
+    belongs_to :user, class_name: Storytime.user_class.to_s
     belongs_to :post
 
-    validates Storytime.user_class_symbol, presence: true
+    validates :user, presence: true
     validates :post_id, presence: true
 
     def commenter_name

data/app/models/storytime/media.rb

@@ -1,6 +1,6 @@
 module Storytime
   class Media < ActiveRecord::Base
-    belongs_to Storytime.user_class_symbol
+    belongs_to :user, class_name: Storytime.user_class.to_s
     has_many :posts # posts where this is the featured media
 
     mount_uploader :file, MediaUploader

data/app/models/storytime/post.rb

@@ -6,7 +6,7 @@ module Storytime
     extend FriendlyId
     friendly_id :slug_candidates, use: [:history]
 
-    belongs_to Storytime.user_class_symbol
+    belongs_to :user, class_name: Storytime.user_class.to_s
     belongs_to :featured_media, class_name: "Media"
     belongs_to :secondary_media, class_name: "Media"
 

data/app/models/storytime/version.rb

@@ -1,6 +1,6 @@
 module Storytime
   class Version < ActiveRecord::Base
-    belongs_to Storytime.user_class_symbol
+    belongs_to :user, class_name: Storytime.user_class.to_s
     belongs_to :versionable, polymorphic: true
   end
 end

data/app/views/storytime/dashboard/_navigation.html.erb

@@ -27,7 +27,7 @@
       <% end %>
 
       <% if Pundit.policy(current_user, Storytime.user_class).index? %>
-        <li <%= active_nav_item_class("users") %>><%= link_to "Users", storytime.url_for([:dashboard, Storytime.user_class]) %></li>
+        <li <%= active_nav_item_class("users") %>><%= link_to "Users", storytime.url_for([:dashboard, :users]) %></li>
       <% end %>
 
       <% if Pundit.policy(current_user, Storytime::Site).edit? %>
@@ -43,7 +43,7 @@
         </a>
         <ul class="dropdown-menu">
           <li><%= link_to "My Account", storytime.edit_dashboard_user_path(current_user) %></li>
-          <li><%= link_to "Sign Out", main_app.destroy_user_session_path, method: :delete %></li>
+          <li><%= link_to "Sign Out", main_app.send("destroy_#{Storytime.user_class_underscore}_session_path"), method: :delete %></li>
         </ul>
       </li>
     </ul>

data/app/views/storytime/dashboard/users/_user.html.erb

@@ -1,11 +1,11 @@
-<tr id="user_<%= user.id %>">
+<tr id="<%= Storytime.user_class_underscore %>_<%= user.id %>">
   <td><%= user.email %></td>
   <td><%= user.storytime_name %></td>
   <td><%= user.storytime_role.name.humanize if user.storytime_role %></td>
   <td class='right'>
     <div class="btn-group">
-      <%= link_to t('dashboard.users.edit_user_button'), edit_polymorphic_url([:dashboard, user]), class: "btn btn-xs btn-default" %>
-      <%= delete_resource_link user, polymorphic_url([:dashboard, user]) unless user == current_user %>
+      <%= link_to t('dashboard.users.edit_user_button'), url_for(:controller => 'dashboard/users', :action => 'edit', :id => user.id), class: "btn btn-xs btn-default" %>
+      <%= delete_resource_link user, dashboard_user_url(user) unless user == current_user %>
     </div>
   </td>
 </tr>

data/app/views/storytime/dashboard/users/edit.html.erb

@@ -1,7 +1,7 @@
 <div class="container">
   <h2><%= t('dashboard.users.edit_user_header') %></h2>
   
-  <%= simple_form_for [:dashboard, @user] do |f| %>
+  <%= simple_form_for @user, :url => dashboard_user_path do |f| %>
     <%= f.input :email %>
     <%= f.input :storytime_name %>
     <%= f.association :storytime_role, include_blank: true, label_method: :label %>

data/app/views/storytime/dashboard/users/new.html.erb

@@ -1,6 +1,7 @@
 <div class="container">
   <h2>New User</h2>
-  <%= simple_form_for [:dashboard, @user] do |f| %>
+
+  <%= simple_form_for @user, :url => dashboard_users_path, :method => :post do |f| %>
     <%= f.input :email %>
     <%= f.association :storytime_role, include_blank: false, label_method: :label %>
     <%= f.input :password %>

data/config/routes.rb

@@ -10,7 +10,7 @@
     resources :snippets, except: [:show]
     resources :media, except: [:show, :edit, :update]
     resources :imports, only: [:new, :create]
-    resources :users
+    resources :users, path: Storytime.user_class_underscore.pluralize
     resources :roles do 
       collection do
         patch :update_multiple

data/lib/storytime/concerns/storytime_user.rb

@@ -6,6 +6,7 @@ module Storytime
       module ClassMethods
         def storytime_user
           belongs_to :storytime_role, class_name: "Storytime::Role"
+          
           has_many :storytime_posts, class_name: "Storytime::Post"
           has_many :storytime_pages, class_name: "Storytime::Page"
           has_many :storytime_media, class_name: "Storytime::Media"
@@ -13,6 +14,10 @@ module Storytime
           has_many :storytime_comments, class_name: "Storytime::Comment"
 
           class_eval <<-EOS
+            def self.policy_class
+              UserPolicy
+            end
+
             def storytime_user?
               !storytime_role.nil?
             end

data/lib/storytime/version.rb

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

data/lib/storytime.rb

@@ -51,6 +51,10 @@ module Storytime
       @@user_class.constantize
     end
 
+    def user_class_underscore
+      @@user_class.to_s.underscore
+    end
+
     def user_class_symbol
       @@user_class.underscore.to_sym
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storytime
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Ben Roesch, David Van Der Beek, Brandon Robins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails