georgia 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2c023563b6dd7111d22f5caf701b495c27bbeaf
-  data.tar.gz: 2bebca43c34b00820ce9ec89ddcb25bc088c9aff
+  metadata.gz: 299c38cb8ad39e71ee60b95ec7257d07e34065f3
+  data.tar.gz: 08ad778ae03b46ff2cfde384e120eb4b87ecddfb
 SHA512:
-  metadata.gz: 14d7799b3912e204652a67a1f53b9c75ad63c3d8303927d0a0d272ba8abd858d2c82649beb6e3ac44023a07bc71ef8077bce9a7ac320fea651c637191d10e8c8
-  data.tar.gz: 64a18a2521039fb0ee834dc89781f8d104a92833c0322f7baeb96b0d7d3e7011478f7613edd4911fc3fecfd8eef8ce440e379b9440d1c046127be4d25a39d9c9
+  metadata.gz: e384d34497ed13604fcafde5553b76b9e80fbb42fd2e1275ce95b0735dcea7e1e54a2a29088909825f3529e898cbb4fa411be7ceec294b55fcbb490a938d8d52
+  data.tar.gz: 3aad07802f87602d35395ef8fdba06c4077a4137c1389d8d7fd745243e17c2ac4a7b3961b9523b0d2ed99b5de87c9ee7c7f153bb903677f7741d54933d78e500

data/README.md

@@ -32,11 +32,17 @@ Rails. Engine. CMS. Plug-and-play content management system for Ruby on Rails. H
 
 ### Getting started
 
+Add Georgia to your Gemfile
+
+    gem 'georgia'
+
 Make sure you have properly identify your default locale and possible available ones.
 Georgia uses available_locales to know which translations should be configured or not.
 
-    config.i18n.default_locale = :en
-    config.i18n.available_locales = [:en]
+``` ruby
+config.i18n.default_locale = :en
+config.i18n.available_locales = [:en]
+```
 
 Then run the generator to mount routes, run migrations & setup initial instances.
 
@@ -48,21 +54,88 @@ We built Georgia to help you quickly develop an application with a CMS (Content
 
 Start your server (`rails server`) and go to [http://localhost:3000/admin](http://localhost:3000/admin) to get started.
 
+### Cloud Storage
+
+Georgia's media library stores your documents and images on the cloud. You'll need to configure the solution that best fits your needs. Two options for you: Cloudinary or Custom Storage with Fog (e.g. Amazon S3, Rackspace Cloud Files)
+
+#### Cloudinary
+
+This will only work if you plan to have only pictures/images in your Media Library. Cloudinary won't work for `.pdf` files and other documents.
+
+1. Add cloudinary gem to your Gemfile.
+
+    gem 'cloudinary'
+
+2. Set storage to `:cloudinary` in the `config/initializers/georgia.rb` file.
+
+    ``` ruby
+    Georgia.setup do |config|
+      ...
+
+      # Storage
+      config.storage = :cloudinary
+    end
+    ```
+
+3. Open a Cloudinary Account
+
+You can skip this step if you plan on using Heroku. Otherwise, take 10 seconds to open an account on Cloudinary if not already done. Download your `cloudinary.yml` file and add to your config folder.
+
+#### Custom Storage
+
+The `georgia:install` generator added a `carrierwave.example.rb` file to your initializers. Use it to configure your custom location.
+
 ### Heroku
 
-You will need certain addons to make it work. I suggest going with this list matching Georgia's default tools:
+Georgia will run smoothly and cheaply (read free) on Heroku but you will need certain addons to make it work, all free.
+
+#### Sengrid
+
+Add sendgrid addon to handle emails
 
-    heroku addons:add bonsai
     heroku addons:add sendgrid
 
+Add sendgrid config to your production environment file
+
+``` ruby
+# Send emails via sendgrid
+config.action_mailer.smtp_settings = {
+  :address        => 'smtp.sendgrid.net',
+  :port           => '587',
+  :authentication => :plain,
+  :user_name      => ENV['SENDGRID_USERNAME'],
+  :password       => ENV['SENDGRID_PASSWORD'],
+  :domain         => 'heroku.com',
+  :enable_starttls_auto => true
+}
+```
+
+#### Bonsai
+
+Add bonsai addon to handle elasticsearch
+
+    heroku addons:add bonsai
+
 Add `config/initializers/bonsai.rb` with:
 
     ENV['ELASTICSEARCH_URL'] = ENV['BONSAI_URL']
 
-Create your indices with these commands:
+Create your elasticsearch indices with these commands:
+
+*** After your first deploy *** You need tire installed on Heroku to perform this.
 
     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
+
+#### Cloudinary
+
+Add cloudinary addon to handle media library cloud storage
+
+    heroku addons:add cloudinary
+
+#### Create your admin user
 
 Finally, create your first admin user to access to web panel:
 

data/app/assets/javascripts/georgia/components/asset-uploader.js.coffee

@@ -26,7 +26,7 @@ class @AssetUploader
     @progress.modal('hide')
     @btn.html("<i class='fa fa-check'></i> Uploaded")
     setTimeout(
-      -> @btn.html("<i class='fa fa-plus'></i> Select files...")
+      => @btn.html("<i class='fa fa-plus'></i> Select files...")
       1500
     )
 

data/app/controllers/georgia/api/media_controller.rb

@@ -3,8 +3,8 @@ module Georgia
     class MediaController < Georgia::ApplicationController
 
       def pictures
-        @pictures = Georgia::Indexer.search(Ckeditor::Picture, params.merge(per: 12))
-        @pictures = Ckeditor::PictureDecorator.decorate_collection(@pictures)
+        @search = Georgia::Indexer.search(Ckeditor::Picture, params.merge(per: 12))
+        @pictures = Ckeditor::PictureDecorator.decorate_collection(@search.results)
         render layout: false
       end
 

data/app/controllers/georgia/api/tags_controller.rb

@@ -6,7 +6,7 @@ module Georgia
       respond_to :json
 
       def search
-        @tags = Georgia::Indexer.search(ActsAsTaggableOn::Tag, params)
+        @tags = Georgia::Indexer.search(ActsAsTaggableOn::Tag, params).results
 
         # Format for select2
         @tags = @tags.map{|t| {id: t.id, text: t.name}}

data/app/controllers/georgia/media_controller.rb

@@ -11,15 +11,16 @@ module Georgia
 
     def search
       @asset = Ckeditor::Asset.new
-      @results = Georgia::Indexer.search(Ckeditor::Asset, params)
-      @assets = Ckeditor::AssetDecorator.decorate_collection(@results)
+      @search = Georgia::Indexer.search(Ckeditor::Asset, params)
+      @assets = Ckeditor::AssetDecorator.decorate_collection(@search.results)
     end
 
     def create
-      @assets = []
-      params[:assets].each do |asset|
-        klass = asset.content_type.match(/^image/) ? Ckeditor::Picture : Ckeditor::Asset
-        @assets << klass.create(data: asset)
+      begin
+        @assets = params[:assets].map{|asset| CreateMediaAsset.new(asset).call}
+        @assets = Ckeditor::AssetDecorator.decorate_collection(@assets)
+      rescue ArgumentError => ex
+        flash.now[:alert] = ex.message
       end
       render layout: false
     end

data/app/controllers/georgia/pages_controller.rb

@@ -149,8 +149,8 @@ module Georgia
 
     def search
       session[:search_params] = params
-      @results = Georgia::Indexer.adapter.search(model, params)
-      @pages = Georgia::PageDecorator.decorate_collection(@results)
+      @search = Georgia::Indexer.adapter.search(model, params)
+      @pages = Georgia::PageDecorator.decorate_collection(@search.results)
     end
 
     private

data/app/helpers/georgia/ui_helper.rb

@@ -31,6 +31,11 @@ module Georgia
       link_to text, url, options.reverse_merge(data: {confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-danger')
     end
 
+    # Link to close modal box
+    def link_to_close
+      content_tag :button, icon_tag('times'), class: 'close', data: {dismiss: 'modal'}, aria: {hidden: true}, type: 'button'
+    end
+
     def tooltip_tag icon, tooltip, options={}
       content_tag(:span, icon, options.reverse_merge(title: tooltip, class: 'js-tooltip', data: {placement: 'right'}))
     end

data/app/models/ckeditor/asset.rb

@@ -10,7 +10,7 @@ class Ckeditor::Asset < ActiveRecord::Base
 
   delegate :url, :current_path, :content_type, to: :data
 
-  mount_uploader :data, CkeditorAttachmentFileUploader, mount_on: :data_file_name
+  mount_uploader :data, Ckeditor::AttachmentFileUploader, mount_on: :data_file_name
 
   validates :data, presence: true
   attr_accessible :data
@@ -29,7 +29,12 @@ class Ckeditor::Asset < ActiveRecord::Base
     }
   end
 
+  def short_name
+    @short_name ||= self.data.file.filename.dup.gsub(/(.*)\.#{extension}/, '\1') if data.file and data.file.filename
+  end
+
   def extension
+    self.data_content_type ||= self.data.file.content_type
     @extension ||= data_content_type.gsub(/.*\/(.*)/, '\1')
   end
 

data/app/models/ckeditor/attachment_file.rb

@@ -1,5 +1,5 @@
 class Ckeditor::AttachmentFile < Ckeditor::Asset
-  mount_uploader :data, CkeditorAttachmentFileUploader, :mount_on => :data_file_name
+  mount_uploader :data, Ckeditor::AttachmentFileUploader, :mount_on => :data_file_name
 
   def url_thumb
     @url_thumb ||= Ckeditor::Utils.filethumb(filename)

data/app/models/ckeditor/picture.rb

@@ -1,6 +1,6 @@
 class Ckeditor::Picture < Ckeditor::Asset
 
-  mount_uploader :data, CkeditorPictureUploader, mount_on: :data_file_name
+  mount_uploader :data, Ckeditor::PictureUploader, mount_on: :data_file_name
 
   has_many :contents, foreign_key: :image_id, class_name: Georgia::Content
 
@@ -12,4 +12,13 @@ class Ckeditor::Picture < Ckeditor::Asset
     @pages ||= contents.map(&:contentable).map(&:page).compact.uniq
   end
 
+  def filename
+    @filename ||=
+      if defined?(Cloudinary)
+        data_file_name.dup.gsub(/v\d{10}\/(.*)/, '\1') || data_file_name
+      else
+        data_file_name
+      end
+  end
+
 end

data/app/presenters/georgia/list_facet_presenter.rb

@@ -25,7 +25,7 @@ module Georgia
     end
 
     def merged_params(text)
-      params.merge(param => ((params[param] || []) + [text]))
+      params.reject{|k,v| k == 'page'}.merge(param => ((params[param] || []) + [text]))
     end
 
   end

data/app/services/create_media_asset.rb

@@ -0,0 +1,51 @@
+class CreateMediaAsset
+
+  require 'carrierwave/processing/mini_magick'
+
+  def initialize file
+    @file = file
+    @asset = klass.new(data: file)
+  end
+
+  # Returns created asset
+  def call
+    extract_content_type
+    set_file_name
+    set_size
+    read_dimensions
+    @asset.save!
+    @asset
+  end
+
+  private
+
+  def read_dimensions
+    if @asset.image? && @asset.has_dimensions?
+      magick = ::MiniMagick::Image.new(@asset.data.current_path)
+      @asset.width, @asset.height = magick[:width], magick[:height]
+    end
+  end
+
+  def extract_content_type
+    if @file.content_type == 'application/octet-stream' || @file.content_type.blank?
+      content_type = MIME::Types.type_for(@file.original_filename).first
+    else
+      content_type = @file.content_type
+    end
+
+    @asset.data_content_type = content_type.to_s
+  end
+
+  def set_file_name
+    @asset.data_file_name = @file.original_filename
+  end
+
+  def set_size
+    @asset.data_file_size = @file.size
+  end
+
+  def klass
+    @file.content_type.match(/^image/) ? Ckeditor::Picture : Ckeditor::Asset
+  end
+
+end

data/app/uploaders/ckeditor/attachment_file_uploader.rb

@@ -0,0 +1,19 @@
+module Ckeditor
+  class AttachmentFileUploader < CarrierWave::Uploader::Base
+    include Ckeditor::Backend::CarrierWave
+
+    # Fallback to file system. Files will be attached to emails when sent
+    case Georgia.storage
+    when :fog then storage(:fog)
+    when :cloudinary then storage(:file)
+    end
+
+    def store_dir
+      "assets/#{model.id}"
+    end
+
+    def extension_white_list
+      %w(doc docx odt xls ods csv pdf rar zip tar tar.gz ppt pptx) + Ckeditor.image_file_types
+    end
+  end
+end

data/app/uploaders/ckeditor/picture_uploader.rb

@@ -0,0 +1,23 @@
+module Ckeditor
+  class PictureUploader < CarrierWave::Uploader::Base
+
+    include Georgia::Uploader::Adapter
+
+    def extension_white_list
+      Ckeditor.image_file_types
+    end
+
+    version :tiny do
+      process resize_to_fill: [65, 65]
+    end
+
+    version :thumb do
+      process resize_to_fill: [160, 120]
+    end
+
+    version :content do
+      process resize_to_limit: [800, 800]
+    end
+
+  end
+end

data/app/views/georgia/ckeditor/pictures/_picture.html.erb

@@ -4,7 +4,7 @@
   </td>
   <td class='thumbnail-cell'>
     <%= link_to picture.url_content, class: 'media-link bg-transparent', rel: 'shadowbox[gallery]' do %>
-      <%= image_tag picture.url(:tiny), title: picture.data_file_name, class: 'media-image' %>
+      <%= image_tag picture.url(:tiny), title: picture.filename, class: 'media-image' %>
     <% end %>
   </td>
   <td>

data/app/views/georgia/media/create.js.erb

@@ -1 +1,6 @@
-$('table.assets tbody').prepend("<%= j render(@assets) %>");
+<% if @assets and @assets.any? %>
+  $('table.assets tbody').prepend("<%= j render(@assets) %>");
+<% end %>
+<% flash.each do |name, msg| %>
+  new Flash('<%= msg %>', '<%= name %>')
+<% end -%>

data/app/views/georgia/media/edit.html.erb

@@ -8,7 +8,7 @@
     <div class="col-md-9">
 
       <h2>
-        <%= link_to @asset.data_file_name, @asset.url %>
+        <%= link_to @asset.filename, @asset.url %>
         <% unless @asset.is_a?(Ckeditor::Picture) %>
           <%= link_to icon_tag('link'), @asset.url, title: @asset.url, target: '_blank', class: 'btn btn-default' %>
         <% end -%>
@@ -25,7 +25,7 @@
               </span>
             <% end -%>
           </div>
-          <%= image_tag @asset.url(:content), title: @asset.data_file_name, class: 'media-image--inline' %>
+          <%= image_tag @asset.url(:content), title: @asset.filename, class: 'media-image--inline' %>
         </div>
       <% end -%>
     </div>
@@ -36,7 +36,7 @@
         </div>
         <div class="panel-body">
           <p>
-            <b>File Name</b>: <%= @asset.data_file_name %><br />
+            <b>File Name</b>: <%= @asset.filename %><br />
             <b>Content Type</b>: <%= @asset.data_content_type %><br />
             <% if @asset.is_a?(Ckeditor::Picture) %>
               <b>File Size</b>: <%= number_to_human_size(@asset.data_file_size) %><br />

data/app/views/layouts/georgia/_header.html.erb

@@ -20,7 +20,7 @@
         <ul class="nav navbar-nav navbar-right">
           <% if can? :index, Georgia::User %>
             <li>
-              <%= link_to icon_tag('users'), users_path, class: 'header-link--icon' %>
+              <%= link_to icon_tag('users'), georgia.users_path, class: 'header-link--icon' %>
             </li>
           <% end -%>
           <li class='dropdown'>
@@ -30,7 +30,7 @@
               <%= content_tag(:b, nil, class: 'caret') %>
             <% end -%>
             <ul class="dropdown-menu">
-              <li><%= link_to('Logout', destroy_user_session_path, method: :delete) %></li>
+              <li><%= link_to('Logout', georgia.destroy_user_session_path, method: :delete) %></li>
             </ul>
           </li>
         </ul>

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

@@ -1,11 +1,8 @@
-# encoding: UTF-8
-require 'rails/generators/migration'
-require 'rails/generators/active_record'
+require 'bundler'
 
 module Georgia
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
-      include Rails::Generators::Migration
       source_root File.expand_path('../templates', __FILE__)
 
       desc "Installs Georgia CMS:\n
@@ -24,10 +21,6 @@ module Georgia
         route "mount Georgia::Engine => '/admin'"
       end
 
-      def self.next_migration_number(number)
-        ActiveRecord::Generators::Base.next_migration_number(number)
-      end
-
       def run_migrations
         rake "railties:install:migrations"
         rake "db:migrate"
@@ -40,15 +33,23 @@ module Georgia
 
       def copy_templates
         copy_file "config/initializers/georgia.rb"
+        copy_file "config/initializers/carrierwave.example.rb"
         copy_file "app/controllers/pages_controller.rb"
       end
 
-      def create_indices
-        if defined? Tire
-          say("Creating elasticsearch indices", :yellow)
-          rake "environment tire:import CLASS=Georgia::Page FORCE=true"
-          rake "environment tire:import CLASS=Ckeditor::Asset FORCE=true"
+      def add_default_indexer
+        return if defined?(Sunspot)
+        if !defined?(Tire)
+          say("Adding Tire gem for Elasticsearch", :yellow)
+          gem 'tire'
+          Bundler.with_clean_env do
+            run "bundle install"
+          end
         end
+        say("Creating elasticsearch indices", :yellow)
+        rake "environment tire:import CLASS=Georgia::Page FORCE=true"
+        rake "environment tire:import CLASS=Ckeditor::Asset FORCE=true"
+        rake "environment tire:import CLASS=Ckeditor::Picture FORCE=true"
       end
 
       def show_readme

data/lib/generators/georgia/install/templates/README

@@ -5,8 +5,6 @@ Some setup you must do manually if you haven't yet:
   1. Ensure you overwrite default options in your georgia initializer.
      Find me at config/initializers/georgia.rb
 
-  2. Ensure your routes we've just added are in order.
-
-  3. Ensure you chose one of the 2 indexers currently available (solr or elasticsearch).
+  2. Ensure the routes we've just added did not messed up anything.
 
 ===============================================================================

data/lib/generators/georgia/install/templates/config/initializers/carrierwave.example.rb

@@ -0,0 +1,44 @@
+# This file was added by Georgia for you to customize a storage location
+
+# Follow example configs from CarrierWave README file
+# Here are some of their examples for Amazon, Rackspace and Google Storage
+
+# AMAZON S3
+# https://github.com/carrierwaveuploader/carrierwave#using-amazon-s3
+# CarrierWave.configure do |config|
+#   config.fog_credentials = {
+#     :provider               => 'AWS',                        # required
+#     :aws_access_key_id      => 'xxx',                        # required
+#     :aws_secret_access_key  => 'yyy',                        # required
+#     :region                 => 'eu-west-1',                  # optional, defaults to 'us-east-1'
+#     :host                   => 's3.example.com',             # optional, defaults to nil
+#     :endpoint               => 'https://s3.example.com:8080' # optional, defaults to nil
+#   }
+#   config.fog_directory  = 'name_of_directory'                     # required
+#   config.fog_public     = false                                   # optional, defaults to true
+#   config.fog_attributes = {'Cache-Control'=>'max-age=315576000'}  # optional, defaults to {}
+# end
+
+# RACKSPACE
+# https://github.com/carrierwaveuploader/carrierwave#using-rackspace-cloud-files
+# CarrierWave.configure do |config|
+#   config.fog_credentials = {
+#     :provider           => 'Rackspace',
+#     :rackspace_username => 'xxxxxx',
+#     :rackspace_api_key  => 'yyyyyy',
+#     :rackspace_region   => :ord                # optional, defaults to :dfw
+#   }
+#   config.fog_directory = 'name_of_directory'
+#   config.asset_host = "http://c000000.cdn.rackspacecloud.com"
+# end
+
+# GOOGLE STORAGE
+# https://github.com/carrierwaveuploader/carrierwave#using-google-storage-for-developers
+# CarrierWave.configure do |config|
+#   config.fog_credentials = {
+#     :provider                         => 'Google',
+#     :google_storage_access_key_id     => 'xxxxxx',
+#     :google_storage_secret_access_key => 'yyyyyy'
+#   }
+#   config.fog_directory = 'name_of_directory'
+# end

data/lib/generators/georgia/install/templates/config/initializers/georgia.rb

@@ -16,4 +16,8 @@ Georgia.setup do |config|
   # Indexer
   # Choices are :solr or :tire
   # config.indexer = :tire
+
+  # Storage
+  # Choices are :cloudinary or :fog
+  # config.storage = :fog
 end

data/lib/generators/georgia/views/templates/app/views/pages/templates/_one-column.html.erb

@@ -1 +1 @@
-<%= @page.text.html_safe %>
+<%= @page.text.try(:html_safe) %>

data/lib/georgia.rb

@@ -2,6 +2,7 @@ require "georgia/version"
 require "georgia/paths"
 require "georgia/engine"
 require "georgia/indexer"
+require "georgia/uploader/adapter"
 
 module Georgia
 
@@ -20,6 +21,9 @@ module Georgia
   mattr_accessor :indexer
   @@indexer = :tire
 
+  mattr_accessor :storage
+  @@storage = :fog
+
   def self.setup
     yield self
   end

data/lib/georgia/indexer/extensions/solr_adapter/acts_as_taggable_on/tag.rb

@@ -19,7 +19,7 @@ module Georgia
                 fields(:name)
               end
               paginate(page: 1, per_page: 10)
-            end.results
+            end
           end
 
         end

data/lib/georgia/indexer/extensions/solr_adapter/ckeditor/asset.rb

@@ -35,7 +35,7 @@ module Georgia
               with(:tags).any_of(params[:tg]) unless params[:tg].blank?
               order_by (params[:o] || :updated_at), (params[:dir] || :desc)
               paginate(page: params[:page], per_page: (params[:per] || 8))
-            end.results
+            end
           end
 
         end

data/lib/georgia/indexer/extensions/solr_adapter/georgia/page.rb

@@ -51,7 +51,7 @@ module Georgia
           end
 
           def self.search_index model, params
-            @search = model.search do
+            model.search do
               fulltext params[:query] do
                 fields(:title, :excerpt, :text, :keywords, :tags, :url, :template)
               end
@@ -64,7 +64,7 @@ module Georgia
               order_by (params[:o] || :updated_at), (params[:dir] || :desc)
               paginate(page: params[:page], per_page: (params[:per] || 25))
               instance_eval &model.extra_search_params if model.respond_to? :extra_search_params
-            end.results
+            end
           end
 
         end

data/lib/georgia/indexer/extensions/tire_adapter/acts_as_taggable_on/tag.rb

@@ -4,7 +4,6 @@ module Georgia
   module Indexer
     module TireAdapter
       module ActsAsTaggableOnTagExtension
-
         extend ActiveSupport::Concern
 
         included do
@@ -16,8 +15,19 @@ module Georgia
             {name: name}.to_json
           end
 
-        end
+          def self.search_index params
+            search(page: (params[:page] || 1), per_page: (params[:per] || 10)) do
+              if params[:q].present?
+                query do
+                  boolean do
+                    must { string params[:q], default_operator: "AND" }
+                  end
+                end
+              end
+            end
+          end
 
+        end
       end
     end
   end

data/lib/georgia/indexer/extensions/tire_adapter/ckeditor/asset.rb

@@ -12,6 +12,10 @@ module Georgia
           include ::Tire::Model::Search
           include ::Tire::Model::Callbacks
 
+          after_rollback do
+            self.index.remove(self)
+          end
+
           def to_indexed_json
             indexed_hash = {
               widt: width,
@@ -42,7 +46,7 @@ module Georgia
                 end
                 sort { by (params[:o] || :updated_at), (params[:dir] || :desc) } if params[:query].blank?
               end
-            end.results
+            end
           end
 
         end

data/lib/georgia/indexer/extensions/tire_adapter/georgia/page.rb

@@ -44,7 +44,7 @@ module Georgia
                 end
                 sort { by (params[:o] || :updated_at), (params[:dir] || :desc) }
               end
-            end.results
+            end
           end
 
         end

data/lib/georgia/uploader/adapter.rb

@@ -0,0 +1,23 @@
+require 'active_support/concern'
+require 'georgia/uploader/storage/cloudinary'
+require 'georgia/uploader/storage/fog'
+
+module Georgia
+  module Uploader
+    module Adapter
+      extend ActiveSupport::Concern
+
+      included do
+        case Georgia.storage
+        when :cloudinary
+          include(Georgia::Uploader::Storage::Cloudinary)
+        when :fog
+          include(Georgia::Uploader::Storage::Fog)
+        else
+          include(Georgia::Uploader::Storage::Fog)
+        end
+      end
+
+    end
+  end
+end

data/lib/georgia/uploader/storage/cloudinary.rb

@@ -0,0 +1,21 @@
+require 'active_support/concern'
+
+module Georgia
+  module Uploader
+    module Storage
+      module Cloudinary
+        extend ActiveSupport::Concern
+
+        included do
+          'georgia/uploader/storage/cloudinary'
+          include ::Cloudinary::CarrierWave
+        end
+
+        def public_id
+          model.short_name
+        end
+
+      end
+    end
+  end
+end

data/lib/georgia/uploader/storage/fog.rb

@@ -0,0 +1,23 @@
+require 'active_support/concern'
+
+module Georgia
+  module Uploader
+    module Storage
+      module Fog
+        extend ActiveSupport::Concern
+
+        included do
+          include Ckeditor::Backend::CarrierWave
+          require 'carrierwave/processing/mini_magick'
+          include CarrierWave::MiniMagick
+          storage :fog
+        end
+
+        def store_dir
+          "assets/#{model.id}"
+        end
+
+      end
+    end
+  end
+end

data/lib/georgia/version.rb

@@ -1,3 +1,3 @@
 module Georgia
-  VERSION = "0.7.7"
+  VERSION = "0.7.8"
 end

data/lib/tasks/georgia.rake

@@ -2,12 +2,63 @@ namespace :georgia do
 
   desc "Creates an Admin user to get started"
   task seed: :environment do
-    first_name = ask("First name:")
-    last_name = ask("Last name:")
-    email = ask("Email:")
-    password = ask("Password:")
-    Georgia::User.create(first_name: first_name, last_name: last_name, email: email, password: password, password_confirmation: password) do |user|
+    require "highline/import"
+
+    class InvalidUser < StandardError; end
+
+    def echo_off
+      with_tty do
+        system "stty -echo"
+      end
+    end
+
+    def echo_on
+      with_tty do
+        system "stty echo"
+      end
+    end
+
+    def with_tty(&block)
+      return unless $stdin.isatty
+      begin
+        yield
+      rescue
+        # fails on windows
+      end
+    end
+
+    def ask_for_password message
+      print message
+      echo_off
+      password = $stdin.gets.to_s.strip
+      puts
+      echo_on
+      password
+    end
+
+    def user_instance
+      first_name = ask("First name: ")
+      last_name = ask("Last name: ")
+      email = ask("Email: ")
+      password = ask_for_password("Password (typing will be hidden): ")
+
+      user = Georgia::User.new(
+        first_name: first_name,
+        last_name: last_name,
+        email: email,
+        password: password,
+        password_confirmation: password)
       user.roles << Georgia::Role.all
+      user
+    end
+
+    begin
+      user = user_instance
+      raise InvalidUser, "#{user.errors.full_messages.join('. ')}" unless user.valid?
+      say(HighLine.color("Admin user successfully created.", :green)) if user.save
+    rescue InvalidUser => ex
+      say(HighLine.color(ex.message, :red))
+      retry
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: georgia
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Mathieu Gagné
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.6
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -499,7 +513,6 @@ files:
 - app/helpers/georgia/states_helper.rb
 - app/helpers/georgia/facets_helper.rb
 - app/helpers/georgia/ui_helper.rb
-- app/helpers/georgia/modals_helper.rb
 - app/helpers/georgia/checkboxes_helper.rb
 - app/helpers/georgia/menus_helper.rb
 - app/helpers/georgia/devise_helper.rb
@@ -690,9 +703,9 @@ files:
 - app/presenters/georgia/presenter.rb
 - app/presenters/georgia/sidebar_link_presenter.rb
 - app/presenters/georgia/media_library_presenter.rb
-- app/uploaders/ckeditor_attachment_file_uploader.rb
-- app/uploaders/ckeditor_picture_uploader.rb
-- app/uploaders/georgia/attachment_uploader.rb
+- app/services/create_media_asset.rb
+- app/uploaders/ckeditor/attachment_file_uploader.rb
+- app/uploaders/ckeditor/picture_uploader.rb
 - app/policies/georgia/policy.rb
 - app/policies/georgia/revision_policy.rb
 - config/locales/georgia.en.yml
@@ -725,6 +738,9 @@ files:
 - lib/templates/erb/scaffold/_form.html.erb
 - lib/georgia/version.rb
 - lib/georgia/paths.rb
+- lib/georgia/uploader/adapter.rb
+- lib/georgia/uploader/storage/cloudinary.rb
+- lib/georgia/uploader/storage/fog.rb
 - lib/georgia/indexer.rb
 - lib/georgia/engine.rb
 - lib/georgia/indexer/adapter.rb
@@ -743,6 +759,7 @@ files:
 - lib/generators/georgia/views/templates/app/views/pages/templates/_sidebar-right.html.erb
 - lib/generators/georgia/views/templates/app/views/pages/show.html.erb
 - lib/generators/georgia/install/install_generator.rb
+- lib/generators/georgia/install/templates/config/initializers/carrierwave.example.rb
 - lib/generators/georgia/install/templates/config/initializers/georgia.rb
 - lib/generators/georgia/install/templates/app/controllers/pages_controller.rb
 - lib/generators/georgia/install/templates/Procfile

data/app/helpers/georgia/modals_helper.rb

@@ -1,7 +0,0 @@
-module Georgia
-  module ModalsHelper
-    def link_to_close
-      content_tag :button, icon_tag('times'), class: 'close', data: {dismiss: 'modal'}, aria: {hidden: true}, type: 'button'
-    end
-  end
-end

data/app/uploaders/ckeditor_attachment_file_uploader.rb

@@ -1,16 +0,0 @@
-# encoding: utf-8
-class CkeditorAttachmentFileUploader < CarrierWave::Uploader::Base
-  include Ckeditor::Backend::CarrierWave
-
-  storage :fog
-
-  def store_dir
-    "assets/#{model.id}"
-  end
-
-  def extension_white_list
-    %w(doc docx odt xls ods csv pdf rar zip tar tar.gz ppt pptx) + Ckeditor.image_file_types
-  end
-
-
-end

data/app/uploaders/ckeditor_picture_uploader.rb

@@ -1,36 +0,0 @@
-# encoding: utf-8
-class CkeditorPictureUploader < CarrierWave::Uploader::Base
-
-  include Ckeditor::Backend::CarrierWave
-  require 'carrierwave/processing/mini_magick'
-  include CarrierWave::MiniMagick
-
-  storage :fog
-
-  def store_dir
-    "assets/#{model.id}"
-  end
-
-  def extension_white_list
-    Ckeditor.image_file_types
-  end
-
-  process :read_dimensions
-
-  version :tiny do
-    process resize_to_fill: [65, 65]
-  end
-
-  version :thumb do
-    process resize_to_fill: [160, 120]
-  end
-
-  version :big_thumb do
-    process resize_to_fill: [460, 280, 'North']
-  end
-
-  version :content do
-    process resize_to_limit: [800, 800]
-  end
-
-end

data/app/uploaders/georgia/attachment_uploader.rb

@@ -1,16 +0,0 @@
-# encoding: utf-8
-module Georgia
-  class AttachmentUploader < CarrierWave::Uploader::Base
-
-    storage :fog
-
-    def store_dir
-      "/uploads/ckeditor/attachments/#{model.id}"
-    end
-
-    def extension_white_list
-      Ckeditor.attachment_file_types
-    end
-
-  end
-end