alchemy_cms 2.6.3 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c1c44138b3e7be76b6a952789f4b54045aa8f8a
-  data.tar.gz: c8cd62e435145ef96d4b874ad68b840cbdf8524c
+  metadata.gz: 47456fa8fded3fd78ac81d01bb4dd3b051c34c77
+  data.tar.gz: f94ce0049b27128fe5868a04e13b41376a34db06
 SHA512:
-  metadata.gz: 3f3bde0e560a5c53c7305a6371851e31b2a980dae1b49781e98ec3c1129dcfc2542ae8686cb5e02d13378881e50edbdbf0b315e211236bc23d4407867088bb8b
-  data.tar.gz: 6194a45096869a6ae0faed7e4fdad33c88a326e1505bc716c886388ea33efb6ea0e265dbc0275a76fb2973e21138a17fe577cb135b5472c2c283019311b17f44
+  metadata.gz: d32252e1256371e7c98bee941dfedf654fd5e4115bec71e8181d626c6da0baf9d9b38c2d1cf752a295d12a527ef073d2328ca761c4a83904e6d7dc47af25fbe0
+  data.tar.gz: 91f58b59b4d938486de085b6783b4054bad57b7f8c08740ef3490b621311cd9109d71c5c454c2b61452724be8d211a118c922371bf8a05d836bb394cae983c92

data/.simplecov

@@ -0,0 +1,14 @@
+SimpleCov.adapters.define 'alchemy' do
+  add_filter '/spec/'
+  add_filter '/config/'
+  add_filter '/db/'
+  add_filter '/bin/'
+  add_filter '/script/'
+
+  add_group 'Controllers', 'app/controllers/alchemy'
+  add_group 'Models', 'app/models/alchemy'
+  add_group 'Mailers', 'app/mailers/alchemy'
+  add_group 'Helpers', 'app/helpers/alchemy'
+  add_group 'Sweepers', 'app/sweepers'
+  add_group 'Libraries', 'lib'
+end

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
   - 2.0.0
 branches:
   only:
-    - 2.6-stable
+    - 2.7-stable
 script: rake
 env:
   - DB=mysql

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 # For some strange reason it's only loaded outside any group
 gem 'jasmine'
 gem 'jasminerice'
+gem 'multi_json', '1.7.2' # http://stackoverflow.com/q/16543693
 
 # Code coverage plattform
 gem 'coveralls', require: false
@@ -13,11 +14,12 @@ group :test do
   gem 'sqlite3'               if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
   gem 'mysql2'                if ENV['DB'] == 'mysql'
   gem 'pg'                    if ENV['DB'] == 'postgresql'
-  gem 'poltergeist', '1.1.0'
-  gem 'faye-websocket', '0.4.7' # https://github.com/jonleighton/poltergeist/issues/320
-  gem 'connection_pool' # https://gist.github.com/mperham/3049152
-  unless ENV['CI']
-    gem 'launchy'
+  unless ENV['FAST_SPECS']
+    gem 'poltergeist'
+    gem 'connection_pool' # https://gist.github.com/mperham/3049152
+    unless ENV['CI']
+      gem 'launchy'
+    end
   end
 end
 
@@ -29,7 +31,6 @@ end
 
 group :development do
   unless ENV['CI']
-    gem 'guard-spork'
     gem 'debugger'
     gem 'quiet_assets' # Mute assets loggin
     gem 'thin' # Get rid off 'Could not determine content-length of response body' Warning. Start with 'rails s thin'

data/README.md

@@ -1,6 +1,7 @@
 ![Alchemy CMS](http://alchemy-cms.com/assets/alchemy_logo.png)
 
-[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=2.6-stable)](http://travis-ci.org/magiclabs/alchemy_cms) [![Dependency Status](https://gemnasium.com/magiclabs/alchemy_cms.png)](https://gemnasium.com/magiclabs/alchemy_cms) [![Code Climate](https://codeclimate.com/github/magiclabs/alchemy_cms.png)](https://codeclimate.com/github/magiclabs/alchemy_cms) [![Coverage Status](https://coveralls.io/repos/magiclabs/alchemy_cms/badge.png?branch=2.6-stable)](https://coveralls.io/r/magiclabs/alchemy_cms)
+[![Gem Version](https://badge.fury.io/rb/alchemy_cms.png)](http://badge.fury.io/rb/alchemy_cms)
+[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=2.7-stable)](http://travis-ci.org/magiclabs/alchemy_cms) [![Code Climate](https://codeclimate.com/github/magiclabs/alchemy_cms.png)](https://codeclimate.com/github/magiclabs/alchemy_cms) [![Coverage Status](https://coveralls.io/repos/magiclabs/alchemy_cms/badge.png?branch=2.7-stable)](https://coveralls.io/r/magiclabs/alchemy_cms)
 
 About
 -----
@@ -42,7 +43,7 @@ If you are looking for a Rails 2.3 compatible version check the [1.6-stable bran
 Ruby Version
 ------------
 
-Alchemy runs with Ruby 1.9.2 and Ruby 1.9.3 only.
+Alchemy runs with Ruby >= 1.9.3 (including Ruby 2.0.0).
 
 For a Ruby 1.8.7 compatible version use the [2.3-stable branch](https://github.com/magiclabs/alchemy_cms/tree/2.3-stable).
 
@@ -66,7 +67,7 @@ Add to existing Rails project
 
 In your Gemfile:
 
-    gem 'alchemy_cms', github: 'magiclabs/alchemy_cms', branch: '2.6-stable'
+    gem 'alchemy_cms', github: 'magiclabs/alchemy_cms', branch: '2.7-stable'
 
 Run in terminal:
 
@@ -100,6 +101,14 @@ Tipps
 - Ask the community: http://groups.google.com/group/alchemy-cms
 
 
+Getting Help
+------------
+
+* If you have bugs, please use the [issue tracker on Github](https://github.com/magiclabs/alchemy_cms/issues).
+* For Q&A and general usage, please use the [User Group](http://groups.google.com/group/alchemy-cms) or the IRC channel.
+* New features should be discussed on our [Trello Board](https://trello.com/alchemycms). *PLEASE* don't use the Github issues for new features.
+
+
 Resources
 ---------
 
@@ -109,7 +118,8 @@ Resources
 * Issue-Tracker: <https://github.com/magiclabs/alchemy_cms/issues>
 * Sourcecode: <https://github.com/magiclabs/alchemy_cms>
 * User Group: <http://groups.google.com/group/alchemy-cms>
-* Changelog: <http://revision.io/alchemy_cms>
+* IRC Channel: #alchemy_cms on irc.freenode.net
+* Discussion Board: <https://trello.com/alchemycms>
 
 Authors
 ---------
@@ -123,4 +133,4 @@ Authors
 License
 -------
 
-* BSD: <https://raw.github.com/magiclabs/alchemy_cms/master/LICENSE>
+* BSD: <https://raw.github.com/magiclabs/alchemy_cms/2.7-stable/LICENSE>

data/alchemy_cms.gemspec

@@ -34,7 +34,6 @@ POST_INSTALL
 
   s.add_runtime_dependency %q<rails>,                            ["~> 3.2.13"]
   s.add_runtime_dependency %q<devise>,                           ["~> 2.2.3"]
-  s.add_runtime_dependency %q<devise-encryptable>,               ["~> 0.1.1"]
   s.add_runtime_dependency %q<awesome_nested_set>,               ["~> 2.0"]
   s.add_runtime_dependency %q<acts-as-taggable-on>,              ["~> 2.1"]
   s.add_runtime_dependency %q<declarative_authorization>,        ["~> 0.5.7"]
@@ -44,7 +43,7 @@ POST_INSTALL
   s.add_runtime_dependency %q<acts_as_list>,                     ["~> 0.2.0"]
   s.add_runtime_dependency %q<magiclabs-userstamp>,              ["~> 2.0.2"]
   s.add_runtime_dependency %q<dynamic_form>,                     ["~> 1.1"]
-  s.add_runtime_dependency %q<jquery-rails>,                     ["~> 2.2.1"]
+  s.add_runtime_dependency %q<jquery-rails>,                     ["~> 3.0.4"]
   s.add_runtime_dependency %q<jquery-ui-rails>,                  ["~> 3.0.1"]
   s.add_runtime_dependency %q<sass-rails>,                       ['~> 3.2.3']
   s.add_runtime_dependency %q<coffee-rails>,                     ['~> 3.2.1']
@@ -52,11 +51,13 @@ POST_INSTALL
   s.add_runtime_dependency %q<sassy-buttons>,                    ['~> 0.1.3']
   s.add_runtime_dependency %q<rails3-jquery-autocomplete>,       ['~> 1.0.10']
   s.add_runtime_dependency %q<tvdeyen-handles_sortable_columns>, ['~> 0.1.5']
+  s.add_runtime_dependency %q<spinner.rb>
 
   s.add_development_dependency %q<bumpy>
   s.add_development_dependency %q<capybara>,               ['~> 2.0.3']
   s.add_development_dependency %q<factory_girl_rails>
   s.add_development_dependency %q<rspec-rails>,            ['~> 2.13.1']
+  s.add_development_dependency %q<sqlite3>
   s.add_development_dependency %q<yard>
   s.add_development_dependency %q<redcarpet>
 

data/app/assets/javascripts/alchemy/alchemy.base.js.coffee

@@ -42,23 +42,6 @@ $.extend Alchemy,
       $overlay.css "visibility", "hidden"
     return
 
-  # Checks if the element is dirty (has unsaved changes)
-  # and only calls the Alchemy.ElementEditors.toggleFold function, if it is not dirty.
-  toggleElement: (id, text) ->
-    if Alchemy.isPageDirty()
-      Alchemy.openConfirmWindow
-        title: text.title
-        message: text.message
-        okLabel: text.okLabel
-        cancelLabel: text.cancelLabel
-        okCallback: ->
-          Alchemy.ElementEditors.toggleFold id
-          return
-      false
-    else
-      Alchemy.ElementEditors.toggleFold id
-    return
-
   # Shows spinner while loading images and
   # fades the image after its been loaded
   ImageLoader: (scope = document, options = {color: '#fff'}) ->
@@ -127,6 +110,15 @@ $.extend Alchemy,
       console.trace()
     return
 
+  # Translates given string
+  #
+  _t: (id) ->
+    translation = Alchemy.translations[id]
+    if (translation)
+      translation[Alchemy.locale]
+    else
+      id
+
   getUrlParam: (name) ->
     results = new RegExp("[\\?&]" + name + "=([^&#]*)").exec(window.location.href)
     results[1] or 0  if results

data/app/assets/javascripts/alchemy/alchemy.dirty.js.coffee

@@ -0,0 +1,70 @@
+window.Alchemy = {} if typeof (window.Alchemy) is "undefined"
+
+$.extend Alchemy,
+
+  ElementDirtyObserver: (selector) ->
+    $elements = $(selector)
+    $elements.find('input[type="text"], select').change ->
+      $this = $(this)
+      $this.addClass('dirty')
+      Alchemy.setElementDirty $this.parents(".element_editor")
+    $elements.find('.element_foot input[type="checkbox"]').click ->
+      $this = $(this)
+      $this.addClass "dirty"
+      Alchemy.setElementDirty $this.parents(".element_editor")
+
+  setElementDirty: (element) ->
+    $element = $(element)
+    $element
+      .addClass('dirty')
+      .find('.element_head .icon')
+      .addClass('element_dirty')
+    window.onbeforeunload = @pageUnload
+
+  pageUnload: ->
+    Alchemy.pleaseWaitOverlay(false)
+    Alchemy._t('page_dirty_notice')
+
+  setElementClean: (element) ->
+    $element = $(element)
+    $element
+      .removeClass('dirty')
+      .find('.element_foot input[type="checkbox"], input[type="text"], select')
+      .removeClass('dirty')
+    $element.find('.element_head .icon').removeClass('element_dirty')
+    window.onbeforeunload = undefined
+
+  isPageDirty: ->
+    $('#element_area').find('.element_editor.dirty').length > 0
+
+  isElementDirty: (element) ->
+    $(element).hasClass('dirty')
+
+  checkPageDirtyness: (element) ->
+    okcallback = undefined
+    if $(element).is("form")
+      okcallback = ->
+        $form = $("<form action=\"#{element.action}\" method=\"POST\" style=\"display: none\" />")
+        $form.append $(element).find("input")
+        $form.appendTo "body"
+        Alchemy.pleaseWaitOverlay()
+        $form.submit()
+    else if $(element).is("a")
+      okcallback = ->
+        Alchemy.pleaseWaitOverlay()
+        document.location = element.pathname
+    if Alchemy.isPageDirty()
+      Alchemy.pleaseWaitOverlay(false)
+      Alchemy.openConfirmWindow
+        title: Alchemy._t('warning')
+        message: Alchemy._t('page_dirty_notice')
+        okLabel: Alchemy._t('ok')
+        cancelLabel: Alchemy._t('cancel')
+        okCallback: okcallback
+      false
+    else
+      true
+
+  PageLeaveObserver: ->
+    $("#main_navi a").click (event) ->
+      event.preventDefault() unless Alchemy.checkPageDirtyness(event.currentTarget)

data/app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee

@@ -0,0 +1,80 @@
+window.Alchemy = {} if typeof (window.Alchemy) is "undefined"
+
+$.extend Alchemy,
+
+  SortableElements: (page_id, form_token, selector) ->
+    selector = "#element_area .sortable_cell"  if typeof (selector) is "undefined"
+    $(selector).sortable
+      items: "div.element_editor"
+      handle: ".element_handle"
+      axis: "y"
+      placeholder: "droppable_element_placeholder"
+      forcePlaceholderSize: true
+      dropOnEmpty: true
+      opacity: 0.5
+      cursor: "move"
+      tolerance: "pointer"
+      update: (event, ui) ->
+        ids = $.map $(this).children(), (child) ->
+          $(child).attr "data-element-id"
+        params_string = ""
+        cell_id = $(this).attr("data-cell-id")
+        # Is the trash window open?
+        if $("#alchemyTrashWindow").length > 0
+          # updating the trash icon
+          if $("#trash_items div.element_editor").not(".dragged").length is 0
+            $("#element_trash_button .icon").removeClass "full"
+            $("#trash_empty_notice").show()
+        $(event.target).css "cursor", "progress"
+        params_string = "page_id=" + page_id + "&authenticity_token=" + encodeURIComponent(form_token) + "&" + $.param(element_ids: ids)
+        params_string += "&cell_id=" + cell_id  if cell_id
+        $.ajax
+          url: Alchemy.routes.order_admin_elements_path
+          type: "POST"
+          data: params_string
+          complete: ->
+            $(event.target).css "cursor", "auto"
+            Alchemy.TrashWindow.refresh page_id
+
+      start: (event, ui) ->
+        $textareas = ui.item.find("textarea.default_tinymce, textarea.custom_tinymce")
+        Alchemy.Tinymce.removeEditor $textareas
+
+      stop: (event, ui) ->
+        $textareas = ui.item.find("textarea.default_tinymce, textarea.custom_tinymce")
+        Alchemy.Tinymce.addEditor $textareas
+
+  SortableContents: (selector, token) ->
+    $(selector).sortable
+      items: "div.dragable_picture"
+      handle: "div.picture_handle"
+      opacity: 0.5
+      cursor: "move"
+      tolerance: "pointer"
+      containment: "parent"
+      update: (event, ui) ->
+        ids = $.map $(this).children("div.dragable_picture"), (child) ->
+          child.id.replace /essence_picture_/, ""
+        $(event.originalTarget).css "cursor", "progress"
+        $.ajax
+          url: Alchemy.routes.order_admin_contents_path
+          type: "POST"
+          data: "authenticity_token=" + encodeURIComponent(token) + "&" + $.param(content_ids: ids)
+          complete: ->
+            $(event.originalTarget).css "cursor", "move"
+
+  DraggableTrashItems: (items_n_cells) ->
+    $("#trash_items div.draggable").each ->
+      cell_classes = ""
+      cell_names = items_n_cells[@id]
+      $.each cell_names, (i) ->
+        cell_classes += "." + this + "_cell" + ", "
+      $(this).draggable
+        helper: "clone"
+        iframeFix: "iframe#alchemyPreviewWindow"
+        connectToSortable: cell_classes.replace(/,.$/, "")
+        start: (event, ui) ->
+          $(this).hide().addClass "dragged"
+          ui.helper.css width: "300px"
+        stop: ->
+          $(this).show().removeClass "dragged"

data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee

@@ -9,30 +9,33 @@ window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
 Alchemy.ElementEditors =
 
   # Binds all events to element editor partials.
+  #
   # Calles once per page load.
+  #
   init: ->
     $elements = $("#element_area .element_editor")
     self = Alchemy.ElementEditors
     self.reinit $elements
-    return
 
-  # Binds events to all given element editors
+  # Binds events to all given element editors.
+  #
   # Called after replacing element editors via ajax.
+  #
   reinit: (elements) ->
     self = Alchemy.ElementEditors
     $elements = $(elements)
     $elements.each ->
       self.bindEvent this
-      return
     $elements.find(".element_head").click self.onClickElement
     $elements.find(".element_head").dblclick ->
       id = $(this).parent().attr("id").replace(/\D/g, "")
-      self.toggleFold id
-      return
-    return
+      self.toggle id
+    Alchemy.ElementEditors.observeToggler($elements)
 
   # Click event handler.
+  #
   # Also triggers custom 'Alchemy.SelectElement' event on target element in preview frame.
+  #
   onClickElement: (e) ->
     self = Alchemy.ElementEditors
     $element = $(this).parent(".element_editor")
@@ -44,20 +47,22 @@ Alchemy.ElementEditors =
     $frame_elements = document.getElementById("alchemyPreviewWindow").contentWindow.jQuery("[data-alchemy-element]")
     $selected_element = $frame_elements.closest("[data-alchemy-element=\"" + id + "\"]")
     $selected_element.trigger "Alchemy.SelectElement"
-    return
 
   # Binds the custom 'Alchemy.SelectElementEditor' event.
+  #
   # Triggered, if an element gets selected inside the preview iframe.
+  #
   bindEvent: (element) ->
     self = Alchemy.ElementEditors
     $(element).bind "Alchemy.SelectElementEditor", self.selectElement
-    return
 
   # Selects an element in the element window.
+  #
   # Expands the element, if necessary.
   # Also chooses the right cell, if necessary.
   # Can be triggered through custom event 'Alchemy.SelectElementEditor'
   # Used by the elements on click events in the preview frame.
+  #
   selectElement: (e) ->
     self = Alchemy.ElementEditors
     id = @id.replace(/\D/g, "")
@@ -74,25 +79,44 @@ Alchemy.ElementEditors =
       self.toggleFold id
     else
       self.scrollToElement this
-    return
 
   # Scrolls the element window to given element editor dom element.
+  #
   scrollToElement: (el) ->
     $("#alchemyElementWindow").scrollTo el,
       duration: 400
       offset: -10
-    return
+
+  # Expands or folds a element editor
+  #
+  # If the element is dirty (has unsaved changes) it displays a warning.
+  #
+  toggle: (id, text) ->
+    el = $("#element_#{id}")
+    if Alchemy.isElementDirty(el)
+      Alchemy.openConfirmWindow
+        title: Alchemy._t('warning')
+        message: Alchemy._t('element_dirty_notice')
+        okLabel: Alchemy._t('ok')
+        cancelLabel: Alchemy._t('cancel')
+        okCallback: =>
+          @toggleFold id
+      false
+    else
+      @toggleFold id
 
   # Folds or expands the element editor with the given id.
+  #
   toggleFold: (id) ->
-    self = Alchemy.ElementEditors
     spinner = Alchemy.Spinner.small()
-    element = $('.ajax_folder', '#element_' + id)
-    $("#element_" + id + "_folder").hide()
-    element.prepend(spinner.spin().el)
-    $.post Alchemy.routes.fold_admin_element_path(id), ->
-      $("#element_" + id + "_folder").show()
+    element = $('.ajax_folder', "#element_#{id}")
+    $("#element_#{id}_folder").hide()
+    element.prepend spinner.spin().el
+    $.post Alchemy.routes.fold_admin_element_path(id), =>
+      $("#element_#{id}_folder").show()
       spinner.stop()
-      self.scrollToElement "#element_" + id
-      return
-    return
+      @scrollToElement "#element_#{id}"
+
+  observeToggler: (scope) ->
+    $('[data-element-dirty]', scope).click ->
+      Alchemy.ElementEditors.toggle $(this).data('element-dirty')