Merge branch 'develop'

Author: ElliottAYoung

.gitignore

@@ -1,10 +1,68 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+/vendor/bundle
+/vendor/assets
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp
+
+# Debug
+.byebug_history
+
+# OS Files
+.DS_Store
+._.DS_Store
+.directory
+
+# Text-editor/IDE generated files
+*.sublime-workspace
+*.sublime-project
+/.idea
+*.iml
+
+*.rbc
+*.sassc
+.sass-cache
+capybara-*.html
+.powrc
+/public/system
+/coverage/
+/spec/tmp
+**.orig
+rerun.txt
+.env
+
 Gemfile.lock
-.bundle/
-log/*.log
-pkg/
+.ruby-version
+.ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+# React on Rails
+npm-debug.log*
+node_modules
+
+# Generated js bundles
+/app/assets/webpack/*
+
+# Test app
 test/dummy/db/*.sqlite3
 test/dummy/db/*.sqlite3-journal
 test/dummy/log/*.log
 test/dummy/tmp/
-.idea/
+
+# build artifacts
 *.gem
+pkg/

.npmignore

@@ -0,0 +1,22 @@
+CHANGELOG.md
+Gemfile
+README.md
+app
+coverage
+docs
+examples
+node_modules
+react_on_rails.gemspec
+Dockerfile_tests
+Gemfile.lock
+Rakefile
+bin
+docker-compose.yml
+etc
+lib
+rakelib
+ruby-lint.yml
+spec
+node_modules
+tmp
+gen-examples

app/cells/plugins/core/author/input.haml

@@ -0,0 +1,5 @@
+.mdl-textfield.mdl-js-textfield.authorfield
+  = render_field_id
+  = render_label
+  = render_input
+  = render_default_value

app/cells/plugins/core/author_cell.rb

@@ -0,0 +1,29 @@
+module Plugins
+  module Core
+    class AuthorCell < Plugins::Core::Cell
+      include Devise::Controllers::Helpers
+
+      def input
+        render
+      end
+
+      private
+
+      def value
+        data&.[]('author_name') || current_user.fullname
+      end
+
+      def render_label
+        @options[:form].label 'data[author_name]', field.name, class: 'mdl-textfield__label'
+      end
+
+      def render_input
+        @options[:form].text_field 'data[author_name]', value: value, placeholder: @options[:placeholder], class: 'mdl-textfield__input', required: required?
+      end
+
+      def render_default_value
+        @options[:form].hidden_field 'data[default_author_name]', value: current_user.fullname
+      end
+    end
+  end
+end

app/cells/plugins/core/cell.rb

@@ -1,6 +1,8 @@
 module Plugins
   module Core
     class Cell < FieldCell
+      include ReactOnRailsHelper
+
       view_paths << "#{Cortex::Plugins::Core::Engine.root}/app/cells"
 
       def required?

app/cells/plugins/core/react_test/show.haml

@@ -0,0 +1 @@
+= react_component("HelloWorld2App", props: hello_world_props)

app/cells/plugins/core/react_test_cell.rb

@@ -0,0 +1,15 @@
+module Plugins
+  module Core
+    class ReactTestCell < Plugins::Core::Cell
+      def show
+        render
+      end
+
+      private
+
+      def hello_world_props
+        { name: 'Stranger' }
+      end
+    end
+  end
+end

app/models/asset_field_type.rb

@@ -36,6 +36,7 @@ def data
         'file_size': asset_file_size,
         'updated_at': asset_updated_at
       },
+      'media_title': media_title,
       'asset_field_type_id': id
     }
   end
@@ -74,6 +75,10 @@ def allowed_content_types
     end
   end
 
+  def media_title
+    existing_data['media_title'] || ContentItemService.form_fields[@metadata[:naming_data][:title]][:text].parameterize.underscore
+  end
+
   def mapping_field_name
     "#{field_name.parameterize('_')}_asset_file_name"
   end
@@ -128,11 +133,7 @@ def style_urls
 
   def existing_metadata
     metadata.except!(:existing_data)
-
-    unless existing_data.empty?
-      metadata[:path].gsub!(":id", existing_data['asset_field_type_id']) if metadata[:path]
-    end
-
+    metadata[:path].gsub!(":media_title", media_title) if metadata[:path]
     metadata
   end
 end

app/models/author_field_type.rb

@@ -0,0 +1,35 @@
+class AuthorFieldType < FieldType
+  attr_accessor :author_name
+  jsonb_accessor :data, author_name: :string
+
+  validates :author_name, presence: true, if: :validate_presence?
+
+  def data=(data_hash)
+    data_hash[:author_name] = data_hash[:default_author_name] if data_hash.deep_symbolize_keys[:author_name].blank?
+    @author_name = data_hash.deep_symbolize_keys[:author_name]
+  end
+
+  def field_item_as_indexed_json_for_field_type(field_item, options = {})
+    json = {}
+    json[mapping_field_name] = field_item.data['author_name']
+    json
+  end
+
+  def mapping
+    {author_name: mapping_field_name, type: :string, analyzer: :snowball}
+  end
+
+  private
+
+  def mapping_field_name
+    "#{field_name.parameterize('_')}_author_name"
+  end
+
+  def author_name_present
+    errors.add(:author_name, 'must be present') if @author_name.empty?
+  end
+
+  def validate_presence?
+    @validations.key? :presence
+  end
+end

app/models/tree_field_type.rb

@@ -36,19 +36,17 @@ def mapping_field_name
   end
 
   def minimum
-    unless @values.nil?
-      if @values.length >= @validations[:minimum]
-        true
-      else
-        errors.add(:minimum, "You have selected too few values.")
-        false
-      end
+    if !@values.nil? && @values[:values].length >= @validations[:minimum]
+      true
+    else
+      errors.add(:minimum, "You have selected too few values.")
+      false
     end
   end
 
   def maximum
     unless @values.nil?
-      if @values.length <= @validations[:maximum]
+      if @values[:values].length <= @validations[:maximum]
         true
       else
         errors.add(:maximum, "You have selected too many values.")