trusty-cms 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6ebe8fcd153e149f08eec67dbdcc44e23b50f30
-  data.tar.gz: dfaff5d25baef6ed75e7f0d1e9d17bd8072a426f
+  metadata.gz: 0ccd0b6b41ce1e02420af580c501c2a581985f3d
+  data.tar.gz: 3c10ca1244abaa09b83ec6756560f8860357a146
 SHA512:
-  metadata.gz: bfdf645ed79a45b6ee8a8ceaa57c9d6d01478939ee2a34c0402492749b5d09fc857092a679742a35856933f4efcb086cea020435f14084f4f48a8e669e036ea2
-  data.tar.gz: 6649e139dfa185309c435ffbc4378eaddae63c6a997ee9bb047b7ae5c743e91514b1d10efc867d2d1ae156e96abc150956c3dfa08aae4cc1552d5349d977b706
+  metadata.gz: 174cb8782f0707ee753e0c02ae4020e47f034e8d840d90b9eb41a8a8a1e134fe9ef23e2f5f2c12945cb93b8237d932b3c9243c028f4acb96edebf1167ee9a322
+  data.tar.gz: 3e6700961794fa3c92d948a71effb78d9918248b6f2c390a7745629886888f9d99a2121119498ea7c7d6ec4d61add41448e2a095dcae8953d0ef3c8958e17cff

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    trusty-cms (3.0.8)
+    trusty-cms (3.0.9)
       RedCloth (~> 4.3.2)
       acts_as_tree (~> 2.6.1)
       bundler (~> 1.7)
@@ -24,7 +24,7 @@ PATH
       rack (~> 2.0.1)
       rack-cache (~> 1.7)
       radius (~> 0.7)
-      rails (~> 5.0.2)
+      rails (~> 5.0.1)
       rake (< 11.0)
       rdoc (~> 5.1)
       roadie-rails (~> 1.2.1)
@@ -39,39 +39,39 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (5.0.4)
-      actionpack (= 5.0.4)
+    actioncable (5.0.5)
+      actionpack (= 5.0.5)
       nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.4)
-      actionpack (= 5.0.4)
-      actionview (= 5.0.4)
-      activejob (= 5.0.4)
+    actionmailer (5.0.5)
+      actionpack (= 5.0.5)
+      actionview (= 5.0.5)
+      activejob (= 5.0.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.4)
-      actionview (= 5.0.4)
-      activesupport (= 5.0.4)
+    actionpack (5.0.5)
+      actionview (= 5.0.5)
+      activesupport (= 5.0.5)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.4)
-      activesupport (= 5.0.4)
+    actionview (5.0.5)
+      activesupport (= 5.0.5)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.4)
-      activesupport (= 5.0.4)
+    activejob (5.0.5)
+      activesupport (= 5.0.5)
       globalid (>= 0.3.6)
-    activemodel (5.0.4)
-      activesupport (= 5.0.4)
-    activerecord (5.0.4)
-      activemodel (= 5.0.4)
-      activesupport (= 5.0.4)
+    activemodel (5.0.5)
+      activesupport (= 5.0.5)
+    activerecord (5.0.5)
+      activemodel (= 5.0.5)
+      activesupport (= 5.0.5)
       arel (~> 7.0)
-    activesupport (5.0.4)
+    activesupport (5.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -135,7 +135,7 @@ GEM
     ffi (1.9.18)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
-    haml (5.0.1)
+    haml (5.0.2)
       temple (>= 0.8.0)
       tilt
     haml-rails (1.0.0)
@@ -168,7 +168,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.2.0)
-    minitest (5.10.2)
+    minitest (5.10.3)
     multi_json (1.12.1)
     mysql2 (0.4.8)
     nio4r (2.1.0)
@@ -195,26 +195,26 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     radius (0.7.4)
-    rails (5.0.4)
-      actioncable (= 5.0.4)
-      actionmailer (= 5.0.4)
-      actionpack (= 5.0.4)
-      actionview (= 5.0.4)
-      activejob (= 5.0.4)
-      activemodel (= 5.0.4)
-      activerecord (= 5.0.4)
-      activesupport (= 5.0.4)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.4)
+    rails (5.0.5)
+      actioncable (= 5.0.5)
+      actionmailer (= 5.0.5)
+      actionpack (= 5.0.5)
+      actionview (= 5.0.5)
+      activejob (= 5.0.5)
+      activemodel (= 5.0.5)
+      activerecord (= 5.0.5)
+      activesupport (= 5.0.5)
+      bundler (>= 1.3.0)
+      railties (= 5.0.5)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.4)
-      actionpack (= 5.0.4)
-      activesupport (= 5.0.4)
+    railties (5.0.5)
+      actionpack (= 5.0.5)
+      activesupport (= 5.0.5)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)

data/INSTALL.md

@@ -2,17 +2,22 @@
 
 From within the directory containing your TrustyCMS instance:
 
-1. Create a new Rails 4 application (i.e. `rails new [project_name]`)
+1. Create a new Rails 5.0 application (i.e. `rails new [project_name]`)
 
-2. Replace most of your Gemfile with these gems:
-  - gem "trusty-cms", "~>2.0.0-beta"
-  - gem "mysql2"
+2. Add the following gems to your Gemfile:
+  - gem 'trusty-cms'
   - gem 'rails-observers'
-  - gem 'protected_attributes'
 
-3. Run `bundle install`
+3. Add any additional CMS dependencies. TrustyCMS currently supports:
 
-4. Run the Trusty CMS generator to get the project into shape: `rails g trusty_cms [project_name]`.
+* gem 'trusty-clipped-extension'
+* gem 'trusty-snippets-extension'
+* gem 'trusty-layouts-extension'
+* gem 'trusty-multi-site-extension'
+
+4. Run `bundle install`
+
+5. Run the Trusty CMS generator to get the project into shape: `rails g trusty_cms [project_name]`.
    - This will ask you if you want to replace a number of existing files (like application.rb); reply Y to all.
 
-5. Run `bundle exec rake db:create`, then `bundle exec rake db:bootstrap`.
+6. Run `bundle exec rake db:setup`, then `bundle exec rake db:bootstrap`.

data/README.md

@@ -2,121 +2,91 @@
 
 [![Gem Version](https://badge.fury.io/rb/trusty-cms.svg)](http://badge.fury.io/rb/trusty-cms)
 
-Trusty is a branch of the venerable Radiant CMS. Its goal is to pull the Radiant framework into Rails 4 with minimal changes to its infrastructure. Most of what is below is derived from the original Radiant CMS readme.
+TrustyCMS is a branch of Radiant CMS. Its goal is to pull the Radiant framework into Rails 5 with minimal changes to its infrastructure.
 
-TrustyCms is a no-fluff, open source content management system designed for
+TrustyCMS is a no-fluff, open source content management system designed for
 small teams. It is similar to Textpattern or MovableType, but is a general
-purpose content management system (not just a blogging engine).
+purpose content management system (not just a blogging engine). TrustyCMS is a
+Rails engine and is built to be installed into an existing Rails 5 application as a gem.
 
-[![Build Status](https://secure.travis-ci.org/pgharts/trusty-cms.png?branch=master)](https://travis-ci.org/pgharts/trusty-cms/)
+TravisCI: [![Build Status](https://secure.travis-ci.org/pgharts/trusty-cms.png?branch=master)](https://travis-ci.org/pgharts/trusty-cms/)
 
-Currently, TrustyCMS is functional but still has some core issues. We're managing the outstanding problems in [Github Issues](https://github.com/pgharts/trusty-cms/issues?state=open), so if you'd like to help out, that's a great place to start. Also, if you find anything wrong, let us know there so we can get to work fixing it.
+CodeClimate: [![Code Climate](https://codeclimate.com/github/codeclimate/codeclimate/badges/gpa.svg)](https://codeclimate.com/github/codeclimate/codeclimate)
 
-
-TrustyCms features:
+TrustyCMS features:
 
 * An elegant user interface
-* The ability to arrange pages in a hierarchy
+* The ability to arrange pages in a hierarchy with drag and drop
 * Flexible templating with layouts, snippets, page parts, and a custom tagging
-  language (Radius: http://radius.rubyforge.org)
+  language
 * A simple user management/permissions system
 * Support for Markdown and Textile as well as traditional HTML (it's easy to
   create other filters)
 * An advanced plugin system
+* Social sharing buttons
 * Operates in two modes: dev and production depending on the URL
 * A caching system which expires pages every 5 minutes
-* Built using Ruby on Rails
-* And much more...
+* Built using Ruby on Rails (version 5)
 
 ## License
 
-TrustyCms is released under the MIT license. The Radiant portions of the
+TrustyCMS is released under the MIT license. The Radiant portions of the
 codebase are copyright (c) John W. Long and Sean Cribbs; anything after the
 fork is copyright (c) Pittsburgh Cultural Trust. A copy of the MIT license can
 be found in the LICENSE file.
 
 ## Installation and Setup for Use
 
-TrustyCms is a traditional Ruby on Rails application, meaning that you can
-configure and run it the way you would a normal Rails application.
+TrustyCMS is a traditional Ruby on Rails engine, meaning that you can
+configure and run it the way you would a normal gem, like [Devise](https://github.com/plataformatec/devise).
 
-See the INSTALL file for more details.
+See the INSTALL.md file for more instructions.
 
-### Installation and Setup for Contributing to TrustyCms
+### Installation and Setup for Contributing to TrustyCMS
 
-#### Part A of setup, common to both kinds of installations
+#### Setup
 
 Prerequisites:
 
-* A Github account and Git ([Github has some really good instructons](https://help.github.com/articles/set-up-git))
+* A Github account and Git ([Github has some really good instructions](https://help.github.com/articles/set-up-git))
+* Ruby 2.2.0 or higher
+* A Rails application (currently supports version 5.0)
+* Bundler
+* MySQL
+* [PhantomJS >= 1.8.1](https://github.com/teampoltergeist/poltergeist/tree/v1.5.0#installing-phantomjs)
 
 Steps:
 
-1. Fork this repository to your github account.
+1. Fork this repository to your Github account.
 1. Clone your fork to your machine.
 1. `cd` into the directory you just cloned into.
+1. Follow the INSTALL.md instructions to setup an empty app with TrustyCMS installed. To modify TrustyCMS,
+point your dependency to the local path of your fork.
 
-#### Part B, the Vagrant install way
-
-To get a development environment up and running quickly, we have a vagrant box with the dependencies you'll need! Just follow these steps:
-
-1. Download and install [Vagrant](http://www.vagrantup.com/)
-1. Download and install [Virtualbox](https://www.virtualbox.org/)
-1. Download [this box](https://dl.dropboxusercontent.com/u/27379052/trusty-cms.box) into the directory with your code and make sure the file is named "trusty-cms.box".
-1. Run `vagrant up` to start the virutal environment
-1. Run `vagrant ssh` to ssh into the virtual environment
-1. `cd /vagrant` to get to the directory with the rails code that's shared with your computer.
+    gem 'trusty-cms', path: '../trusty-cms'
 
-You can edit the files in this directory with your favorite editor on your
-machine. The files are shared into the `/vagrant` directory in the virtual
-machine.
-
-When you're done using the vagrant environment, you can run `vagrant destroy`
-to stop the vm and remove all guest hard disks. Next time you want to use it,
-just start from the `vagrant up` step again!
-
-#### Part B, the native install way to set up
-
-Prerequisites:
-
-* Ruby 2.2.0
-* The bundler gem
-* Mysql
-* [PhantomJS >= 1.8.1](https://github.com/teampoltergeist/poltergeist/tree/v1.5.0#installing-phantomjs)
-
-1. Install the gems with bundler: `bundle`
-
-#### Part C of setup, common to both kinds of installations
-
-1. Create a database configuration: `cp config/database.mysql.yml config/database.yml`. You probably don't need to make any further changes.
-1. Set up your databases:
+1. Set up your databases in your Rails application:
 
         bundle exec rake db:create
         bundle exec rake db:migrate
-        bundle exec rake db:migrate:extensions
-        bundle exec rake db:test:prepare
 
 1. Run the tests to make sure they pass (If they don't, file a bug!):
 
         rspec
 
-1. Run `rails s` to start the server. Visit the site in your browser at http://localhost:3000.
-
 When you're ready to make a change:
 
 1. Add the pgharts fork as a git remote called "upstream": `git remote add upstream https://github.com/pgharts/trusty-cms.git` so that you can keep up with changes that other people make.
-1. Fetch the remote you just added: `git fetch upstream`
-1. Start a new branch for the change you're going to make. Name it something having to do with the changes, like "fix-queries" if you are going to try to fix some queries. Base this branch on `upstream/master` by running `git checkout -b fix-queries upstream/master`
+1. Fetch the remote you just added: `git fetch upstream`.
+1. Start a new branch for the change you're going to make. Name it something having to do with the changes, like "fix-queries" if you are going to try to fix some queries. Base this branch on `upstream/master` by running `git checkout -b fix-queries upstream/master`.
 1. Make your changes and commit them. Please include tests!
 1. Run the tests and make sure they pass.
-1. Push your changes to your github fork: `git push origin fix-queries`
-1. Send a pull request to the pgharts fork
-1. High five the nearest person!
-
+1. Push your changes to your github fork: `git push origin fix-queries`.
+1. Send a pull request to the pgharts fork.
 
 ## Support
 
-Most of the development for TrustyCms happens on Github:
+All of the development for TrustyCMS happens on Github:
 
 https://github.com/pgharts/trusty-cms
 

data/app/models/page.rb

@@ -282,7 +282,7 @@ class Page < ActiveRecord::Base
           $1.camelize.constantize if page =~ %r{/([^/]+)\.rb}
         end
       end
-      if ActiveRecord::Base.connection.tables.include?('pages') && Page.column_names.include?('class_name') # Assume that we have bootstrapped
+      if ActiveRecord::Base.connection.data_sources.include?('pages') && Page.column_names.include?('class_name') # Assume that we have bootstrapped
         Page.connection.select_values("SELECT DISTINCT class_name FROM pages WHERE class_name <> '' AND class_name IS NOT NULL").each do |p|
           begin
             p.constantize

data/coverage/index.html

@@ -14,7 +14,7 @@
       <img src="./assets/0.10.1/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2017-07-21T16:05:39-04:00">2017-07-21T16:05:39-04:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2017-08-07T14:39:52-04:00">2017-08-07T14:39:52-04:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">

data/lib/generators/generator_base_extension.rb

@@ -2,8 +2,9 @@ require 'rails_generator'
 module TrustyCms
   module GeneratorBaseExtension
     def self.included(base)
-      base.class_eval %{
-        alias_method_chain :existing_migrations, :extensions
+      base.class_eval {
+        alias_method :existing_migrations_without_extensions, :existing_migrations
+        alias_method :existing_migrations, :existing_migrations_with_extensions
       }
     end
 
@@ -13,4 +14,5 @@ module TrustyCms
 
   end
 end
+
 Rails::Generator::Commands::Base.class_eval { include TrustyCms::GeneratorBaseExtension }

data/lib/trusty_cms/admin_ui.rb

@@ -18,7 +18,7 @@ module TrustyCms
       end
 
       def [](id)
-        unless id.kind_of? Fixnum
+        unless id.kind_of? Integer
           self.find {|subnav_item| subnav_item.name.to_s.titleize == id.to_s.titleize }
         else
           super

data/lib/trusty_cms/extension.rb

@@ -107,14 +107,11 @@ module TrustyCms
 
       def activate_extension
         return if instance.active?
-        instance.activate if instance.respond_to? :activate
+        instance.activate_extension if instance.respond_to? :activate
         Dir["#{Rails.root}/config/routes/**/*.rb"].each do |route_file|
-          #config.paths["config/routes"] << route_file if instance.routed?
         end
-        #TrustyCms::Application.reload_routes!
         instance.active = true
       end
-      alias :activate :activate_extension
 
       def deactivate_extension
         return unless instance.active?
@@ -131,14 +128,6 @@ module TrustyCms
         instance.migrates_from[extension_name] = until_migration
       end
 
-      # Expose the configuration object for init hooks
-      # class MyExtension < ActiveRecord::Base
-      #   extension_config do |config|
-      #     config.after_initialize do
-      #       run_something
-      #     end
-      #   end
-      # end
       def extension_config(&block)
         yield Rails.configuration
       end

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = "3.0.8"
+    VERSION = '3.0.9'
   end
 end