effective_regions 1.2.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25ed06406f8a04e1d792807284ee8880b6c09295
-  data.tar.gz: 876a622d86724293561eac4b5441c6f7060368d6
+  metadata.gz: 845fd91a15ea50bd655577f4b410826cf6226982
+  data.tar.gz: af6c8fbaf42cd8767d27527cff84285a131f4833
 SHA512:
-  metadata.gz: 09298494b0fe98f9cab7b744aa3ff1636faedcbd122384b29f5e809afefa0865263e2bfc5cec0e9a1c07c387bfe2c3fee3183a901c6dbbaea35e39a9d34859f8
-  data.tar.gz: 37f73e385ec916f25530d125bd0c40dee98012ee93db49d8324356f096fa1c332d4d01d79a371dc8600fd6910ea286e4951e3ab3345c8d3a2aba7c051f91835f
+  metadata.gz: b2031a17af484bd62bbd7c66e2457aa09a2f40d4fc0c252892901b623f227980f17f251c7c253f013956c46dcc5a51f9044a3828deb18c5e3e743f84fd837f66
+  data.tar.gz: 4b2b1f4c9f86d908c2c140be8ddb8f6cac8bbe87a7b2a60a5bfb315cd720268558b02bb07da737f9b7ed2b42ae498ce8ba6f2257ab016d990a906f1a095ae866

data/app/controllers/effective/regions_controller.rb

@@ -4,7 +4,7 @@ module Effective
     layout false
 
     before_filter :authenticate_user! if defined?(Devise)
-    skip_log_page_views :quiet => true, :only => [:snippet, :snippets, :templates] if defined?(EffectiveLogging)
+    skip_log_page_views :quiet => true, :only => [:snippet] if defined?(EffectiveLogging)
 
     skip_before_filter :verify_authenticity_token, :only => [:update]
 
@@ -67,25 +67,6 @@ module Effective
       render :text => 'error', :status => :unprocessable_entity
     end
 
-    def snippets
-      EffectiveRegions.authorized?(self, :edit, Effective::Region.new())
-
-      retval = {}
-      EffectiveRegions.snippets.each do |snippet|
-        retval[snippet.class_name] = {
-          :dialog_url => snippet.snippet_dialog_url,
-          :label => snippet.snippet_label,
-          :description => snippet.snippet_description,
-          :inline => snippet.snippet_inline,
-          :editables => snippet.snippet_editables,
-          :tag => snippet.snippet_tag.to_s
-          #:template => ActionView::Base.new(ActionController::Base.view_paths, {}, ActionController::Base.new).render(:partial => snippet.to_partial_path, :object => snippet, :locals => {:snippet => snippet})
-        }
-      end
-
-      render :json => retval
-    end
-
     def snippet # This is a GET.  CKEDITOR passes us data, we need to render the non-editable content
       klass = "Effective::Snippets::#{region_params[:name].try(:classify)}".safe_constantize
 
@@ -97,21 +78,6 @@ module Effective
       end
     end
 
-    def templates
-      EffectiveRegions.authorized?(self, :edit, Effective::Region.new())
-
-      retval = EffectiveRegions.templates.map do |template|
-        {
-          :title => template.title,
-          :description => template.description,
-          :image => template.image || "#{template.class_name}.png",
-          :html => render_to_string(:partial => template.to_partial_path, :object => template, :locals => {:template => template})
-        }
-      end
-
-      render :json => retval
-    end
-
     protected
 
     def find_regionable(key)

data/app/helpers/effective_regions_helper.rb

@@ -22,7 +22,8 @@ module EffectiveRegionsHelper
   # Loads the Ckeditor Javascript & Stylesheets only when in edit mode
   def effective_regions_include_tags
     if effectively_editting?
-      javascript_include_tag('effective_ckeditor') + stylesheet_link_tag('effective_ckeditor')
+      javascript_include_tag('effective_ckeditor') + stylesheet_link_tag('effective_ckeditor') +
+      render(:partial => 'effective_regions/include_tags_javascript')
     end
   end
 
@@ -69,10 +70,10 @@ module EffectiveRegionsHelper
 
     if effectively_editting? && (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).strip.html_safe) if block_given?)
+        region.try(:content).present? ? render_region(region, true) : (yield if block_given?; nil)
       end
     else
-      region.try(:content).present? ? render_region(region, false) : ((capture(&block).strip.html_safe) if block_given?)
+      region.try(:content).present? ? render_region(region, false) : (yield if block_given?; nil)
     end
   end
 

data/app/models/effective/snippets/snippet.rb

@@ -12,9 +12,24 @@ module Effective
 
       # Each Snippet has to be a block (or inline) element with nested children.
       # It has to start with a root object
-
       # That root object has to do {snippet_data(snippet)}
 
+      # This is used by the effective_regions_helper effective_regions_include_tags
+      # And ends up in the javascript CKEDITOR.config['effective_regions'] top level namespace
+      def self.all(controller = nil)
+        {}.tap do |all_snippets|
+          EffectiveRegions.snippets.each do |snippet|
+            all_snippets[snippet.class_name] = {
+              :dialog_url => snippet.snippet_dialog_url,
+              :label => snippet.snippet_label,
+              :description => snippet.snippet_description,
+              :inline => snippet.snippet_inline,
+              :editables => snippet.snippet_editables,
+              :tag => snippet.snippet_tag.to_s
+            }
+          end
+        end
+      end
 
       def initialize(atts = {})
         (atts || {}).each { |k, v| self.send("#{k}=", v) if respond_to?("#{k}=") }

data/app/models/effective/templates/template.rb

@@ -1,6 +1,21 @@
 module Effective
   module Templates
     class Template
+
+      # This is used by the effective_regions_helper effective_regions_include_tags
+      # And ends up in the javascript CKEDITOR.config['effective_regions'] top level namespace
+      # Passing the controller is hacky but it works
+      def self.all(controller)
+        EffectiveRegions.templates.map do |template|
+          {
+            :title => template.title,
+            :description => template.description,
+            :image => template.image || "#{template.class_name}.png",
+            :html => controller.render_to_string(:partial => template.to_partial_path, :object => template, :locals => {:template => template})
+          }
+        end
+      end
+
       def title
         class_name.to_s.humanize
       end

data/app/views/effective_regions/_include_tags_javascript.html.haml

@@ -0,0 +1,4 @@
+- payload = {:snippets => Effective::Snippets::Snippet.all(controller), :templates => Effective::Templates::Template.all(controller)}
+
+:javascript
+  CKEDITOR.config['effective_regions'] = #{payload.to_json()};

data/config/routes.rb

@@ -5,10 +5,7 @@ end
 EffectiveRegions::Engine.routes.draw do
   scope :module => 'effective' do
     scope '/effective' do
-      get 'snippets' => 'regions#snippets', :as => :snippets # Index of all Snippets
       get 'snippet/:id' => 'regions#snippet', :as => :snippet # Get a Snippet based on passed values
-
-      get 'templates' => 'regions#templates', :as => :templates # Index of all Templates
     end
 
     scope '/edit' do  # Changing this, means changing the effective_ckeditor routes

data/lib/effective_regions/version.rb

@@ -1,3 +1,3 @@
 module EffectiveRegions
-  VERSION = '1.2.3'.freeze
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_regions
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -90,6 +90,7 @@ files:
 - app/models/effective/templates/template.rb
 - app/views/effective/snippets/_current_user_info.html.haml
 - app/views/effective/templates/_image_and_title.html.haml
+- app/views/effective_regions/_include_tags_javascript.html.haml
 - config/routes.rb
 - db/migrate/01_create_effective_regions.rb.erb
 - lib/effective_regions.rb