integral 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 250965f43a08d1f07fecdc20fc951807c5e7f13b
-  data.tar.gz: e565fae4584832acc09f8c26b1aae89c9d393938
+  metadata.gz: 1d79cf3d29d5bd42ed2ff312edfba5df092f44f5
+  data.tar.gz: 4e1436dcafb059b53ecd4edbc2f32b875cc4314d
 SHA512:
-  metadata.gz: 1fd28a9d092ad9e563079ea34096b979d1bb8e861d710dc11ab27e5f32ca0fdcad4df6ed714f174c25ba4c6b4d21c6181b4b2ad682a6efe821cdea3e2ecc869d
-  data.tar.gz: 8173542b99981aae581fba611836fb6c6dbfb3e09966b27e13058dca427649646ff5db475063f2d2638e318093b15cbdb0b3b5d92448ae6a0f239a94e81cc9ee
+  metadata.gz: 1cc6755ead403715d6118da43b5e56fec7cc41ba13ab80a4e6eae175e26299b863a443f92335e610e7062d3c3796b21793d9881754b4a9b8ddaed65292d01505
+  data.tar.gz: 67cb53f56c8e07f95a2b2e41eaa7414179d59342a5901913b1bab0c3138183d81e69c290cc9bfac305dfc3508bfacf135dce9c8024d8a3429623f55485b60802

data/README.md

@@ -1,6 +1,7 @@
-[![Gem Version](https://badge.fury.io/rb/integral.svg)][version-website] 
+[![Gem Version](https://badge.fury.io/rb/integral.svg)][version-website]
 [![Current Build Status](https://img.shields.io/circleci/project/github/yamasolutions/integral/master.svg)][ci-website] [![Inline docs](http://inch-ci.org/github/yamasolutions/integral.svg?branch=master)][docs-website]
 # Integral CMS
+![Integral CMS Features](https://media.giphy.com/media/LwzTKp4PxFpvKfxMJe/giphy.gif)
 
 Integral is a CMS for Rails 5+. The aim of Integral is to lower the barrier of entry in creating websites, using Ruby on Rails, with all the bells and whistles that users have now come to expect.
 Out of the box integral provides;
@@ -20,6 +21,10 @@ Out of the box integral provides;
     * Sitemap generation
 * [Find out more...][integral-cms]
 
+## Demo Now - Deploy a Sample App
+
+[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/yamasolutions/integral-sample)
+
 ## Getting Started
 
 1. Create a new Rails application
@@ -30,29 +35,11 @@ Out of the box integral provides;
  ```
   gem 'integral'
  ```
-3. Mount the Integral engine routes in your application
- ```
-  # config/routes.rb
-  mount Integral::Engine, at: "/", as: 'integral'
-  root to: 'integral/static_pages#home'
- ```
-4. Make sure you're app runs Integral seed data on setup
- ```
-  # db/seeds.rb
-  Integral::Engine.load_seed
- ```
-5. Setup database - Copy and run necessary migrations
- ```
-  rake integral:install:migrations
-  rake db:create
-  rake db:migrate
-  rake db:setup
- ```
-6. Run Integral install rake task (adds configuration initializers)
+3. Run Integral install rake task (adds configuration initializers, installs routes & sets up database)
  ```
 rails generate integral:install
  ```
-7. Set the default host within the development environment, used for URL generation
+4. Set the default host within the development environment, used for URL generation
 ```
 # config/environments/development.rb
 
@@ -61,6 +48,8 @@ Rails.application.routes.default_url_options[:host] = 'http://localhost:3000'
 
 Voila! Start your rails server and you're ready to go! You can access the user only area at `/admin`
 
+Integral requires Rails 5.1 or higher and Ruby 2.4.1 or higher.
+
 ## Information
 
 * [Integral Website][integral-cms]

data/app/assets/javascripts/integral/backend.js

@@ -185,7 +185,7 @@ function ready() {
   I18n.locale = $('body').data('locale') || 'en';
 
   // CKEditor Initialization
-  // TODO: Figure out why this is causing JS warning messages
+  // TODO: Fork Ckeditor and remove obtrusive JS causing the below to throw warnings
   for(name in CKEDITOR.instances) {
     CKEDITOR.instances[name].destroy(true);
   }

data/app/assets/javascripts/integral/support/character_counter.js

@@ -11,8 +11,9 @@ jQuery.fn.characterCounter = function(){
     }
 
     var itHasLengthAttribute = $input.attr('maxlength') != undefined;
+    var itIsntDisabled = $input.attr('data-character-counter') != 'false';
 
-    if(itHasLengthAttribute){
+    if ((itHasLengthAttribute) && (itIsntDisabled)) {
       $input.on('input', updateCounter);
       $input.on('focus', updateCounter);
       $input.on('blur', removeCounterElement);

data/app/assets/javascripts/integral/support/confirm_modal.coffee

@@ -16,8 +16,8 @@ $.rails.buildConfirmationDialog = (message, modalId, confirmBtnId, cancelBtnId)
     </div>
 
     <div class='modal-footer'>
-       <a id='#{cancelBtnId}' class='button secondary hollow'>#{I18n.t('integral.backend.confirmation_modal.cancel')}</a>
-       <a id='#{confirmBtnId}' class='button primary'>#{I18n.t('integral.backend.confirmation_modal.confirm')}</a>
+       <a id='#{cancelBtnId}' class='button secondary hollow'>#{I18n.t('integral.actions.cancel')}</a>
+       <a id='#{confirmBtnId}' class='button primary'>#{I18n.t('integral.actions.confirm')}</a>
     </div>
      <button class='close-button' data-close aria-label='Close modal' type='button'>
        <span aria-hidden='true'>&times;</span>

data/app/assets/javascripts/integral/support/gallery.coffee

@@ -72,7 +72,32 @@ class this.Gallery
       projectGalleryTop.controller.control = projectGalleryThumbs
       projectGalleryThumbs.controller.control = projectGalleryTop
 
-    # Show/hide content and placeholder 
+    # Set main swiper size
+    revealHeight = gallery.height()
+    thumbSwiperHeight = galleryContent.find('.thumb-swiper').height()
+    revealAvailableHeight = revealHeight - thumbSwiperHeight
+    mainSwiper.height(revealAvailableHeight)
+
+    window.addEventListener 'resize', =>
+      # TODO: Tidy up this duplication
+      revealHeight = gallery.height()
+      thumbSwiperHeight = galleryContent.find('.thumb-swiper').height()
+      revealAvailableHeight = revealHeight - thumbSwiperHeight
+      mainSwiper.height(revealAvailableHeight)
+
+    # Listen for arrow keys
+    $(document).keydown (event) =>
+      return unless gallery.is(':focus')
+
+      switch event.which
+        when 37 # Left
+          projectGalleryThumbs.slidePrev()
+        when 39 # Right
+          projectGalleryThumbs.slideNext()
+        else
+          return # Exit this handler for other keys
+
+    # Show/hide content and placeholder
     gallery.find('.placeholder').css('display', 'none')
     galleryContent.css('visibility', 'initial')
 

data/app/assets/stylesheets/integral/support/gallery.sass

@@ -11,6 +11,10 @@
       font-size: 2em
       margin-bottom: 0.5em
   .main-swiper
+    height: 0
+    margin-bottom: 0
+    .swiper-wrapper
+      height: 100%
     .swiper-button-prev, .swiper-button-next
       position: absolute
       top: 40%
@@ -22,12 +26,16 @@
         font-size: 1.5em
     .swiper-slide
       margin: auto 0
+      text-align: center
+      img
+        max-height: 100%
   .thumb-swiper
     height: 9em
     padding: 0.5em 0
+    margin-bottom: 0
     .swiper-slide
-      width: 12em
-      height: 8em
+      width: 10em
+      height: 6em
       cursor: pointer
       @include breakpoint(small down)
         width: 8em

data/app/controllers/integral/backend/images_controller.rb

@@ -44,12 +44,10 @@ module Integral
             flash.now[:error] = notification_message('creation_failure')
             head :unprocessable_entity
           end
+        elsif @image.save
+          respond_successfully(notification_message('creation_success'), edit_backend_img_path(@image))
         else
-          if @image.save
-            respond_successfully(notification_message('creation_success'), edit_backend_img_path(@image))
-          else
-            respond_failure(notification_message('creation_failure'), @image, :new)
-          end
+          respond_failure(notification_message('creation_failure'), @image, :new)
         end
       end
 

data/app/controllers/integral/backend/lists_controller.rb

@@ -2,7 +2,7 @@ module Integral
   module Backend
     # List controller
     class ListsController < BaseController
-      before_action :set_list, only: %i[edit update destroy show clone]
+      before_action :set_list, only: %i[edit update destroy clone]
       before_action :authorize_with_klass
       before_action -> { set_grid(Integral::Grids::ListsGrid) }, only: [:index]
 
@@ -17,14 +17,6 @@ module Integral
         end
       end
 
-      # GET /:id
-      def show
-        @list = List.find(params[:id])
-        @list.list_items.order(:priority)
-
-        add_breadcrumb @list.title, :backend_list_path
-      end
-
       # GET /new
       # List creation form
       def new
@@ -38,7 +30,7 @@ module Integral
         @list = List.new(list_params)
 
         if @list.save
-          respond_successfully(notification_message('creation_success'), backend_list_path(@list))
+          respond_successfully(notification_message('creation_success'), edit_backend_list_path(@list))
         else
           respond_failure(notification_message('creation_failure'), @list, :new)
         end
@@ -47,7 +39,8 @@ module Integral
       # GET /:id/edit
       # List edit form
       def edit
-        add_breadcrumb @list.title, :backend_list_path
+        @list = List.find(params[:id])
+
         add_breadcrumb I18n.t('integral.breadcrumbs.edit'), :edit_backend_list_path
       end
 
@@ -70,9 +63,9 @@ module Integral
       # Updating an list
       def update
         if @list.update(list_params)
-          respond_successfully(notification_message('edit_success'), backend_list_path(@list))
+          respond_successfully(notification_message('edit_success'), edit_backend_list_path(@list))
         else
-          respond_failure(notification_message('edit_failure'), @list, :show)
+          respond_failure(notification_message('edit_failure'), @list, :edit)
         end
       end
 
@@ -105,6 +98,7 @@ module Integral
 
       def set_list
         @list = List.find(params[:id])
+        @list.list_items&.order(:priority)
       end
 
       def list_params

data/app/controllers/integral/pages_controller.rb

@@ -39,7 +39,11 @@ module Integral
     end
 
     def canonical_url
-      "#{Rails.application.routes.default_url_options[:host]}#{@page.path}"
+      if Settings[:homepage_id]&.to_i == @page.id
+        "#{Rails.application.routes.default_url_options[:host]}"
+      else
+        "#{Rails.application.routes.default_url_options[:host]}#{@page.path}"
+      end
     end
   end
 end

data/app/helpers/integral/backend/base_helper.rb

@@ -50,22 +50,28 @@ module Integral
 
       # Donut Graph - At a Glance
       def dataset_dashboard_atg
-        [
+        data = [
           { scope: Integral::Page, label: 'Total Pages' },
           { scope: Integral::List, label: 'Total Lists' },
           { scope: Integral::Image, label: 'Total Images' },
           { scope: Integral::User, label: 'Total Users' }
         ]
+
+        data.prepend(scope: Integral::Post, label: 'Total Posts') if Integral.blog_enabled?
+        data
       end
 
       # Line graph - Last week
       def dataset_dashboard_last_week
-        [
+        data = [
           { scope: Integral::Page, label: 'Pages' },
           { scope: Integral::List, label: 'Lists' },
           { scope: Integral::Image, label: 'Images' },
           { scope: Integral::User, label: 'Users' }
         ]
+
+        data.prepend(scope: Integral::Post, label: 'Posts') if Integral.blog_enabled?
+        data
       end
     end
   end

data/app/views/devise/sessions/new.haml

@@ -8,7 +8,7 @@
   .input-group
     %span.input-group-label
       = icon('key')
-    = f.input :password, input_html: { class: 'input-group-field' }, label: false
+    = f.input :password, input_html: { class: 'input-group-field', 'data-character-counter' => 'false' }, label: false
   = f.input :remember_me, as: :boolean
 
   .form-actions

data/app/views/integral/backend/images/_grid.haml

@@ -10,7 +10,7 @@
           %td.actions
             = link_to edit_backend_img_url(record) do
               = icon('edit')
-            = link_to backend_img_url(record), method: :delete, data: { confirm: t('integral.actions.confirm.deletion') } do
+            = link_to backend_img_url(record), method: :delete, data: { confirm: t('integral.actions.confirmation.deletion') } do
               = icon('remove')
     - else
       = render partial: 'integral/backend/shared/empty_grid'

data/app/views/integral/backend/lists/_grid.haml

@@ -6,11 +6,9 @@
           %td= record.title
           %td= record.description
           %td.actions
-            = link_to backend_list_url(record) do
-              = icon('eye')
             = link_to edit_backend_list_url(record) do
               = icon('edit')
-            = link_to backend_list_url(record), method: :delete, data: { confirm: t('integral.actions.confirm.deletion') } do
+            = link_to backend_list_url(record), method: :delete, data: { confirm: t('integral.actions.confirmation.deletion') } do
               = icon('remove')
     - else
       = render partial: 'integral/backend/shared/empty_grid'

data/app/views/integral/backend/lists/edit.haml

@@ -1,2 +1,23 @@
-= render 'form'
+= simple_form_for [:backend, @list], validate: true, html: { class: 'are-you-sure', 'data-confirm-dirty-form' => true, 'data-list-item-limit' => @list.list_item_limit, id: :list_form } do |f|
+  = f.input :lock_version, as: :hidden
+  .grid-x.grid-padding-x
+    .cell.medium-6.flex-container
+      .card
+        .card-section
+          = f.input :title, hint: false, disabled: f.object.locked?
+    .cell.medium-6.flex-container
+      .card
+        .card-section
+          = f.input :description, hint: false, disabled: f.object.locked?
+    .cell
+      = render partial: 'integral/backend/lists/manager', locals: { f: f, locked: f.object.locked? }
+    .cell
+      = f.button :button
+
+-# Image Selector
+= render partial: 'integral/backend/shared/record_selector/modal', locals: { search_path: backend_img_index_path, title: t('integral.prompts.select_image'), name: 'Image', create_modal: '#new_image_modal', initialize: true }
+= render partial: 'integral/backend/images/create_modal'
+
+- Integral::ActsAsListable.objects.each do |listable|
+  = render partial: 'integral/backend/shared/record_selector/modal', locals: { search_path: listable.listable_options[:selector_path], title: listable.listable_options[:selector_title], name: listable.to_s.parameterize, initialize: true }
 

data/app/views/integral/backend/pages/_form.haml

@@ -18,7 +18,7 @@
         .cell
           .card
             .card-section
-              = f.input :body, as: :ckeditor, input_html: { id: 'page_body_editor', ckeditor: { toolbar: 'mini', language: current_user.locale }, data: { 'ckeditor-class' => @page.template } }
+              = f.input :body, as: :ckeditor, input_html: { id: 'page_body_editor', ckeditor: { language: current_user.locale }, data: { 'ckeditor-class' => @page.template } }
 
     .cell.small-12.medium-4.large-3
       .grid-y

data/app/views/integral/backend/pages/_grid.haml

@@ -15,7 +15,7 @@
               = link_to edit_backend_page_url(record) do
                 = icon('edit')
             - if policy(Integral::Page).destroy?
-              = link_to backend_page_url(record), method: :delete, data: { confirm: t('integral.actions.confirm.deletion') } do
+              = link_to backend_page_url(record), method: :delete, data: { confirm: t('integral.actions.confirmation.deletion') } do
                 = icon('remove')
     - else
       = render partial: 'integral/backend/shared/empty_grid'

data/app/views/integral/backend/posts/_grid.haml

@@ -19,7 +19,7 @@
               = icon('eye')
             = link_to edit_backend_post_url(record) do
               = icon('edit')
-            = link_to backend_post_url(record), method: :delete, data: { confirm: t('integral.actions.confirm.deletion') } do
+            = link_to backend_post_url(record), method: :delete, data: { confirm: t('integral.actions.confirmation.deletion') } do
               = icon('remove')
     - else
       = render partial: 'integral/backend/shared/empty_grid'

data/app/views/integral/backend/static_pages/dashboard.haml

@@ -3,10 +3,11 @@
     .grid-x.grid-padding-x
       .cell.small-12
         = render partial: 'integral/backend/shared/cards/welcome'
+      - if Integral.blog_enabled?
+        .cell.small-12.medium-6.flex-container
+          = render partial: 'integral/backend/static_pages/card', locals: { title: t('.recent_post'), record: Integral::Post.published.last }
       .cell.small-12.medium-6.flex-container
-        = render partial: 'integral/backend/static_pages/card', locals: { title: t('.recent_post'), record: Integral::Post.first }
-      .cell.small-12.medium-6.flex-container
-        = render partial: 'integral/backend/static_pages/card', locals: { title: t('.recent_page'), record: Integral::Page.first }
+        = render partial: 'integral/backend/static_pages/card', locals: { title: t('.recent_page'), record: Integral::Page.published.last }
   .cell.large-6
     .grid-x.grid-padding-x
       .cell.small-12

data/app/views/integral/backend/users/_grid.haml

@@ -13,7 +13,7 @@
               = icon('eye')
             = link_to edit_backend_user_url(record) do
               = icon('edit')
-            = link_to backend_user_url(record), method: :delete, data: { confirm: t('integral.actions.confirm.deletion') } do
+            = link_to backend_user_url(record), method: :delete, data: { confirm: t('integral.actions.confirmation.deletion') } do
               = icon('remove')
     - else
       = render partial: 'integral/backend/shared/empty_grid'

data/app/views/integral/pages/_demo.haml

@@ -4,7 +4,7 @@
       .cell.medium-6.large-5
         %h1 A Rails CMS which just works.
         %p Create a website (which does stuff) within minutes powered by Rails 5.
-        = link_to 'GET STARTED', 'https://github.com/yamasolutions/integral', class: 'button', target: :blank
+        = link_to 'DEPLOY NOW', 'https://heroku.com/deploy?template=https://github.com/yamasolutions/integral-sample', class: 'button', target: :blank
         %p
           %small
             = icon('check', class: 'text-primary')
@@ -184,5 +184,5 @@
   .grid-container.text-center
     %h2 A Rails CMS which will knock your socks off
     %p Creating a professional website on Rails has never been easier
-    = link_to 'Get Started', 'https://github.com/yamasolutions/integral', class: 'button white hollow', target: :blank
+    = link_to 'Get Started', 'https://heroku.com/deploy?template=https://github.com/yamasolutions/integral-sample', class: 'button white hollow', target: :blank
 

data/app/views/integral/posts/_collection.haml

@@ -0,0 +1,4 @@
+- collection.decorate.each do |post|
+  .cell.medium-6.flex-container
+    = render partial: 'integral/posts/item', locals: { post: post }
+

data/app/views/integral/shared/gallery/_placeholder.haml

@@ -1,4 +1,4 @@
-#gallery-placeholder.reveal.large.modal--gallery{ data: {reveal: true }}
+#gallery-placeholder.reveal.full.modal--gallery{ data: {reveal: true }}
   %button.close-button{ data: { close: '' }, aria: { label: "Close modal" }}
     %span{ aria: { hidden: true } } ×
   .content

data/config/locales/en.yml

@@ -46,7 +46,7 @@ en:
       forward_enquiry:
         subject: Website Enquiry
     actions:
-      confirm:
+      confirmation:
         deletion: If you delete this item it will be gone forever. Are you sure you want to proceed?
       new_page: Add new page
       new_post: Add new post
@@ -75,6 +75,8 @@ en:
       copy_url: Copy URL
       copied: Copied
       search: Search
+      confirm: Confirm
+      cancel: Cancel
     prompts:
       select_image: Select Image..
       select_type: Select Type..
@@ -101,6 +103,7 @@ en:
         title: Title
         tags: Tags
         gallery: Gallery
+        type: Type
       status:
         archived: Archived
         draft: Draft

data/db/seeds.rb

@@ -47,7 +47,7 @@ Integral::List.create!({ title: 'Main Menu', list_items: [
   Integral::Link.create!({title: 'Integral', url: '/'}),
   Integral::Link.create!({title: 'Documentation', url: 'https://github.com/yamasolutions/integral'}),
   Integral::Link.create!({title: 'Blog', url: '/blog'}),
-  Integral::Link.create!({title: 'Get Started', url: 'https://github.com/yamasolutions/integral'})
+  Integral::Link.create!({title: 'Demo Now', url: 'https://heroku.com/deploy?template=https://github.com/yamasolutions/integral-sample'})
 ]})
 
 PaperTrail.enabled = true

data/lib/generators/integral/assets_generator.rb

@@ -0,0 +1,54 @@
+module Integral
+  # Integral Generators
+  module Generators
+    # Generates a copy of Integral assets
+    #
+    # @example Generate all Integral assets
+    #   rails g integral:assets --assets 'backend frontend email'
+    class AssetsGenerator < Rails::Generators::Base
+      source_root File.expand_path('../../../../app/assets', __FILE__)
+      class_option :asset_list, aliases: '-a', type: :array, default: 'frontend'
+      desc 'Copies Integral assets to your application'
+
+      # Copies over backend assets
+      def copy_backend_assets
+        return unless options['asset_list'].include?('backend')
+
+        file 'javascripts/integral/backend.js'
+        file 'stylesheets/integral/backend.sass'
+        directory 'stylesheets/integral/backend'
+      end
+
+      # Copies over frontend assets
+      def copy_frontend_assets
+        return unless options['asset_list'].include?('frontend')
+
+        file 'javascripts/integral/frontend.js'
+        file 'stylesheets/integral/frontend.sass'
+        directory 'stylesheets/integral/frontend'
+      end
+
+      # Copies over mailer assets
+      def copy_mailer_assets
+        return unless options['asset_list'].include?('email')
+
+        file 'stylesheets/integral/emails.scss'
+        directory 'stylesheets/integral/emails'
+      end
+
+      private
+
+      def directory(source, destination = nil)
+        destination = "app/assets/#{source}" if destination.nil?
+
+        super(source, destination)
+      end
+
+      def file(source, destination = nil)
+        destination = "app/assets/#{source}" if destination.nil?
+
+        copy_file(source, destination)
+      end
+    end
+  end
+end

data/lib/generators/integral/install_generator.rb

@@ -1,19 +1,53 @@
 module Integral
   # Integral Generators
   module Generators
-    # Generates helpful Integral initializers
+    # Runs setup for an Integral Application
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path('../../templates', __FILE__)
       desc 'Creates Integral, Carrierwave, CarrierwaveBackgrounder & Sitemap initializers'
 
       # Copies over necessary initialiser files
-      def copy_initializer_file
+      def copy_initializer_files
         copy_file 'integral.rb', 'config/initializers/integral.rb'
         copy_file 'app.yml', 'config/app.yml'
         copy_file 'carrierwave.rb', 'config/initializers/carrierwave.rb'
         copy_file 'carrierwave_backgrounder.rb', 'config/initializers/carrierwave_backgrounder.rb'
         copy_file 'sitemap.rb', 'config/sitemap.rb'
       end
+
+      # Copies routes file
+      def copy_routes
+        copy_file 'routes.rb', 'config/routes.rb'
+      end
+
+      # Copies seeding file
+      def copy_seeding
+        copy_file 'seeds.rb', 'db/seeds.rb'
+      end
+
+      # Copy required migrations
+      def copy_migrations
+        rake 'integral:install:migrations'
+      end
+
+      # Create, migrate and run setup on database - setup is incase DB was already present
+      def setup_database
+        rake 'db:create'
+        rake 'db:migrate'
+        rake 'db:setup'
+      end
+
+      # Output successful install message
+      def install_message
+        puts ' --------------------------------------------------------------------'
+        puts '  Integral has successfully installed! '
+        puts
+        puts "  The admin backend is located at /#{Integral.backend_namespace}."
+        puts
+        puts "  User email     :  #{Integral::User.first.email}"
+        puts '  User password     :  password'
+        puts ' --------------------------------------------------------------------'
+      end
     end
   end
 end

data/lib/generators/integral/views_generator.rb

@@ -0,0 +1,66 @@
+module Integral
+  # Integral Generators
+  module Generators
+    # Generates a copy of Integral views
+    #
+    # @example Generate all Integral views
+    #   rails g integral:views --views 'backend frontend devise mailer'
+    class ViewsGenerator < Rails::Generators::Base
+      source_root File.expand_path('../../../../app/views', __FILE__)
+      class_option :views, aliases: '-v', type: :array, default: 'frontend'
+      desc 'Copies Integral views to your application'
+
+      # Copies over backend views
+      def copy_backend_views
+        return unless options['views'].include?('backend')
+
+        directory 'integral/backend'
+        directory 'layouts/integral/backend'
+        file 'layouts/integral/backend.html.haml'
+      end
+
+      # Copies over frontend views
+      def copy_frontend_views
+        return unless options['views'].include?('frontend')
+
+        directory 'integral/pages'
+        directory 'integral/posts'
+        directory 'integral/tags'
+        directory 'integral/shared'
+        directory 'layouts/integral/frontend'
+        file 'layouts/integral/frontend.html.haml'
+      end
+
+      # Copies over mailer views
+      def copy_mailer_views
+        return unless options['views'].include?('mailer')
+
+        directory 'integral/contact_mailer'
+        directory 'layouts/integral/mailer'
+        file 'layouts/integral/mailer.html.inky-haml'
+      end
+
+      # Copies over devise views
+      def copy_devise_views
+        return unless options['views'].include?('devise')
+
+        directory 'devise'
+        file 'layouts/integral/login.haml'
+      end
+
+      private
+
+      def directory(source, destination = nil)
+        destination = "app/views/#{source}" if destination.nil?
+
+        super(source, destination)
+      end
+
+      def file(source, destination = nil)
+        destination = "app/views/#{source}" if destination.nil?
+
+        copy_file(source, destination)
+      end
+    end
+  end
+end

data/lib/generators/templates/routes.rb

@@ -0,0 +1,7 @@
+Rails.application.routes.draw do
+  # Integral Routes
+  mount Integral::Engine, at: '/', as: 'integral'
+
+  # Must specify root so that #root_url method is defined
+  root to: 'integral/static_pages#home'
+end

data/lib/generators/templates/seeds.rb

@@ -0,0 +1,2 @@
+# Load Integral seedings
+Integral::Engine.load_seed

data/lib/integral/content_renderer.rb

@@ -3,7 +3,7 @@ module Integral
   # A widget could be used to list recent articles from the blog, featured content from a list, etc
   #
   # Example Widget Markup
-  # <p class='integral-widget' data-widget-type='recent_posts' data-widget-value-tagged='awesome-tag'>
+  # <p class='integral-widget' data-widget-type='recent_posts' data-widget-value-tagged='sweet-tag'>
   class ContentRenderer
     # Markup defining a widget
     PLACEHOLDER_SELECTOR = 'p.integral-widget'.freeze

data/lib/integral/router.rb

@@ -91,7 +91,7 @@ module Integral
           end
 
           # List Management
-          resources :lists do
+          resources :lists, except: [:show] do
             member do
               post 'clone'
             end

data/lib/integral/version.rb

@@ -1,5 +1,5 @@
 # :nocov:
 module Integral
   # Integral Version
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/integral/widgets/recent_posts.rb

@@ -32,7 +32,7 @@ module Integral
 
       # Scope of the widget
       def self.skope(options)
-        skope = Integral::Post.published
+        skope = Integral::Post.published.order(published_at: :desc)
         skope = skope.tagged_with(options[:tagged].split) if options[:tagged].present?
         skope.limit(options[:amount])
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: integral
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Patrick Lindsay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-04 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_union
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: devise_invitable
   requirement: !ruby/object:Gem::Requirement
@@ -822,20 +822,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: cane
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: flay
   requirement: !ruby/object:Gem::Requirement
@@ -1425,7 +1411,6 @@ files:
 - app/assets/stylesheets/integral/support/mixins.sass
 - app/assets/stylesheets/integral/support/scroll-to-top.sass
 - app/assets/stylesheets/integral/support/swiper.css
-- app/assets/stylesheets/integral/wysiwyg.sass
 - app/controllers/integral/application_controller.rb
 - app/controllers/integral/backend/activities_controller.rb
 - app/controllers/integral/backend/base_controller.rb
@@ -1527,7 +1512,6 @@ files:
 - app/views/integral/backend/lists/edit.haml
 - app/views/integral/backend/lists/index.haml
 - app/views/integral/backend/lists/new.haml
-- app/views/integral/backend/lists/show.haml
 - app/views/integral/backend/pages/_form.haml
 - app/views/integral/backend/pages/_grid.haml
 - app/views/integral/backend/pages/activities.haml
@@ -1577,6 +1561,7 @@ files:
 - app/views/integral/contact_mailer/forward_enquiry.text.erb
 - app/views/integral/pages/_demo.haml
 - app/views/integral/pages/templates/default.haml
+- app/views/integral/posts/_collection.haml
 - app/views/integral/posts/_item.haml
 - app/views/integral/posts/index.haml
 - app/views/integral/posts/templates/default.haml
@@ -1669,11 +1654,15 @@ files:
 - db/migrate/20180920030236_update_posts_and_pages_null.rb
 - db/migrate/20181011234446_add_preview_image_to_posts.rb
 - db/seeds.rb
+- lib/generators/integral/assets_generator.rb
 - lib/generators/integral/install_generator.rb
+- lib/generators/integral/views_generator.rb
 - lib/generators/templates/app.yml
 - lib/generators/templates/carrierwave.rb
 - lib/generators/templates/carrierwave_backgrounder.rb
 - lib/generators/templates/integral.rb
+- lib/generators/templates/routes.rb
+- lib/generators/templates/seeds.rb
 - lib/generators/templates/sitemap.rb
 - lib/integral.rb
 - lib/integral/acts_as_listable.rb
@@ -1703,6 +1692,20 @@ files:
 - lib/integral/widgets/swiper_list.rb
 - lib/tasks/integral_tasks.rake
 - lib/templates/erb/scaffold/_form.html.erb
+- public/images/integral/demo/continous-integration.png
+- public/images/integral/demo/foundation-frontend-framework.jpg
+- public/images/integral/demo/heroku.png
+- public/images/integral/demo/integral-cms-without-hassle.jpg
+- public/images/integral/demo/integral-features-activity-tracking.jpg
+- public/images/integral/demo/integral-features-contact-form.png
+- public/images/integral/demo/integral-features-design.jpg
+- public/images/integral/demo/integral-features-dynamic-pages.jpg
+- public/images/integral/demo/integral-features-image-management.jpg
+- public/images/integral/demo/integral-features-integrated-blog.jpg
+- public/images/integral/demo/integral-features-list-management.jpg
+- public/images/integral/demo/integral-features-seo-ready.jpg
+- public/images/integral/demo/integral-features-user-management.jpg
+- public/images/integral/demo/integral-presentation.png
 - public/integral/ckeditor_demo_content.html
 - spec/factories.rb
 - spec/support/image.jpg

data/app/assets/stylesheets/integral/wysiwyg.sass

@@ -1,13 +0,0 @@
-// TODO: Update or Remove
-.wysiwyg-content, body.cke_editable
-  table.img-container
-    width: auto
-    tbody
-      border: none
-    tbody th, tbody td
-      padding: 0
-    tr:last-of-type td
-      background-color: $light-gray
-      text-align: center
-      padding: .25em
-      font-size: .9em

data/app/views/integral/backend/lists/show.haml

@@ -1,26 +0,0 @@
--# = icon_link_to 'content_copy', '#clone-modal', class: 'button', data: { tooltip: t('integral.actions.clone') }, icon_classes: 'small'
-
-= content_for :title, t('.title', title: @list.title)
-
-= simple_form_for [:backend, @list], validate: true, html: { class: 'are-you-sure', 'data-confirm-dirty-form' => true, 'data-list-item-limit' => @list.list_item_limit, id: :list_form } do |f|
-  = f.input :lock_version, as: :hidden
-  .grid-x.grid-padding-x
-    .cell.medium-6.flex-container
-      .card
-        .card-section
-          = f.input :title, hint: false, disabled: true
-    .cell.medium-6.flex-container
-      .card
-        .card-section
-          = f.input :description, hint: false, disabled: true
-    .cell
-      = render partial: 'integral/backend/lists/manager', locals: { f: f, locked: true }
-    .cell
-      = f.button :button
-
--# Image Selector
-= render partial: 'integral/backend/shared/record_selector/modal', locals: { search_path: backend_img_index_path, title: t('integral.prompts.select_image'), name: 'Image', create_modal: '#new_image_modal', initialize: true }
-= render partial: 'integral/backend/images/create_modal'
-
-- Integral::ActsAsListable.objects.each do |listable|
-  = render partial: 'integral/backend/shared/record_selector/modal', locals: { search_path: listable.listable_options[:selector_path], title: listable.listable_options[:selector_title], name: listable.to_s.parameterize, initialize: true }