revelry_content 0.0.1.2 → 1.0.0

data/app/controllers/revelry/content/pages_controller.rb

@@ -0,0 +1,30 @@
+require_dependency "revelry_content/application_controller"
+
+module Revelry::Content
+  class PagesController < ApplicationController
+    include ::Revelry::Content::WithRevelryContent
+
+    layout ->(_) { 'application' }
+
+    def show
+      render template: template_path
+    end
+
+    def template_path
+      "templates/#{current_page.template}"
+    end
+
+    def current_page
+      @_current_page ||= find_page
+    end
+
+    def find_page
+      ::Revelry::Content::Page.find_by(slug: params[:id]) || raise(ActionController::RoutingError.new('Not Found'))
+    end
+
+    def content_scope
+      ::Revelry::Content::Content.excluding_prefix('pages') +
+      ::Revelry::Content::Content.prefix("pages.#{params[:id]}")
+    end
+  end
+end

data/app/controllers/{revelry_content → revelry/content}/versions_controller.rb

@@ -1,6 +1,8 @@
-class RevelryContent::VersionsController < ApplicationController
+class Revelry::Content::VersionsController < ApplicationController
   respond_to :json, :html
-  include RevelryContent::ControllerAuthorization
+  include Revelry::Content::ControllerAuthorization
+
+  before_action :check_authorization
 
   def info_for_paper_trail
     { rollback_version_id: params[:id] }
@@ -9,14 +11,14 @@ class RevelryContent::VersionsController < ApplicationController
   def index
     # Versions does not include the version, so grab versions, convert the
     # currents to mock versions, then combine and sort
-    @versions = RevelryContent::ContentVersion.all
-    @content = RevelryContent::Content.all.map { |content| RevelryContent::PseudoContentVersion.new model: content }
+    @versions = Revelry::Content::ContentVersion.all
+    @content = Revelry::Content::Content.all.map { |content| Revelry::Content::PseudoContentVersion.new model: content }
     @all_versions = (@content + @versions).sort { |a, b| b.created_at - a.created_at }
-    respond_with @all_versions
+    respond_with data: @all_versions
   end
 
   def revert_all_to
-    newer_versions = RevelryContent::ContentVersion.where('id >= ?', params[:id]).order('id desc')
+    newer_versions = Revelry::Content::ContentVersion.where('id >= ?', params[:id]).order('id desc')
     newer_versions.each do |version|
       if ['create', 'import create'].include? version.event
         unless version.id == params[:id].to_i
@@ -33,4 +35,10 @@ class RevelryContent::VersionsController < ApplicationController
 
     redirect_to :back
   end
+
+  private
+
+  def check_authorization
+    throw "Unauthorized" unless Revelry::Content.config.authorize(self)
+  end
 end

data/app/models/{revelry_content → revelry/content}/content.rb

@@ -1,4 +1,4 @@
-class RevelryContent::PseudoContentVersion
+class Revelry::Content::PseudoContentVersion
   include ActiveModel::Model
   attr_accessor :id, :model, :rollback_version_id
 
@@ -33,17 +33,20 @@ class RevelryContent::PseudoContentVersion
   end
 end
 
-class RevelryContent::Content < ActiveRecord::Base
+class Revelry::Content::Content < ActiveRecord::Base
   include ERB::Util
-  has_paper_trail class_name: 'RevelryContent::ContentVersion'
+  has_paper_trail class_name: 'Revelry::Content::ContentVersion'
   mount_uploader :src, SrcUploader
 
-  has_many :versions, class_name: 'RevelryContent::ContentVersion', :as => :item
+  has_many :versions, class_name: 'Revelry::Content::ContentVersion', :as => :item
   validates :key, presence: true, uniqueness: true
 
+  scope :prefix, ->(prefix) { where("key LIKE '#{prefix}%'") }
+  scope :excluding_prefix, ->(prefix) { where.not("key LIKE '#{prefix}%'") }
+
   def html_content
     return if content.nil?
-    RevelryContent.config.sanitizer.call(markdown_engine.render(content))
+    Revelry::Content.config.sanitizer.call(markdown_engine.render(content))
   end
 
   def as_json(opts = {})
@@ -140,7 +143,7 @@ class RevelryContent::Content < ActiveRecord::Base
   end
 
   def self.from_import_hash(content_object)
-    content_model = RevelryContent::Content.find_or_initialize_by(key: content_object['key'])
+    content_model = Revelry::Content::Content.find_or_initialize_by(key: content_object['key'])
     # Mark as an import event for papertrail to distinguish from a normal create/update
     if content_model.new_record?
       content_model.paper_trail_event = 'import create'
@@ -154,14 +157,27 @@ class RevelryContent::Content < ActiveRecord::Base
   end
 
   def markdown_engine
-    @markdown ||= Redcarpet::Markdown.new(RevelryContent.config.markdown_renderer, underline: true)
+    @markdown ||= Redcarpet::Markdown.new(Revelry::Content.config.markdown_renderer, underline: true)
   end
 
-  def self.as_lookup_table
-    Hash[all.map { |c| [c.key, c.as_json] }]
+  def self.as_lookup_table(content_scope = nil)
+    content_scope = all unless content_scope.present?
+    Hash[content_scope.map { |c| [c.key, c.as_json] }]
   end
 
   def self.as_serialized_table
     Hash[all.map { |c| [c.key, c.as_serialized_json] }]
   end
+
+  if self.respond_to?(:rails_admin)
+    rails_admin do
+      object_label_method { :key }
+
+      include_fields :key, :content, :src
+
+      field :src do
+        label 'Image'
+      end
+    end
+  end
 end

data/app/models/{revelry_content → revelry/content}/content_version.rb

@@ -4,7 +4,7 @@ PaperTrail::Version.module_eval do
   end
 end
 
-class RevelryContent::ContentVersion < PaperTrail::Version
+class Revelry::Content::ContentVersion < PaperTrail::Version
   self.table_name = :revelry_content_content_versions
   self.sequence_name = :revelry_content_version_id_seq
   before_save :cast_whodunnit

data/app/models/revelry/content/page.rb

@@ -0,0 +1,6 @@
+module Revelry::Content
+  class Page < ActiveRecord::Base
+    has_ancestry
+    validates :slug, :menu_name, :name, :template, presence: true
+  end
+end

data/app/views/layouts/revelry_content/application.html.erb

@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>RevelryContent</title>
+  <title>Revelry::Content</title>
   <%= stylesheet_link_tag    "revelry_content/application" %>
-  <%= javascript_include_tag "revelry_content" %>
+  <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
 </head>
 <body>

data/app/views/revelry_content/contents/_menus.html.erb

@@ -1,2 +1,2 @@
-<div data-react-class="RevelryContent.TopBar" data-react-props="{}"></div>
-<div data-react-class="RevelryContent.EditModeButton" data-react-props="{}"></div>
+<div data-react-class="Rev.Content.TopBar" data-react-props="{}"></div>
+<div data-react-class="Rev.Content.EditModeButton" data-react-props="{}"></div>

data/app/views/revelry_content/contents/index.html.erb

@@ -1 +1 @@
-<div data-react-class="RevelryContent.AdminPage" data-react-props="{}"></div>
+<div data-react-class="Rev.Content.AdminPage" data-react-props="{}"></div>

data/config/routes.rb

@@ -1,4 +1,4 @@
-RevelryContent::Engine.routes.draw do
+Revelry::Content::Engine.routes.draw do
   root to: 'contents#index'
   resources :contents do
     collection do

data/lib/generators/revelry/content/css_generator.rb

@@ -0,0 +1,51 @@
+require 'rails/generators'
+
+module Revelry
+  module Generators
+    module Content
+      class CssGenerator < ::Rails::Generators::Base
+        CSS_FILE_EXTENSIONS = %w(
+          .css
+          .css.sass
+          .css.scss
+          .sass
+          .scss
+        )
+
+        def add_css_assets
+          if using_sass?
+            append_to_file css_app_bundle do
+              '@import "revelry_content";'
+            end
+          else
+            insert_into_file css_app_bundle, before: %r{(//|\*)= require_self} do
+              "*= require revelry_content\n "
+            end
+          end
+        end
+
+        private
+
+        def using_sass?
+          /s(c|a)ss/.match(css_file_extname)
+        end
+
+        def css_app_bundle
+          File.join(css_base_dir, "revelry-app#{ css_file_extname }")
+        end
+
+        def css_base_dir
+          File.join('app', 'assets', 'stylesheets')
+        end
+
+        def test_css_format(fmt)
+          File.exist?(File.join(css_base_dir, "revelry-app#{ fmt }"))
+        end
+
+        def css_file_extname
+          CSS_FILE_EXTENSIONS.find { |fmt| test_css_format(fmt) }
+        end
+      end
+    end
+  end
+end

data/lib/generators/revelry/content/initializer_generator.rb

@@ -0,0 +1,13 @@
+module Revelry
+  module Generators
+    module Content
+      class InitializerGenerator < ::Rails::Generators::Base
+        source_root File.expand_path('../templates', __FILE__)
+
+        def add_initializer
+          template 'initializer.rb', 'config/initializers/revelry_content.rb'
+        end
+      end
+    end
+  end
+end

data/lib/generators/revelry/content/install_generator.rb

@@ -0,0 +1,40 @@
+module Revelry
+  module Generators
+    module Content
+      class InstallGenerator < ::Rails::Generators::Base
+        def add_migrations
+          generate 'revelry:content:migrations'
+          rake 'db:migrate'
+        end
+
+        def add_js_assets
+          generate 'revelry:content:js'
+        end
+
+        def add_css_assets
+          generate 'revelry:content:css'
+        end
+
+        def add_initializer
+          generate 'revelry:content:initializer'
+        end
+
+        def add_route
+          route 'mount Revelry::Content::Engine => "/revelry_content"'
+        end
+
+        def add_controller_concern
+          insert_into_file app_controller, after: "ApplicationController < ActionController::Base\n" do
+            "include Revelry::Content::WithRevelryContent\n"
+          end
+        end
+
+        private
+
+        def app_controller
+          File.join('app', 'controllers', 'application_controller.rb')
+        end
+      end
+    end
+  end
+end

data/lib/generators/revelry/content/js_generator.rb

@@ -0,0 +1,45 @@
+module Revelry
+  module Generators
+    module Content
+      class JsGenerator < ::Rails::Generators::Base
+        JS_FILE_EXTENSIONS = %w(
+          .coffee
+          .coffee.erb
+          .js.coffee
+          .js.coffee.rb
+          .js
+          .js.rb
+        )
+
+        def add_js_assets
+          insert_into_file js_app_bundle, before: %r{(//|#)= require_tree \.} do
+            "#{ js_require_marker }= require revelry_content\n"
+          end
+        end
+
+        private
+
+        def js_app_bundle
+          File.join(js_base_dir, "revelry-app#{ js_file_extname }")
+        end
+
+        def test_js_format(fmt)
+          File.exist?(File.join(js_base_dir, "revelry-app#{ fmt }"))
+        end
+
+        def js_base_dir
+          File.join('app', 'assets', 'javascripts')
+        end
+
+        def js_file_extname
+          JS_FILE_EXTENSIONS.find { |fmt| test_js_format(fmt) }
+        end
+
+        def js_require_marker
+          '#' if js_file_extname.include?('coffee')
+          '//'
+        end
+      end
+    end
+  end
+end

data/lib/generators/revelry/content/migrations_generator.rb

@@ -0,0 +1,28 @@
+require 'rails/generators/migration'
+
+module Revelry
+  module Generators
+    module Content
+      class MigrationsGenerator < ::Rails::Generators::Base
+        include Rails::Generators::Migration
+        source_root File.expand_path('../templates', __FILE__)
+        desc "add the migrations"
+
+        def self.next_migration_number(path)
+          unless @prev_migration_nr
+            @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+          else
+            @prev_migration_nr += 1
+          end
+          @prev_migration_nr.to_s
+        end
+
+        def copy_migrations
+          migration_template "create_revelry_content_contents.rb", "db/migrate/create_revelry_content_contents.rb"
+          migration_template "create_versions.rb", "db/migrate/create_versions.rb"
+          migration_template "create_revelry_content_pages.rb", "db/migrate/create_revelry_content_pages.rb"
+        end
+      end
+    end
+  end
+end

data/lib/generators/revelry/content/templates/create_revelry_content_pages.rb

@@ -0,0 +1,17 @@
+class CreateRevelryContentPages < ActiveRecord::Migration
+  def change
+    create_table :revelry_content_pages do |t|
+      t.string :slug
+      t.string :menu_name
+      t.string :name
+      t.string :template
+      t.string :ancestry
+      t.integer :depth_cache
+      t.boolean :show_in_menu
+      t.boolean :draft
+      t.timestamps null: false
+    end
+
+    add_index :revelry_content_pages, :template
+  end
+end

data/lib/generators/revelry/content/templates/initializer.rb

@@ -0,0 +1,13 @@
+Revelry::Content.configure do |config|
+  #config.user_for_content do |controller|
+  #  # Your authentication logic here
+  #  controller.current_user
+  #end
+
+  #config.authorization_policy do |user|
+  #  # Your authorization logic here
+  #  user.admin?
+  #end
+
+  #config.js_export = true
+end

data/lib/revelry/content/admin_concern.rb

@@ -0,0 +1,13 @@
+unless defined?(Revelry::Content::ControllerAuthorization)
+  module Revelry::Content::ControllerAuthorization
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :check_authorization
+    end
+
+    def check_authorization
+      throw "Unauthorized" unless Revelry::Content.config.authorize(self)
+    end
+  end
+end

data/lib/{revelry_content → revelry/content}/configuration.rb

@@ -1,4 +1,4 @@
-class RevelryContent::Configuration
+class Revelry::Content::Configuration
   def js_export
     @js_export || false
   end
@@ -33,7 +33,7 @@ class RevelryContent::Configuration
   def default_authorization_policy
     ->(user) do
       if user.present?
-        if user.respond_to? :has_role?
+        if user.respond_to?(:has_role?)
           return user.has_role? :admin
         else
           return user.admin?

data/lib/revelry/content/content_concern.rb

@@ -0,0 +1,18 @@
+unless defined?(::Revelry::Content::WithRevelryContent)
+  module ::Revelry::Content::WithRevelryContent
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :gather_contents
+    end
+
+    def content_scope
+      Revelry::Content::Content.excluding_prefix('pages')
+    end
+
+    def gather_contents
+      @revelry_content_contents =
+        Revelry::Content::Content.as_lookup_table(content_scope)
+    end
+  end
+end