message_train 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2c452b5241a4e611e157e797c7356978c9c5d42
-  data.tar.gz: f1fe677ab65551e8df6edd6f717aad52dc7fd8e4
+  metadata.gz: cc19fc2e0a39e267e10c61fb9090fa72fd8bf7ae
+  data.tar.gz: b7f16af91e7cc61d8b050e1cf5c6bdfc8194c267
 SHA512:
-  metadata.gz: 1ab0ee501281774dbb0386531283502776e84938039d1326a02dd199b15651d45ae216f601c328c72e672ee545fa491c4771874799124f4f70fe089be4686d03
-  data.tar.gz: 6987c5bd65d63f30eb34de0cad9eec16793c4c07f6f7500ee8abbf1d9703f40f1b007bf34ee62e8d5fb39671ac981aa9b4a0934ee5ef3193ac87c336c1f2472a
+  metadata.gz: 63d3fb74b09bc2b5dee0bf57153fc1f35c82994541b4c2b2ba07ee09b85729f6c87b470cd6f81b7577ada84d9534d5c24a8b3c22adcf8792daca7cc7fee17c9e
+  data.tar.gz: 0438d2ca2ecd8f450626642ac0dfb9fa848c6cd3d3f4a7c16ba39fca5c5112fad0b650e547dddc8e46f8a8609c3d96b2641b3bff80117128d1969fc0b18a4318

data/Gemfile

@@ -9,6 +9,9 @@ gem 'haml-rails', '~> 0.9'
 gem 'jquery-rails', '~> 4'
 gem 'uglifier', '~> 2.7'
 
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails', '~> 4.1.0'
+
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.0'
 
@@ -17,8 +20,11 @@ gem 'bootstrap-sass', '~> 3.3'
 gem 'bootstrap_leather', '~> 0.8'
 gem 'bootstrap_pager', '~> 0.10'
 gem 'bootstrap_form', '~> 2.3'
-gem 'bootstrap-wysihtml5-rails', '~> 0.3'
+gem 'ckeditor'
+gem 'bootstrap_tokenfield_rails', '~> 0.12'
 gem 'cocoon', '~> 1.2'
+gem 'jquery-ui-bootstrap-rails-asset'
+gem 'twitter-typeahead-rails'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/README.rdoc

@@ -15,7 +15,7 @@ Email messages are sent when a user receives a message, either directly or throu
 == Installation
 
 First, install the gem:
-    gem 'bootstrap-wysihtml5-rails'
+    gem 'ckeditor'
     gem 'message_train'
 
 Then, run the install generator:

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.5.0

data/app/assets/javascripts/ckeditor/config.js.coffee

@@ -0,0 +1,48 @@
+CKEDITOR.editorConfig = (config) ->
+  config.allowedContent = true
+  config.width = '100%'
+  config.toolbar_full = [
+    {
+      name: 'links',
+      items: [
+        'Link',
+        'Unlink'
+      ]
+    },
+    {
+      name: 'paragraph',
+      groups: [
+        'list',
+        'indent',
+        'blocks',
+        'align',
+        'bidi'
+      ],
+      items: [
+        'NumberedList',
+        'BulletedList',
+        '-',
+        'Outdent',
+        'Indent',
+        '-',
+        'Blockquote'
+      ]
+    },
+    {
+      name: 'basicstyles',
+      groups: [
+        'basicstyles',
+        'cleanup'
+      ],
+      items: [
+        'Format',
+        'Bold',
+        'Italic',
+        'Strike',
+        '-',
+        'RemoveFormat'
+      ]
+    }
+  ]
+  config.toolbar = 'full'
+  true

data/app/assets/javascripts/message_train.js

@@ -1,6 +1,7 @@
-//= require bootstrap-tags
+//= require twitter/typeahead.min
+//= require bootstrap-tokenfield
 //= require cocoon
-//= require bootstrap-wysihtml5
+//= require ckeditor/init
 
 function create_alert(level, message) {
     $('#alert_area').append('<div class="alert alert-' + level + ' alert-dismissible fade in" role="alert"><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>' + message + ' </div>');
@@ -61,31 +62,17 @@ function process_results(data) {
 }
 
 function add_tag_magic(selector) {
-    var div = $(selector);
-    var model = div.data('model');
-    if ( div.data('read-only') ) {
-        var readOnly = true;
-    } else {
-        var readOnly = false;
-    }
-    var request_string = '/box/in/participants/' + model + '.json';
-    $.getJSON(request_string, function(data){
-        var form = div.parents('form');
-        var suggestions = [];
-        $.each(data.participants, function (i, participant) {
-            suggestions.push(participant.slug);
-        });
-        var tags = div.tags({
-            readOnly: readOnly,
-            suggestions: suggestions,
-            tagSize: 'lg',
-            promptText: 'Comma separated list'
-        });
-        form.submit(function(e) {
-            field_template = '<input name="' + div.data('field-name') + '" value="' + tags.getTags() + '" type="hidden">';
-            form.append(field_template);
-            return true;
-        });
+    $(selector).tokenfield({
+        typeahead: [
+            {
+                hint: true,
+                highlight: true
+            },
+            {
+                source: suggestions.ttAdapter()
+            }
+        ],
+        showAutocompleteOnFocus: true
     });
 }
 
@@ -100,6 +87,7 @@ $(document).ready(function(){
             $(this).parents('.message_train_conversation').removeClass('selected');
         }
     });
+
     $('#check_all').change(function(event) {
         if (event.target.checked) {
             set_and_change( '.message_train_conversation input[type="checkbox"]', true);
@@ -107,6 +95,7 @@ $(document).ready(function(){
             set_and_change( '.message_train_conversation input[type="checkbox"]', false);
         }
     });
+
     $('#box-actions .check').click(function(event) {
         event.preventDefault();
         selector = $(this).data('selector');
@@ -120,6 +109,7 @@ $(document).ready(function(){
             set_and_change( selector + ' input[type="checkbox"]', true);
         }
     });
+
     $('#box-actions .mark').click(function(event) {
         event.preventDefault();
         $('#spinner').removeClass('hide');
@@ -132,13 +122,14 @@ $(document).ready(function(){
         $('input[name="mark_to_set"]').val(mark_to_set);
         $('#box').submit();
     });
-    $('#box')
-        .on('ajax:success', function (e, data, status, xhr) {
-            $('#spinner').addClass('hide');
-            process_results(data);
-        }).on('ajax:error', function (e, data, status, xhr) {
-            create_alert('danger', data.responseJSON.message);
-        });
+
+    $('#box').on('ajax:success', function (e, data, status, xhr) {
+        $('#spinner').addClass('hide');
+        process_results(data);
+    }).on('ajax:error', function (e, data, status, xhr) {
+        create_alert('danger', data.responseJSON.message);
+    });
+
     $('#box #message_train_messages .read').each(function(e){
         $(this).find('.collapse').collapse('hide');
     });
@@ -154,21 +145,5 @@ $(document).ready(function(){
         var text = button.data('text');
         var modal = $(this);
         modal.find('#image_placeholder').html('<a href="' + original + '" title="' + text + '"><img src="' + src + '" /></a>')
-    })
-
-    $('.wysiwyg').wysihtml5({
-        toolbar: {
-            'font-styles': true,
-            'color': false,
-            'emphasis': {
-                'small': true
-            },
-            'blockquote': true,
-            'lists': true,
-            'html': false,
-            'link': true,
-            'image': false,
-            'smallmodals': true
-        }
     });
 });

data/app/assets/stylesheets/message_train.scss

@@ -1,5 +1,5 @@
-@import 'bootstrap-tags';
-@import "bootstrap-wysihtml5/bootstrap3-wysihtml5";
+@import 'tokenfield-typeahead';
+@import 'bootstrap-tokenfield';
 
 img {
   max-width: 100%;
@@ -123,9 +123,10 @@ tr:hover .conversation-actions a {
   white-space: inherit;
 }
 
-.tags-input {
-  border-radius: 4px;
-  padding-left: 12px;
+.tt-menu {
+  @extend .tt-dropdown-menu;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
 }
 
 .dropdown-menu {

data/app/controllers/message_train/messages_controller.rb

@@ -71,7 +71,7 @@ module MessageTrain
       )
       if permitted['draft'] == :save_as_draft.l
         permitted['draft'] = true
-      elsif permitted['draft'] == :send.l
+      else
         permitted['draft'] = false
       end
       permitted

data/app/controllers/message_train/participants_controller.rb

@@ -35,6 +35,10 @@ module MessageTrain
         else
           @participants = model.all
         end
+        if params[:query].present?
+          field_name = MessageTrain.configuration.slug_columns[model_sym]
+          @participants = @participants.where("#{field_name} LIKE ?", "#{params[:query]}%")
+        end
       end
 
       def load_participant

data/app/views/message_train/messages/_form.html.haml

@@ -4,11 +4,32 @@
   - resource = message.new_record? ? message_train.collective_box_messages_path(@collective.path_part, @box) : message_train.collective_box_message_path(@collective.path_part, @box, message)
 = bootstrap_form_for message, url: resource do |f|
   - if @collective.nil?
-    = render partial: 'message_train/participants/field', locals: { message: message, field_name: :users }
+    = f.fields_for :recipients_to_save do |g|
+      = g.text_field :users, label: :recipients.l, class: 'recipient-input'
+    - add_footer_javascript do
+      :javascript
+        url = "/box/in/participants/users.json"
+        var suggestions = new Bloodhound({
+            prefetch: url,
+            remote: {
+                wildcard: '%QUERY',
+                url: url + '?query=%QUERY',
+                transform: function(response) {
+                  return $.map(response.participants, function(val, i) {
+                    return val.slug
+                  });
+                }
+            },
+            queryTokenizer: Bloodhound.tokenizers.whitespace,
+            datumTokenizer: function(item) {
+                return Bloodhound.tokenizers.whitespace(item.slug);
+            }
+        });
   - else
     = render partial: 'message_train/participants/prefilled_field', locals: { message: message, recipient: @collective }
   = f.text_field :subject
-  = f.text_area :body, class: 'wysiwyg'
+  = f.form_group :body, label: { text: MessageTrain::Message.human_attribute_name(:body) } do
+    = f.cktext_area :body
   .links
     %h3
       = link_to_add_association(icon('plus'), f, :attachments, title: :add_attachment.l, class: 'btn btn-info', id: 'add-attachment', data: { association_insertion_method: 'append', association_insertion_node: '#attachments'})
@@ -16,5 +37,5 @@
   #attachments
     = f.fields_for :attachments do |attachment|
       = render 'attachment_fields', f: attachment
-  = f.submit :save_as_draft.l, name: 'message[draft]'
-  = f.submit :send.l, class: 'btn btn-primary', name: 'message[draft]'
+  = f.submit :save_as_draft.l, name: 'message[draft]', id: 'save-as-draft'
+  = f.submit :send.l, class: 'btn btn-primary', name: 'message[draft]', id: 'send'

data/message_train.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: message_train 0.4.6 ruby lib
+# stub: message_train 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "message_train"
-  s.version = "0.4.6"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Karen Lundgren"]
-  s.date = "2016-02-19"
+  s.date = "2016-02-20"
   s.description = "Rails 4 Engine providing private/public messaging for any object, such as Users or Groups"
   s.email = "karen.e.lundgren@gmail.com"
   s.extra_rdoc_files = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "app/assets/javascripts/ckeditor/config.js.coffee",
     "app/assets/javascripts/message_train.js",
     "app/assets/stylesheets/message_train.scss",
     "app/controllers/concerns/message_train_support.rb",
@@ -86,7 +87,6 @@ Gem::Specification.new do |s|
     "app/views/message_train/messages/edit.html.haml",
     "app/views/message_train/messages/new.html.haml",
     "app/views/message_train/messages/show.json.jbuilder",
-    "app/views/message_train/participants/_field.html.haml",
     "app/views/message_train/participants/_participant.json.jbuilder",
     "app/views/message_train/participants/_prefilled_field.html.haml",
     "app/views/message_train/participants/index.json.jbuilder",
@@ -270,10 +270,7 @@ Gem::Specification.new do |s|
     "spec/support/roles.rb",
     "spec/support/shared_connection.rb",
     "spec/support/users.rb",
-    "spec/support/utilities.rb",
-    "spec/support/wysihtml5_helper.rb",
-    "vendor/assets/javascripts/bootstrap-tags.js",
-    "vendor/assets/stylesheets/bootstrap-tags.css"
+    "spec/support/utilities.rb"
   ]
   s.homepage = "http://www.gemvein.com/museum/cases/message_train"
   s.licenses = ["MIT"]
@@ -290,14 +287,18 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<haml-rails>, ["~> 0.9"])
       s.add_runtime_dependency(%q<jquery-rails>, ["~> 4"])
       s.add_runtime_dependency(%q<uglifier>, ["~> 2.7"])
+      s.add_runtime_dependency(%q<coffee-rails>, ["~> 4.1.0"])
       s.add_runtime_dependency(%q<jbuilder>, ["~> 2.0"])
       s.add_runtime_dependency(%q<sass-rails>, ["~> 5"])
       s.add_runtime_dependency(%q<bootstrap-sass>, ["~> 3.3"])
       s.add_runtime_dependency(%q<bootstrap_leather>, ["~> 0.8"])
       s.add_runtime_dependency(%q<bootstrap_pager>, ["~> 0.10"])
       s.add_runtime_dependency(%q<bootstrap_form>, ["~> 2.3"])
-      s.add_runtime_dependency(%q<bootstrap-wysihtml5-rails>, ["~> 0.3"])
+      s.add_runtime_dependency(%q<ckeditor>, [">= 0"])
+      s.add_runtime_dependency(%q<bootstrap_tokenfield_rails>, ["~> 0.12"])
       s.add_runtime_dependency(%q<cocoon>, ["~> 1.2"])
+      s.add_runtime_dependency(%q<jquery-ui-bootstrap-rails-asset>, [">= 0"])
+      s.add_runtime_dependency(%q<twitter-typeahead-rails>, [">= 0"])
       s.add_development_dependency(%q<sdoc>, ["~> 0.4.1"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
@@ -319,14 +320,18 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<haml-rails>, ["~> 0.9"])
       s.add_dependency(%q<jquery-rails>, ["~> 4"])
       s.add_dependency(%q<uglifier>, ["~> 2.7"])
+      s.add_dependency(%q<coffee-rails>, ["~> 4.1.0"])
       s.add_dependency(%q<jbuilder>, ["~> 2.0"])
       s.add_dependency(%q<sass-rails>, ["~> 5"])
       s.add_dependency(%q<bootstrap-sass>, ["~> 3.3"])
       s.add_dependency(%q<bootstrap_leather>, ["~> 0.8"])
       s.add_dependency(%q<bootstrap_pager>, ["~> 0.10"])
       s.add_dependency(%q<bootstrap_form>, ["~> 2.3"])
-      s.add_dependency(%q<bootstrap-wysihtml5-rails>, ["~> 0.3"])
+      s.add_dependency(%q<ckeditor>, [">= 0"])
+      s.add_dependency(%q<bootstrap_tokenfield_rails>, ["~> 0.12"])
       s.add_dependency(%q<cocoon>, ["~> 1.2"])
+      s.add_dependency(%q<jquery-ui-bootstrap-rails-asset>, [">= 0"])
+      s.add_dependency(%q<twitter-typeahead-rails>, [">= 0"])
       s.add_dependency(%q<sdoc>, ["~> 0.4.1"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 2.0"])
@@ -349,14 +354,18 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<haml-rails>, ["~> 0.9"])
     s.add_dependency(%q<jquery-rails>, ["~> 4"])
     s.add_dependency(%q<uglifier>, ["~> 2.7"])
+    s.add_dependency(%q<coffee-rails>, ["~> 4.1.0"])
     s.add_dependency(%q<jbuilder>, ["~> 2.0"])
     s.add_dependency(%q<sass-rails>, ["~> 5"])
     s.add_dependency(%q<bootstrap-sass>, ["~> 3.3"])
     s.add_dependency(%q<bootstrap_leather>, ["~> 0.8"])
     s.add_dependency(%q<bootstrap_pager>, ["~> 0.10"])
     s.add_dependency(%q<bootstrap_form>, ["~> 2.3"])
-    s.add_dependency(%q<bootstrap-wysihtml5-rails>, ["~> 0.3"])
+    s.add_dependency(%q<ckeditor>, [">= 0"])
+    s.add_dependency(%q<bootstrap_tokenfield_rails>, ["~> 0.12"])
     s.add_dependency(%q<cocoon>, ["~> 1.2"])
+    s.add_dependency(%q<jquery-ui-bootstrap-rails-asset>, [">= 0"])
+    s.add_dependency(%q<twitter-typeahead-rails>, [">= 0"])
     s.add_dependency(%q<sdoc>, ["~> 0.4.1"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 2.0"])

data/spec/features/messages_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 RSpec.feature 'Messages' do
   include_context 'loaded site'
-  include Wysihtml5Helper
 
   it_behaves_like 'an authenticated section', '/box/in/messages/new'
 
@@ -13,11 +12,10 @@ RSpec.feature 'Messages' do
       describe 'at /box/in/messages' do
         before do
           visit '/box/in/messages/new/'
-          recipient_input = find(:css, "#message_recipients_to_save_users .tags-input")
-          recipient_input.set("")
+          fill_in_autocomplete 'Recipients', with: 'x'
           fill_in 'Subject', with: 'This is a draft.'
-          fill_in_html 'Body', with: 'This is the body.'
-          click_button 'Send'
+          fill_in_ckeditor 'Body', with: 'This is the body.'
+          submit_via_button 'Send'
         end
         it_behaves_like 'a bootstrap page with an alert', 'warning', 'Message saved as draft.'
       end
@@ -26,12 +24,9 @@ RSpec.feature 'Messages' do
       describe 'at /box/in/messages' do
         before do
           visit '/box/in/messages/new/'
-          recipient_input = find(:css, "#message_recipients_to_save_users .tags-input")
-          recipient_input.set("sec") # Should auto-complete to second-user with the following two key-presses
-          recipient_input.native.send_keys :arrow_down
-          recipient_input.native.send_keys :return
+          fill_in_autocomplete 'Recipients', with: 'sec'
           fill_in 'Subject', with: 'This is the subject.'
-          fill_in_html 'Body', with: 'This is the body.'
+          fill_in_ckeditor 'Body', with: 'This is the body.'
           click_link 'add-attachment'
           click_link 'add-attachment'
           click_link 'add-attachment'
@@ -46,7 +41,7 @@ RSpec.feature 'Messages' do
               find('.remove_fields').click
             end
           end
-          click_button 'Send'
+          submit_via_button 'Send'
         end
         it_behaves_like 'a bootstrap page with an alert', 'info', 'Message sent.'
       end
@@ -55,13 +50,10 @@ RSpec.feature 'Messages' do
       describe 'at /box/in/messages' do
         before do
           visit "/box/in/conversations/#{draft_conversation.id}"
-          recipient_input = find(:css, "#message_recipients_to_save_users .tags-input")
-          recipient_input.set("sec") # Should auto-complete to second-user with the following two key-presses
-          recipient_input.native.send_keys :arrow_down
-          recipient_input.native.send_keys :return
+          fill_in_autocomplete 'Recipients', with: 'sec'
           fill_in 'Subject', with: 'This is the subject.'
-          fill_in_html 'Body', with: 'This is the body.'
-          click_button 'Send'
+          fill_in_ckeditor 'Body', with: 'This is the body.'
+          submit_via_button 'Send'
         end
         it_behaves_like 'a bootstrap page with an alert', 'info', 'Message sent.'
         it_behaves_like 'a bootstrap page without an alert', 'warning'

data/spec/support/shared_connection.rb

@@ -1,4 +1,3 @@
-# In your test_helper.rb
 class ActiveRecord::Base
   mattr_accessor :shared_connection
   @@shared_connection = nil

data/spec/support/utilities.rb

@@ -5,4 +5,55 @@ end
 def show_page
   save_page Rails.root.join( 'public', 'capybara.html' )
   %x(launchy http://localhost:3000/capybara.html)
+end
+
+def submit_via_button(button_name)
+  button_id = find("input[type=submit][value='#{button_name}']")[:id]
+  page.execute_script("$('##{button_id}').click();")
+end
+
+# Used to fill ckeditor fields
+# @param [String] locator label text for the textarea or textarea id
+def fill_in_ckeditor(locator, options)
+  locator = find_field_by_label(locator)
+  # Fill the editor content
+  page.execute_script <<-SCRIPT
+      var ckeditor = CKEDITOR.instances.#{locator}
+      ckeditor.setData('#{ActionController::Base.helpers.j options[:with]}')
+      ckeditor.focus()
+      ckeditor.updateElement()
+  SCRIPT
+end
+
+def fill_in_autocomplete(field, options = {})
+  field = find_field_by_label(field)
+  fill_in field, with: options[:with]
+
+  page.execute_script %Q{ $('##{field}').trigger('focus') }
+  page.execute_script %Q{ $('##{field}').trigger('keydown') }
+  selector = %Q{.tt-menu .tt-suggestion:contains("#{options[:with]}")}
+
+  if page.has_selector?('.tt-menu .tt-suggestion')
+    page.execute_script %Q{ $('#{selector}').trigger('mouseenter').click() }
+  end
+end
+
+def find_field_by_label(locator)
+  if page.has_css?('label', text: locator)
+    find('label', text: locator)[:for]
+  else
+    locator
+  end
+end
+
+def wait_until(delay = 1)
+  seconds_waited = 0
+  while !yield && seconds_waited < Capybara.default_max_wait_time
+    sleep delay
+    seconds_waited += 1
+  end
+  unless yield
+    puts "Waited for #{Capybara.default_max_wait_time} seconds."
+    puts "{#{yield}} did not become true, continuing."
+  end
 end