virgo 0.1.1 → 0.1.2

data/app/controllers/virgo/page_modules_controller.rb

@@ -5,7 +5,7 @@ module Virgo
                   cache_path: ->(o){ "#{deploy_key}/#{site_key}/page_modules/popular_posts/#{params[:category_id]}/#{params[:page]}" }
 
     def popular_posts
-      @category = Category.friendly.find(category_id_param) if category_id_param.present?
+      @category = Category.friendly.find(params[:category_id]) if params[:category_id].present?
       @tabbed = @category.present? ? true : false
       @tab = @category.present? ? :category : :all
 
@@ -13,11 +13,5 @@ module Virgo
         html: render_content(partial: '/virgo/page_modules/popular_posts', locals: {category: @category, tab: @tab, tabbed: @tabbed})
       }
     end
-
-    private
-
-    def category_id_param
-      params.permit(:category_id)[:category_id]
-    end
   end
 end

data/app/controllers/virgo/pages_controller.rb

@@ -19,11 +19,7 @@ module Virgo
     private
 
     def set_page
-      @page = Post.pages.friendly.find(slug_param)
-    end
-
-    def slug_param
-      params.permit(:slug)[:slug]
+      @page = Post.pages.friendly.find(params[:slug])
     end
   end
 end

data/app/controllers/virgo/posts_controller.rb

@@ -4,7 +4,7 @@ module Virgo
 
     if Rails.application.config.caching == :aggressive
       caches_action :show, if: ->{ current_user.nil? && flash.empty? },
-                    cache_path: ->(o){ "#{deploy_key}/#{site_key}/posts/#{category_id_param}/#{params[:id]}/#{post_timestamp(params[:id])}" }
+                    cache_path: ->(o){ "#{deploy_key}/#{site_key}/posts/#{params[:category_id]}/#{params[:id]}/#{post_timestamp(params[:id])}" }
 
       caches_action :index, if: ->{ current_user.nil? && flash.empty? },
                     cache_path: ->(o){ "#{deploy_key}/#{site_key}/posts/index/#{params[:page]}" }
@@ -14,18 +14,18 @@ module Virgo
     end
 
     def index
-      @posts = Post.posts.publicly_viewable.order(publish_at: :desc).page(page_param)
+      @posts = Post.posts.publicly_viewable.order(publish_at: :desc).page(params[:page])
     end
 
     def more
-      @posts = Post.order(publish_at: :desc).page(page_param).per(6).padding(6)
+      @posts = Post.order(publish_at: :desc).page(params[:page]).per(6).padding(6)
       render json: {
         html: render_content('/virgo/posts/more', layout: false)
       }
     end
 
     def latest
-      @posts = Post.posts.publicly_viewable.order(publish_at: :desc).page(page_param)
+      @posts = Post.posts.publicly_viewable.order(publish_at: :desc).page(params[:page])
     end
 
     def show
@@ -60,7 +60,7 @@ module Virgo
       # can't slam this endpoint w/ js ajax requests to artificially pump up a story)
       tracked = JSON::load(Rails.cache.fetch("tracks[#{client_id}]") || '{}')
 
-      unless tracked[id_param]
+      unless tracked[params[:id]]
         set_post
         @post.track_view!
         tracked[@post.id.to_s] = 1
@@ -77,14 +77,14 @@ module Virgo
       # params w/ a leading "&" instead of w/ a leading "?"
       # (assuming there are alread querystring params on the
       # article url I guess) - adding a catch for this here.
-      post_id = id_param
+      post_id = params[:id]
 
       post_id = (post_id.present? && post_id.include?("&")) ? post_id.slice(0..(post_id.index('&') - 1)) : post_id
 
       @post = Post.find_by_id_or_historic_slug!(post_id)
 
-      if category_id_param.present?
-        @category = Category.friendly.find(category_id_param)
+      if params[:category_id].present?
+        @category = Category.friendly.find(params[:category_id])
       else
         @category = @post.primary_category
       end
@@ -93,7 +93,7 @@ module Virgo
     end
 
     def old_path?
-      if @post && id_param != @post.slug && id_param.to_i != @post.id
+      if @post && params[:id] != @post.slug && params[:id].to_i != @post.id
         true
       end
     end

data/app/controllers/virgo/search_controller.rb

@@ -23,7 +23,7 @@ module Virgo
 
       @search = PostSearch.new(post_search_params)
 
-      @posts = Post.search_by_similarity(@search.term).page(page_param)
+      @posts = Post.search_by_similarity(@search.term).page(params[:page])
     end
 
     private

data/app/controllers/virgo/tags_controller.rb

@@ -3,13 +3,13 @@ module Virgo
     before_action :set_tag
 
     def show
-      @posts = @tag.posts.publicly_viewable.order(publish_at: :desc).page(page_param)
+      @posts = @tag.posts.publicly_viewable.order(publish_at: :desc).page(params[:page])
     end
 
     private
 
     def set_tag
-      @tag = Tag.friendly.find(id_param)
+      @tag = Tag.friendly.find(params[:id])
     end
   end
 end

data/app/controllers/virgo/users_controller.rb

@@ -3,13 +3,13 @@ module Virgo
     before_filter :set_user, only: member_actions
 
     def show
-      @posts = @user.posts.latest.page(page_param)
+      @posts = @user.posts.latest.page(params[:page])
     end
 
     private
 
     def set_user
-      @user = User.friendly.find(id_param)
+      @user = User.friendly.find(params[:id])
     end
   end
 end

data/app/helpers/virgo/application_helper.rb

@@ -87,18 +87,10 @@ module Virgo
       end
     end
 
-    def category_id_param
-      params.permit(:category_id)[:category_id]
-    end
-
     def tabbed_param
       params.permit(:tabbed)[:tabbed].try(:to_bool)
     end
 
-    def tab_param
-      params.permit(:tab)[:tab]
-    end
-
     def site
       @site ||= Site.instance
     end

data/app/views/layouts/virgo/errors.haml

@@ -14,7 +14,7 @@
     - if content_for?(:title)
       %title #{yield(:title)}
     - else
-      %title= "#{site.title} | #{site.tagline}"
+      %title= "#{site.name} | #{site.tagline}"
 
     - if content_for?(:description)
       %meta{:content => yield(:description), :name => "description"}

data/app/views/virgo/admin/categories/_form.haml

@@ -1,7 +1,7 @@
 - url = @category.new_record? ? admin_categories_path : admin_category_path(@category)
 
 = simple_form_for @category, url: url, html: {id: 'category-form'} do |f|
-  = hidden_field_tag 'post_id', post_id_param
+  = hidden_field_tag 'post_id', params[:post_id]
   = f.input :name
   = f.input :slug, label: "Permalink"
   = f.input :parent_id, label: 'Parent', as: :select, collection: Virgo::Category.where.not(id: @category.id)

data/app/views/virgo/admin/media_modal/_library_panel.haml

@@ -4,7 +4,7 @@
       = form_tag do
         .media-thumbnails
           .media-thumbnails-inner
-            - if @images.empty? && page_param.blank?
+            - if @images.empty? && params[:page].blank?
               %p.empty-message
                 The media library is currently empty. Click "Upload Image" on the left to add your first image file.
 
@@ -18,7 +18,7 @@
                         = icon 'check-square'
                       = image_tag image.image.url(:thumb)
 
-          %a.paginator.js-paginate-link{href: '#', data: {page: page_param.to_i, last_page: last_page?.to_s, uri: library_panel_admin_media_modal_index_path(page: next_page_num)}, class: ('last-page' if last_page?)}
+          %a.paginator.js-paginate-link{href: '#', data: {page: params[:page].to_i, last_page: last_page?.to_s, uri: library_panel_admin_media_modal_index_path(page: next_page_num)}, class: ('last-page' if last_page?)}
             Load More
 
     .col-md-3

data/app/views/virgo/admin/posts/index.haml

@@ -3,7 +3,7 @@
 - search_url = pages_action? ? admin_posts_path(filters: {post_type: :page}) : admin_posts_path
 
 = form_tag search_url, method: :get, class: 'search-form form-inline pull-left' do
-  = hidden_field_tag 'sort', sort_param
+  = hidden_field_tag 'sort', params[:sort]
 
   - if pages_action?
     = hidden_field_tag 'filters[post_type]', 'page'

data/app/views/virgo/admin/slideshows/index.haml

@@ -1,5 +1,5 @@
 = form_tag admin_slideshows_path, method: :get, class: 'search-form form-inline pull-left' do
-  = hidden_field_tag 'sort', sort_param
+  = hidden_field_tag 'sort', params[:sort]
 
   = text_field_tag 'filters[term]', filter_params[:term], class: 'form-control', placeholder: 'Filter by name or ID'
   = submit_tag "Search", class: 'btn btn-default'

data/app/views/virgo/admin/tags/_form.haml

@@ -3,14 +3,14 @@
 = simple_form_for tag, url: url, html: {id: 'tag-form'} do |f|
   - if flash.now[:success].present?
     %p.success-msg= flash.now[:success]
-  = hidden_field_tag 'post_id', post_id_param
+  = hidden_field_tag 'post_id', params[:post_id]
   = f.input :name
 
   - if tag.persisted?
     = link_to admin_tag_path(tag), class: 'delete-link pull-left', data: {method: :delete, confirm: "Are you sure you want to delete this tag?"} do
       %i.fa.fa-trash-o
       Delete Tag
-  
+
   = f.button :submit, class: 'btn btn-primary pull-right js-submit-tag'
   %a.btn.btn-default.pull-right{href: '#', data: {dismiss: 'modal'}} Close
   .clear

data/app/views/virgo/categories/show.haml

@@ -2,7 +2,7 @@
   = "#{site.name} | #{@category.name}"
 
 - content_for :posts_content do
-  - cache [@category, page_param] do
+  - cache [@category, params[:page]] do
     - category_feature = Virgo::Post.category_feature(@category)
 
     - if category_feature

data/app/views/virgo/columns/show.haml

@@ -1,7 +1,7 @@
 - content_for :title do
   = "#{site.name} | #{@column.name}"
 
-- cache [@column, page_param] do
+- cache [@column, params[:page]] do
   .container.posts-container.column-posts
     .row
       .col-md-10.col-md-offset-1

data/app/views/virgo/common/_public_nav.haml

@@ -17,13 +17,13 @@
         = link_to 'Home', virgo.root_path
 
       - Virgo::Category.navbar.limit(5).each do |cat|
-        %li{class: ('active' if (controller?('categories') && id_param == cat.slug) || cat == @category)}
+        %li{class: ('active' if (controller?('categories') && params[:id] == cat.slug) || cat == @category)}
           = link_to virgo.category_path(cat) do
             %span= cat.name
 
       - if Virgo::Category.navbar.size > 5
         - Virgo::Category.navbar.offset(5).limit(2).each_with_index do |cat, index|
-          %li.extended{class: "extended-#{index + 1} #{('active' if (controller?('categories') && id_param == cat.slug) || cat == @category)}"}
+          %li.extended{class: "extended-#{index + 1} #{('active' if (controller?('categories') && params[:id] == cat.slug) || cat == @category)}"}
             = link_to virgo.category_path(cat) do
               %span= cat.name
 

data/app/views/virgo/images/_shortcode.haml

@@ -1,4 +1,4 @@
-- if defined?(caption_param) && caption_param.present?
-  = raw "[image name=\"#{image.name}\" caption=\"#{caption_param}\"]"
+- if defined?(params[:caption]) && params[:caption].present?
+  = raw "[image name=\"#{image.name}\" caption=\"#{params[:caption]}\"]"
 - else
   = raw "[image name=\"#{image.name}\"]"

data/app/views/virgo/page_modules/_popular_posts.haml

@@ -1,11 +1,11 @@
 - mini = local_assigns.has_key?(:mini) ? mini : false
 - tabbed = local_assigns.has_key?(:tabbed) ? tabbed : tabbed_param
-- cat_id = category_id_param
+- cat_id = params[:category_id]
 - category = local_assigns.has_key?(:category) ? category : nil
-- category = Category.find_by(id: category_id_param) if category.nil?
-- tab = local_assigns.has_key?(:tab) ? tab : (tab_param.try(:to_sym) || :all)
+- category = Category.find_by(id: params[:category_id]) if category.nil?
+- tab = local_assigns.has_key?(:tab) ? tab : (params[:tab].try(:to_sym) || :all)
 
-- cache_if !action?('popular_posts'), [site_key, popular_posts_page_param, mini, tabbed, cat_id, category, tab] do
+- cache_if !action?('popular_posts'), [site_key, params[:popular_posts_page], mini, tabbed, cat_id, category, tab] do
   .most-popular-posts-box.js-popular-posts-box{class: ('mini' if mini), data: {uri: popular_posts_page_modules_path(category_id: category.try(:id))}}
     .inner
       %h3.most-popular-posts-heading Most Popular
@@ -20,29 +20,29 @@
       .loading-overlay.most-popular-posts-loading-overlay
       %ul.popular-posts.list-unstyled
         - if tab == :category
-          - posts = category.posts.most_popular.page(popular_posts_page_param).per(5)
+          - posts = category.posts.most_popular.page(params[:popular_posts_page]).per(5)
         - else
-          - posts = Post.most_popular.page(popular_posts_page_param).per(5)
+          - posts = Post.most_popular.page(params[:popular_posts_page]).per(5)
 
         - posts.each_with_index do |post, index|
           %li.popular-post
             %a.popular-post-inner{href: expanded_post_url(post)}
-              .number= (((popular_posts_page_param.try(:to_i) || 1) - 1) * 5) + index + 1
+              .number= (((params[:popular_posts_page].try(:to_i) || 1) - 1) * 5) + index + 1
               .post-headline
                 .text= post.headline
                 .author-info
                   = post_byline post, no_links: true
 
     .more-link
-      - is_first_page = popular_posts_page_param.blank? || popular_posts_page_param.to_i == 1
+      - is_first_page = params[:popular_posts_page].blank? || params[:popular_posts_page].to_i == 1
 
-      - is_last_page = ((popular_posts_page_param.try(:to_i) || 1) >= posts.total_pages)
+      - is_last_page = ((params[:popular_posts_page].try(:to_i) || 1) >= posts.total_pages)
 
-      = link_to popular_posts_path(popular_posts_page: ((popular_posts_page_param.try(:to_i) || 1) - 1), category_id: (category.try(:id) || cat_id), tabbed: tabbed, tab: tab), class: "popular-prev-link#{' first-page' if is_first_page}" do
+      = link_to popular_posts_path(popular_posts_page: ((params[:popular_posts_page].try(:to_i) || 1) - 1), category_id: (category.try(:id) || cat_id), tabbed: tabbed, tab: tab), class: "popular-prev-link#{' first-page' if is_first_page}" do
         %i.fa.fa-chevron-left
          Prev 5
 
-      = link_to popular_posts_path(popular_posts_page: ((popular_posts_page_param.try(:to_i) || 1) + 1), category_id: (category.try(:id) || cat_id), tabbed: tabbed, tab: tab), class: "popular-more-link#{' last-page' if is_last_page}" do
+      = link_to popular_posts_path(popular_posts_page: ((params[:popular_posts_page].try(:to_i) || 1) + 1), category_id: (category.try(:id) || cat_id), tabbed: tabbed, tab: tab), class: "popular-more-link#{' last-page' if is_last_page}" do
 
         Next 5 
         %i.fa.fa-chevron-right

data/app/views/virgo/posts/index.haml

@@ -1,7 +1,7 @@
 - content_for :title do
   = "Latest Posts | #{site.try(:name)}"
 
-- cache [site_key, page_param] do
+- cache [site_key, params[:page]] do
   .latest-posts-page
     .container.posts-container.latest-posts-wrap
       .row

data/app/views/virgo/posts/latest.haml

@@ -1,7 +1,7 @@
 - content_for :title do
   = "Latest Posts | #{site.try(:name)}"
 
-- cache [site_key, page_param] do
+- cache [site_key, params[:page]] do
   .latest-posts-page
     .container.posts-container.latest-posts-wrap
       .row

data/app/views/virgo/posts/more.haml

@@ -6,5 +6,5 @@
           = render '/virgo/posts/post_thumb_box', post: post, classes: 'third-level'
 
 .show-more-wrap.text-center
-  = link_to "Load More", '#', data: {uri: more_posts_path(page: (page_param.to_i + 1))}, class: 'view-more-link block-link js-load-posts'
+  = link_to "Load More", '#', data: {uri: more_posts_path(page: (params[:page].to_i + 1))}, class: 'view-more-link block-link js-load-posts'
   -#= link_to "All Articles", latest_posts_path, class: 'view-more-link block-link'

data/app/views/virgo/tags/show.haml

@@ -1,4 +1,4 @@
-- cache [@tag, page_param] do
+- cache [@tag, params[:page]] do
   .container.posts-container.column-posts
     .row
       .col-md-10.col-md-offset-1

data/lib/generators/virgo/install/install_generator.rb

@@ -2,10 +2,14 @@ module Virgo
   class InstallGenerator < Rails::Generators::Base
     def run_install
       unless app_has_engine_route?
-        route "mount Virgo::Engine => \"/\""
+        in_root do
+          inject_into_file 'config/routes.rb',"\n  mount Virgo::Engine => \"/\"\n", { before: /^end/, verbose: false, force: true }
+        end
       end
 
       generate "virgo:views"
+      generate "virgo:migrations"
+      generate "virgo:schedule"
     end
 
     def app_has_engine_route?

data/lib/generators/virgo/migrations/migrations_generator.rb

@@ -0,0 +1,19 @@
+module Virgo
+  class MigrationsGenerator < Rails::Generators::Base
+    source_root File.expand_path('../../../../..', __FILE__)
+
+    def copy_migrations
+      Dir["#{engine_root}/db/migrate/*.rb"].each do |abs_path|
+        relative_path = abs_path.gsub("#{engine_root}/", '')
+
+        unless File.directory?(abs_path)
+          copy_file relative_path, relative_path
+        end
+      end
+    end
+
+    def engine_root
+      File.expand_path('../../../../..', __FILE__)
+    end
+  end
+end

data/lib/generators/virgo/schedule/schedule_generator.rb

@@ -0,0 +1,15 @@
+module Virgo
+  class ScheduleGenerator < Rails::Generators::Base
+    source_root File.expand_path('../../../../..', __FILE__)
+
+    def copy_schedule
+      abs_path = "#{engine_root}/config/schedule.rb"
+      relative_path = abs_path.gsub("#{engine_root}/", '')
+      copy_file relative_path, relative_path
+    end
+
+    def engine_root
+      File.expand_path('../../../../..', __FILE__)
+    end
+  end
+end

data/lib/virgo/engine.rb

@@ -1,6 +1,3 @@
-require 'devise'
-require 'kaminari-bootstrap'
-
 module Virgo
   class Engine < ::Rails::Engine
     isolate_namespace Virgo
@@ -13,8 +10,6 @@ module Virgo
 
     config.domain = 'localhost'
 
-    config.caching = :aggressive
-
     config.edit_lock_timeout = 8.seconds
 
     config.edit_lock_grace = 10.seconds
@@ -24,6 +19,8 @@ module Virgo
     config.deploy_key = Digest::MD5.hexdigest(Dir["#{Rails.root}/public/assets/**/*"].join(':'))
 
     # some dependencies must be explicitly required if used in an engine...
+    require 'devise'
+    require 'kaminari-bootstrap'
     require 'friendly_id'
     require 'kaminari'
     require 'kaminari-bootstrap'
@@ -43,6 +40,7 @@ module Virgo
     require 'local_time'
     require 'tinymce-rails'
     require 'chronic'
+
     require File.expand_path("../../../vendor/gems/shortcode/lib/shortcode", __FILE__)
 
 
@@ -59,15 +57,6 @@ module Virgo
       end
     end
 
-
-    initializer :append_migrations do |app|
-      unless app.root.to_s == root.to_s
-        config.paths["db/migrate"].expanded.each do |expanded_path|
-          app.config.paths["db/migrate"] << expanded_path
-        end
-      end
-    end
-
     config.generators do |g|
       g.test_framework :rspec
     end