cortex 0.1.1 → 0.1.3

data/app/helpers/cortex/content_item_helper.rb

@@ -6,22 +6,32 @@ module Cortex
 
     def create_content_item
       CreateContentItemTransaction.new
-        .with_step_args(
-          execute_content_item_state_change: [state: params[:content_item][:state]]
-        )
-        .call(id: params[:id], content_type: content_type,
-              content_item_params: content_item_params, current_user: current_user)
-        .value!
     end
 
     def update_content_item
       UpdateContentItemTransaction.new
-        .with_step_args(
-          execute_content_item_state_change: [state: params[:content_item][:state]]
-        )
-        .call(id: params[:id], content_type: content_type,
-              content_item_params: content_item_params, current_user: current_user)
-        .value!
+    end
+
+    def render_create_content_item_error
+      @content_item = content_item_reload(content_type.content_items.new)
+      @wizard = wizard_decorator(@content_item.content_type)
+
+      add_breadcrumb content_type.name.pluralize, :content_type_content_items_path
+      add_breadcrumb 'New'
+
+      render :new
+    end
+
+    def render_update_content_item_error
+      @content_item = content_item_reload(content_type.content_items.find_by_id(params[:id]))
+      @wizard = wizard_decorator(@content_item.content_type)
+
+      title = @content_item.field_items.find { |field_item| field_item.field.name == 'Title' }.data['text'] # TODO: refactor this hardcoded Field reference
+      add_breadcrumb content_type.name.pluralize, :content_type_content_items_path
+      add_breadcrumb title
+      add_breadcrumb 'Edit'
+
+      render :edit
     end
 
     def content_item_reload(content_item)
@@ -98,9 +108,8 @@ module Cortex
       params_hash['data'] || {}
     end
 
-    def validation_message(base_message)
-      msg_array = base_message.gsub('Validation failed:', '').gsub('Field items', '').split(',')
-      msg_array.map {|message| message.strip.titleize}
+    def clean_error_messages(messages)
+      messages.map {|message| message.gsub('Field items', '').strip.titleize}
     end
   end
 end

data/app/operations/cortex/database_transact_operation.rb

@@ -4,14 +4,11 @@ module Cortex
 
     result = nil
 
-    begin
-      ActiveRecord::Base.transaction do
-        result = block.(Success(input))
-        raise ActiveRecord::Rollback if result.failure?
-        result
-      end
-    rescue ActiveRecord::Rollback
-      result
+    ActiveRecord::Base.transaction do
+      result = block.(Success(input))
+      raise ActiveRecord::Rollback if result.failure?
     end
+
+    result
   }
 end

data/app/operations/cortex/persist_content_item_operation.rb

@@ -5,8 +5,11 @@ module Cortex
     include Dry::Transaction::Operation
 
     def call(input)
-      input.save!
-      Success(input)
+      if input.save
+        Success(input)
+      else
+        Failure(input.errors)
+      end
     end
   end
 end

data/app/views/cortex/content_items/_form.html.haml

@@ -1,11 +1,11 @@
 = form_for [@content_type, @content_item], html: { multipart: true } do |form|
   = form.hidden_field :creator_id, value: current_user.id
   = form.hidden_field :content_type_id, value: @content_type.id
-  -# TODO: remove conditional once cortex plugins fields are properly converted
-  - if @content_type.name == 'Media'
-    = react_component('CortexApp', props: { temporary_render: 'Wizard' })
-  - else
-    = cell(Cortex::WizardCell, @wizard, context: { content_item: @content_item, form: form }).()
+  -# TODO: remove conditional once fields are properly converted to React
+  -# if @content_type.name == 'Media'
+    =# react_component('CortexApp', props: { temporary_render: 'Wizard' })
+  -# else
+  = cell(Cortex::WizardCell, @wizard, context: { content_item: @content_item, form: form }).()
 
   %footer.mdl-grid
     .mdl-cell.mdl-cell--12-col

data/app/views/layouts/cortex/application.html.haml

@@ -8,7 +8,7 @@
       = title
     = favicon_link_tag 'cortex/favicon.ico'
     = stylesheet_link_tag :application, {media: 'all'}
-    // = stylesheet_pack_tag 'cortex-bundle', {media: 'all'} # Enable once assets migrated
+    // = stylesheet_pack_tag 'cortex_cms', {media: 'all'} # Enable once assets migrated
     = stylesheet_link_tag 'https://fonts.googleapis.com/icon?family=Material+Icons'
     = csrf_meta_tags
   %body
@@ -23,8 +23,8 @@
             = yield
     = render 'cortex/partials/flash'
 
-    %script{src: '//cdn.ckeditor.com/4.8.0/standard-all/ckeditor.js', type: 'text/javascript'}
+    %script{src: '//cdn.ckeditor.com/4.10.0/standard-all/ckeditor.js', type: 'text/javascript'}
     = javascript_include_tag :application
-    = javascript_pack_tag 'cortex'
+    = javascript_pack_tag 'cortex_cms'
     = render 'cortex/partials/trackers/google_analytics' if extra_config[:google_analytics_id?]
     = render 'cortex/partials/trackers/qualtrics' if extra_config[:qualtrics_id?]

data/cortex.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.authors = ['CareerBuilder Employer Site & Content Products']
   s.email = 'toastercup@gmail.com'
   s.homepage = 'https://github.com/cortex-cms/cortex'
-  s.summary = 'An API-driven multitenant identity, dynamic content distribution/management and reporting platform powered by Rails, GraphQL and ElasticSearch'
+  s.summary = 'An API-driven multitenant identity, custom content distribution/management and reporting platform powered by Rails, React, GraphQL and ElasticSearch'
   s.license = 'Apache-2.0'
 
   s.files = `git ls-files -z`.split("\x0").reject do |f|

data/lib/cortex/version.rb

@@ -1,3 +1,3 @@
 module Cortex
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

data/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "cortex",
-  "version": "0.1.0",
+  "name": "cortex-cms",
+  "version": "0.1.2",
   "main": "node_package/lib/index.js",
   "homepage": "https://github.com/cortex-cms/cortex",
   "repository": {

data/spec/dummy/app/javascript/packs/cortex_cms.jsx

@@ -0,0 +1 @@
+import 'cortex-cms';

data/spec/dummy/bin/bundle

@@ -1,105 +1,3 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'bundle' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "rubygems"
-
-m = Module.new do
-    module_function
-
-  def invoked_as_script?
-    File.expand_path($0) == File.expand_path(__FILE__)
-  end
-
-  def env_var_version
-    ENV["BUNDLER_VERSION"]
-  end
-
-  def cli_arg_version
-    return unless invoked_as_script? # don't want to hijack other binstubs
-    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
-    bundler_version = nil
-    update_index = nil
-    ARGV.each_with_index do |a, i|
-      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
-        bundler_version = a
-      end
-      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
-      bundler_version = $1 || ">= 0.a"
-      update_index = i
-    end
-    bundler_version
-  end
-
-  def gemfile
-    gemfile = ENV["BUNDLE_GEMFILE"]
-    return gemfile if gemfile && !gemfile.empty?
-
-    File.expand_path("../../Gemfile", __FILE__)
-  end
-
-  def lockfile
-    lockfile =
-      case File.basename(gemfile)
-      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
-      else "#{gemfile}.lock"
-      end
-    File.expand_path(lockfile)
-  end
-
-  def lockfile_version
-    return unless File.file?(lockfile)
-    lockfile_contents = File.read(lockfile)
-    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
-    Regexp.last_match(1)
-  end
-
-  def bundler_version
-    @bundler_version ||= begin
-      env_var_version || cli_arg_version ||
-        lockfile_version || "#{Gem::Requirement.default}.a"
-    end
-  end
-
-  def load_bundler!
-    ENV["BUNDLE_GEMFILE"] ||= gemfile
-
-    # must dup string for RG < 1.8 compatibility
-    activate_bundler(bundler_version.dup)
-  end
-
-  def activate_bundler(bundler_version)
-    if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0")
-      bundler_version = "< 2"
-    end
-    gem_error = activation_error_handling do
-      gem "bundler", bundler_version
-    end
-    return if gem_error.nil?
-    require_error = activation_error_handling do
-      require "bundler/version"
-    end
-    return if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
-    warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`"
-    exit 42
-  end
-
-  def activation_error_handling
-    yield
-    nil
-  rescue StandardError, LoadError => e
-    e
-  end
-end
-
-m.load_bundler!
-
-if m.invoked_as_script?
-  load Gem.bin_path("bundler", "bundle")
-end
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rspec

@@ -8,7 +8,7 @@
 #
 
 require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
 require "rubygems"

data/spec/dummy/bin/setup

@@ -1,35 +1,35 @@
 #!/usr/bin/env ruby
-require 'pathname'
 require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
 end
 
 chdir APP_ROOT do
-  # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file.
-
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
-  # Install JavaScript dependencies if using Yarn
-  # system('bin/yarn')
-
+  system!('bin/yarn')
 
-  # puts "\n== Copying sample files =="
-  # unless File.exist?('config/database.yml')
-  #   cp 'config/database.yml.sample', 'config/database.yml'
-  # end
+  puts "\n== Copying sample files =="
+  unless File.exist?('.env')
+    cp '.env.example', '.env'
+  end
 
   puts "\n== Preparing database =="
   system! 'bin/rails db:setup'
 
+  puts "\n== Seed initial ContentType/Decorator data =="
+  system! 'bin/rails cortex_starter:content_types:seed'
+
+  puts "\n== Rebuild ElasticSearch indices =="
+  system! 'bin/rails cortex:rebuild_indexes'
+
   puts "\n== Removing old logs and tempfiles =="
   system! 'bin/rails log:clear tmp:clear'
 

data/spec/dummy/bin/update

@@ -1,23 +1,21 @@
 #!/usr/bin/env ruby
-require 'pathname'
 require 'fileutils'
 include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
 end
 
 chdir APP_ROOT do
-  # This script is a way to update your development environment automatically.
-  # Add necessary update steps to this file.
-
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
+  system!('bin/yarn')
+
   puts "\n== Updating database =="
   system! 'bin/rails db:migrate'
 

data/spec/dummy/bin/yarn

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
-VENDOR_PATH = File.expand_path('..', __dir__)
-Dir.chdir(VENDOR_PATH) do
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
   begin
-    exec "yarnpkg #{ARGV.join(" ")}"
+    exec "yarnpkg", *ARGV
   rescue Errno::ENOENT
     $stderr.puts "Yarn executable was not detected in the system."
     $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"

data/spec/dummy/config/boot.rb

@@ -1,11 +1,5 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 
-require 'bundler/setup'
-
-# Cache requires
-begin
-  puts 'Initializing bootscale..'
-  require 'bootscale/setup'
-rescue LoadError
-  puts 'Skipping bootscale initialization - not loaded.'
-end
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)

data/spec/dummy/lib/tasks/content_types_tasks.rake

@@ -1,31 +1,33 @@
 Bundler.require(:default, Rails.env)
 
-namespace :content_types do
-  desc 'Re-Seeds (will wipe existing ContentTypes!) CortexStarter with Core Custom Content Seed Data'
-  task reseed: :environment do
-    Rake::Task['content_types:clear'].execute
-    Rake::Task['content_types:seed'].execute
-  end
+namespace :cortex_starter do
+  namespace :content_types do
+    desc 'Re-Seeds (will wipe existing ContentTypes!) CortexStarter with Core Custom Content Seed Data'
+    task reseed: :environment do
+      Rake::Task['cortex_starter:content_types:clear'].execute
+      Rake::Task['cortex_starter:content_types:seed'].execute
+    end
 
-  desc 'Seeds CortexStarter with Core Custom Content Seed Data'
-  task seed: :environment do
-    Rake::Task['cortex:core:media:seed'].execute
-    Rake::Task['employer:blog:seed'].execute
-  end
+    desc 'Seeds CortexStarter with Core Custom Content Seed Data'
+    task seed: :environment do
+      Rake::Task['cortex:core:media:seed'].execute
+      Rake::Task['employer:blog:seed'].execute
+    end
 
-  desc 'Clear Existing Custom Content Data From DB'
-  task clear: :environment do
-    puts "Clearing ContentTypes..."
-    Cortex::ContentType.destroy_all
-    puts "Clearing Fields..."
-    Cortex::Field.destroy_all
-    puts "Clearing ContentItems..."
-    Cortex::ContentItem.destroy_all
-    puts "Clearing FieldItems..."
-    Cortex::FieldItem.destroy_all
-    puts "Clearing ContentableDecorators..."
-    Cortex::ContentableDecorator.destroy_all
-    puts "Clearing Decorators..."
-    Cortex::Decorator.destroy_all
+    desc 'Clear Existing Custom Content Data From DB'
+    task clear: :environment do
+      puts "Clearing ContentTypes..."
+      Cortex::ContentType.destroy_all
+      puts "Clearing Fields..."
+      Cortex::Field.destroy_all
+      puts "Clearing ContentItems..."
+      Cortex::ContentItem.destroy_all
+      puts "Clearing FieldItems..."
+      Cortex::FieldItem.destroy_all
+      puts "Clearing ContentableDecorators..."
+      Cortex::ContentableDecorator.destroy_all
+      puts "Clearing Decorators..."
+      Cortex::Decorator.destroy_all
+    end
   end
 end

data/spec/dummy/package.json

@@ -13,7 +13,7 @@
     "redux": "^3.7.2",
     "redux-logger": "^3.0.6",
 
-    "cortex": "/Users/atharp/Repos/cortex",
+    "cortex-cms": "0.1.2",
     "cortex-plugins-core": "2.0.1"
   },
   "devDependencies": {