cmtool 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 369abd658923dd7a4e553cbfac70222833ba658c
-  data.tar.gz: 2f29749987090be6dfc6bcf21c886b941484df3a
+SHA256:
+  metadata.gz: 57b2a507dbed62eed8528b2c9bbaa4b4303b8b36b75df68f59a80f43c58c5a8f
+  data.tar.gz: c0246bf43756707a9ccef94a720654cfdd5ade5984febc02bad6e338e6057417
 SHA512:
-  metadata.gz: 312166192bff4919c28323d6bd1a10579dc4c3b27f88c1d64d4cf2c69d6f8523f8611f6bdea6654591ca92f6c7ad3c48a50daf6c62b4aeee7db645873ff963bc
-  data.tar.gz: c0e59a0771ab62815653afd6fceb1a7909b6d00711b3061320f7735523ff9f840f64c31e07140bcf65249cc6acc333d1da743f1d6fdd91f9e88de3aac7771a96
+  metadata.gz: f7e6b716e8423184d216627c2e494912cbcc24eb0dfe7546610727a63b1bc136681c70dfec4a5233d219822a5a44ec452a718191f8f9801bebf7e973f194b79f
+  data.tar.gz: 97a7b691f3bb8dd701d898b76271926914d08bca0b967f67a18a84d488414946549e1ca09569d83bd84eaa8502c3e6a8cd4c03dcdc34779c0d769291faf8942a

data/.gitignore

@@ -10,3 +10,4 @@ spec/dummy/.sass-cache
 spec/dummy/public
 *.gem
 routes.txt
+/.project

data/.travis.yml

@@ -1,5 +1,6 @@
+sudo: false
 rvm:
-- 2.1
+- 2.3.1
 services:
 - couchdb
 before_script:

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+CHANGELOG
+================
+
+v3.0.0 and before
+-----------------------
+- integrate with a rails 8 application
+
+
+V2.0.0 and before
+----------------------
+- Was a long time ago

data/Gemfile

@@ -5,29 +5,29 @@ source "http://rubygems.org"
 # development dependencies will be added by default to the :development group.
 gemspec
 
-gem "rails", " ~> 4.2.3"
+gem "rails", " ~> 8.0.1"
 group :assets do
   gem 'sass-rails' #, ' ~> 5.0.0'
-  gem 'bourbon'
+  # gem 'bourbon', '~> 4.3.1'
   gem 'coffee-script'
   #gem 'therubyracer', :platforms => :ruby
   #gem 'less-rails'
-  gem 'foundation-rails'
+  gem 'foundation-rails', '~> 5.5'
   gem 'ace-rails-ap'
   gem "jquery-rails"
   gem 'font-awesome-rails'
-  gem 'tinymce-rails'
+  # gem 'tinymce-rails'
   gem 'pickadate-rails'
+  gem 'momentjs-rails'
 end
 
 gem 'simply_stored' , github: 'bterkuile/simply_stored'
-gem 'orm_adapter', github: 'bterkuile/orm_adapter'
+#gem 'orm_adapter', github: 'bterkuile/orm_adapter'
 gem 'devise'
 gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored'
 gem 'slim-rails'
 gem 'paperclip', ['>= 3.4', '!= 4.3.0']
 gem 'email_validator'
-gem 'actionpack-page_caching'
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing
@@ -38,6 +38,7 @@ group :development, :test do
   gem 'rspec-rails'
   gem 'pry-rails'
 end
+
 group :test do
   gem 'factory_girl_rails'
   gem 'capybara'
@@ -45,6 +46,7 @@ group :test do
   gem 'rspec-its'
   gem 'launchy'
 end
+
 group :development do
   gem 'thin'
   #gem 'ruby-debug19', :require => 'ruby-debug'

data/Gemfile.lock

@@ -5,25 +5,18 @@ GIT
     devise_simply_stored (0.3.0)
       devise
 
-GIT
-  remote: git://github.com/bterkuile/orm_adapter.git
-  revision: e0b5f652c8d1eda8c0f6636f3b3d17d598603450
-  specs:
-    orm_adapter (0.4.0)
-
 GIT
   remote: git://github.com/bterkuile/simply_stored.git
-  revision: 05cb3a06a9d4a3588efd4491db42fac84276befb
+  revision: 7633d88a62972cee6aea49d7d2a175bf07906236
   specs:
     simply_stored (1.0.0)
       activesupport
-      couch_potato (>= 0.2.15)
-      rest-client (>= 1.4.2)
+      couch_potato (>= 1.7.0)
 
 PATH
   remote: .
   specs:
-    cmtool (1.0.0)
+    cmtool (2.0.0)
       ace-rails-ap
       bourbon
       email_validator
@@ -38,238 +31,230 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    ace-rails-ap (3.0.3)
-    actionmailer (4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
+    ace-rails-ap (4.1.2)
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.3)
-      actionview (= 4.2.3)
-      activesupport (= 4.2.3)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionpack-page_caching (1.0.2)
-      actionpack (>= 4.0.0, < 5)
-    actionview (4.2.3)
-      activesupport (= 4.2.3)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.3)
-      activesupport (= 4.2.3)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
-    activerecord (4.2.3)
-      activemodel (= 4.2.3)
-      activesupport (= 4.2.3)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       arel (~> 6.0)
-    activesupport (4.2.3)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
-    arel (6.0.2)
-    bcrypt (3.1.10)
-    bourbon (4.2.3)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    arel (6.0.4)
+    bcrypt (3.1.11)
+    bourbon (4.3.2)
       sass (~> 3.4)
-      thor
-    builder (3.2.2)
-    capybara (2.4.4)
+      thor (~> 0.19)
+    builder (3.2.3)
+    capybara (2.12.0)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
+    climate_control (0.1.0)
     cliver (0.3.2)
-    cocaine (0.5.7)
+    cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    coderay (1.1.0)
+    coderay (1.1.1)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
-    couch_potato (1.4.0)
-      activemodel
-      couchrest (~> 1.2.0)
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.4)
+    couch_potato (1.7.0)
+      activemodel (~> 4.0)
+      couchrest (~> 2.0.0.rc3)
       json (~> 1.6)
-    couchrest (1.2.1)
+    couchrest (2.0.1)
+      httpclient (~> 2.8)
       mime-types (>= 1.15)
-      multi_json (~> 1.7, ~> 1.0)
-      rest-client (~> 1.8.0)
-    daemons (1.2.3)
-    devise (3.5.1)
+      multi_json (~> 1.7)
+    daemons (1.2.4)
+    devise (4.2.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 5.1)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    diff-lcs (1.2.5)
-    domain_name (0.5.24)
-      unf (>= 0.0.5, < 1.0.0)
+    diff-lcs (1.3)
     email_validator (1.6.0)
       activemodel
     erubis (2.7.0)
-    eventmachine (1.0.7)
-    execjs (2.5.2)
-    factory_girl (4.5.0)
+    eventmachine (1.2.2)
+    execjs (2.7.0)
+    factory_girl (4.8.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.5.0)
-      factory_girl (~> 4.5.0)
+    factory_girl_rails (4.8.0)
+      factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    font-awesome-rails (4.3.0.0)
-      railties (>= 3.2, < 5.0)
-    foundation-rails (5.5.2.1)
+    font-awesome-rails (4.7.0.1)
+      railties (>= 3.2, < 5.1)
+    foundation-rails (5.5.3.2)
       railties (>= 3.1.0)
       sass (>= 3.3.0, < 3.5)
-    globalid (0.3.5)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    i18n (0.7.0)
-    jquery-rails (4.0.4)
-      rails-dom-testing (~> 1.0)
+    httpclient (2.8.3)
+    i18n (0.8.0)
+    jquery-rails (4.2.2)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.3)
+    json (1.8.6)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.0.2)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.7.0)
-    multi_json (1.11.2)
-    netrc (0.10.3)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    paperclip (4.2.4)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mimemagic (0.3.2)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    multi_json (1.12.1)
+    nokogiri (1.7.0.1)
+      mini_portile2 (~> 2.1.0)
+    orm_adapter (0.5.0)
+    paperclip (5.1.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
       mime-types
+      mimemagic (~> 0.3.0)
     pickadate-rails (3.5.6.0)
       railties (>= 3.1.0)
-    poltergeist (1.6.0)
+    poltergeist (1.13.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
-      multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    pry (0.10.1)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-rails (0.3.4)
+    pry-rails (0.3.5)
       pry (>= 0.9.10)
-    rack (1.6.4)
+    public_suffix (2.0.5)
+    rack (1.6.5)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.3)
-      actionmailer (= 4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
-      activemodel (= 4.2.3)
-      activerecord (= 4.2.3)
-      activesupport (= 4.2.3)
+    rails (4.2.7.1)
+      actionmailer (= 4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activerecord (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.3)
+      railties (= 4.2.7.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.3)
-      actionpack (= 4.2.3)
-      activesupport (= 4.2.3)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rake (12.0.0)
+    responders (2.3.0)
+      railties (>= 4.2.0, < 5.1)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
+      rspec-support (~> 3.5.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.3.2)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-rails (3.3.3)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    sass (3.4.16)
-    sass-rails (5.0.3)
-      railties (>= 4.0.0, < 5.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sass (3.4.23)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
-    slim (3.0.6)
-      temple (~> 0.7.3)
+      tilt (>= 1.1, < 3)
+    slim (3.0.7)
+      temple (~> 0.7.6)
       tilt (>= 1.3.3, < 2.1)
-    slim-rails (3.0.1)
-      actionmailer (>= 3.1, < 5.0)
-      actionpack (>= 3.1, < 5.0)
-      activesupport (>= 3.1, < 5.0)
-      railties (>= 3.1, < 5.0)
+    slim-rails (3.1.1)
+      actionpack (>= 3.1)
+      railties (>= 3.1)
       slim (~> 3.0)
     slop (3.6.0)
-    sprockets (3.2.0)
-      rack (~> 1.0)
-    sprockets-rails (2.3.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    temple (0.7.6)
-    thin (1.6.3)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    temple (0.7.7)
+    thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
-      rack (~> 1.0)
-    thor (0.19.1)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
+    thor (0.19.4)
     thread_safe (0.3.5)
-    tilt (1.4.1)
-    tinymce-rails (4.2.1)
+    tilt (2.0.6)
+    tinymce-rails (4.5.3)
       railties (>= 3.1.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
-    warden (1.2.3)
+    warden (1.2.7)
       rack (>= 1.0)
-    websocket-driver (0.6.2)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.0.0)
@@ -280,7 +265,6 @@ PLATFORMS
 
 DEPENDENCIES
   ace-rails-ap
-  actionpack-page_caching
   bourbon
   capybara
   cmtool!
@@ -290,10 +274,9 @@ DEPENDENCIES
   email_validator
   factory_girl_rails
   font-awesome-rails
-  foundation-rails
+  foundation-rails (~> 5.5)
   jquery-rails
   launchy
-  orm_adapter!
   paperclip (>= 3.4, != 4.3.0)
   pickadate-rails
   poltergeist
@@ -306,3 +289,6 @@ DEPENDENCIES
   slim-rails
   thin
   tinymce-rails
+
+BUNDLED WITH
+   1.13.6

data/README.md

@@ -34,9 +34,8 @@ Make sure that the locales you want to work with are specified in
 
 This will add some gems you might like anyway, here a list:
 
-*   bourbon
+*   bourbon # NOOOOOO
 *   jquery-rails
-*   tinymce-rails
 *   sass-rails
 *   paperclip
 *   email_validator (validates :email, email: true)
@@ -120,7 +119,7 @@ If you add a method `cmtool_locale` to your application controller Cmtool will
 take this value:
 ```ruby
 class ApplicationController
-  before_filter :set_locale
+  before_action :set_locale
 
   private
 

data/app/assets/javascripts/cmtool/application.js.coffee

@@ -2,12 +2,15 @@
 #= require jquery_ujs
 #= require foundation
 #= require ace/ace
+#= require moment
 #= require ace/theme-monokai
 #= require ace/mode-coffee
 #= require ace/mode-handlebars
 #= require ace/mode-yaml
 #= require ace/mode-haml
-#= require tinymce-jquery
+#= require ace/mode-slim
+# require tinymce-jquery
+# require tinymce
 #= require pickadate/picker
 #= require pickadate/picker.date
 #= require pickadate/picker.time
@@ -36,3 +39,6 @@ $ ->
       iframe.attr 'src', url
       $('#preview-modal').foundation('reveal', 'open')
     false
+
+  $("[data-time]").each ->
+    $(this).text moment($(this).data("time")).format($(this).data("timeFormat") or "dd D MMM HH:mm")

data/app/assets/javascripts/cmtool/html_edit.js.coffee

@@ -2,7 +2,7 @@ class HtmlEdit
   setup: ->
     #ACE
     locale_field = $('#page_locale')
-    $('.html-content').each (i, el)->
+    $('.html-content').each (i, el) ->
       text_field = $(el)
       template_field = $("##{text_field.attr('id')}_template")
       ace_div = $('<div></div>').addClass('ace-div')
@@ -13,9 +13,10 @@ class HtmlEdit
       editor = ace.edit(ace_div.get(0))
       editor.setTheme 'ace/theme/monokai'
       if template_field.length
+        text_field.before '<a href="https://emblemjs.com/" target="_blank">This is a template language. For reference, visit: emblemjs.com</a>'
         editor.setValue template_field.val(), -1
-        editor.getSession().setMode 'ace/mode/haml'
-        console.log "Editing haml"
+        editor.getSession().setMode 'ace/mode/slim'
+        console.log "Editing Emblem using Slim mode for ACE editor"
       else
         editor.setValue text_field.val(), -1
         editor.getSession().setMode 'ace/mode/handlebars'
@@ -33,6 +34,9 @@ class HtmlEdit
             result_value = template(template_vars)
             template_field.val value
             text_field.val result_value
+            console.log "Succesfull conversion of template to HTML"
+          catch error
+            console.log error.message
         else
           text_field.val value
       editor.getSession().on 'change', rebuild_html

data/app/assets/javascripts/cmtool/structure.js.coffee.erb

@@ -1,13 +1 @@
 <% cmtool = Cmtool::Engine.routes.url_helpers %>
-$ ->
-  $('textarea.mceEditor, .editor_full').tinymce
-    theme: 'modern'
-    plugins: ['image', 'link', 'table', 'searchreplace', 'code']
-    language: tinymce_language
-    image_list: '<%= cmtool.images_path(format: :js) %>'
-    relative_urls: false
-    removed_menuitems: 'newdocument'
-    apply_source_formatting: true
-  $('.editor_basic').tinymce
-    theme: 'modern'
-    language: tinymce_language

data/app/assets/stylesheets/cmtool/user_info.sass

@@ -1,10 +1,10 @@
-@import bourbon
+// @import bourbon
 #user-info
   float: right
   width: 400px
   height: 22px
   margin-top: -30px
-  @include linear-gradient(#2989d8, #1e5799)
+  // @include linear-gradient(#2989d8, #1e5799)
   color: white
   font-weight: bold
   padding: 4px

data/app/controllers/cmtool/application_controller.rb

@@ -1,7 +1,7 @@
 module Cmtool
   class ApplicationController < ::ApplicationController
     include Cmtool::ControllerGlue
-    before_filter :authorize_user, :check_environment, :set_locale
+    before_action :authorize_user, :check_environment, :set_locale
     layout 'cmtool/application'
 
     private