storytime 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06f4a653cab5a07931cdc7c80d0892bd5a7daa12
-  data.tar.gz: 3fb261085ce26f70bf249ce1724a3005afa3c6f7
+  metadata.gz: f5763a623b7cbc3a4338fb7ad83ddc56a5dbb8e3
+  data.tar.gz: dc51e884bd9e91cf0cc466edbdc5a54ce1a74abc
 SHA512:
-  metadata.gz: 3d35eeeb18f0d289a16f3a7b312d2e76f17220dfd57b0c6077cea8de1012dc9a0227cdac33c8a05a444e5d819cd5b03e70b8e79138d8e14490ca959314cfe4e0
-  data.tar.gz: 5b5621d9c72c07e3ede66912eefc1c06a629ffca917075915e153bdf0e4a7f7aee85d14c262f8670654c520aea03fec3c435544f79384e06c724c540d3eb47a7
+  metadata.gz: 0614230034de10544be38ed69510228d33c0655ed48b02bcaf9f975626aac957204ecbf5541848c6ad3fb79b7175314dfc0656b2b0d26df2e4c121e88ed1f132
+  data.tar.gz: ce87e3b715e67c59f8254143f4fff0a7f5baecfc026cee4f895bc409c01dcad268c8d2b66b855eeb8149dd572d8c6d8172afd54285d926e9110872c708908688

data/app/controllers/storytime/application_controller.rb

@@ -30,15 +30,15 @@ class Storytime::ApplicationController < ApplicationController
 
   if Storytime.user_class_symbol != :user
     def authenticate_user!
-      send("authenticate_#{Storytime.user_class.to_s.downcase}!".to_sym)
+      send("authenticate_#{Storytime.user_class_underscore_all}!".to_sym)
     end
 
     def current_user
-      send("current_#{Storytime.user_class.to_s.downcase}".to_sym)
+      send("current_#{Storytime.user_class_underscore_all}".to_sym)
     end
 
     def user_signed_in?
-      send("#{Storytime.user_class.to_s.downcase}_signed_in?".to_sym)
+      send("#{Storytime.user_class_underscore_all}_signed_in?".to_sym)
     end
   end
 

data/app/models/storytime/autosave.rb

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

data/app/models/storytime/comment.rb

@@ -1,6 +1,6 @@
 module Storytime
   class Comment < ActiveRecord::Base
-    belongs_to :user, class_name: Storytime.user_class.to_s
+    belongs_to :user, class_name: Storytime.user_class
     belongs_to :post
 
     validates :user, presence: true

data/app/models/storytime/media.rb

@@ -1,6 +1,6 @@
 module Storytime
   class Media < ActiveRecord::Base
-    belongs_to :user, class_name: Storytime.user_class.to_s
+    belongs_to :user, class_name: Storytime.user_class
     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 :user, class_name: Storytime.user_class.to_s
+    belongs_to :user, class_name: Storytime.user_class
     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 :user, class_name: Storytime.user_class.to_s
+    belongs_to :user, class_name: Storytime.user_class
     belongs_to :versionable, polymorphic: true
   end
 end

data/app/views/storytime/application/storytime/_header.html.erb

@@ -22,7 +22,7 @@
             <%= link_to "#{t 'layout.subscribe_to', site_name: @site.title}", "#", data: {target: "#addSubscriptionModal", toggle: "modal"} %>
           </li>
           <% unless user_signed_in? %>
-            <li><%= link_to "Sign In", main_app.new_user_session_path %></li>
+            <li><%= link_to "Sign In", Storytime.login_path %></li>
           <% end %>
         </ul>
       </div>

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

@@ -45,7 +45,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.send("destroy_#{Storytime.user_class_underscore}_session_path"), method: :delete %></li>
+          <li><%= link_to "Sign Out", Storytime.logout_path, method: Storytime.logout_method %></li>
         </ul>
       </li>
     </ul>

data/lib/generators/templates/storytime.rb

@@ -15,6 +15,15 @@ Storytime.configure do |config|
   # Storytime's mount point within the host app.
   # config.home_page_path = "/"
 
+  # Path used to sign users in. 
+  # config.login_path = '/users/sign_in'
+
+  # Path used to log users out. 
+  # config.logout_path = '/users/sign_out'
+
+  # Method used for Storytime user logout path.
+  # config.logout_method = :delete
+
   # Add custom post types to use within Storytime.
   # Make sure that the custom post types inherit the
   # from the Storytime::Post class.
@@ -41,7 +50,7 @@ Storytime.configure do |config|
   # Post subclasses. Options for the search adapter include:
   # Storytime::PostgresSearchAdapter, Storytime::MysqlSearchAdapter,
   # Storytime::MysqlFulltextSearchAdapter, Storytime::Sqlite3SearchAdapter
-  # config.search_adapter = Storytime::PostgresSearchAdapter
+  # config.search_adapter = ''
 
   # File upload options.
   config.enable_file_upload = true

data/lib/storytime.rb

@@ -19,6 +19,18 @@ module Storytime
   mattr_accessor :home_page_path
   @@home_page_path = "/"
 
+  # Path used to sign users in. 
+  mattr_accessor :login_path
+  @@login_path = '/users/sign_in'
+
+  # Path used to log users out. 
+  mattr_accessor :logout_path
+  @@logout_path = '/users/sign_out'
+
+  # Method used for Storytime user logout path.
+  mattr_accessor :logout_method
+  @@logout_method = :delete
+
   # Enable file uploads through Carrierwave.
   mattr_accessor :enable_file_upload
   @@enable_file_upload = true
@@ -55,7 +67,7 @@ module Storytime
   # Storytime::PostgresSearchAdapter, Storytime::MysqlSearchAdapter,
   # Storytime::MysqlFulltextSearchAdapter, Storytime::Sqlite3SearchAdapter
   mattr_accessor :search_adapter
-  @@search_adapter = Storytime::PostgresSearchAdapter
+  @@search_adapter = ''
 
   class << self
     attr_accessor :layout, :media_storage, :s3_bucket, :post_types
@@ -71,7 +83,11 @@ module Storytime
     end
 
     def user_class_underscore
-      @@user_class.to_s.underscore
+      @@user_class.underscore
+    end
+
+    def user_class_underscore_all
+      @@user_class.underscore.gsub('/', '_')
     end
 
     def user_class_symbol

data/lib/storytime/version.rb

@@ -1,3 +1,3 @@
 module Storytime
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storytime
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ben Roesch, David Van Der Beek, Brandon Robins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -679,25 +679,6 @@ files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20140530185250_devise_create_users.rb
-- spec/dummy/db/migrate/20150130213631_create_storytime_posts.storytime.rb
-- spec/dummy/db/migrate/20150130213632_create_friendly_id_slugs.storytime.rb
-- spec/dummy/db/migrate/20150130213633_create_storytime_media.storytime.rb
-- spec/dummy/db/migrate/20150130213634_create_storytime_sites.storytime.rb
-- spec/dummy/db/migrate/20150130213635_create_storytime_tags.storytime.rb
-- spec/dummy/db/migrate/20150130213636_create_storytime_taggings.storytime.rb
-- spec/dummy/db/migrate/20150130213637_create_storytime_versions.storytime.rb
-- spec/dummy/db/migrate/20150130213638_create_storytime_roles.storytime.rb
-- spec/dummy/db/migrate/20150130213639_add_storytime_role_id_to_users.storytime.rb
-- spec/dummy/db/migrate/20150130213640_create_storytime_permissions.storytime.rb
-- spec/dummy/db/migrate/20150130213641_create_storytime_actions.storytime.rb
-- spec/dummy/db/migrate/20150130213642_create_storytime_comments.storytime.rb
-- spec/dummy/db/migrate/20150130213643_add_storytime_name_to_users.storytime.rb
-- spec/dummy/db/migrate/20150130213644_create_storytime_autosaves.storytime.rb
-- spec/dummy/db/migrate/20150130213645_add_secondary_media_id_to_storytime_post.storytime.rb
-- spec/dummy/db/migrate/20150130213646_create_storytime_snippets.storytime.rb
-- spec/dummy/db/migrate/20150130213647_create_storytime_subscriptions.storytime.rb
-- spec/dummy/db/migrate/20150130213648_add_title_and_content_index_to_storytime_post.storytime.rb
-- spec/dummy/db/migrate/20150130213649_add_site_id_to_storytime_subscription.storytime.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
@@ -819,25 +800,6 @@ test_files:
 - spec/dummy/config.ru
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20140530185250_devise_create_users.rb
-- spec/dummy/db/migrate/20150130213631_create_storytime_posts.storytime.rb
-- spec/dummy/db/migrate/20150130213632_create_friendly_id_slugs.storytime.rb
-- spec/dummy/db/migrate/20150130213633_create_storytime_media.storytime.rb
-- spec/dummy/db/migrate/20150130213634_create_storytime_sites.storytime.rb
-- spec/dummy/db/migrate/20150130213635_create_storytime_tags.storytime.rb
-- spec/dummy/db/migrate/20150130213636_create_storytime_taggings.storytime.rb
-- spec/dummy/db/migrate/20150130213637_create_storytime_versions.storytime.rb
-- spec/dummy/db/migrate/20150130213638_create_storytime_roles.storytime.rb
-- spec/dummy/db/migrate/20150130213639_add_storytime_role_id_to_users.storytime.rb
-- spec/dummy/db/migrate/20150130213640_create_storytime_permissions.storytime.rb
-- spec/dummy/db/migrate/20150130213641_create_storytime_actions.storytime.rb
-- spec/dummy/db/migrate/20150130213642_create_storytime_comments.storytime.rb
-- spec/dummy/db/migrate/20150130213643_add_storytime_name_to_users.storytime.rb
-- spec/dummy/db/migrate/20150130213644_create_storytime_autosaves.storytime.rb
-- spec/dummy/db/migrate/20150130213645_add_secondary_media_id_to_storytime_post.storytime.rb
-- spec/dummy/db/migrate/20150130213646_create_storytime_snippets.storytime.rb
-- spec/dummy/db/migrate/20150130213647_create_storytime_subscriptions.storytime.rb
-- spec/dummy/db/migrate/20150130213648_add_title_and_content_index_to_storytime_post.storytime.rb
-- spec/dummy/db/migrate/20150130213649_add_site_id_to_storytime_subscription.storytime.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html

data/spec/dummy/db/migrate/20150130213631_create_storytime_posts.storytime.rb

@@ -1,18 +0,0 @@
-# This migration comes from storytime (originally 20140501174341)
-class CreateStorytimePosts < ActiveRecord::Migration
-  def change
-    create_table :storytime_posts do |t|
-      t.references :user, index: true
-      t.string :type
-      t.string :title
-      t.string :slug, index: true
-      t.text :content
-      t.text :excerpt
-      t.datetime :published_at
-      t.references :featured_media
-      t.boolean :featured, default: false
-
-      t.timestamps
-    end
-  end
-end

data/spec/dummy/db/migrate/20150130213632_create_friendly_id_slugs.storytime.rb

@@ -1,16 +0,0 @@
-# This migration comes from storytime (originally 20140509191309)
-class CreateFriendlyIdSlugs < ActiveRecord::Migration
-  def change
-    create_table :friendly_id_slugs do |t|
-      t.string   :slug,           :null => false
-      t.integer  :sluggable_id,   :null => false
-      t.string   :sluggable_type, :limit => 50
-      t.string   :scope
-      t.datetime :created_at
-    end
-    add_index :friendly_id_slugs, :sluggable_id
-    add_index :friendly_id_slugs, [:slug, :sluggable_type]
-    add_index :friendly_id_slugs, [:slug, :sluggable_type, :scope], :unique => true
-    add_index :friendly_id_slugs, :sluggable_type
-  end
-end

data/spec/dummy/db/migrate/20150130213633_create_storytime_media.storytime.rb

@@ -1,11 +0,0 @@
-# This migration comes from storytime (originally 20140511200849)
-class CreateStorytimeMedia < ActiveRecord::Migration
-  def change
-    create_table :storytime_media do |t|
-      t.string :file
-      t.references :user, index: true
-
-      t.timestamps
-    end
-  end
-end

data/spec/dummy/db/migrate/20150130213634_create_storytime_sites.storytime.rb

@@ -1,14 +0,0 @@
-# This migration comes from storytime (originally 20140513161233)
-class CreateStorytimeSites < ActiveRecord::Migration
-  def change
-    create_table :storytime_sites do |t|
-      t.string :title
-      t.integer :post_slug_style, default: 0
-      t.string :ga_tracking_id
-      t.integer :root_page_content, default: 0
-      t.references :root_post, index: true
-
-      t.timestamps
-    end
-  end
-end

data/spec/dummy/db/migrate/20150130213635_create_storytime_tags.storytime.rb

@@ -1,10 +0,0 @@
-# This migration comes from storytime (originally 20140514200234)
-class CreateStorytimeTags < ActiveRecord::Migration
-  def change
-    create_table :storytime_tags do |t|
-      t.string :name
-
-      t.timestamps
-    end
-  end
-end

data/spec/dummy/db/migrate/20150130213636_create_storytime_taggings.storytime.rb

@@ -1,11 +0,0 @@
-# This migration comes from storytime (originally 20140514200304)
-class CreateStorytimeTaggings < ActiveRecord::Migration
-  def change
-    create_table :storytime_taggings do |t|
-      t.belongs_to :tag, index: true
-      t.belongs_to :post, index: true
-
-      t.timestamps
-    end
-  end
-end

data/spec/dummy/db/migrate/20150130213637_create_storytime_versions.storytime.rb

@@ -1,13 +0,0 @@
-# This migration comes from storytime (originally 20140516141252)
-class CreateStorytimeVersions < ActiveRecord::Migration
-  def change
-    create_table :storytime_versions do |t|
-      t.text :content
-      t.references :user, index: true
-      t.references :versionable, polymorphic: true
-
-      t.timestamps
-    end
-    add_index :storytime_versions, [:versionable_type, :versionable_id], name: "versionable_index"
-  end
-end

data/spec/dummy/db/migrate/20150130213638_create_storytime_roles.storytime.rb

@@ -1,10 +0,0 @@
-# This migration comes from storytime (originally 20140521190606)
-class CreateStorytimeRoles < ActiveRecord::Migration
-  def change
-    create_table :storytime_roles do |t|
-      t.string :name, index: true
-
-      t.timestamps
-    end
-  end
-end

data/spec/dummy/db/migrate/20150130213639_add_storytime_role_id_to_users.storytime.rb

@@ -1,7 +0,0 @@
-# This migration comes from storytime (originally 20140521191048)
-class AddStorytimeRoleIdToUsers < ActiveRecord::Migration
-  def change
-    add_column Storytime.user_class.table_name.to_sym, :storytime_role_id, :integer
-    add_index Storytime.user_class.table_name.to_sym, :storytime_role_id
-  end
-end

data/spec/dummy/db/migrate/20150130213640_create_storytime_permissions.storytime.rb

@@ -1,11 +0,0 @@
-# This migration comes from storytime (originally 20140521191728)
-class CreateStorytimePermissions < ActiveRecord::Migration
-  def change
-    create_table :storytime_permissions do |t|
-      t.belongs_to :role, index: true
-      t.belongs_to :action, index: true
-
-      t.timestamps
-    end
-  end
-end

data/spec/dummy/db/migrate/20150130213641_create_storytime_actions.storytime.rb

@@ -1,11 +0,0 @@
-# This migration comes from storytime (originally 20140521191744)
-class CreateStorytimeActions < ActiveRecord::Migration
-  def change
-    create_table :storytime_actions do |t|
-      t.string :name
-      t.string :guid, index: true
-
-      t.timestamps
-    end
-  end
-end

data/spec/dummy/db/migrate/20150130213642_create_storytime_comments.storytime.rb

@@ -1,12 +0,0 @@
-# This migration comes from storytime (originally 20140813014447)
-class CreateStorytimeComments < ActiveRecord::Migration
-  def change
-    create_table :storytime_comments do |t|
-      t.text :content
-      t.references :user, index: true
-      t.references :post, index: true
-
-      t.timestamps
-    end
-  end
-end

data/spec/dummy/db/migrate/20150130213643_add_storytime_name_to_users.storytime.rb

@@ -1,6 +0,0 @@
-# This migration comes from storytime (originally 20140813130534)
-class AddStorytimeNameToUsers < ActiveRecord::Migration
-  def change
-    add_column Storytime.user_class.table_name.to_sym, :storytime_name, :string
-  end
-end

data/spec/dummy/db/migrate/20150130213644_create_storytime_autosaves.storytime.rb

@@ -1,13 +0,0 @@
-# This migration comes from storytime (originally 20140916183056)
-class CreateStorytimeAutosaves < ActiveRecord::Migration
-  def change
-    create_table :storytime_autosaves do |t|
-      t.text :content
-      t.references :autosavable, polymorphic: true
-
-      t.timestamps
-    end
-
-    add_index :storytime_autosaves, [:autosavable_type, :autosavable_id], name: "autosavable_index"
-  end
-end

data/spec/dummy/db/migrate/20150130213645_add_secondary_media_id_to_storytime_post.storytime.rb

@@ -1,6 +0,0 @@
-# This migration comes from storytime (originally 20141020213343)
-class AddSecondaryMediaIdToStorytimePost < ActiveRecord::Migration
-  def change
-    add_reference :storytime_posts, :secondary_media
-  end
-end

data/spec/dummy/db/migrate/20150130213646_create_storytime_snippets.storytime.rb

@@ -1,22 +0,0 @@
-# This migration comes from storytime (originally 20141021073356)
-class CreateStorytimeSnippets < ActiveRecord::Migration
-  def up
-    create_table :storytime_snippets do |t|
-      t.string :name, index: true
-      t.text :content
-
-      t.timestamps
-    end
-
-    Storytime::Role.seed
-    Storytime::Action.seed
-
-    manage_snippets = Storytime::Action.find_by(guid: "5qg25i")
-    Storytime::Permission.find_or_create_by(role: Storytime::Role.find_by(name: "editor"), action: manage_snippets)
-    Storytime::Permission.find_or_create_by(role: Storytime::Role.find_by(name: "admin"), action: manage_snippets)
-  end
-
-  def down
-    drop_table :storytime_snippets
-  end
-end

data/spec/dummy/db/migrate/20150130213647_create_storytime_subscriptions.storytime.rb

@@ -1,15 +0,0 @@
-# This migration comes from storytime (originally 20141111164439)
-class CreateStorytimeSubscriptions < ActiveRecord::Migration
-  def change
-    create_table :storytime_subscriptions do |t|
-      t.string :email
-      t.boolean :subscribed, default: true
-      t.string :token, index: true
-
-      t.timestamps
-    end
-
-    Storytime::Action.seed
-    Storytime::Permission.seed
-  end
-end

data/spec/dummy/db/migrate/20150130213648_add_title_and_content_index_to_storytime_post.storytime.rb

@@ -1,57 +0,0 @@
-# This migration comes from storytime (originally 20150122200805)
-class AddTitleAndContentIndexToStorytimePost < ActiveRecord::Migration
-  def up
-    if Storytime.search_adapter == Storytime::PostgresSearchAdapter
-      execute "CREATE INDEX posts_title_contentx ON storytime_posts USING gin(to_tsvector('english', coalesce(title, '') || ' ' || coalesce(content, '')));"
-    elsif Storytime.search_adapter == Storytime::MysqlSearchAdapter
-      type = get_table_type
-      version = get_mysql_version
-
-      if (type == "MyISAM") || (type == "InnoDB" && Gem::Version.new(version) >= Gem::Version.new("5.6.4"))
-        add_index :storytime_posts, [:title, :content], type: :fulltext, :length => 50
-      elsif type == "InnoDB"
-        add_index :storytime_posts, [:title, :content], :length => 50
-      end
-    elsif Storytime.search_adapter == Storytime::MysqlFulltextSearchAdapter
-      add_index :storytime_posts, [:title, :content], type: :fulltext, :length => 50
-    end
-  end
-
-  def down
-    if Storytime.search_adapter == Storytime::PostgresSearchAdapter
-      execute "REMOVE INDEX posts_title_contentx ON storytime_posts"
-    elsif Storytime.search_adapter == Storytime::MysqlSearchAdapter
-      type = get_table_type
-      version = get_mysql_version
-
-      if (type == "MyISAM") || (type == "InnoDB" && Gem::Version.new(version) >= Gem::Version.new("5.6.4"))
-        remove_index :storytime_posts, [:title, :content], type: :fulltext
-      elsif type == "InnoDB"
-        remove_index :storytime_posts, [:title, :content]
-      end
-    elsif Storytime.search_adapter == Storytime::MysqlFulltextSearchAdapter
-      remove_index :storytime_posts, [:title, :content], type: :fulltext
-    end
-  end
-
-  def get_table_type
-    config = Rails.configuration.database_configuration
-    database_name = config[Rails.env]["database"]
-
-    sql = "SELECT TABLE_NAME, ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '#{database_name}'"
-    query = ActiveRecord::Base.connection.execute(sql)
-
-    query.entries.each do |k,v|
-      if k == "storytime_posts"
-        return v
-      end
-    end
-  end
-
-  def get_mysql_version
-    sql = "SELECT VERSION()"
-    query = ActiveRecord::Base.connection.execute(sql)
-
-    query.entries[0][0]
-  end
-end

data/spec/dummy/db/migrate/20150130213649_add_site_id_to_storytime_subscription.storytime.rb

@@ -1,6 +0,0 @@
-# This migration comes from storytime (originally 20150129215308)
-class AddSiteIdToStorytimeSubscription < ActiveRecord::Migration
-  def change
-    add_column :storytime_subscriptions, :site_id, :integer
-  end
-end