trusty-cms 1.0.0 → 1.0.1

data/.gitignore

@@ -20,4 +20,7 @@ radiant-*.gem
 .ruby-version
 .ruby-gemset
 *.rails2
-vendor/plugins/rails_upgrade
+vendor/plugins/rails_upgrade
+trusty-cms.box
+.vagrant
+.sass-cache

data/CHANGELOG.md

@@ -751,4 +751,4 @@ included in more than one extension will be loaded only once according to the ex
 
 ## 0.5.0 Grindstone (June 28, 2006)
 
-* First release. [John Long]
+* First release. [John Long]

data/Gemfile

@@ -1,5 +1,3 @@
-
-
 source 'https://rubygems.org'
 
 # This is the minimum of dependency required to run
@@ -9,8 +7,6 @@ source 'https://rubygems.org'
 # requires radiant and therefore pulls in every
 # dependency mentioned in radiant.gemspec.
 
-gem "rails",   "3.2.18"
-gem "mysql"
 gemspec
 
 # When radiant is installed as a gem you can run all of
@@ -33,8 +29,16 @@ gemspec
 # gem "radiant-smarty_pants_filter-extension", "~> 1.0.2"
 # gem "radiant-textile_filter-extension",      "~> 1.0.4"
 
-if ENV['TRAVIS']
-  gemspec :development_group => :test
-  gem "mysql"
-  gem "pg"
+
+group :development, :test do
+  gem "compass-rails",   "~> 2.0.1"
+  gem 'thin',             '~> 1.6.2'
+  gem 'pry',              '~> 0.10.0'
+  gem 'capybara',         '~> 2.3.0'
+  gem 'rspec-rails',      '~> 3.0.0'
+  gem 'launchy',          '~> 2.4.2'
+  gem 'database_cleaner', '~> 1.3.0'
+  gem 'poltergeist',      '~> 1.5.1'
+  gem "ckeditor",        "~> 4.1.0"
+  gem 'sprockets-rails', '2.0.0.backport1'
 end

data/Gemfile.lock

@@ -1,21 +1,25 @@
 PATH
   remote: .
   specs:
-    trusty-cms (1.1.4)
+    trusty-cms (1.0.1)
       RedCloth (~> 4.2.0)
       acts_as_tree (~> 0.1.1)
       bundler (>= 1.0.0)
-      compass (~> 0.12.2)
-      compass-rails (~> 1.0.3)
+      ckeditor (~> 4.1.0)
+      compass-rails (~> 2.0.1)
       delocalize (~> 0.2.3)
-      haml (~> 3.1.1)
+      haml (~> 4.0.5)
+      haml-rails (>= 0.4, < 0.5)
       highline (~> 1.6.10)
+      jquery-rails (~> 3.1.0)
+      mysql (~> 2.9.1)
       rack (~> 1.4.5)
       rack-cache (~> 1.2)
       radius (~> 0.7.3)
       rails (~> 3.2.18)
       rake (>= 0.8.7)
       rdoc (~> 3.9)
+      sprockets-rails (~> 2.0.0.backport1)
       stringex (~> 1.3.0)
       tzinfo (~> 0.3.31)
       will_paginate (~> 3.0)
@@ -25,12 +29,12 @@ GEM
   specs:
     RedCloth (4.2.9)
     RedCloth (4.2.9-java)
-    actionmailer (3.2.18)
-      actionpack (= 3.2.18)
+    actionmailer (3.2.21)
+      actionpack (= 3.2.21)
       mail (~> 2.5.4)
-    actionpack (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
+    actionpack (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -38,74 +42,107 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.18)
-      activesupport (= 3.2.18)
+    activemodel (3.2.21)
+      activesupport (= 3.2.21)
       builder (~> 3.0.0)
-    activerecord (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
+    activerecord (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
-    activesupport (3.2.18)
+    activeresource (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
+    activesupport (3.2.21)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     acts_as_tree (0.1.1)
+    addressable (2.3.6)
     arel (3.0.3)
     builder (3.0.4)
-    capybara (2.2.1)
+    capybara (2.3.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    chunky_png (1.3.1)
-    compass (0.12.6)
+    chunky_png (1.3.3)
+    ckeditor (4.1.0)
+      mime-types
+      orm_adapter (~> 0.5.0)
+    cliver (0.3.2)
+    coderay (1.1.0)
+    compass (1.0.1)
       chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.2.19)
-    compass-rails (1.0.3)
-      compass (>= 0.12.2, < 0.14)
-    cucumber (1.3.15)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
-    cucumber-rails (1.4.1)
-      capybara (>= 1.1.2, < 3)
-      cucumber (>= 1.3.8, < 2)
-      mime-types (~> 1.16)
-      nokogiri (~> 1.5)
-      rails (>= 3, < 5)
-    database_cleaner (0.6.7)
+      compass-core (~> 1.0.1)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.1)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
+    compass-rails (2.0.1)
+      compass (~> 1.0.0)
+    daemons (1.1.9)
+    database_cleaner (1.3.0)
     delocalize (0.2.6)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    fssm (0.2.10)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    gherkin (2.12.2-java)
-      multi_json (~> 1.3)
-    haml (3.1.8)
+    eventmachine (1.0.3)
+    eventmachine (1.0.3-java)
+    ffi (1.9.6)
+    ffi (1.9.6-java)
+    haml (4.0.5)
+      tilt
+    haml-rails (0.4)
+      actionpack (>= 3.1, < 4.1)
+      activesupport (>= 3.1, < 4.1)
+      haml (>= 3.1, < 4.1)
+      railties (>= 3.1, < 4.1)
     highline (1.6.21)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.6.11)
     journey (1.0.4)
+    jquery-rails (3.1.2)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
     json (1.8.1)
     json (1.8.1-java)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    launchy (2.4.3-java)
+      addressable (~> 2.3)
+      spoon (~> 0.0.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    method_source (0.8.2)
     mime-types (1.25.1)
-    multi_json (1.10.0)
-    multi_test (0.1.1)
+    mini_portile (0.6.1)
+    multi_json (1.10.1)
     mysql (2.9.1)
-    nokogiri (1.5.11)
-    nokogiri (1.5.11-java)
-    polyglot (0.3.4)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
+    nokogiri (1.6.4.1-java)
+    orm_adapter (0.5.0)
+    poltergeist (1.5.1)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
+    polyglot (0.3.5)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry (0.10.1-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      spoon (~> 0.0)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -114,51 +151,70 @@ GEM
     rack-test (0.6.2)
       rack (>= 1.0)
     radius (0.7.4)
-    rails (3.2.18)
-      actionmailer (= 3.2.18)
-      actionpack (= 3.2.18)
-      activerecord (= 3.2.18)
-      activeresource (= 3.2.18)
-      activesupport (= 3.2.18)
+    rails (3.2.21)
+      actionmailer (= 3.2.21)
+      actionpack (= 3.2.21)
+      activerecord (= 3.2.21)
+      activeresource (= 3.2.21)
+      activesupport (= 3.2.21)
       bundler (~> 1.0)
-      railties (= 3.2.18)
-    railties (3.2.18)
-      actionpack (= 3.2.18)
-      activesupport (= 3.2.18)
+      railties (= 3.2.21)
+    railties (3.2.21)
+      actionpack (= 3.2.21)
+      activesupport (= 3.2.21)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.3.1)
+    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-rails (2.14.2)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-rails (3.0.2)
       actionpack (>= 3.0)
-      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    sass (3.2.19)
-    sprockets (2.2.2)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
+    sass (3.4.8)
+    slop (3.6.0)
+    spoon (0.0.4)
+      ffi
+    sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0.backport1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.2.2.backport2)
     stringex (1.3.3)
-    test-unit (2.5.5)
+    thin (1.6.3)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0)
+      rack (~> 1.0)
     thor (0.19.1)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.39)
-    will_paginate (3.0.5)
+    tzinfo (0.3.42)
+    websocket-driver (0.4.0)
+    websocket-driver (0.4.0-java)
+    will_paginate (3.0.7)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -167,11 +223,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cucumber-rails (~> 1.4.1)
-  database_cleaner (~> 0.6.5)
-  mysql
-  nokogiri (~> 1.5.10)
-  rails (= 3.2.18)
-  rspec-rails (~> 2.14.2)
-  test-unit (~> 2.5.5)
+  capybara (~> 2.3.0)
+  ckeditor (~> 4.1.0)
+  compass-rails (~> 2.0.1)
+  database_cleaner (~> 1.3.0)
+  launchy (~> 2.4.2)
+  poltergeist (~> 1.5.1)
+  pry (~> 0.10.0)
+  rspec-rails (~> 3.0.0)
+  sprockets-rails (= 2.0.0.backport1)
+  thin (~> 1.6.2)
   trusty-cms!

data/LICENSE.md

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

data/README.md

@@ -1,6 +1,6 @@
 ## Welcome to TrustyCMS
 
-Trusty is a branch of the venerable TrustyCms CMS. Its goal is to pull the TrustyCms framework into Rails 3 with minimal changes to its infrastructure. Everything below this is from the TrustyCms readme.
+Trusty is a branch of the venerable Radiant CMS. Its goal is to pull the Radiant framework into Rails 3 with minimal changes to its infrastructure. Most of what is below is derived from the original Radiant CMS readme.
 
 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
@@ -8,6 +8,9 @@ purpose content management system (not just a blogging engine).
 
 [![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.
+
+
 TrustyCms features:
 
 * An elegant user interface
@@ -39,31 +42,71 @@ See the INSTALL file for more details.
 
 ### Installation and Setup for Contributing to TrustyCms
 
+#### Part A of setup, common to both kinds of installations
+
 Prerequisites:
 
 * A github account and Git ([Github has some really good instructons](https://help.github.com/articles/set-up-git))
+
+Steps:
+
+1. Fork this repository to your github account.
+1. Clone your fork to your machine.
+1. `cd` into the directory you just cloned into.
+
+#### 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.
+
+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 1.9.3
 * The bundler gem
 * Mysql
+* [PhantomJS >= 1.8.1](https://github.com/teampoltergeist/poltergeist/tree/v1.5.0#installing-phantomjs)
 
-1. Fork this repository to your github account.
-1. Clone your fork to your machine.
 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 database:
+1. Set up your databases:
 
         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. Make your changes and commit them.
+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!