Merge branch 'develop'

Author: toastercup

.codeclimate.yml

@@ -40,10 +40,36 @@ exclude_paths:
 - db/
 - spec/
 - vendor/
+- app/interactors/
+- app/api/
 - app/assets/javascripts/legacy/
 - app/assets/javascripts/legacy_application.js
 - app/assets/legacy_templates/
 - app/assets/stylesheets/legacy/
 - app/assets/stylesheets/legacy_application.scss
 - app/controllers/legacy_controller.rb
 - app/views/legacy/
+- app/models/abilities/
+- app/models/observers/
+- app/models/media_types/
+- app/models/post_types/
+- app/models/onet/
+- app/models/concerns/searchable*
+- app/models/application.rb
+- app/models/author.rb
+- app/models/bulk_job.rb
+- app/models/category.rb
+- app/models/document.rb
+- app/models/locale.rb
+- app/models/localization.rb
+- app/models/media.rb
+- app/models/onet.rb
+- app/models/post.rb
+- app/models/snippet.rb
+- app/models/webpage.rb
+- app/jobs/bulk_create_media_job.rb
+- app/jobs/bulk_create_users_job.rb
+- app/jobs/cache_bust_webpage_job.rb
+- app/jobs/youtube_media_job.rb
+- app/jobs/youtube_media_job.rb
+- lib/tasks/cortex.rake

.gitignore

@@ -4,8 +4,6 @@
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile '~/.gitignore_global'
 
-.byebug_history
-
 # Ignore bundler config.
 /.bundle
 /vendor/bundle
@@ -26,6 +24,9 @@
 /log/*.log
 /tmp
 
+# Debug
+.byebug_history
+
 # OS Files
 .DS_Store
 ._.DS_Store

app/observers/.keep

@@ -1,4 +1,4 @@
-class CortexService
+class ApplicationService
   include Virtus.model
 
   attr_reader :errors

app/services/cortex_service.rb app/services/application_service.rbapp/services/cortex_service.rb renamed to app/services/application_service.rb

@@ -1,4 +1,4 @@
-class ContentItemService < CortexService
+class ContentItemService < ApplicationService
   include WidgetParsersHelper
 
   attribute :id, String

app/services/content_item_service.rb

@@ -1,4 +1,4 @@
-class IndexDecoratorService < CortexService
+class IndexDecoratorService < ApplicationService
   attribute :content_type, ContentType
 
   def data

app/services/index_decorator_service.rb

@@ -1,4 +1,4 @@
-class WizardDecoratorService < CortexService
+class WizardDecoratorService < ApplicationService
   attribute :content_item, ContentItem
 
   def data

app/services/wizard_decorator_service.rb

@@ -7,7 +7,7 @@
       - if @content_type.publishable
         - case @content_item.state
         - when 'published'
-          = form.submit "Update #{@content_type.name} Post", class: 'mdl-button mdl-js-button mdl-button--raised mdl-button--success mdl-js-ripple-effect'
+          = form.submit "Update Post", class: 'mdl-button mdl-js-button mdl-button--raised mdl-button--success mdl-js-ripple-effect'
           = form.button 'Save as Draft', value: 'draft', name: 'content_item[state]', class: 'mdl-button mdl-js-button mdl-button--cb mdl-js-ripple-effect', type: 'submit'
         - when 'scheduled'
           = form.button 'Schedule Post', value: 'schedule',  name: 'content_item[state]', class: 'mdl-button mdl-js-button  mdl-button--cb mdl-js-ripple-effect', type: 'submit'