rubber_ring 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b2baf1750ad522511f98b8828adfe1900ae6f75
-  data.tar.gz: 0760fe6c1d2c1b7f34322f03b42a8deb38fb01c2
+  metadata.gz: a0e79aebcd8e04701aac347c16511109152e8323
+  data.tar.gz: 4de7a15f5afc6f96126c8a6e3f203d01ff164e4b
 SHA512:
-  metadata.gz: df4a3f44a94f23bddd27ab69402a627c6e2db2382f62b6c7474f024de0ded64984e9b6f6520e60c701a95e4f0158cfd33e2d3bb5f90abfe7d865435a837a29e5
-  data.tar.gz: 58cbbd5781cdb2b63a4b8407f3c55f0e970ddf08a9b9f6714e01170eab609b4bc12ed4cc828abdab53249f0f4045167f99b41856698db30fd04e5311445136b7
+  metadata.gz: 6e2349aa420c70b14ce53992593298dfbd3d6638c9dc62b5d63035f89bb687d4ca4e40bb9cc7b3ba5fac2d778bc7559fcb6b56ea6c55a08ebfaf236b2c9da4ac
+  data.tar.gz: 4ce0d584eb20be9aa5e6ebad85956175acc8e65790db6baf9e77e476f8e5af85d85fd20aacf3715d0953c6f00244efd10f4f0a62cfda8dd9bb53ffc93e6b7f68

data/README.md

@@ -44,7 +44,7 @@ To install `imagemagick` and `sqlite3` on `Ubuntu`
 
 Add it to your `Gemfile`
 
-	gem 'rubber_ring', :git => 'git://github.com/zigomir/rubber_ring.git'
+	gem 'rubber_ring'
 
 Create/migrate database
 
@@ -131,37 +131,40 @@ CMS fields are made of tag, key and `@page` which holds content for all the page
 
 Examples
 
-	<%= editable_field(:h1, {key: 'header'}, @page) do %>
-	  I'm editable content in one line.
-	<% end %>
+```erb
+<%= editable_field(:h1, {key: 'header'}, @page) do %>
+  I'm editable content in one line.
+<% end %>
 
-	<%= editable_field(:div, {key: 'first_content', class: 'multi-line'}, @page) do %>
-	  I'm editable content in 
-	  multi lines...
-	<% end %>
-	
-	<%= editable_link({class: 'rubber_ring_attachment', key: 'attachment-link', href: '/link-to-something'}, @page) do %>
-    	Link to PDF
-	<% end %>
+<%= editable_field(:div, {key: 'first_content', class: 'multi-line'}, @page) do %>
+  I'm editable content in 
+  multi lines...
+<% end %>
+
+<%= editable_link({class: 'rubber_ring_attachment', key: 'attachment-link', href: '/link-to-something'}, @page) do %>
+	Link to PDF
+<% end %>
 
-	<%= editable_image({key: 'header_image', src: image_path('baws.jpg'), height: '360'}, @page) %>
+<%= editable_image({key: 'header_image', src: image_path('baws.jpg'), height: '360'}, @page) %>
+```
 
 ## Templates
 
 Allows you to set up repeating and sortable templates. Example
 
-	<% template([
-	    {template: 'article',   tclass: 'article', element: 'article'},
-	    {template: 'blog_post', tclass: 'blog',    element: 'div'}
-	  ],
-	  {key: 'template_key', wrap_element: 'div', wrap_class: 'templates'}, @page)
-	%>
-	
+```erb
+<% template([
+    {template: 'article',   tclass: 'article', element: 'article'},
+    {template: 'blog_post', tclass: 'blog',    element: 'div'}
+  ],
+  {key: 'template_key', wrap_element: 'div', wrap_class: 'templates'}, @page)
+%>
+```
 
 This means, that you need to create new view for each template in 
 `app/views/templates/`. Example
 
-	`app/views/templates/_article.html.erb` 
+    app/views/templates/_article.html.erb
 
 Convention
 
@@ -169,17 +172,19 @@ Convention
 	{template: 'article', ...
 	...
 
-means that you need a view, saved like:
+means that you need a view, saved in a file
 
-	`app/views/templates/_article.html.erb`
+    app/views/templates/_article.html.erb
 
 **Inside templates** you can use all other helpers. **BUT**, you need to 
 assemble your key correctly or otherwise you will be overwriting your own content. 
 You can use `key_prefix`, which is assembled the way which will help you to prevent key overwites. Example:
 
-	<%= editable_field(:h2, {key: "#{key_prefix}_title"}, @page) do %>
-		Article Title
-	<% end %>
+```erb
+<%= editable_field(:h2, {key: "#{key_prefix}_title"}, @page) do %>
+	Article Title
+<% end %>
+```
 
 ### Helper options
 

data/app/assets/javascripts/rubber_ring/application.js

@@ -1,17 +1,17 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-//= require jquery
-//= require jquery-ui
-//= require jquery_ujs
-//= require_tree ../libs
-//= require_tree .
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery-ui
+//= require jquery_ujs
+//= require_tree ../libs
+//= require_tree .

data/app/assets/javascripts/rubber_ring/attachment_dragger.coffee

@@ -33,7 +33,7 @@ class @AttachmentDragger
           # also change link if we are dropping attachmeng
           $(e.currentTarget).html(e.dataTransfer.getData(@attribute).split('/').reverse()[0]) if @attribute == "href"
 
-          pm = new PersistenceManager()
+          pm = new PersistenceManager(App.config.action_btns, $(".alert-saved div"))
           pm.save_image($(e.currentTarget)) if @attribute == "src"
           pm.save_attachment($(e.currentTarget)) if @attribute == "href"
 

data/app/assets/javascripts/rubber_ring/attachment_manager.coffee

@@ -6,7 +6,7 @@ $ ->
 
   # remove all unused images action
   $(".remove_not_used_attachments").on "click", ->
-    pm = new PersistenceManager()
+    pm = new PersistenceManager(App.config.action_btns, $(".alert-saved div"))
     uploaded_images      = ($(item).attr("src")  for item in $(".uploaded-images img"))
     uploaded_attachments = ($(item).attr("href") for item in $(".uploaded-attachments a"))
     used_images          = ($(item).attr("src")  for item in $(".rubber_ring_image"))

data/app/assets/javascripts/rubber_ring/editor.coffee

@@ -1,66 +1,69 @@
 $ ->
-  # init
-  config = {
-    action_btns: {
-      reset_btn: '<button class="reset-content"></button>',
-      reset_img: '<button class="reset-image"></button>'
-    }
-  }
-
-  $editable_content = $("[contenteditable]")
-  $alert = $(".alert-saved div")
-
   util = new Util()
   # first check for any duplicated keys
   duplicates = util.find_duplicated_keys($('[data-cms]'))
   alert "Correct key duplicates: '#{duplicates}'" if duplicates.length > 0
 
-  pm = new PersistenceManager(config.action_btns, $alert)
+  pm = new PersistenceManager(App.config.action_btns, $(".alert-saved div"))
   te = new TemplateEditor(pm, util)
   te.init()
   te.init_sortable()
 
-  le = new LinkEditor($editable_content)
+  le = new LinkEditor($("[contenteditable]"))
   le.init()
 
-  # append reset button to editable contents
-  $("[contenteditable]").append(config.action_btns.reset_btn)
-  $("img[data-cms]").after(config.action_btns.reset_img)
+  App.init = ->
+    # append reset button to editable contents
+    $("[contenteditable]").append(App.config.action_btns.reset_btn)
+    $("img[data-cms]").after(App.config.action_btns.reset_img)
 
-  $("body").on "click", ".reset-content", (e) ->
-    $content_to_reset = $(e.currentTarget).parent()
-    if window.confirm "Really want reset content?"
-      pm.remove($content_to_reset).then ->
-        window.location.reload(true)
+    $("body").on "click", ".reset-content", (e) ->
+      $content_to_reset = $(e.currentTarget).parent()
+      if window.confirm "Really want reset content?"
+        pm.remove($content_to_reset).then ->
+          window.location.reload(true)
 
-  $("body").on "click", ".reset-image", (e) ->
-    $image_to_reset = $(e.currentTarget).prev()
-    if window.confirm "Really want reset image?"
-      pm.remove($image_to_reset).then ->
-        window.location.reload(true)
+    $("body").on "click", ".reset-image", (e) ->
+      $image_to_reset = $(e.currentTarget).prev()
+      if window.confirm "Really want reset image?"
+        pm.remove($image_to_reset).then ->
+          window.location.reload(true)
 
-  $(".rubber_ring_attachment").click (e) ->
-    e.preventDefault()
+    $(".rubber_ring_attachment").click (e) ->
+      e.preventDefault()
 
-  # register change event for HTML5 content editable
-  $("body").on "focus", "[contenteditable]", ->
-    $this = $(this)
-    $this.data "before", $this.html()
-    $this
-  .on "blur", "[contenteditable]", ->
-    $this = $(this)
-    if $this.data("before") isnt $this.html()
+    # register change event for HTML5 content editable
+    $("body").on "focus", "[contenteditable]", ->
+      $this = $(this)
       $this.data "before", $this.html()
-      $this.trigger "change"
-    $this
+      $this
+    .on "blur", "[contenteditable]", ->
+      $this = $(this)
+      if $this.data("before") isnt $this.html()
+        $this.data "before", $this.html()
+        $this.trigger "change"
+      $this
+
+    $("[contenteditable]").change (e) ->
+      $content = $(e.currentTarget)
+      pm.save($content)
+
+    # disable enter in single line editor
+    $("[contenteditable]").not(".multi-line").keydown (e) ->
+      e.preventDefault() if e.keyCode is 13
 
-  $editable_content.change (e) ->
-    $content = $(e.currentTarget)
-    pm.save($content)
+    # https://developer.mozilla.org/en-US/docs/Rich-Text_Editing_in_Mozilla#Executing%5FCommands
+    $("[contenteditable].multi-line").keydown (e) ->
+      if e.which == 13
+        lineBreak = "<br />"
+        end = $(this).text().length == getCaretCharacterOffsetWithin(this)
 
-  # disable enter in single line editor
-  $editable_content.not(".multi-line").keydown (e) ->
-    e.preventDefault() if e.keyCode is 13
+        if end
+          this.insertAdjacentHTML("beforeend", lineBreak)
+        else
+          document.execCommand("insertHTML", false, lineBreak)
+
+        false
 
   getCaretCharacterOffsetWithin = (element) ->
     caretOffset = 0
@@ -78,15 +81,4 @@ $ ->
       caretOffset = preCaretTextRange.text.length
     caretOffset
 
-  # https://developer.mozilla.org/en-US/docs/Rich-Text_Editing_in_Mozilla#Executing%5FCommands
-  $("[contenteditable].multi-line").keydown (e) ->
-    if e.which == 13
-      lineBreak = "<br />"
-      end = $(this).text().length == getCaretCharacterOffsetWithin(this)
-
-      if end
-        this.insertAdjacentHTML("beforeend", lineBreak)
-      else
-        document.execCommand("insertHTML", false, lineBreak)
-
-      false
+  App.init()

data/app/assets/javascripts/rubber_ring/persistence_manager.coffee

@@ -1,74 +1,77 @@
-class @PersistenceManager
-  post_object:
-    page_controller: App.controller
-    page_action:     App.action
-    page_path:       document.location.pathname
-    page_locale:     App.locale
-
-  constructor: (@action_btns, @alert) ->
-
-  # all pm methods should have key and content parameters
-  save: (content) ->
-    key = content.attr("data-cms") # data wont work here because of cloning dom
-
-    if content.is('input')
-      value = content.val()
-    else
-      value = @sanitize(content)
-
-    @post_object.content = {}
-    @post_object.content[key] = value
-
-    if content.is("a")
-      @post_object.content["#{key}_href"] = content.attr("href")
-
-    @post_to_backend(App.save_path, @post_object)
-
-  save_template: (templates) ->
-    @post_object.content = templates
-    @post_to_backend(App.save_template_path, @post_object)
-
-  add_template: (content) ->
-    @post_object.content = content
-    @post_to_backend(App.add_template_path, @post_object)
-
-  remove_template: (content) ->
-    @post_object.content = content
-    @post_to_backend(App.remove_template_path, @post_object)
-
-  save_image: (content) ->
-    key = content.attr("data-cms")
-    @post_object.content = {}
-    @post_object.content[key] = content.attr("src")
-    @post_object.width        = content.attr("width")
-    @post_object.height       = content.attr("height")
-    @post_to_backend(App.save_image_path, @post_object)
-
-  save_attachment: (content) ->
-    key = content.attr("data-cms")
-    @post_object.content = {}
-    @post_object.content[key] = content.attr("href").split('/').reverse()[0]
-    @post_object.content["#{key}_href"] = content.attr("href")
-    @post_to_backend(App.save_attachment_path, @post_object)
-
-  sanitize: (content) ->
-    # it is important to sanitize htmlValue or else we will get more and more broken html from database
-    # we need to remove any new lines like \r and \n
-    content = content.html().replace(/^[\s]+$/g, "").trim()
-    content = content.replace(value, "").trim() for key, value of @action_btns
-    content
-
-  remove: (content) ->
-    key = content.attr("data-cms")
-    path = App.remove_path.replace(':key', key)
-    @post_to_backend(path, @post_object)
-
-  remove_image: (src) ->
-    @post_object.src_to_remove = src
-    @post_to_backend(App.remove_attachment_path, @post_object)
-
-  post_to_backend: (path, post_object) =>
-    $.post path, post_object, =>
-      @alert.addClass("animate")
-      @alert.on "transitionend", =>
-        @alert.removeClass("animate")
+class @PersistenceManager
+  post_object:
+    page_controller: App.controller
+    page_action:     App.action
+    page_path:       document.location.pathname
+    page_locale:     App.locale
+
+  constructor: (@action_btns, @alert) ->
+
+  save: (content) ->
+    key = content.attr("data-cms") # data wont work here because of cloning dom
+
+    if content.is('input')
+      value = content.val()
+    else
+      value = @sanitize(content)
+
+    @post_object.content = {}
+    @post_object.content[key] = value
+
+    if content.is("a")
+      @post_object.content["#{key}_href"] = content.attr("href")
+
+    @post_to_backend(App.save_path, @post_object)
+
+  save_template: (templates) ->
+    @post_object.content = templates
+    @post_to_backend(App.save_template_path, @post_object)
+
+  add_template: (content) ->
+    @post_object.content = content
+    @post_to_backend(App.add_template_path, @post_object)
+
+  remove_template: (content) ->
+    @post_object.content = content
+    @post_to_backend(App.remove_template_path, @post_object)
+
+  save_image: (content) ->
+    key = content.attr("data-cms")
+    @post_object.content = {}
+    @post_object.content[key] = content.attr("src")
+    @post_object.width        = content.attr("width")
+    @post_object.height       = content.attr("height")
+    @post_to_backend(App.save_image_path, @post_object)
+
+  save_attachment: (content) ->
+    key = content.attr("data-cms")
+    @post_object.content = {}
+    @post_object.content[key] = content.attr("href").split('/').reverse()[0]
+    @post_object.content["#{key}_href"] = content.attr("href")
+    @post_to_backend(App.save_attachment_path, @post_object)
+
+  sanitize: (content) ->
+    # it is important to sanitize htmlValue or else we will get more and more broken html from database
+    # we need to remove any new lines like \r and \n
+    content = content.html().replace(/^[\s]+$/g, "").trim()
+
+    for key, value of @action_btns
+      regex = new RegExp(value, "g");
+      content = content.replace(regex, "").trim()
+
+    content
+
+  remove: (content) ->
+    key = content.attr("data-cms")
+    path = App.remove_path.replace(':key', key)
+    @post_to_backend(path, @post_object)
+
+  remove_image: (src) ->
+    @post_object.src_to_remove = src
+    @post_to_backend(App.remove_attachment_path, @post_object)
+
+  post_to_backend: (path, post_object) =>
+    $.post path, post_object, =>
+      @alert.addClass("animate")
+      @alert.on "transitionend", =>
+        @alert.removeClass("animate")

data/app/assets/javascripts/rubber_ring/template_editor.coffee

@@ -1,76 +1,76 @@
-class @TemplateEditor
-
-  constructor: (@pm, @util) ->
-
-  init: ->
-    # save templates to database immediately
-    not_saved_yet = $('[data-cms-template]').filter (index, element) ->
-      $(element).data('from-db') == false
-
-    if not_saved_yet.length > 0
-      @save_all_templates()
-
-    $('.rr-control .add-remove').click (e) =>
-      $select = $(e.currentTarget).parents('.rr-control').find('select')
-      action = $(e.target).data('action')
-
-      template = $select.val()
-      key = $select.data('cms-template')
-      add_index = $("[data-cms=#{key}]").find("[data-template=#{template}]:first").data('template-index')
-      remove_index = $("[data-cms=#{key}]").find("[data-template=#{template}]:last").data('template-index')
-
-      content = {
-        key: key
-        template: template
-        index: add_index
-      }
-
-      if action is 'add'
-        @pm.add_template(content).then ->
-          window.location.reload(true)
-      else
-        if add_index isnt remove_index
-          content.index = remove_index
-
-          @pm.remove_template(content).then ->
-            window.location.reload(true)
-
-  save_all_templates: ->
-      $templates = $('[data-template]')
-      templates_to_save = @get_templates_array($templates)
-      @pm.save_template(templates_to_save)
-
-  get_templates_array: ($templates) ->
-    list = []
-    $templates.each (index, element) ->
-      list.push({
-        key:      $(element).parents('[data-cms]').first().data('cms')
-        index:    $(element).data('template-index')
-        template: $(element).data('template')
-        tclass:   $(element).attr('class')
-        element:  $(element).prop('tagName').toLowerCase()
-        sort:     index
-      })
-
-    list
-
-  init_sortable: ->
-    # init sortable and disable it by default
-    $('.templates').sortable()
-    $('.templates').sortable('disable')
-
-    $('.rr-control [data-action=sort]').click (e) =>
-      $btn = $(e.currentTarget)
-
-      if $('.templates').hasClass('ui-sortable-disabled')
-        $('.templates').sortable('enable')
-        $btn.text('Disable sort')
-        $('.templates').children().css('cursor', 'move')
-      else
-        $('.templates').sortable('disable')
-        $btn.text('Enable sort')
-        $('.templates').children().css('cursor', 'auto')
-
-    # re initialize order and save
-    $('.templates').on 'sortupdate', (event, ui) =>
-      @save_all_templates()
+class @TemplateEditor
+
+  constructor: (@pm, @util) ->
+
+  init: ->
+    # save templates to database immediately
+    not_saved_yet = $('[data-cms-template]').filter (index, element) ->
+      $(element).data('from-db') == false
+
+    if not_saved_yet.length > 0
+      @save_all_templates()
+
+    $('.rr-control .add-remove').click (e) =>
+      $select = $(e.currentTarget).parents('.rr-control').find('select')
+      action = $(e.target).data('action')
+
+      template = $select.val()
+      key = $select.data('cms-template')
+      add_index = $("[data-cms=#{key}]").find("[data-template=#{template}]:first").data('template-index')
+      remove_index = $("[data-cms=#{key}]").find("[data-template=#{template}]:last").data('template-index')
+
+      content = {
+        key: key
+        template: template
+      }
+
+      if action is 'add'
+        content.index = add_index
+        @pm.add_template(content).then (data) ->
+          $(data.new_template).appendTo("[data-cms=#{key}]");
+          App.init()
+      else
+        if add_index isnt remove_index
+          content.index = remove_index
+          @pm.remove_template(content).then ->
+            $("[data-template-index=#{remove_index}]").remove()
+
+  save_all_templates: ->
+      $templates = $('[data-template]')
+      templates_to_save = @get_templates_array($templates)
+      @pm.save_template(templates_to_save)
+
+  get_templates_array: ($templates) ->
+    list = []
+    $templates.each (index, element) ->
+      list.push({
+        key:      $(element).parents('[data-cms]').first().data('cms')
+        index:    $(element).data('template-index')
+        template: $(element).data('template')
+        tclass:   $(element).attr('class')
+        element:  $(element).prop('tagName').toLowerCase()
+        sort:     index
+      })
+
+    list
+
+  init_sortable: ->
+    # init sortable and disable it by default
+    $('.templates').sortable()
+    $('.templates').sortable('disable')
+
+    $('.rr-control [data-action=sort]').click (e) =>
+      $btn = $(e.currentTarget)
+
+      if $('.templates').hasClass('ui-sortable-disabled')
+        $('.templates').sortable('enable')
+        $btn.text('Disable sort')
+        $('.templates').children().css('cursor', 'move')
+      else
+        $('.templates').sortable('disable')
+        $btn.text('Enable sort')
+        $('.templates').children().css('cursor', 'auto')
+
+    # re initialize order and save
+    $('.templates').on 'sortupdate', (event, ui) =>
+      @save_all_templates()