rubber_ring 0.1.0 → 0.1.1

data/app/controllers/rubber_ring/rubber_ring_controller.rb

@@ -1,67 +1,67 @@
-module RubberRing
-  class RubberRingController < ActionController::Base
-    layout 'rubber_ring/layout'
-
-    before_action :load_page_content, :set_locale
-    before_filter :admin?, :cache?, :publish? # check if admin before cache
-
-    def load_page_content
-      page = Page.where(
-        controller: params[:controller],
-        action:     params[:action],
-        locale:     params[:locale] || I18n.default_locale.to_s
-      )
-
-      @page = page.empty? ? Page.new : page.first
-      @page.edit_mode = true
-      @images, @attachments = Util.load_attachments_page(params)
-    end
-
-    def set_locale
-      I18n.locale = params[:locale] || I18n.default_locale
-      @locale = I18n.locale.to_s
-    end
-
-    def expire_and_respond(page)
-      expire_page(params[:page_path])
-      render :json => {controller: page.controller, action: page.action, content: page.content}
-    end
-
-    private
-
-      def admin?
-        if session[:password] == RubberRing.admin_password
-          @admin = true
-          @page.edit_mode = true
-        else
-          @admin = false
-          @page.edit_mode = false
-        end
-      end
-
-      def cache?
-        if params[:cache] == '1' and params[:publish].nil?
-          disable_edit_mode
-          Thread::new{
-            Build.assets!
-          }
-        end
-      end
-
-      def publish?
-        if params[:publish] == '1' and params[:cache] == '1'
-          disable_edit_mode
-          Thread::new{
-            Build.assets!
-            Publish.assets!
-          }
-        end
-      end
-
-      def disable_edit_mode
-        @page_caching = true
-        @page.edit_mode = false
-      end
-
-  end
-end
+module RubberRing
+  class RubberRingController < ActionController::Base
+    layout 'rubber_ring/layout'
+
+    before_action :load_page_content, :set_locale
+    before_filter :admin?, :cache?, :publish? # check if admin before cache
+
+    def load_page_content
+      page = Page.where(
+        controller: params[:controller],
+        action:     params[:action],
+        locale:     params[:locale] || I18n.default_locale.to_s
+      )
+
+      @page = page.empty? ? Page.new : page.first
+      @page.edit_mode = true
+      @images, @attachments = Util.load_attachments_page(params)
+    end
+
+    def set_locale
+      I18n.locale = params[:locale] || I18n.default_locale
+      @locale = I18n.locale.to_s
+    end
+
+    def expire_and_respond(page)
+      expire_page(params[:page_path])
+      render :json => {controller: page.controller, action: page.action, content: page.content}
+    end
+
+    private
+
+      def admin?
+        if session[:password] == RubberRing.admin_password
+          @admin = true
+          @page.edit_mode = true
+        else
+          @admin = false
+          @page.edit_mode = false
+        end
+      end
+
+      def cache?
+        if params[:cache] == '1' and params[:publish].nil?
+          disable_edit_mode
+          Thread::new{
+            Build.assets!
+          }
+        end
+      end
+
+      def publish?
+        if params[:publish] == '1' and params[:cache] == '1'
+          disable_edit_mode
+          Thread::new{
+            Build.assets!
+            Publish.assets!
+          }
+        end
+      end
+
+      def disable_edit_mode
+        @page_caching = true
+        @page.edit_mode = false
+      end
+
+  end
+end

data/app/helpers/rubber_ring/cms_helper.rb

@@ -1,127 +1,127 @@
-module RubberRing
-  module CmsHelper
-
-    def editable_field(tag, options = {}, page, &block)
-      key = options[:key]
-      content_value = nil
-      content_value = page.content[key] unless page.content.nil?
-
-      content_tag_options = {
-        :class            => options[:class],
-        :id               => options[:id]
-      }
-
-      if page and page.edit_mode?
-        content_tag_options['data-cms']        = key
-        content_tag_options['contenteditable'] = 'true'
-      end
-
-      # if no content passed from @content (view - controller - model)
-      # this means it is not yet in database and we will create tag with
-      # content which is defined in a block of this editable_field helper
-      content_value = capture(&block) if content_value.nil?
-
-      content_tag(tag, raw(content_value), content_tag_options)
-    end
-
-    def title(page, &block)
-      editable_field(:span, {key: 'page_title'}, page, &block)
-    end
-
-    def editable_link(options = {}, page, &block)
-      content_tag_options, content_value = compose_link(block, options, page)
-      content_tag_options['contenteditable'] = 'true' if page and page.edit_mode?
-      content_tag(:a, raw(content_value), content_tag_options)
-    end
-
-    def compose_link(block, options, page)
-      key = options[:key]
-      content_value = nil
-      content_value = page.content[key] unless page.content.nil?
-      href_attribute = nil
-      href_attribute = page.content["#{key}_href"] unless page.content.nil?
-
-      content_tag_options = {
-        :class     => options[:class],
-        :id        => options[:id],
-        :href      => href_attribute || options[:href]
-      }
-      content_tag_options['data-cms'] = key if page and page.edit_mode?
-
-      content_value = capture(&block) if content_value.nil?
-      return content_tag_options, content_value
-    end
-
-    def editable_image(options = {}, page)
-      key = options[:key]
-      image_source = nil
-      image_source = page.content[key] unless page.content.nil?
-
-      content_tag_options = {
-        :class     => "rubber_ring_image #{options[:class]}",
-        :src       => image_source || options[:src]
-      }
-      content_tag_options['data-cms'] = key if page and page.edit_mode?
-
-      unless options[:width].nil?
-        content_tag_options.merge!({width: options[:width]})
-      end
-
-      unless options[:height].nil?
-        content_tag_options.merge!({height: options[:height]})
-      end
-
-      tag(:img, content_tag_options)
-    end
-
-    def template(templates, options = {}, page)
-      key = options[:key]
-      page_templates = page.page_templates.where(key: key)
-
-      # if nothing is saved yet, use templates from helper defined in erb
-      # convert array of hashes to open struct which will provide template and index methods like AR
-      if page_templates.empty?
-        page_templates = templates.inject([]) { |pt, t| pt << OpenStruct.new(t) }
-        grouped_templates = page_templates
-        from_db = false
-      else
-        grouped_templates = page_templates.group(:template)
-        from_db = true
-      end
-
-      concat(render 'rubber_ring/template_control', key: key, template_types: grouped_templates, from_db: from_db)
-
-      content_tag_options = { class: "#{options[:wrap_class]}" }
-      content_tag_options['data-cms'] = key if page and page.edit_mode?
-      built_templates = build_templates(page_templates, page, key)
-
-      concat(content_tag(options[:wrap_element], raw(built_templates), content_tag_options))
-    end
-
-    def build_key_prefix(page_content, key)
-      "#{page_content.id}_#{key}_#{page_content.template}"
-    end
-
-    private
-
-      def build_templates(page_templates, page, key)
-        templates_concatenated = ''
-
-        page_templates.each_with_index do |t, index|
-          t.id = t.id.nil? ? index : t.id
-          rendered_template = render "templates/#{t.template}", key_prefix: build_key_prefix(t, key)
-          content_tag_options = {'class' => t.tclass}
-
-          if page and page.edit_mode?
-            content_tag_options['data-template'] = t.template
-            content_tag_options['data-template-index'] = t.id
-          end
-
-          templates_concatenated += content_tag(t.element, rendered_template, content_tag_options)
-        end
-
-        templates_concatenated
-      end
-
-  end
-end
+module RubberRing
+  module CmsHelper
+
+    def editable_field(tag, options = {}, page, &block)
+      key = options[:key]
+      content_value = nil
+      content_value = page.content[key] unless page.content.nil?
+
+      content_tag_options = {
+        :class            => options[:class],
+        :id               => options[:id]
+      }
+
+      if page and page.edit_mode?
+        content_tag_options['data-cms']        = key
+        content_tag_options['contenteditable'] = 'true'
+      end
+
+      # if no content passed from @content (view - controller - model)
+      # this means it is not yet in database and we will create tag with
+      # content which is defined in a block of this editable_field helper
+      content_value = capture(&block) if content_value.nil?
+
+      content_tag(tag, raw(content_value), content_tag_options)
+    end
+
+    def title(page, &block)
+      editable_field(:span, {key: 'page_title'}, page, &block)
+    end
+
+    def editable_link(options = {}, page, &block)
+      content_tag_options, content_value = compose_link(block, options, page)
+      content_tag_options['contenteditable'] = 'true' if page and page.edit_mode?
+      content_tag(:a, raw(content_value), content_tag_options)
+    end
+
+    def compose_link(block, options, page)
+      key = options[:key]
+      content_value = nil
+      content_value = page.content[key] unless page.content.nil?
+      href_attribute = nil
+      href_attribute = page.content["#{key}_href"] unless page.content.nil?
+
+      content_tag_options = {
+        :class     => options[:class],
+        :id        => options[:id],
+        :href      => href_attribute || options[:href]
+      }
+      content_tag_options['data-cms'] = key if page and page.edit_mode?
+
+      content_value = capture(&block) if content_value.nil?
+      return content_tag_options, content_value
+    end
+
+    def editable_image(options = {}, page)
+      key = options[:key]
+      image_source = nil
+      image_source = page.content[key] unless page.content.nil?
+
+      content_tag_options = {
+        :class     => "rubber_ring_image #{options[:class]}",
+        :src       => image_source || options[:src]
+      }
+      content_tag_options['data-cms'] = key if page and page.edit_mode?
+
+      unless options[:width].nil?
+        content_tag_options.merge!({width: options[:width]})
+      end
+
+      unless options[:height].nil?
+        content_tag_options.merge!({height: options[:height]})
+      end
+
+      tag(:img, content_tag_options)
+    end
+
+    def template(templates, options = {}, page)
+      key = options[:key]
+      page_templates = page.page_templates.where(key: key)
+
+      # if nothing is saved yet, use templates from helper defined in erb
+      # convert array of hashes to open struct which will provide template and index methods like AR
+      if page_templates.empty?
+        page_templates = templates.inject([]) { |pt, t| pt << OpenStruct.new(t) }
+        grouped_templates = page_templates
+        from_db = false
+      else
+        grouped_templates = page_templates.group(:template)
+        from_db = true
+      end
+
+      concat(render 'rubber_ring/template_control', key: key, template_types: grouped_templates, from_db: from_db)
+
+      content_tag_options = { class: "#{options[:wrap_class]}" }
+      content_tag_options['data-cms'] = key if page and page.edit_mode?
+      built_templates = build_templates(page_templates, page, key)
+
+      concat(content_tag(options[:wrap_element], raw(built_templates), content_tag_options))
+    end
+
+    def build_key_prefix(page_content, key)
+      "#{page_content.id}_#{key}_#{page_content.template}"
+    end
+
+    private
+
+      def build_templates(page_templates, page, key)
+        templates_concatenated = ''
+
+        page_templates.each_with_index do |t, index|
+          t.id = t.id.nil? ? index : t.id
+          rendered_template = render "templates/#{t.template}", key_prefix: build_key_prefix(t, key)
+          content_tag_options = {'class' => t.tclass}
+
+          if page and page.edit_mode?
+            content_tag_options['data-template'] = t.template
+            content_tag_options['data-template-index'] = t.id
+          end
+
+          templates_concatenated += content_tag(t.element, rendered_template, content_tag_options)
+        end
+
+        templates_concatenated
+      end
+
+  end
+end

data/app/models/rubber_ring/page.rb

@@ -1,126 +1,126 @@
-module RubberRing
-  class Page < ActiveRecord::Base
-    attr_accessor :edit_mode, :title
-    has_many :page_contents
-    has_many :page_templates, -> { order(:sort) }
-
-    def self.save_or_update(options)
-      page, page_content = get_page_and_content(options, :content)
-
-      page_content.keys.each do |key|
-        pc = RubberRing::PageContent.where('page_id = ? AND key = ?', page.id, key)
-          .first_or_initialize()
-
-        pc.update_attributes(
-          key:   key,
-          value: page_content[key],
-          page:  page
-        )
-
-        pc.save
-      end
-
-      page
-    end
-
-    def self.save_or_update_templates(options)
-      page, templates = get_page_and_content(options, :content)
-
-      templates.keys.each do |key|
-        template = templates[key]
-        pt = RubberRing::PageTemplate.where('id = ?', template['index']).first_or_initialize()
-
-        if pt.id.nil?
-          pt.update_attributes(
-            key:      template['key'],
-            template: template['template'],
-            sort:     template['sort'],
-            tclass:   template['tclass'],
-            element:  template['element'],
-            page:     page
-          )
-        else
-          # when updating, only sort is allowed to change
-          pt.update_attributes(
-            sort: template['sort']
-          )
-        end
-
-        pt.save
-      end
-
-      page
-    end
-
-    def self.add_template(options)
-      page, content = get_page_and_content(options, :content)
-
-      last = RubberRing::PageTemplate.all.order(:sort).last
-      pt = RubberRing::PageTemplate.where('id = ?', content['index']).first_or_initialize()
-
-      new_pt      = pt.id.nil? ? last.dup : pt.dup
-      new_pt.sort = last.sort + 1
-      new_pt.save
-
-      return page, new_pt
-    end
-
-    def self.remove_template(options)
-      page, content = get_page_and_content(options, :content)
-      RubberRing::PageTemplate.where('id = ?', content['index']).delete_all
-      page
-    end
-
-    def self.remove(options, key_to_remove)
-      page = load_first_page(options)
-      RubberRing::PageContent
-        .where('page_id = ? AND key = ?', page.id, key_to_remove)
-        .delete_all
-      page
-    end
-
-    def group_keys(group_key)
-      return [] if content.nil?
-      (content.select { |key, _| key.match(group_key) }).keys
-    end
-
-    def edit_mode?
-      @edit_mode
-    end
-
-    # all page_contents as one hash
-    def content
-      result = {}
-      page_contents.each do |page_content|
-        result[page_content.key] = page_content.value
-      end
-      result
-    end
-
-    def title
-      self.content['page_title'] unless self.content.nil?
-    end
-
-  private
-
-    def self.load_first_page(options)
-      where(controller: options[:controller], action: options[:action], locale: options[:locale]).first
-    end
-
-    def self.get_page_and_content(options, content_key)
-      page = load_first_page(options)
-      content = options[content_key]
-
-      if page.nil?
-        page = create(
-          controller: options[:controller],
-          action:     options[:action],
-          locale:     options[:locale]
-        )
-      end
-
-      return page, content
-    end
-
-  end
-end
+module RubberRing
+  class Page < ActiveRecord::Base
+    attr_accessor :edit_mode, :title
+    has_many :page_contents
+    has_many :page_templates, -> { order(:sort) }
+
+    def self.save_or_update(options)
+      page, page_content = get_page_and_content(options, :content)
+
+      page_content.keys.each do |key|
+        pc = RubberRing::PageContent.where('page_id = ? AND key = ?', page.id, key)
+          .first_or_initialize()
+
+        pc.update_attributes(
+          key:   key,
+          value: page_content[key],
+          page:  page
+        )
+
+        pc.save
+      end
+
+      page
+    end
+
+    def self.save_or_update_templates(options)
+      page, templates = get_page_and_content(options, :content)
+
+      templates.keys.each do |key|
+        template = templates[key]
+        pt = RubberRing::PageTemplate.where('id = ?', template['index']).first_or_initialize()
+
+        if pt.id.nil?
+          pt.update_attributes(
+            key:      template['key'],
+            template: template['template'],
+            sort:     template['sort'],
+            tclass:   template['tclass'],
+            element:  template['element'],
+            page:     page
+          )
+        else
+          # when updating, only sort is allowed to change
+          pt.update_attributes(
+            sort: template['sort']
+          )
+        end
+
+        pt.save
+      end
+
+      page
+    end
+
+    def self.add_template(options)
+      page, content = get_page_and_content(options, :content)
+
+      last = RubberRing::PageTemplate.all.order(:sort).last
+      pt = RubberRing::PageTemplate.where('id = ?', content['index']).first_or_initialize()
+
+      new_pt      = pt.id.nil? ? last.dup : pt.dup
+      new_pt.sort = last.sort + 1
+      new_pt.save
+
+      return page, new_pt
+    end
+
+    def self.remove_template(options)
+      page, content = get_page_and_content(options, :content)
+      RubberRing::PageTemplate.where('id = ?', content['index']).delete_all
+      page
+    end
+
+    def self.remove(options, key_to_remove)
+      page = load_first_page(options)
+      RubberRing::PageContent
+        .where('page_id = ? AND key = ?', page.id, key_to_remove)
+        .delete_all
+      page
+    end
+
+    def group_keys(group_key)
+      return [] if content.nil?
+      (content.select { |key, _| key.match(group_key) }).keys
+    end
+
+    def edit_mode?
+      @edit_mode
+    end
+
+    # all page_contents as one hash
+    def content
+      result = {}
+      page_contents.each do |page_content|
+        result[page_content.key] = page_content.value
+      end
+      result
+    end
+
+    def title
+      self.content['page_title'] unless self.content.nil?
+    end
+
+  private
+
+    def self.load_first_page(options)
+      where(controller: options[:controller], action: options[:action], locale: options[:locale]).first
+    end
+
+    def self.get_page_and_content(options, content_key)
+      page = load_first_page(options)
+      content = options[content_key]
+
+      if page.nil?
+        page = create(
+          controller: options[:controller],
+          action:     options[:action],
+          locale:     options[:locale]
+        )
+      end
+
+      return page, content
+    end
+
+  end
+end

data/app/models/rubber_ring/page_content.rb

@@ -1,5 +1,5 @@
-module RubberRing
-  class PageContent < ActiveRecord::Base
-    belongs_to :page
-  end
-end
+module RubberRing
+  class PageContent < ActiveRecord::Base
+    belongs_to :page
+  end
+end

data/app/models/rubber_ring/page_template.rb

@@ -1,5 +1,5 @@
-module RubberRing
-  class PageTemplate < ActiveRecord::Base
-    belongs_to :page
-  end
-end
+module RubberRing
+  class PageTemplate < ActiveRecord::Base
+    belongs_to :page
+  end
+end