effective_regions 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c68f8b9320e92711bff9e48cff2c10ea1cca058e
-  data.tar.gz: ad1412d4611d786ff37aff95ab1a28f1fcdc4ddf
+  metadata.gz: 1432af453a66d2d1f2672f47789d64692c48c579
+  data.tar.gz: be31e35b026add332ee28309dae121efbc919bc0
 SHA512:
-  metadata.gz: e341d276e8691a305c1af17114f5aa103c70abcbe7b44e269275b569674b3c2b34a08e70aad86cb7fd2e9e2788cffe0113d68271f8b375ddc6d0f86dfcb44c0b
-  data.tar.gz: 31da5d284bb39032425b1cf7c9cf41e1b652694dad89105cea4476370fef10210bf584d44dab02486b43cd4c9eb87f8024d329a9805ea07a502d17ef44c0baf0
+  metadata.gz: 52189ffaae99cde2b1e9d56bead2bec8f9117f92782405255535a97dc2290adf4ed62bc664f28fd4fb763e897a3332f23b5f8ae74ecae2025ef3ef07f6c5e95a
+  data.tar.gz: 0b02fc28bdaa6f45f9982470466427e6d13dbda1bc5ef8642a8d0744d34b342cd30ed72e5b031b52e1b54144b78d7b865d8afdb3f78465c86799d373eb920325

data/README.md

@@ -82,14 +82,14 @@ It's super easy to add an effective_region into any regular view, anywhere you w
 
 The following is an example of a global region:
 
-```ruby
+```haml
 %h2 This is a header
 %p= effective_region :footer_left
 ```
 
 and another example of the same region with some default content:
 
-```ruby
+```haml
 %h2 This is a header
 %p
   = effective_region :footer_left do
@@ -101,7 +101,7 @@ Anywhere in your application, in any layout or view, refering to `:footer_left`
 
 Effective Regions can also belong to a specific object:
 
-```ruby
+```haml
 %h2= effective_region(@event, :title)
 
 %p
@@ -214,6 +214,24 @@ or to disable completely:
 config.before_save_method = false
 ```
 
+## Helpers
+
+### effectively_editing?
+
+Call `effectively_editing?` in any controller or view to determine if the current action is in edit mode.
+
+This checks both that `request.fullpath.include?('edit=true')` and that the current_user has permission to use the editor.
+
+### The Exit button
+
+When a user clicks on the 'Exit' button from the full-screen editor toolbar, they are redirected to the last visited page.
+
+You can overide the default behaviour by passing an Exit URL as a parameter:
+
+```haml
+= link_to 'Edit Post Content', effective_regions.edit_path(post_path(@post), :exit => edit_admin_post_path(@post))
+```
+
 
 ## Authorization
 

data/app/helpers/effective_regions_helper.rb

@@ -21,7 +21,7 @@ module EffectiveRegionsHelper
 
   # Loads the Ckeditor Javascript & Stylesheets only when in edit mode
   def effective_regions_include_tags
-    if effectively_editting?
+    if effectively_editing?
       payload = {
         :snippets => Effective::Snippets::Snippet.all(controller),
         :templates => Effective::Templates::Template.all(controller)
@@ -37,12 +37,13 @@ module EffectiveRegionsHelper
     end
   end
 
-  def effectively_editting?
-    @effectively_editting ||= (
+  def effectively_editing?
+    @effectively_editing ||= (
       request.fullpath.include?('edit=true') &&
       (EffectiveRegions.authorized?(controller, :edit, Effective::Region.new()) rescue false)
     )
   end
+  alias_method :effectively_editting?, :effectively_editing?
 
   private
 
@@ -52,7 +53,7 @@ module EffectiveRegionsHelper
     editable_tag = options.delete(:editable_tag) || :div
 
     # Set up the editable div options we need to send to ckeditor
-    if effectively_editting?
+    if effectively_editing?
       opts = {
         :contenteditable => true,
         'data-effective-ckeditor' => (options.delete(:type) || :full).to_s,
@@ -67,7 +68,7 @@ module EffectiveRegionsHelper
 
       region = obj.regions.find { |region| region.title == title }
 
-      if effectively_editting?
+      if effectively_editing?
         can_edit = (EffectiveRegions.authorized?(controller, :update, obj) rescue false)
         opts[:id] = [model_name_from_record_or_class(obj).param_key(), obj.id, title].join('_')
       end
@@ -75,13 +76,13 @@ module EffectiveRegionsHelper
       regions = (@effective_regions_global ||= Effective::Region.global.to_a)
       region = regions.find { |region| region.title == title } || Effective::Region.new(:title => title)
 
-      if effectively_editting?
+      if effectively_editing?
         can_edit = (EffectiveRegions.authorized?(controller, :update, region) rescue false)
         opts[:id] = title.to_s.parameterize
       end
     end
 
-    if effectively_editting? && (can_edit && options[:editable] != false) # If we need the editable div
+    if effectively_editing? && (can_edit && options[:editable] != false) # If we need the editable div
       content_tag(editable_tag, opts) do
         region.try(:content).present? ? render_region(region, true) : (capture(&block) if block_given?)
       end
@@ -110,7 +111,7 @@ module EffectiveRegionsHelper
       content = render(:partial => snippet.to_partial_path, :object => snippet, :locals => {:snippet => snippet})
     end
 
-    if effectively_editting? && can_edit
+    if effectively_editing? && can_edit
       content_tag(snippet.snippet_tag, content, :data => {'effective-snippet' => snippet.class_name, 'snippet-data' => snippet.data().to_json})
     else
       content

data/lib/effective_regions/version.rb

@@ -1,3 +1,3 @@
 module EffectiveRegions
-  VERSION = '1.4.7'.freeze
+  VERSION = '1.4.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_regions
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails