storytime 1.2.0 → 2.0.0

data/app/models/storytime/post.rb

@@ -2,78 +2,61 @@ module Storytime
   class Post < ActiveRecord::Base
     include Storytime::Concerns::HasVersions
     include ActionView::Helpers::SanitizeHelper
+    include Storytime::ScopedToSite
+    include Storytime::PostTags
+    include Storytime::PostPartialInheritance
 
     extend FriendlyId
-    friendly_id :slug_candidates, use: [:history]
+    friendly_id :slug_candidates, use: [:history, :scoped], scope: :site
 
     belongs_to :user, class_name: Storytime.user_class
-    belongs_to :featured_media, class_name: "Media"
-    belongs_to :secondary_media, class_name: "Media"
-
-    has_many :taggings, dependent: :destroy
-    has_many :tags, through: :taggings
-    has_many :comments
+    belongs_to :site
 
     has_one :autosave, as: :autosavable, dependent: :destroy, class_name: "Autosave"
 
-    attr_accessor :preview, :published_at_date, :published_at_time, :send_subscriber_email
+    attr_accessor :preview
 
-    validates_presence_of :title, :draft_content
+    validates_presence_of :title
     validates :title, length: { in: 1..Storytime.post_title_character_limit }
-    validates :excerpt, length: { in: 0..Storytime.post_excerpt_character_limit }
     validates :user, presence: true
     validates :type, inclusion: { in: Storytime.post_types }
 
-    before_validation :populate_excerpt_from_content
     before_save :sanitize_content
-    before_save :set_published_at
 
-    scope :primary_feed, ->{ where(type: primary_feed_types) }
+    scope :notification_delivery_pending, -> { where(notifications_enabled: true, notifications_sent_at: nil) }
 
     class << self
       def policy_class
         Storytime::PostPolicy
       end
 
-      def primary_feed_types
-        Storytime.post_types.map{|post_type| post_type.constantize }.select do |post_type|
-          post_type.included_in_primary_feed?
-        end
-      end
-
       def human_name
         @human_name ||= type_name.humanize.split(" ").map(&:capitalize).join(" ")
       end
 
       def find_preview(id)
-        Post.friendly.find(id)
+        post = Post.friendly.find(id)
+        
+        if post.present?
+          post.content = post.preview_content
+          post.preview = true
+        end
+
+        post
       end
 
       def type_name
         to_s.split("::").last.underscore
       end
+    end 
+    #### END class << self
 
-      def tagged_with(name)
-        if t = Storytime::Tag.find_by(name: name)
-          joins(:taggings).where(storytime_taggings: { tag_id: t.id }) 
-        else
-          none
-        end
-      end
-
-      def tag_counts
-        Storytime::Tag.select("storytime_tags.*, count(storytime_taggings.tag_id) as count").joins(:taggings).group("storytime_tags.id")
-
-        #Tagging.group("storytime_taggings.tag_id").includes(:tag)
-      end
-
-      def included_in_primary_feed?
-        true
-      end
+    def to_partial_path
+      self.class._to_partial_path(site)
+    end
 
-      def model_name
-        ActiveModel::Name.new(self, nil, "Post")
-      end
+    def preview_content
+      autosave.present? ? autosave.content : latest_version.content 
     end
 
     def human_name
@@ -84,35 +67,6 @@ module Storytime
       self.class.type_name
     end
 
-    def tag_list
-      tags.map(&:name).join(", ")
-    end
-
-    def tag_list=(names_or_ids)
-      self.tags = names_or_ids.map do |n|
-        if n.empty? || n == "nv__"
-          ""
-        elsif n.include?("nv__") || n.to_i == 0
-          Storytime::Tag.where(name: n.sub("nv__", "").strip).first_or_create!
-        else
-          Storytime::Tag.find(n)
-        end
-      end.delete_if { |x| x == "" }
-    end
-
-    def populate_excerpt_from_content
-      self.excerpt = (content || draft_content).slice(0..Storytime.post_excerpt_character_limit) if excerpt.blank?
-      self.excerpt = strip_tags(self.excerpt)
-    end
-
-    def show_comments?
-      true
-    end
-
-    def included_in_primary_feed?
-      self.class.included_in_primary_feed
-    end
-
     def author_name
       user.storytime_name.blank? ? user.email : user.storytime_name
     end
@@ -122,24 +76,17 @@ module Storytime
     end
 
     def should_generate_new_friendly_id?
-      slug = nil if slug == ""
-      slug_changed? || (slug.nil? && published_at_changed? && published_at_change.first.nil?)
+      current_slug = self.slug == "" ? nil : self.slug
+      slug_changed? || (current_slug.nil? && published_at_changed? && published_at_change.first.nil?)
     end
 
     def sanitize_content
-      self.draft_content = sanitize(self.draft_content, tags: Storytime.whitelisted_post_html_tags) unless Storytime.whitelisted_post_html_tags.blank?
+      self.draft_content = Storytime.post_sanitizer.call(self.draft_content) unless Storytime.post_sanitizer.blank?
     end
 
-    def set_published_at
-      if self.published_at_date || self.published_at_time
-        self.published_at = if self.published_at_time.nil?
-          DateTime.parse "#{self.published_at_date}"
-        elsif self.published_at_date.nil?
-          DateTime.parse "#{Date.today} #{self.published_at_time}"
-        else
-          DateTime.parse "#{self.published_at_date} #{self.published_at_time}"
-        end
-      end
+    def post_ancestor_klasses
+      self.class.ancestors.grep(Class).split(ActiveRecord::Base).first
     end
+
   end
 end

data/app/models/storytime/role.rb

@@ -6,6 +6,18 @@ module Storytime
 
     validates :name, uniqueness: true
 
+    def editor?
+      name == "editor"
+    end
+
+    def writer?
+      name == "writer"
+    end
+
+    def admin?
+      name == "admin"
+    end
+
     def label
       name.humanize
     end

data/app/models/storytime/site.rb

@@ -1,28 +1,49 @@
 module Storytime
   class Site < ActiveRecord::Base
+    require 'uri'
     extend Storytime::Enum if Rails::VERSION::MINOR < 1
 
     enum post_slug_style: [:default, :day_and_name, :month_and_name, :post_id]
     enum root_page_content: [:posts, :page]
 
+    has_many :memberships, class_name: "Storytime::Membership", dependent: :destroy
+    has_many :users, through: :memberships, class_name: Storytime.user_class
     has_many :subscriptions, dependent: :destroy
+    has_many :posts, dependent: :destroy
+    has_many :blog_posts, dependent: :destroy
+    has_many :pages, dependent: :destroy
+    has_many :blogs, dependent: :destroy
+    belongs_to :homepage, class_name: "Storytime::Post", foreign_key: "root_post_id"
+    belongs_to :creator, class_name: Storytime.user_class, foreign_key: "user_id"
 
-    validates :root_post_id, presence: true, if: ->(site){ site.root_page_content == "page" }
-    validates :title, length: { in: 1..200 }
+    validates :subscription_email_from, presence: true
+    validates :custom_domain, presence: true, uniqueness: true
+    validates :title, presence: true, length: { in: 1..200 }
 
-    after_create :ensure_routes_updated
-    after_update :ensure_routes_updated
+    before_save :remove_http_from_custom_domain
 
-    def ensure_routes_updated
-      if id_changed? || root_post_id_changed? || post_slug_style_changed? || root_page_content_changed?
-        Rails.application.reload_routes!
-      end
+    def self.current_id=(id)
+      Thread.current[:storytime_site_id] = id
+    end
+
+    def self.current_id
+      Thread.current[:storytime_site_id]
+    end
+
+    def self.current
+      find(current_id)
     end
 
     def save_with_seeds(user)
-      self.class.setup_seeds
-      user.update_attributes(storytime_role: Storytime::Role.find_by(name: "admin"))
-      save
+      self.creator = user
+      if save
+        self.class.setup_seeds
+        Storytime::Membership.create(user: user, site: self, storytime_role: Storytime::Role.find_by(name: "admin"))
+        blog = Storytime::Blog.seed(self, user)
+        self.update_column("root_post_id", blog.id)
+      else
+        false
+      end
     end
 
     def self.setup_seeds
@@ -32,11 +53,20 @@ module Storytime
     end
 
     def root_post_options
-      Storytime::Page.published
+      Storytime::Post.published.where(type: ["Storytime::Page", "Storytime::Blog"])
     end
 
     def active_email_subscriptions
       subscriptions.active
     end
+
+    def custom_view_path
+      self.title.parameterize
+    end
+
+  private
+    def remove_http_from_custom_domain
+      self.custom_domain = self.custom_domain.gsub(/http:\/\/|https:\/\//, "")
+    end
   end
 end

data/app/models/storytime/snippet.rb

@@ -1,5 +1,8 @@
 module Storytime
   class Snippet < ActiveRecord::Base
+    include Storytime::ScopedToSite
+    belongs_to :site
+
     validates :name, length: { in: 1..255 }
     validates :content, length: { in: 1..5000 }
   end

data/app/models/storytime/subscription.rb

@@ -1,12 +1,13 @@
 module Storytime
   class Subscription < ActiveRecord::Base
+    include Storytime::ScopedToSite
     belongs_to :site
 
     scope :active, -> { where(subscribed: true) }
 
     validates_presence_of :email
     validates_format_of :email, with: Storytime.email_regexp
-    validates :email, uniqueness: true
+    validates_uniqueness_of :email, scope: :site_id
 
     before_create :generate_token
 

data/app/models/storytime/tag.rb

@@ -1,8 +1,12 @@
 module Storytime
   class Tag < ActiveRecord::Base
+    include Storytime::ScopedToSite
+    belongs_to :site
+    
     has_many :taggings, dependent: :destroy
     has_many :posts, through: :taggings
 
-    validates :name, presence: true, uniqueness: true
+    validates :name, presence: true
+    validates_uniqueness_of :name, scope: :site_id
   end
 end

data/app/models/storytime/tagging.rb

@@ -1,5 +1,6 @@
 module Storytime
   class Tagging < ActiveRecord::Base
+    include Storytime::ScopedToSite
     belongs_to :tag
     belongs_to :post
   end

data/app/models/storytime/version.rb

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

data/app/policies/admin_policy.rb

@@ -0,0 +1,30 @@
+class AdminPolicy < Struct.new(:user, :admin)
+  attr_reader :user, :admin
+
+  def initialize(user, admin)
+    @user = user
+    @admin = admin
+  end
+
+  def create?
+    manage?
+  end
+
+  def read?
+    manage?
+  end
+
+  def update?
+    manage?
+  end
+
+  def destroy?
+    manage?
+  end
+
+  def manage?
+    action = Storytime::Action.find_by(guid: "3fj09k")
+    role = @user.storytime_role_in_site(Storytime::Site.current)
+    role.present? && role.allowed_actions.include?(action)
+  end
+end

data/app/policies/storytime/comment_policy.rb

@@ -11,12 +11,16 @@ module Storytime
       @comment.user == @user
     end
 
+    def is_admin_or_editor?
+      (@user && (@user.storytime_admin?(@comment.site) || @user.storytime_editor?(@comment.site)))
+    end
+
     def create?
       is_owner?
     end
 
     def destroy?
-      is_owner? || (@user && (@user.storytime_admin? || @user.storytime_editor?))
+      is_owner? || is_admin_or_editor?
     end
 
     def permitted_attributes

data/app/policies/storytime/membership_policy.rb

@@ -0,0 +1,32 @@
+module Storytime
+  class MembershipPolicy
+    attr_reader :user, :record
+
+    def initialize(current_user, record)
+      @current_user = current_user
+      @membership = record
+    end
+
+    def manage?
+      action = Storytime::Action.find_by(guid: "1f7d47")
+      role = @current_user.storytime_role_in_site(Storytime::Site.current)
+      role.present? && role.allowed_actions.include?(action)
+    end
+
+    def index?
+      manage?
+    end
+
+    def create?
+      manage?
+    end
+
+    def destroy?
+      manage?
+    end
+
+    def permitted_attributes
+      [:user_id, :storytime_role_id]
+    end
+  end
+end

data/app/policies/storytime/post_policy.rb

@@ -5,7 +5,7 @@ module Storytime
     class Scope < Struct.new(:user, :scope)
       def resolve
         action = Storytime::Action.find_by(guid: "d8a1b1")
-        if user.storytime_role.allowed_actions.include?(action)
+        if user.storytime_role_in_site(Storytime::Site.current).allowed_actions.include?(action)
           scope.all
         else
           scope.where(user_id: user.id)
@@ -59,7 +59,8 @@ module Storytime
         if @user.nil?
           false
         else
-          @user.storytime_role.allowed_actions.include?(action)
+          role = @user.storytime_role_in_site(Storytime::Site.current)
+          role.present? && role.allowed_actions.include?(action)
         end
       end
     end
@@ -74,12 +75,13 @@ module Storytime
       if @user.nil?
         false
       else
-        @user.storytime_role.allowed_actions.include?(action)
+        role = user.storytime_role_in_site(Storytime::Site.current)
+        role && role.allowed_actions.include?(action)
       end
     end
 
     def permitted_attributes
-      attrs = [:title, :draft_content, :draft_version_id, :excerpt, :featured_media_id, :secondary_media_id, :slug, :published_at_date, :send_subscriber_email, :published_at_time, {:tag_list => []}]
+      attrs = [:title, :draft_content, :draft_version_id, :excerpt, :featured_media_id, :secondary_media_id, :slug, :published_at_date, :notifications_enabled, :published_at_time, {:tag_list => []}]
       attrs << :published if publish?
       attrs
     end

data/app/policies/storytime/site_policy.rb

@@ -9,11 +9,12 @@ module Storytime
 
     def manage?
       action = Storytime::Action.find_by(guid: "47342a")
-      @user.storytime_role.present? && @user.storytime_role.allowed_actions.include?(action)
+      role = @user.storytime_role_in_site(Storytime::Site.current)
+      role.present? && role.allowed_actions.include?(action)
     end
 
     def create?
-      !Site.any?
+      true # !Site.any?
     end
 
     def new?
@@ -27,5 +28,9 @@ module Storytime
     def edit?
       update?
     end
+
+    def destroy?
+      manage?
+    end
   end
 end

data/app/policies/storytime/snippet_policy.rb

@@ -4,7 +4,7 @@ module Storytime
 
     def initialize(user, record)
       @user = user
-      @post = record
+      @snippet = record
     end
 
     def index?
@@ -33,7 +33,8 @@ module Storytime
 
     def manage?
       action = Storytime::Action.find_by(guid: "5qg25i")
-      user.storytime_role.allowed_actions.include?(action)
+      role = @user.storytime_role_in_site(Storytime::Site.current)
+      role.present? && role.allowed_actions.include?(action)
     end
 
     def permitted_attributes

data/app/policies/storytime/subscription_policy.rb

@@ -33,11 +33,12 @@ module Storytime
 
     def manage?
       action = Storytime::Action.find_by(guid: "d29d76")
-      user.storytime_role.allowed_actions.include?(action)
+      role = @user.storytime_role_in_site(Storytime::Site.current)
+      role.present? && role.allowed_actions.include?(action)
     end
 
     def permitted_attributes
-      [:email, :subscribed, :site_id]
+      [:email, :subscribed]
     end
   end
 end

data/app/policies/user_policy.rb

@@ -8,7 +8,8 @@ class UserPolicy
 
   def manage?
     action = Storytime::Action.find_by(guid: "1f7d47")
-    @current_user.storytime_role.present? && @current_user.storytime_role.allowed_actions.include?(action)
+    role = @current_user.storytime_role_in_site(Storytime::Site.current)
+    role.present? && role.allowed_actions.include?(action)
   end
 
   def index?
@@ -30,9 +31,5 @@ class UserPolicy
   def create?
     manage?
   end
-
-  def destroy?
-    manage?
-  end
 end
 

data/app/views/kaminari/_first_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.first? %>
+<li class="first">
+  <%= link_to_unless current_page.first?, raw(t 'pagination.first'), url, :remote => remote %>
+</li>
+<% end %>

data/app/views/kaminari/_gap.html.erb

@@ -0,0 +1,8 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page gap disabled"><a href="#" onclick="return false;"><%= raw(t 'views.pagination.truncate') %></a></li>

data/app/views/kaminari/_last_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.last? %>
+<li class="last next"><%# "next" class present for border styling in twitter bootstrap %>
+  <%= link_to_unless current_page.last?, raw(t 'pagination.last'), url, {:remote => remote} %>
+</li>
+<% end %>

data/app/views/kaminari/_next_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.last? %>
+<li class="next_page">
+  <%= link_to_unless current_page.last?, raw(t 'pagination.next'), url, :rel => 'next', :remote => remote %>
+</li>
+<% end %>

data/app/views/kaminari/_page.html.erb

@@ -0,0 +1,12 @@
+<%# Link showing page number
+  - available local variables
+    page:          a page object for "this" page
+    url:           url to this page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page<%= ' active' if page.current? %>">
+  <%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</li>

data/app/views/kaminari/_paginator.html.erb

@@ -0,0 +1,24 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+    paginator:     the paginator that renders the pagination tags inside
+-%>
+<%- pagination_class ||= '' %>
+<%= paginator.render do -%>
+<ul class="pagination <%= pagination_class %>">
+  <%= first_page_tag unless current_page.first? %>
+  <%= prev_page_tag unless current_page.first? %>
+  <% each_page do |page| -%>
+    <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+      <%= page_tag page %>
+    <% elsif !page.was_truncated? -%>
+      <%= gap_tag %>
+    <% end -%>
+  <% end -%>
+  <%= next_page_tag unless current_page.last? %>
+  <%= last_page_tag unless current_page.last? %>
+</ul>
+<% end -%>

data/app/views/kaminari/_prev_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.first? %>
+<li class="prev">
+  <%= link_to_unless current_page.first?, raw(t 'pagination.previous'), url, :rel => 'prev', :remote => remote %>
+</li>
+<% end %>

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

@@ -15,7 +15,7 @@
   </head>
 
   <body class="<%= params[:controller].split('/').join(' ') %> <%= params[:action] %> <%= params[:controller].parameterize %>-controller <%=params[:action]%>-action" data-controller="<%=params[:controller].camelize%>" data-action="<%=params[:action].camelize%>">
-    <%= render "storytime/application/storytime/navigation" %>
+    <%= render "storytime/application/storytime/navigation", storytime_button_classes: "dark rounded" %>
     <%= render "storytime/application/storytime/flash" %>
     <%= render "storytime/application/storytime/header" %>