rails_admin_cms 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47d6104a8249cfb64b0579732b7abdf5e9600c57
-  data.tar.gz: 12c545d7bdaa8a096d50e28c31a3a928ca274f8a
+  metadata.gz: 9f8bb36dc3f8fda329fa6f6f7963ff41e2707db3
+  data.tar.gz: 5507980dc86a5fb2c302adb9a48a6ff0bc21d79c
 SHA512:
-  metadata.gz: c790c31c68a1cff583a72f57f983a0c1666532ab6d6ab6f7788f7e75e7c51aeab057f19eac6436b33d4f0aca6024ca97b68f6820c90eddc4abb077249729d2c9
-  data.tar.gz: ad2cf322ad079e6fd0c6c8769aad3e268d5b9b1bed108ff91c5b7169da1464d785cda76a2adadb7bfe1c069b730176c4521cc749e83f8585297be1ae7c30aa9e
+  metadata.gz: 5321a7dd235768491894cc59e0b6ee1fd3c1990ae0aae6239715f66b682f2547e5a644c6a23fc68c76cd284ce6de264c71282391a96fac781ff0bc8f9cb0640c
+  data.tar.gz: 634038e2d6aec4c5061785574cf2148bd32cf6371233c9788e41b0be2cd6c213c52d170b4734f67aade35a45b2c80ea2cb82c999c49daddbeb1a11d587125cf0

data/app/controllers/concerns/cms/logger.rb

@@ -0,0 +1,16 @@
+module CMS
+  module Logger
+    extend ActiveSupport
+
+    protected
+
+    def cms_logger(exception, log_name = nil)
+      current_logger = log_name ? ::Logger.new("#{Rails.root}/log/#{log_name}.log") : logger
+      current_logger.error "[ERROR][#{request.remote_ip}][#{request.method}][#{request.original_url}]"
+      if exception
+        current_logger.error exception.message
+        exception.backtrace.each{ |line| current_logger.error line }
+      end
+    end
+  end
+end

data/app/helpers/cms/view_helper.rb

@@ -33,5 +33,53 @@ module CMS
         default
       end
     end
+
+    def cms_meta_og_tags(title = nil)
+      tags = {}
+      if @product # TODO: move to Solidus connector
+        tags[:title] = @product.name
+        tags[:description] = @product.description
+        tags[:url] = product_url(@product, only_path: false)
+        image = @product.images.first.try(:attachment)
+        tags[:image] = image.try(:url, :product)
+      else
+        tags[:title] = title.blank? ? Setting['cms_og_tag_title'] : title
+      end
+      %{
+        <meta property="og:title" content="#{tags[:title]}" />
+        <meta property="og:type" content="website" />
+        <meta property="og:description" content="#{tags[:description] || Setting['cms_og_tag_description']}" />
+        <meta property="og:url" content="#{tags[:url] || request.original_url }" />
+        <meta property="og:image" content="#{image_url(tags[:image] || 'ogimage.jpg', only_path: false)}" />
+      }.html_safe
+    end
+
+    def yes_no(boolean)
+      boolean ? t('yes') : t('no')
+    end
+
+    def to_nbsp(value)
+      value.kind_of?(String) ? value.gsub(' ', '&nbsp;').gsub('-', '&#8209;') : (value || '')
+    end
+
+    def to_currency(value)
+      number_to_currency(value, separator: '.', delimiter: '', format: '%n $')
+    end
+
+    def to_int_if_whole(float)
+      (float % 1 == 0) ? float.to_i : float
+    end
+
+    def full_name(object, prefix = nil)
+      if prefix
+        "#{object.send("#{prefix}_firstname")} #{object.send("#{prefix}_lastname")}"
+      else
+        "#{object.firstname} #{object.lastname}"
+      end
+    end
+
+    def current_url_without_params
+      "#{request.base_url}#{request.path}"
+    end
   end
 end

data/app/models/setting.rb

@@ -1,7 +1,7 @@
 class Setting < ActiveRecord::Base
   include Admin::Setting
 
-  has_paper_trail if RailsAdminCMS::Config.with_paper_trail?
+  has_paper_trail
 
   cattr_accessor :cache
   self.cache = Rails.cache

data/app/models/unique_key.rb

@@ -1,7 +1,7 @@
 class UniqueKey < ActiveRecord::Base
   include Admin::UniqueKey
 
-  has_paper_trail if RailsAdminCMS::Config.with_paper_trail?
+  has_paper_trail
 
   belongs_to :viewable, polymorphic: true
 

data/app/models/viewable.rb

@@ -4,7 +4,7 @@ module Viewable
   included do
     self.table_name_prefix = 'viewable_'
 
-    has_paper_trail if RailsAdminCMS::Config.with_paper_trail?
+    has_paper_trail
 
     has_one :unique_key, as: :viewable, dependent: :destroy
 

data/db/migrate/20150111082038_create_versions.rb

@@ -0,0 +1,20 @@
+class CreateVersions < ActiveRecord::Migration
+
+  # The largest text column available in all supported RDBMS is
+  # 1024^3 - 1 bytes, roughly one gibibyte.  We specify a size
+  # so that MySQL will use `longtext` instead of `text`.  Otherwise,
+  # when serializing very large objects, `text` might not be big enough.
+  TEXT_BYTES = 1_073_741_823
+
+  def change
+    create_table :versions do |t|
+      t.string   :item_type, :null => false
+      t.integer  :item_id,   :null => false
+      t.string   :event,     :null => false
+      t.string   :whodunnit
+      t.text     :object,    :limit => TEXT_BYTES
+      t.datetime :created_at
+    end
+    add_index :versions, [:item_type, :item_id]
+  end
+end

data/db/migrate/20150111082039_add_object_changes_to_versions.rb

@@ -0,0 +1,10 @@
+class AddObjectChangesToVersions < ActiveRecord::Migration
+
+  # The largest text column available in all supported RDBMS.
+  # See `create_versions.rb` for details.
+  TEXT_BYTES = 1_073_741_823
+
+  def change
+    add_column :versions, :object_changes, :text, limit: TEXT_BYTES
+  end
+end

data/db/migrate/20150111082040_create_version_associations.rb

@@ -0,0 +1,17 @@
+class CreateVersionAssociations < ActiveRecord::Migration
+  def self.up
+    create_table :version_associations do |t|
+      t.integer  :version_id
+      t.string   :foreign_key_name, :null => false
+      t.integer  :foreign_key_id
+    end
+    add_index :version_associations, [:version_id]
+    add_index :version_associations, [:foreign_key_name, :foreign_key_id], :name => 'index_version_associations_on_foreign_key'
+  end
+
+  def self.down
+    remove_index :version_associations, [:version_id]
+    remove_index :version_associations, :name => 'index_version_associations_on_foreign_key'
+    drop_table :version_associations
+  end
+end

data/db/migrate/20150111082041_add_transaction_id_column_to_versions.rb

@@ -0,0 +1,11 @@
+class AddTransactionIdColumnToVersions < ActiveRecord::Migration
+  def self.up
+    add_column :versions, :transaction_id, :integer
+    add_index :versions, [:transaction_id]
+  end
+
+  def self.down
+    remove_index :versions, [:transaction_id]
+    remove_column :versions, :transaction_id
+  end
+end

data/db/migrate/20160111072418_add_cms_og_tags_settings.rb

@@ -0,0 +1,16 @@
+class AddCMSOgTagsSettings < ActiveRecord::Migration
+  def change
+    def up
+      Setting.apply_all(
+        cms_og_tag_title: Rails.application.class.parent_name,
+        cms_og_tag_description: Rails.application.class.parent_name,
+      )
+    end
+    def down
+      Setting.remove_all(
+        :cms_og_tag_title,
+        :cms_og_tag_description,
+      )
+    end
+  end
+end

data/lib/generators/cms/install/templates/app/controllers/application_controller.rb

@@ -6,4 +6,9 @@ class ApplicationController < ActionController::Base
   include CMS::Localize
   include CMS::Editing
   include CMS::Authenticate
+  include CMS::Logger
+
+  def paper_trail_enabled_for_controller
+    false
+  end
 end

data/lib/generators/cms/install/templates/config/initializers/rails_admin.rb

@@ -1,12 +1,21 @@
 RailsAdmin.config do |config|
-  ### Popular gems integration
+  config.main_app_name = ["Dashboard", ""]
+
   config.browser_validations = false
 
+  config.compact_show_view = false
+
+  ### Popular gems integration
+
   ## == Devise ==
   # config.authenticate_with do
   #   warden.authenticate! scope: :user
   # end
-  # config.current_user_method(&:current_user)
+  config.current_user_method(&:current_admin)
+
+  config.authorize_with do
+    redirect_to '/' unless current_admin?
+  end
 
   ## == Cancan ==
   # config.authorize_with :cancan
@@ -15,7 +24,11 @@ RailsAdmin.config do |config|
   # config.authorize_with :pundit
 
   ## == PaperTrail ==
-  # config.audit_with :paper_trail, 'User', 'PaperTrail::Version' # PaperTrail >= 3.0.0
+  if 'Spree::User'.safe_constantize # TODO: move to Solidus connector
+    config.audit_with :paper_trail, 'Spree::User', 'PaperTrail::Version' # PaperTrail >= 3.0.0
+  else
+    config.audit_with :paper_trail, 'BlackHole', 'PaperTrail::Version'
+  end
 
   ### More at https://github.com/sferik/rails_admin/wiki/Base-configuration
 
@@ -65,8 +78,8 @@ RailsAdmin.config do |config|
     show_in_app
 
     ## With an audit adapter, you can add:
-    # history_index
-    # history_show
+    history_index
+    history_show
   end
 
   config.model 'Rich::RichFile' do

data/lib/generators/cms/install/templates/config/initializers/rails_admin_cms.rb

@@ -5,9 +5,6 @@ RailsAdminCMS.config do |config|
   # Defines the base mailer inherited from
   # config.parent_mailer = ::ApplicationMailer
 
-  # Defines if PaperTrail support is used
-  # config.with_paper_trail = false
-
   # Defines the maximum number of fields a Form defined admin side has
   # * it is important to note that rake cms:adjust_max_size needs to be run if that number changes
   # config.custom_form_max_size = 20

data/lib/rails_admin_cms.rb

@@ -19,6 +19,14 @@ require "invisible_captcha"
 require "jquery-form-validator-rails"
 require "bootstrap_flash_messages"
 
+require "paper_trail"
+require "rails_admin_history_rollback"
+require "naught"
+
+BlackHole = Naught.build do |config|
+  config.black_hole
+end
+
 require "rails_admin_cms/engine"
 require "rails_admin_cms/inflections"
 require "rails_admin_cms/core_ext/boolean"

data/lib/rails_admin_cms/config.rb

@@ -13,7 +13,6 @@ module RailsAdminCMS
     attr_writer(
       :parent_controller,
       :parent_mailer,
-      :with_paper_trail,
       :custom_form_max_size,
       :with_email_body
     )
@@ -23,15 +22,7 @@ module RailsAdminCMS
     end
 
     def parent_mailer
-      @parent_mailer || "::ApplicationMailer".safe_constantize || Struct.new(:mailer) {
-        def send_email(_form)
-          mailer
-        end
-      }.new(Struct.new(:deliver_now).new(nil))
-    end
-
-    def with_paper_trail?
-      @with_paper_trail
+      @parent_mailer || "::ApplicationMailer".safe_constantize || BlackHole
     end
 
     def custom_form_max_size

data/lib/rails_admin_cms/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminCMS
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Patrice Lebel
@@ -392,6 +392,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: paper_trail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: rails_admin_history_rollback
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: naught
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -608,13 +650,13 @@ files:
 - app/controllers/cms/viewables_controller.rb
 - app/controllers/concerns/cms/editing.rb
 - app/controllers/concerns/cms/localize.rb
+- app/controllers/concerns/cms/logger.rb
 - app/helpers/cms/cache_helper.rb
 - app/helpers/cms/form_helper.rb
 - app/helpers/cms/javascript_helper.rb
 - app/helpers/cms/locale_helper.rb
 - app/helpers/cms/view_helper.rb
 - app/helpers/cms/viewable_helper.rb
-- app/helpers/rails_admin/form_builder_decorator.rb
 - app/helpers/rails_admin/navigation_helper.rb
 - app/mailers/cms/forms_mailer.rb
 - app/models/admin/form/email.rb
@@ -695,6 +737,10 @@ files:
 - config/locales/routes.fr.yml
 - config/routes.rb
 - config/spring.rb
+- db/migrate/20150111082038_create_versions.rb
+- db/migrate/20150111082039_add_object_changes_to_versions.rb
+- db/migrate/20150111082040_create_version_associations.rb
+- db/migrate/20150111082041_add_transaction_id_column_to_versions.rb
 - db/migrate/20151226023652_create_unique_key.rb
 - db/migrate/20151226054335_create_viewable_link.rb
 - db/migrate/20151227064933_create_viewable_text.rb
@@ -709,6 +755,7 @@ files:
 - db/migrate/20160101141844_create_form_row.rb
 - db/migrate/20160102010317_create_form_field.rb
 - db/migrate/20160103120544_create_form_email.rb
+- db/migrate/20160111072418_add_cms_og_tags_settings.rb
 - lib/active_type/virtual_attributes_decorator.rb
 - lib/generators/cms/install/USAGE
 - lib/generators/cms/install/install_generator.rb

data/app/helpers/rails_admin/form_builder_decorator.rb

@@ -1,11 +0,0 @@
-module RailsAdmin
-  FormBuilder.class_eval do
-
-    private
-
-    def nested_field_association?(field, nested_in)
-      field.inverse_of.presence && nested_in.presence && field.inverse_of == nested_in.name &&
-        (@template.instance_variable_get(:@model_config).abstract_model == field.abstract_model || field.name == nested_in.inverse_of)
-    end
-  end
-end