georgia 0.7.8 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 299c38cb8ad39e71ee60b95ec7257d07e34065f3
-  data.tar.gz: 08ad778ae03b46ff2cfde384e120eb4b87ecddfb
+  metadata.gz: 6bc0ff8368285a4875868905f0c0cdb55f7a8130
+  data.tar.gz: d7d972a6b622ef2bac9370379ce2b362f303377a
 SHA512:
-  metadata.gz: e384d34497ed13604fcafde5553b76b9e80fbb42fd2e1275ce95b0735dcea7e1e54a2a29088909825f3529e898cbb4fa411be7ceec294b55fcbb490a938d8d52
-  data.tar.gz: 3aad07802f87602d35395ef8fdba06c4077a4137c1389d8d7fd745243e17c2ac4a7b3961b9523b0d2ed99b5de87c9ee7c7f153bb903677f7741d54933d78e500
+  metadata.gz: c811e67834fb6fc723d24049f4c921c2bb222d9748358fbc8bc5d8a310c5de8b3d0a0eb71d51c2826483f2c8b95169c93d64ecfb8e8d655f36cde62569e5025b
+  data.tar.gz: c1c7bd108ae6b0b1e74b99b7179b8c18eb9d3a22d41bff3ae0e2ed71de30dabaea702f4357053241429dd92a3562d5e6e191f02a22528e890b1668e17e05d379

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014 Motion Eleven
+Copyright 2014 YOURNAME
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -5,22 +5,26 @@
 [![Code Climate](https://codeclimate.com/github/georgia-cms/georgia.png)](https://codeclimate.com/github/georgia-cms/georgia)
 [![Coverage Status](https://coveralls.io/repos/georgia-cms/georgia/badge.png)](https://coveralls.io/r/georgia-cms/georgia)
 
-Rails. Engine. CMS. Plug-and-play content management system for Ruby on Rails. Have a peak at the [demo](http://sorrynodemoyet.com/i-promise-it-s-on-its-way).
+Rails. Engine. CMS. Plug-and-play content management system for Ruby on Rails. Have a go at the [demo](http://demo.georgiacms.org/admin) (demo@georgiacms.org // georgiacms).
 
 ### Features
 
-* Media library on the cloud
-* Spam filter on emails
+* Media library on the cloud (or on files)
+* Messages Inbox with [georgia_mailer](https://github.com/georgia-cms/georgia_mailer)
+* Spam filter
 * Multilingual from the get-go
+* Heroku-ready with georgia_heroku
 * Review you pairs and draft new pages
 * Preview before publishing
+* Add a blog with [georgia_blog](https://github.com/georgia-cms/georgia_blog)
 * Rollback to previous revisions when it hits the fan
-* Great UI, nice search, gravatars
+* Great UI, nice search, gravatars, etc.
 * Editable menus
-* Extendable
 * Widgets
 * Slides
 * Permission levels
+* Sitemaps
+* Extendable (georgia_mailer, georgia_blog & more coming)
 
 ### Why? aka Comparison with refinerycms
 
@@ -44,9 +48,10 @@ config.i18n.default_locale = :en
 config.i18n.available_locales = [:en]
 ```
 
-Then run the generator to mount routes, run migrations & setup initial instances.
+Then run the generators to mount routes, run migrations & setup initial instances.
 
     rails generate georgia:install
+    rails generate georgia:setup
 
 We built Georgia to help you quickly develop an application with a CMS (Content Management System). However, we don't want to be in your way when you need to customize it.
 
@@ -87,17 +92,54 @@ The `georgia:install` generator added a `carrierwave.example.rb` file to your in
 
 ### Heroku
 
-Georgia will run smoothly and cheaply (read free) on Heroku but you will need certain addons to make it work, all free.
+Georgia will run smoothly and cheaply (read free) on Heroku but you will need certain addons to make it work.
+
+#### Get Started
+
+To get started, add `georgia_heroku` gem to your Gemfile in development.
+
+```
+group :development do
+  gem 'georgia_heroku'
+end
+```
+
+##### Run the generator
+
+Prepare your app to be hosted on Heroku by adding necessary gems, cache config, unicorn web server, tools such as Bonsai, Sendgrid & Memcachier.
+
+```
+$ rails g georgia:heroku:install
+```
+
+Follow the post-install instructions in the README.
+
+##### Add the buildpack from TurboSprockets
+
+```
+$ heroku config:add BUILDPACK_URL=https://github.com/ndbroadbent/heroku-buildpack-turbo-sprockets.git
+```
+
+#### Deployment
+
+Use the `georgia:heroku:deploy` rake task to deploy. It will compile your assets locally before pushing to Heroku. Otherwise it is likely you will exceed the time limit allowed to deploy your app. It is also faster.
+
+To deploy:
+```
+$ bundle exec rake georgia:heroku:deploy
+```
 
 #### Sengrid
 
-Add sendgrid addon to handle emails
+Add sendgrid addon to handle emails.
 
     heroku addons:add sendgrid
 
-Add sendgrid config to your production environment file
+The generator should have taken care of this but if you want to do it manually, here's the Sendgrid config to add to your production environment file.
 
 ``` ruby
+# config/environments/production.rb
+
 # Send emails via sendgrid
 config.action_mailer.smtp_settings = {
   :address        => 'smtp.sendgrid.net',
@@ -120,14 +162,13 @@ Add `config/initializers/bonsai.rb` with:
 
     ENV['ELASTICSEARCH_URL'] = ENV['BONSAI_URL']
 
-Create your elasticsearch indices with these commands:
+Create your elasticsearch indices with this command:
 
-*** After your first deploy *** You need tire installed on Heroku to perform this.
+*** After your first deploy ***
 
-    heroku run rake environment tire:import CLASS=Georgia::Page FORCE=true
-    heroku run rake environment tire:import CLASS=Ckeditor::Asset FORCE=true
-    heroku run rake environment tire:import CLASS=Ckeditor::Picture FORCE=true
-    heroku run rake environment tire:import CLASS=ActsAsTaggableOn::Tag FORCE=true
+    heroku run rake environment georgia:create_indices
+
+For more information, you can also follow these [instructions](https://gist.github.com/nz/2041121) to setup bonsai.io. More [here](https://devcenter.heroku.com/articles/bonsai) on heroku.com
 
 #### Cloudinary
 
@@ -141,4 +182,7 @@ Finally, create your first admin user to access to web panel:
 
     heroku run rake georgia:seed
 
-For more information, you can also follow these [instructions](https://gist.github.com/nz/2041121) to setup bonsai.io. More [here](https://devcenter.heroku.com/articles/bonsai) on heroku.com
+
+### Rails 3
+
+Look at branch `rails3` for support on Rails 3.2

data/Rakefile

@@ -1,16 +1,10 @@
-#!/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+
+require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -20,6 +14,19 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Bundler::GemHelper.install_tasks
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
+load 'rails/tasks/engine.rake'
+
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+
+task default: :test

data/app/assets/javascripts/georgia/application.js

@@ -1,12 +1,10 @@
 //= require jquery
-//= require jquery.ui.core
-//= require jquery.ui.sortable
-//= require jquery.ui.tooltip
+//= require jquery-ui/core
+//= require jquery-ui/sortable
+//= require jquery-ui/tooltip
 //= require jquery_ujs
 //= require jquery-fileupload/basic
 //= require select2
-//= require shadowbox
-//= require mousetrap
 
 //= require ckeditor/init
 //= require_tree ./ckeditor
@@ -16,5 +14,4 @@
 //= require_tree ./components
 //= require ./bootstrap-vendor
 //= require ./featured-image
-//= require ./keybindings
 //= require ./toggle

data/app/assets/javascripts/georgia/bootstrap-vendor.js.coffee

@@ -1,5 +1,5 @@
 jQuery ->
-  Shadowbox.init()
+
   $('.js-focus').focus()
   $('.js-tooltip').tooltip()
   $('.js-select2').select2()

data/app/assets/javascripts/georgia/ckeditor/config.js

@@ -1,7 +1,7 @@
 CKEDITOR.config.ignoreEmptyParagraph = false;
 CKEDITOR.config.allowedContent = true;
 CKEDITOR.config.height = 400;
-CKEDITOR.config.width = '95.5%';
+CKEDITOR.config.width = '100%';
 CKEDITOR.config.toolbarStartupExpanded = false;
 CKEDITOR.config.toolbarGroups = [
   { name: 'document', groups: [ 'mode', 'document', 'doctools' ] },

data/app/assets/javascripts/georgia/components/flash.js.coffee

@@ -5,7 +5,7 @@ class Flash
 
     $('<div/>',
       class: "flash-#{type}",
-      text: message
+      html: message
     ).appendTo(".flash-container")
 
     flash.click -> $(@).fadeOut()

data/app/assets/javascripts/georgia/components/media-library.js.coffee

@@ -44,7 +44,7 @@ class @MediaLibrary
     event.preventDefault()
 
   query: => @search.val()
-  spinnerTag: -> "<div class='spinner'><i class='fa fa-spinner fa-4x'></i></div>"
+  spinnerTag: -> "<div class='spinner'><i class='fa fa-spin fa-spinner fa-4x'></i></div>"
 
 jQuery ->
   # If the media library modal is loaded,

data/app/assets/javascripts/georgia/components/tables.js.coffee

@@ -0,0 +1,30 @@
+class @Table
+
+  constructor: (element, checkboxable) ->
+    @element      = $(element)
+    @actions      = @element.find('th.actions > a')
+    @checkboxable = checkboxable
+    @element.on('click', @checkboxes(), @update)
+
+  checkboxes: () -> @element.find("input:checkbox")
+
+  update: () =>
+    if @getChecked().length then @enableActions() else @disableActions()
+
+  notify: (data) =>
+    new Flash(data['message'], data['status'])
+    @checkboxable.updateSelectAll()
+
+  enableActions: () =>
+    @actions.removeClass('disabled').addClass('btn-info')
+
+  disableActions: () =>
+    @actions.addClass('disabled').removeClass('btn-info')
+
+  stopEvent: (event) ->
+    event.stopPropagation()
+    event.preventDefault()
+
+  getChecked: () => @element.find("input:checkbox:checked")
+  getId:      (c) => $(c).data('id')
+  getIds:     () => $.map(@getChecked(), (c) => @getId(c))

data/app/assets/javascripts/georgia/components/tables/{checkbox.js.coffee → checkboxable.js.coffee}

@@ -3,55 +3,33 @@ class @Checkboxable
   constructor: (element) ->
     @element            = $(element)
     @selectAllCheckbox  = @element.find("[data-checkbox='all']")
-    @checkboxes         = @element.find("[data-checkbox='child']")
-    @selectAllLink      = @element.find('.js-select-all')
-    @selectNoneLink     = @element.find('.js-select-none')
-    @selectSpamLink     = @element.find('.js-select-spam')
     @setBindings()
 
+  checkboxes: () => @element.find("[data-checkbox='child']")
+
   setBindings: () =>
     @selectAllCheckbox.bind('click', @updateCheckboxes)
-    @checkboxes.bind('click', @update)
-    @selectAllLink.on('click', @selectAll)
-    @selectNoneLink.on('click', @selectNone)
-    @selectSpamLink.on('click', @selectSpam)
-
-  selectAll: () =>
-    @check(@selectAllCheckbox)
-    @check(@checkboxes)
-    @checkboxes.trigger('change')
-
-  selectNone: () =>
-    @uncheck(@selectAllCheckbox)
-    @uncheck(@checkboxes)
-    @checkboxes.trigger('change')
-
-  selectSpam: () =>
-    @uncheck(@checkboxes)
-    @check(@element.find("tr[data-status='spam'] input:checkbox"))
-    @updateSelectAll()
-    @checkboxes.trigger('change')
+    @element.on('click', @checkboxes(), @update)
 
   update: (event) =>
-    checkbox = $(event.currentTarget)
+    checkbox = $(event.target)
     @updateCheckbox(checkbox)
     @updateSelectAll()
 
   updateCheckboxes: (event) =>
-    event.stopPropagation()
     switch @getState(@selectAllCheckbox)
       # uncheck, going checked
       when 'unchecked'
         @check(@selectAllCheckbox)
-        @check(@checkboxes) if @checkboxes.length
+        @check(@checkboxes()) if @checkboxes().length
       # indeterminate, going unchecked
       when 'indeterminate'
         @uncheck(@selectAllCheckbox)
-        @uncheck(@checkboxes) if @checkboxes.length
+        @uncheck(@checkboxes()) if @checkboxes().length
       # checked, going unchecked
       else
         @uncheck(@selectAllCheckbox)
-        @uncheck(@checkboxes) if @checkboxes.length
+        @uncheck(@checkboxes()) if @checkboxes().length
 
   updateCheckbox: (el) =>
     switch @getState(el)
@@ -65,7 +43,7 @@ class @Checkboxable
 
   updateSelectAll: () =>
     # gather all siblings states
-    states = @checkboxes.map (i, c) => @getState(c)
+    states = @checkboxes().map (i, c) => @getState(c)
     # get unique values
     states = @distinct(states)
     # if not all siblings share the same state, go indeterminate
@@ -78,6 +56,7 @@ class @Checkboxable
         when 'unchecked' then @uncheck(@selectAllCheckbox)
         # if all checked, set parent as checked
         when 'checked' then @check(@selectAllCheckbox)
+        else @uncheck(@selectAllCheckbox)
 
   check: (el) =>
     $(el).each (index, e) =>
@@ -112,12 +91,4 @@ class @Checkboxable
 
   stopEvent: (event) ->
     event.stopPropagation()
-    event.preventDefault()
-
-$.fn.actsAsCheckboxable = () ->
-  @each ->
-    new Checkboxable($(this))
-
-jQuery ->
-  $("table.js-checkboxable").each ->
-    $(this).actsAsCheckboxable()
+    event.preventDefault()

data/app/assets/javascripts/georgia/components/tables/media.js.coffee

@@ -1,16 +1,21 @@
-class @MediaTable
+class @MediaTable extends @Table
 
-  constructor: (element) ->
-    @element      = $(element)
-    @checkboxes   = @element.find("input:checkbox")
+  constructor: (element, checkboxable) ->
+    super(element, checkboxable)
     @downloadBtn  = $('.js-download')
     @deleteBtn    = $('.js-delete')
-    @setBindings()
-
-  setBindings: () =>
-    @checkboxes.on('click', @update)
     @deleteBtn.on('click', @destroy)
 
+  # TODO: Should mark item while request is sent. Should sent one request per selected asset for faster feedback
+  destroy: (event) =>
+    @stopEvent(event)
+    $.ajax(
+      url: "/admin/media/#{@getIds()}"
+      type: 'DELETE'
+      dataType: 'JSON'
+      success: @removeAssets
+    ).always(@notify)
+
   update: () =>
     @updateDownloadableIds()
     if @getChecked().length
@@ -18,18 +23,8 @@ class @MediaTable
     else
       @disableActions()
 
-  # TODO: Should mark item while request is sent. Should sent one request per selected asset for faster feedback
-  destroy: (event) =>
-    @stopEvent(event)
-    $.ajax(
-      type: 'DELETE'
-      url: '/admin/media'
-      data:
-        id: @getIds()
-      dataType: 'JSON'
-    ).always(() =>
-      $.each @getIds(), (index, id) -> $("#asset_#{id}").remove()
-    )
+  removeAssets: () =>
+    $.each @getIds(), (index, id) -> $("#asset_#{id}").remove()
 
   updateDownloadableIds: () =>
     $('.downloadable-ids').val(@getIds())
@@ -42,17 +37,10 @@ class @MediaTable
     @downloadBtn.addClass('disabled').removeClass('btn-info')
     @deleteBtn.addClass('disabled').removeClass('btn-danger')
 
-  stopEvent: (event) ->
-    event.stopPropagation()
-    event.preventDefault()
-
-  getChecked: () => @element.find("input:checkbox:checked[data-checkbox='child']")
-  getId:      (c) => $(c).data('id')
-  getIds:     () => $.map(@getChecked(), (c) => @getId(c))
-
 $.fn.actsAsMediaTable = () ->
   @each ->
-    new MediaTable($(this))
+    checkboxable = new Checkboxable($(this))
+    new MediaTable($(this), checkboxable)
 
 jQuery ->
   $("table.assets.js-checkboxable").each ->

data/app/assets/javascripts/georgia/components/tables/pages.js.coffee

@@ -1,92 +1,74 @@
-class @PagesTable
+class @PagesTable extends @Table
 
-  constructor: (element) ->
-    @element      = $(element)
-    @checkboxes   = @element.find("input:checkbox")
-    @deleteBtn    = $('.js-delete')
-    @publishBtn   = $('.js-publish')
-    @unpublishBtn = $('.js-unpublish')
-    @flushCacheBtn = $('.js-flush-cache')
+  constructor: (element, checkboxable) ->
+    super(element, checkboxable)
+    @deleteBtn    = @element.find('.js-delete')
+    @publishBtn   = @element.find('.js-publish')
+    @unpublishBtn = @element.find('.js-unpublish')
     @setBindings()
 
   setBindings: () =>
-    @checkboxes.on('click', @update)
     @deleteBtn.on('click', @destroy)
     @publishBtn.on('click', @publish)
     @unpublishBtn.on('click', @unpublish)
-    @flushCacheBtn.on('click', @flushCache)
-
-  update: () =>
-    if @getChecked().length
-      @enableActions()
-    else
-      @disableActions()
 
   destroy: (event) =>
     @stopEvent(event)
     $.ajax(
       type: 'DELETE'
-      url: "/admin/pages"
-      data: {id: @getIds()}
       dataType: 'JSON'
-    ).always(() =>
-      $.each @getIds(), (index, id) -> $("#page_#{id}").remove()
-    )
-
-  flushCache: (event) =>
-    @stopEvent(event)
-    $.ajax(
-      type: "POST"
-      url: "/admin/pages/flush-cache"
+      url: "/admin/pages"
       data: {id: @getIds()}
-      dataType: 'JSON'
-    )
+      success: @removePages
+    ).always(@notify)
 
   publish: (event) =>
     @stopEvent(event)
     $.ajax(
       type: "POST"
+      dataType: 'JSON'
       url: "/admin/pages/publish"
       data: {id: @getIds()}
-      dataType: 'JSON'
-    ).always(() =>
-      $.each @getIds(), (index, id) -> $("#page_#{id}").removeClass('private').addClass('public')
-    )
+      success: @markAsPublic
+    ).always(@notify)
 
   unpublish: (event) =>
     @stopEvent(event)
     $.ajax(
       type: "POST"
+      dataType: 'JSON'
       url: "/admin/pages/unpublish"
       data: {id: @getIds()}
-      dataType: 'JSON'
-    ).always(() =>
-      $.each @getIds(), (index, id) -> $("#page_#{id}").addClass('private').removeClass('public')
-    )
+      success: @markAsPrivate
+    ).always(@notify)
+
+  removePages: () =>
+    $.each @getIds(), (index, id) -> $("#page_#{id}").remove()
+
+  markAsPublic: () =>
+    $.each @getIds(), (index, id) -> $("#page_#{id}").removeClass('private').addClass('public')
+
+  markAsPrivate: () =>
+    $.each @getIds(), (index, id) -> $("#page_#{id}").removeClass('public').addClass('private')
 
   enableActions: () =>
     @deleteBtn.removeClass('disabled').addClass('btn-danger')
     @publishBtn.removeClass('disabled').addClass('btn-warning')
     @unpublishBtn.removeClass('disabled').addClass('btn-warning')
-    @flushCacheBtn.removeClass('disabled').addClass('btn-warning')
 
   disableActions: () =>
     @deleteBtn.addClass('disabled').removeClass('btn-danger')
     @publishBtn.addClass('disabled').removeClass('btn-warning')
     @unpublishBtn.addClass('disabled').removeClass('btn-warning')
-    @flushCacheBtn.addClass('disabled').removeClass('btn-warning')
 
   stopEvent: (event) ->
     event.stopPropagation()
     event.preventDefault()
 
-  getChecked: () => @element.find("input:checkbox:checked[data-checkbox='child']")
-  getId:      (c) => $(c).data('id')
-  getIds:     () => $.map(@getChecked(), (c) => @getId(c))
-
 $.fn.actsAsPagesTable = () ->
   @each ->
-    new PagesTable($(this))
+    checkboxable = new Checkboxable($(this))
+    new PagesTable($(this), checkboxable)
 
 jQuery ->
   $("table.pages.js-checkboxable").each ->