cas-cms 0.1.3 → 1.0.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e4cf4081ecbfe1307e6d39d6b64156b98a494f3b
-  data.tar.gz: b1b59204366430b4ff05abf74dd64107524373d5
+SHA256:
+  metadata.gz: 96db3f49e7ef1be93244ed68bf8a6b7a9ed8fd063c7a8eef270028d3c5a0fe49
+  data.tar.gz: 769019cb609a44cb5e10ddae58d9914f6276b373002e8bad542b3988175744b5
 SHA512:
-  metadata.gz: 4144df8905ec86fd3102dcf0cfc7cef2053b314f40a749059a305e97b552187144fc8f669e13e90de69649092522a6edf3c9fc8f40bc23f9637be297d8d436da
-  data.tar.gz: d66d1a0ea481f0e9562e0f370a8dda0fbadcd23787fcbe260a9bfeb9ee3c3e9a8314ae7553312b2854258ffe17343037c24f89a31b5c579a7fe72836217e3336
+  metadata.gz: b116b21f10eb582ad68d7664d89b15e9619a459f4f83d0bba55701e77da658a7fecae9900ba56b9bf4f68e8621fb6231d619eb3d64fe7bfb295dce508b87fe2d
+  data.tar.gz: 56517fae5fb373605c9c323c1c72a8441564e88419c87af7dbdf73a16b723d81dc38d332680cf8f048a159b894a4ce151ca4fad0b30f22f02a6f74ae99e1147c

data/README.md

@@ -1,11 +1,8 @@
 # Cas
-Short description and motivation.
 
-## Usage
-
-How to use my plugin.
+For branches for specific versions: [rails-5](https://github.com/cas-cms/cas-core/tree/rails-5)
 
-## Installation
+## Usage
 
 Add this line to your application's Gemfile:
 
@@ -13,22 +10,25 @@ Add this line to your application's Gemfile:
 gem 'cas'
 ```
 
-### Setup
+### Installation
 
-**Engine:** Cas is mounted in your main Rails application. Say your application
-is called MyBlog, you make can make it accessible at `myblog.com/admin`
-by setting the following in the `config/routes.rb` file in your main
-application:
+```
+bin/rails generate cas:install
+```
 
-```ruby
-Rails.application.routes.draw do
-   mount Cas::Engine, at: "/admin"
+This adds an `/admin` entry to `config/routes.rb` and generates a new file,
+`config/cas.config.yml` which contains all sections your site is supposed to
+have.
+
+Once the file is edited, run
 
-   # ... other routes
-end
 ```
+bin/rails cas:apply_config
+```
+
+### File Uploads
 
-**S3:** you need S3 credentials to use Cas (for file uploads). Set the
+You need S3 credentials to use Cas (for file uploads). Set the
 following ENV vars (e.g paste in your `~/.bash_profile` or use the `dotenv`
 gem in your main Rails application):
 
@@ -37,8 +37,20 @@ gem in your main Rails application):
     export S3_REGION="value"
     export S3_BUCKET="value"
 
-## Contributing
-Contribution directions go here.
+## Development
+
+Quick start:
+
+```
+bundle install
+bundle exec rake db:create db:migrate db:test:prepare
+cd spec/test_app/ && bin/rails server
+```
+
+### The Longer Version
+
+
 
 ## License
+
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/app/assets/config/cas_manifest.js

@@ -1,2 +1,4 @@
+//= link cas/application.js
+//= link cas/application.css
 //= link_directory ../javascripts/cas .js
 //= link_directory ../stylesheets/cas .css

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

@@ -1,6 +1,6 @@
 //= require jquery
 //= require jquery_ujs
-//= require tinymce-jquery
+//= require tinymce
 //= require cas/vendor/selectize.min
 //= require_self
 
@@ -37,6 +37,8 @@ $(document).ready(function() {
   });
 
   tinyMCE.init({
+    branding: false,
+    promotion: false,
     selector: 'textarea.editor',
     mode : "exact",
     relative_urls : false,
@@ -48,7 +50,7 @@ $(document).ready(function() {
     inline_styles: false,
     extended_valid_elements: "embed,param,object,iframe[src|title|width|height|allowfullscreen|frameborder]",
     language : "pt_BR",
-    plugins : 'image,imagetools,code,paste,pagebreak,table,wordcount,link',
+    plugins : 'image code pagebreak table wordcount link',
     default_link_target: "_blank",
     images_upload_url: paths.fileUpload.path,
     images_upload_credentials: true

data/app/assets/javascripts/cas/fileupload_manifest.js

@@ -30,7 +30,7 @@ var UploadSharedFunctions = {
     console.log("error", e);
     console.log("data", data);
     data.progressBar.remove();
-    alert('Falha ao enviar arquivo: '+data.files[0].name);
+    alert('Failed sending file: '+data.files[0].name);
   }
 };
 
@@ -47,7 +47,7 @@ var ImageGalleryUploadFunctions = {
     for (var index in data.originalFiles) {
       var file = data.originalFiles[index];
       if(file['type'].length && !acceptFileTypes.test(file['type'])) {
-        alert('O arquivo enviado não é uma imagem.');
+        alert('File is not a valid image.');
         return false;
       }
     }
@@ -77,14 +77,12 @@ var ImageGalleryUploadFunctions = {
     data.progressBar.remove();
 
     var file = {
-      original: {
-        id: data.formData.key.match(/cache\/(.+)/)[1], // we have to remove the prefix part
-        storage: 'cache',
-        metadata: {
-          size:      data.files[0].size,
-          filename:  data.files[0].name.match(/[^\/\\]*$/)[0], // IE returns full path
-          mime_type: data.files[0].type
-        }
+      id: data.formData.key.match(/cache\/(.+)/)[1], // we have to remove the prefix part
+      storage: 'cache',
+      metadata: {
+        size:      data.files[0].size,
+        filename:  data.files[0].name.match(/[^\/\\]*$/)[0], // IE returns full path
+        mime_type: data.files[0].type
       }
     }
 
@@ -148,14 +146,12 @@ var AttachmentUploadFunctions = {
     data.progressBar.remove();
 
     var file = {
-      original: {
-        id: data.formData.key.match(/cache\/(.+)/)[1], // we have to remove the prefix part
-        storage: 'cache',
-        metadata: {
-          size:      data.files[0].size,
-          filename:  data.files[0].name.match(/[^\/\\]*$/)[0], // IE returns full path
-          mime_type: data.files[0].type
-        }
+      id: data.formData.key.match(/cache\/(.+)/)[1], // we have to remove the prefix part
+      storage: 'cache',
+      metadata: {
+        size:      data.files[0].size,
+        filename:  data.files[0].name.match(/[^\/\\]*$/)[0], // IE returns full path
+        mime_type: data.files[0].type
       }
     }
 

data/app/assets/stylesheets/cas/application.sass

@@ -1,10 +1,10 @@
-
 /*
- * require_tree .
  *= require_self
+ * require cas/vendors/simplegrid.css
+ * require ./cas/vendors/selectize.default.css
  */
-@import 'vendors/simplegrid.css'
-@import 'vendors/selectize.default.css'
+@import 'cas/vendors/selectize.css'
+@import 'cas/vendors/simplegrid.css'
 
 @import 'mixins'
 @import 'colors'

data/app/assets/stylesheets/cas/form.sass

@@ -1,3 +1,5 @@
+@import 'colors'
+
 label
   display: block
 div.input.boolean

data/app/assets/stylesheets/cas/layout.sass

@@ -1,3 +1,5 @@
+@import 'colors'
+@import 'mixins'
 
 body
   margin: 0

data/app/assets/stylesheets/cas/tables.sass

@@ -1,3 +1,6 @@
+@import 'colors'
+@import 'mixins'
+
 table
   width: 100%
   border-spacing: 0

data/app/assets/stylesheets/cas/typography.sass

@@ -1,4 +1,6 @@
 // @import url('https://fonts.googleapis.com/css?family=Lato')
+@import 'colors'
+@import 'mixins'
 
 body
   margin: 0

data/app/controllers/cas/activities_controller.rb

@@ -0,0 +1,9 @@
+class Cas::ActivitiesController < Cas::ApplicationController
+  def index
+    @activities = Cas::Activity
+      .where(site_id: current_user.sites.map(&:id))
+      .order('created_at DESC')
+      .page(params[:page])
+      .per(25)
+  end
+end

data/app/controllers/cas/api/files_controller.rb

@@ -5,17 +5,27 @@ class Cas::Api::FilesController < Cas::ApplicationController
     if ENV.fetch("S3_BUCKET")
       service = "s3"
     end
+
     metadata = resource_params[:attributes][:metadata]
     file = ::Cas::MediaFile.new(
       service: service,
-      size: metadata[:original][:metadata][:size].to_i,
-      original_name: metadata[:original][:metadata][:filename],
-      mime_type: metadata[:original][:metadata][:mime_type],
+      size: metadata[:metadata][:size].to_i,
+      original_name: metadata[:metadata][:filename],
+      mime_type: metadata[:metadata][:mime_type],
       media_type: resource_params[:attributes][:media_type],
       file: metadata.to_json,
-      attachable: attachable_record
+      attachable: attachable_record,
+      author: current_user,
     )
-    file.save
+
+    Rails.logger.debug metadata.inspect
+
+    unless !file.valid?
+      Rails.logger.debug "File upload failed: #{file.errors.inspect}"
+    end
+
+    file.save!
+
     Cas::RemoteCallbacks.callbacks[:after_file_upload].call(file)
     render json: {
       data: {
@@ -53,11 +63,9 @@ class Cas::Api::FilesController < Cas::ApplicationController
           :cover,
           :media_type,
           metadata: [
-            original: [
-              :id,
-              :storage,
-              metadata: [:size, :filename, :mime_type, 'mime-type']
-            ]
+            :id,
+            :storage,
+            metadata: [:size, :filename, :mime_type, 'mime-type']
           ]
         ],
         relationships: [
@@ -68,10 +76,10 @@ class Cas::Api::FilesController < Cas::ApplicationController
       )
 
     if r[:attributes][:metadata].present?
-      if r[:attributes][:metadata][:original][:metadata][:mime_type].blank?
-        r[:attributes][:metadata][:original][:metadata][:mime_type] = r[:attributes][:metadata][:original][:metadata][:"mime-type"]
+      if r[:attributes][:metadata][:metadata][:mime_type].blank?
+        r[:attributes][:metadata][:metadata][:mime_type] = r[:attributes][:metadata][:metadata][:"mime-type"]
       end
-      r[:attributes][:metadata][:original][:metadata].delete(:"mime-type")
+      r[:attributes][:metadata][:metadata].delete(:"mime-type")
     end
     r
   end

data/app/controllers/cas/application_controller.rb

@@ -5,6 +5,7 @@ module Cas
     before_action :set_current_user
     before_action :set_user_sites
     before_action :set_domain
+    before_action :set_site
 
     private
 
@@ -22,6 +23,18 @@ module Cas
       if @domain.blank? || (ENV["DOMAIN"].blank? && @domain == "localhost")
         @domain = ::Cas::Site.first!.domains.first
       end
+    rescue ActiveRecord::RecordNotFound => e
+      raise Cas::Exceptions::IncompleteSetup, "IncompleteSetup: check README.md. #{e.message}: #{e.inspect}"
+    end
+
+    def set_site
+      if params[:site_id].present?
+        @site = ::Cas::Site.find_by!(slug: params[:site_id])
+      else
+        @site = ::Cas::Site
+          .where("cas_sites.domains::text[] && '{#{@domain}}'::text[]")
+          .first!
+      end
     end
   end
 end

data/app/controllers/cas/file_uploads_controller.rb

@@ -1,6 +1,6 @@
 class Cas::FileUploadsController < Cas::ApplicationController
   skip_before_action :authenticate_user!
-  skip_before_filter :verify_authenticity_token
+  skip_before_action :verify_authenticity_token
 
   def create
     file = params.fetch(:file)

data/app/controllers/cas/sites/application_controller.rb

@@ -1,15 +1,2 @@
 class Cas::Sites::ApplicationController < ::Cas::ApplicationController
-  before_action :set_site
-
-  private
-
-  def set_site
-    if params[:site_id].present?
-      @site = ::Cas::Site.find_by!(slug: params[:site_id])
-    else
-      @site = ::Cas::Site
-        .where("cas_sites.domains::text[] && '{#{@domain}}'::text[]")
-        .first!
-    end
-  end
 end

data/app/controllers/cas/sites/sections/contents_controller.rb

@@ -25,10 +25,13 @@ module Cas
           @content.section_id = @section.id
           @content.tag_list = content_params[:tag_list] if content_params[:tag_list]
           success = @content.save!
+
+          ::Cas::Activity.create!(user: current_user, site: @site, subject: @content, event_name: 'create')
           associate_files(@content, :images)
           associate_files(@content, :attachments)
         end
       rescue ActiveRecord::RecordInvalid
+        Rails.logger.info "Errors: #{@content.errors.full_messages.inspect}"
         success = nil
       end
 
@@ -62,6 +65,7 @@ module Cas
           success = @content.update!(content_params)
           associate_files(@content, :images)
           associate_files(@content, :attachments)
+          ::Cas::Activity.create!(user: current_user, site: @site, subject: @content, event_name: 'update')
         end
       rescue ActiveRecord::RecordInvalid
         success = nil
@@ -90,6 +94,13 @@ module Cas
 
     def content_params
       @content_params ||= begin
+        # When no file is uploaded, when the content form is submitted the
+        # `file` input ends up being sent empty (e.g file: [""]). This confuses
+        # Rails.
+        if params[:content][:file].present?
+          params[:content].delete(:file) if params[:content][:file].map(&:presence)&.compact.blank?
+        end
+
         result = params.require(:content).permit(
           :category_id,
           :title,
@@ -100,7 +111,8 @@ module Cas
           :text,
           :url,
           :embedded,
-          :tag_list
+          :tag_list,
+          :file
         )
 
         unless result.keys.map(&:to_sym).include?(:published)

data/app/controllers/cas/sites/users_controller.rb

@@ -36,7 +36,7 @@ module Cas
         without_password = user_params.except(:password, :password_confirmation)
         success = @user.update_without_password(without_password)
       else
-        success = @user.update_attributes(user_params)
+        success = @user.update(user_params)
       end
 
       if success

data/app/jobs/cas/images/delete_job.rb

@@ -3,8 +3,11 @@ module Cas
     class DeleteJob
       include ::Sidekiq::Worker
 
-      def perform(data)
-        ::Shrine::Attacher.delete(data)
+      def perform(attacher_class, data)
+        attacher_class = Object.const_get(attacher_class)
+
+        attacher = attacher_class.from_data(data)
+        attacher.destroy
       end
     end
   end

data/app/jobs/cas/images/promote_job.rb

@@ -1,10 +1,19 @@
 module Cas
   module Images
     class PromoteJob
-      include ::Sidekiq::Worker
 
-      def perform(data)
-        ::Shrine::Attacher.promote(data)
+      include Sidekiq::Worker
+
+      def perform(attacher_class, record_class, record_id, name, file_data)
+        attacher_class = Object.const_get(attacher_class)
+        record         = Object.const_get(record_class).find(record_id) # if using Active Record
+
+        attacher = attacher_class.retrieve(model: record, name: name, file: file_data)
+        attacher.create_derivatives # call derivatives processor 
+        attacher.atomic_promote
+      rescue Shrine::AttachmentChanged, ActiveRecord::RecordNotFound => e
+        Rails.logger.info e.inspect
+        # attachment has changed or record has been deleted, nothing to do
       end
     end
   end

data/app/models/cas/activity.rb

@@ -0,0 +1,30 @@
+module Cas
+  class Activity < ApplicationRecord
+    belongs_to :site
+    belongs_to :user, optional: true
+    belongs_to :subject, polymorphic: true
+
+    # To prevent losing data in case the subject is ever destroyed
+    before_validation :cache_description
+
+    private
+
+    def cache_description
+      if self.user_description.blank?
+        user_string = [user.name]
+        user_string << ["(admin)"] if user.admin?
+        self.user_description = user_string.join(" ")
+      end
+
+      if self.subject_description.blank?
+        subject_string = []
+        if subject.respond_to?(:title)
+          subject_string << [subject.title]
+        elsif subject.respond_to?(:name)
+          subject_string << [subject.name]
+        end
+        self.subject_description = subject_string.join(" ")
+      end
+    end
+  end
+end

data/app/models/cas/content.rb

@@ -9,12 +9,21 @@ module Cas
     serialize :metadata
 
     belongs_to :section
+    belongs_to :category, optional: true
+    belongs_to :author, class_name: "::Cas::User"
+
+    has_many :images,
+      ->{ where(media_type: :image).order("cas_media_files.order ASC") },
+      class_name: "::Cas::MediaFile", as: :attachable, dependent: :destroy
+    has_many :attachments,
+      ->{ where(media_type: :attachment).order("cas_media_files.order ASC") },
+      class_name: "::Cas::MediaFile", as: :attachable, dependent: :destroy
+    has_many :activities, as: :subject
+
     has_one :site, through: :section
-    belongs_to :category
-    belongs_to :author, class_name: Cas::User
-    has_many :images, ->{ where(media_type: :image).order("cas_media_files.order ASC") }, class_name: Cas::MediaFile, as: :attachable, dependent: :destroy
-    has_many :attachments, ->{ where(media_type: :attachment).order("cas_media_files.order ASC") }, class_name: Cas::MediaFile, as: :attachable, dependent: :destroy
-    has_one :cover_image, ->{ where(media_type: :image, cover: true) }, class_name: Cas::MediaFile, as: :attachable
+    has_one :cover_image,
+      ->{ where(media_type: :image, cover: true) },
+      class_name: "::Cas::MediaFile", as: :attachable
 
     validates :title, presence: true
 

data/app/models/cas/media_file.rb

@@ -1,12 +1,12 @@
 module Cas
   class MediaFile < ApplicationRecord
-    include FileUploader::Attachment.new(:file)
+    include FileUploader::Attachment.new(:file) # This is for the Shrine gem
 
     class UnknownPath < StandardError; end
     class UnknownFileService < StandardError; end
 
-    belongs_to :attachable, polymorphic: true
-    belongs_to :author, class_name: "Cas::User"
+    belongs_to :attachable, polymorphic: true, optional: true
+    belongs_to :author, class_name: "::Cas::User", optional: true
 
     before_validation :set_media_type
     before_save :set_image_as_unique_cover
@@ -39,13 +39,37 @@ module Cas
           raise UnknownFileService
         end
 
-      # Shrine gem uses `file_data`
+      # Shrine gem uses `file_data` because `file` is the name we specified for
+      # the Attachment at the top of this model.
       elsif JSON.parse(file_data).present?
-        if cdn.present?
-          file_url(version.to_sym, host: cdn, public: true)
-        else
-          file_url(version.to_sym, public: true).gsub(/\?.*/, "")
-        end
+        params = {
+          public: true
+        }
+        params[:host] = cdn if cdn.present?
+
+        # With Shrine, the default image version is :original. Other versions
+        # are called derivatives. The `file_url` method expects a derivative
+        # name as first argument.
+        #
+        # When we pass :original, it just returns `nil` because the main file is
+        # not considered a derivative. If we had something like :larger, then
+        # that would be the argument.
+        url = if version.to_sym == :original
+                file_url(params)
+              else
+                file_url(version, params)
+              end
+
+        # Shrine 3 returns `nil` when a derivative doesn't exist. It also
+        # returns `nil` when we pass parameters. This is a fallback way of
+        # avoiding any `nil` returns. However, notice that we can't pass
+        # `params` because Shrine just ignores it and returns `nil` if it's
+        # present (it wasn't like that in Shrine 2).
+        url = file_url if url.blank?
+
+        # Amazon S3 has URLs that include some query strings like signatures
+        # which we don't want to include in URLs.
+        url&.gsub(/\?.*/, "")
       else
         raise UnknownPath
       end

data/app/models/cas/sites_user.rb

@@ -2,6 +2,6 @@ module Cas
   class SitesUser < ApplicationRecord
     belongs_to :site
     belongs_to :user
-    belongs_to :owner, class_name: '::Cas::User'
+    belongs_to :owner, class_name: '::Cas::User', optional: true
   end
 end

data/app/models/cas/user.rb

@@ -6,9 +6,10 @@ module Cas
            :rememberable, :trackable, :validatable, request_keys: [:domain]
 
     has_many :contents
-    has_many :files, class_name: 'Cas::MediaFile', as: :attachable
-    has_many :sites_users, class_name: 'Cas::SitesUser'
+    has_many :files, class_name: '::Cas::MediaFile', as: :attachable
+    has_many :sites_users, class_name: '::Cas::SitesUser'
     has_many :sites, through: :sites_users
+    has_many :activities, as: :subject
 
     validates :name, presence: true, length: { maximum: 50 }
     validates :email, presence: true, length: { maximum: 255 },

data/app/uploaders/file_uploader.rb

@@ -1,19 +1,18 @@
 class ::FileUploader < Shrine
-  plugin :versions
-  plugin :processing
 
-  process(:store) do |io, context|
-    result = {}
+  Attacher.derivatives do |original|
+    result = {
+    }
+
     if context[:record].media_type == 'image'
-      result = Cas::RemoteCallbacks.callbacks[:uploaded_image_versions].call(io, context)
+      result = Cas::RemoteCallbacks.callbacks[:uploaded_image_versions].call(original)
     end
-    original = (io.respond_to?(:[]) && io[:original]) ? io[:original] : io
-    result = result.merge(original: original) unless result.keys.include?(:original)
+
+    Rails.logger.info "FileUploader, versions: [#{result.keys.join(", ")}]"
     result
   end
 
   def generate_location(io, context)
-    Rails.logger.info "FileUploader#generate_location"
     year  = Time.now.strftime("%Y")
     month = Time.now.strftime("%m")
     original_filename = context[:metadata]["filename"]