pages_core 3.4.3 → 3.5.1

data/app/helpers/pages_core/admin/tag_editor_helper.rb

@@ -18,17 +18,19 @@ module PagesCore
 
       private
 
+      def tag_check_box(tag, tagged)
+        content_tag(:span, class: :tag) do
+          check_box_tag(
+            "tag-#{tag.id}",
+            1,
+            tagged.include?(tag)
+          ) + content_tag(:span, tag.name, class: :name)
+        end
+      end
+
       def tag_check_boxes(tags, tagged)
         content_tag(:div, class: :tags) do
-          tags.map do |tag|
-            content_tag(:span, class: :tag) do
-              check_box_tag(
-                "tag-#{tag.id}",
-                1,
-                tagged.include?(tag)
-              ) + content_tag(:span, tag.name, class: :name)
-            end
-          end.join.html_safe
+          safe_join(tags.map { |t| tag_check_box(t, tagged) }, "")
         end
       end
 

data/app/helpers/pages_core/application_helper.rb

@@ -6,37 +6,16 @@ module PagesCore
   module ApplicationHelper
     include PagesCore::HeadTagsHelper
     include PagesCore::ImagesHelper
+    include PagesCore::MetaTagsHelper
+    include PagesCore::OpenGraphTagsHelper
+    include PagesCore::PagePathHelper
 
     def page_link(page, options = {})
       link_locale = options[:locale] || locale
       page.localize(link_locale) do |p|
         title = options[:title] || p.name.to_s
         return title unless conditional_options?(options)
-        url = if p.redirects?
-                p.redirect_path(locale: link_locale)
-              else
-                page_path(link_locale, p)
-              end
-        link_to(title, url, class: options[:class])
-      end
-    end
-
-    def page_url(page_or_locale, page = nil, options = {})
-      if page
-        locale = page_or_locale
-      else
-        ActiveSupport::Deprecation.warn(
-          "Calling page_url without locale is deprecated"
-        )
-        locale = options[:locale] || @locale
-        page = page_or_locale
-      end
-      page.localize(locale) do |p|
-        if p.redirects?
-          p.redirect_path(locale: locale)
-        else
-          super locale, p, options
-        end
+        link_to(title, page_link_path(link_locale, p), class: options[:class])
       end
     end
 
@@ -47,7 +26,7 @@ module PagesCore
         output = capture(page.localize(locale), &block)
         concat(output)
       end
-      (page) ? page.localize(locale) : nil
+      page ? page.localize(locale) : nil
     end
 
     private
@@ -61,5 +40,13 @@ module PagesCore
         true
       end
     end
+
+    def page_link_path(locale, page)
+      if page.redirects?
+        page.redirect_path(locale: locale)
+      else
+        page_path(locale, page)
+      end
+    end
   end
 end

data/app/helpers/pages_core/form_builder.rb

@@ -4,184 +4,121 @@ module PagesCore
   class FormBuilder < ActionView::Helpers::FormBuilder
     include ActionView::Helpers::TagHelper
 
-    # Are there any errors on this attribute?
-    def errors_on?(attribute)
-      errors_on(attribute).length > 0
-    end
-
-    # Returns all errors for the attribute
-    def errors_on(attribute)
-      errors = object.errors[attribute] || []
-      errors = [errors] unless errors.is_a?(Array)
-      errors
+    def field_with_label(attr, str, label = nil)
+      classes = ["field"]
+      classes << "field-with-errors" if object.errors[attr].any?
+      content_tag(:div, label_for(attr, label) + str, class: classes.join(" "))
     end
 
-    # Returns the first error on attribute
-    def first_error_on(attribute)
-      errors_on(attribute).first
+    def image_file_preview(attribute)
+      return "" unless object.send(attribute)
+      content_tag(
+        :p, @template.dynamic_image_tag(object.send(attribute), size: "120x100")
+      )
     end
 
     def image_file_field(attribute, options = {})
-      if object.send(attribute)
-        content_tag(
-          "p",
-          @template.dynamic_image_tag(object.send(attribute), size: "120x100")
-        ) + file_field(attribute, options)
-      else
-        file_field(attribute, options)
-      end
+      safe_join [image_file_preview(attribute), file_field(attribute, options)]
     end
 
-    def field_with_label(attribute, content, label_text = nil)
-      classes = ["field"]
-      classes << "field_with_errors" if errors_on?(attribute)
-      content_tag(
-        "div",
-        label_for(attribute, label_text) + content,
-        class: classes.join(" ")
-      )
+    def label_and_errors(attribute, label_text)
+      return label_text unless object.errors[attribute].any?
+      safe_join(
+        [label_text,
+         content_tag(:span, object.errors[attribute].first, class: "error")],
+        " ")
     end
 
     def label_for(attribute, label_text = nil)
       label_text ||= object.class.human_attribute_name(attribute)
-      if errors_on?(attribute)
-        label_text += " <span class=\"error\">" +
-          first_error_on(attribute) +
-          "</span>"
-      end
-      content_tag(
-        "label",
-        label_text.html_safe,
-        for: [object.class.to_s.underscore, attribute].join("_")
-      )
-    end
-
-    def labelled_text_field(attribute, label_text = nil, options = {})
-      label_text, options = parse_label_text_and_options(label_text, options)
-      field_with_label(
-        attribute,
-        text_field(attribute, options),
-        label_text
-      )
+      content_tag("label", label_and_errors(attribute, label_text),
+                  for: [object.class.to_s.underscore, attribute].join("_"))
     end
 
-    def labelled_text_area(attribute, label_text = nil, options = {})
-      label_text, options = parse_label_text_and_options(label_text, options)
-      field_with_label(
-        attribute,
-        text_area(attribute, options),
-        label_text
-      )
+    def labelled_check_box(
+      attribute, label_text = nil, options = {},
+      checked_value = "1", unchecked_value = "0"
+    )
+      labelled_field(attribute, label_text, options) do |opts|
+        check_box(attribute, opts, checked_value, unchecked_value)
+      end
     end
 
     def labelled_country_select(
-      attribute,
-      label_text = nil,
-      priority_or_options = {},
-      options = {},
-      html_options = {}
+      attr, label = nil, priority = {}, opts = {}, html_opts = {}
     )
-      if priority_or_options.is_a?(Hash)
-        label_text, priority_or_options = parse_label_text_and_options(
-          label_text,
-          priority_or_options
-        )
-      else
-        label_text, options = parse_label_text_and_options(
-          label_text,
-          options
-        )
+      if priority.is_a?(Hash)
+        return labelled_field(attr, label, priority) do |options|
+          country_select(attr, options, opts, html_opts)
+        end
+      end
+      labelled_field(attr, label, opts) do |options|
+        country_select(attr, priority, options, html_opts)
       end
-      field_with_label(
-        attribute,
-        country_select(attribute, priority_or_options, options, html_options),
-        label_text
-      )
     end
 
     def labelled_date_select(attribute, label_text = nil, options = {})
-      label_text, options = parse_label_text_and_options(label_text, options)
-      field_with_label(
-        attribute,
-        date_select(attribute, options),
-        label_text
-      )
+      labelled_field(attribute, label_text, options) do |opts|
+        date_select(attribute, opts)
+      end
     end
 
     def labelled_datetime_select(attribute, label_text = nil, options = {})
-      label_text, options = parse_label_text_and_options(label_text, options)
-      field_with_label(
-        attribute,
-        datetime_select(attribute, options),
-        label_text
-      )
+      labelled_field(attribute, label_text, options) do |opts|
+        datetime_select(attribute, opts)
+      end
     end
 
-    def labelled_time_select(attribute, label_text = nil, options = {})
-      label_text, options = parse_label_text_and_options(label_text, options)
-      field_with_label(
-        attribute,
-        time_select(attribute, options),
-        label_text
-      )
+    def labelled_file_field(attribute, label_text = nil, options = {})
+      labelled_field(attribute, label_text, options) do |opts|
+        file_field(attribute, opts)
+      end
     end
 
-    def labelled_select(attribute, choices, label_text = nil, options = {})
-      label_text, options = parse_label_text_and_options(label_text, options)
-      field_with_label(
-        attribute,
-        select(attribute, choices, options),
-        label_text
-      )
+    def labelled_image_file_field(attribute, label_text = nil, options = {})
+      labelled_field(attribute, label_text, options) do |opts|
+        image_file_field(attribute, opts)
+      end
     end
 
-    def labelled_check_box(
-      attribute, label_text = nil, options = {},
-      checked_value = "1", unchecked_value = "0"
-    )
-      label_text, options = parse_label_text_and_options(label_text, options)
-      field_with_label(
-        attribute,
-        check_box(attribute, options, checked_value, unchecked_value),
-        label_text
-      )
+    def labelled_password_field(attribute, label_text = nil, options = {})
+      labelled_field(attribute, label_text, options) do |opts|
+        password_field(attribute, opts)
+      end
     end
 
-    def labelled_file_field(attribute, label_text = nil, options = {})
-      label_text, options = parse_label_text_and_options(label_text, options)
-      field_with_label(
-        attribute,
-        file_field(attribute, options),
-        label_text
-      )
+    def labelled_select(attribute, choices, label_text = nil, options = {})
+      labelled_field(attribute, label_text, options) do |opts|
+        select(attribute, choices, opts)
+      end
     end
 
-    def labelled_image_file_field(attribute, label_text = nil, options = {})
-      label_text, options = parse_label_text_and_options(label_text, options)
-      field_with_label(
-        attribute,
-        image_file_field(attribute, options),
-        label_text
-      )
+    def labelled_text_area(attribute, label_text = nil, options = {})
+      labelled_field(attribute, label_text, options) do |opts|
+        text_area(attribute, opts)
+      end
     end
 
-    def labelled_password_field(attribute, label_text = nil, options = {})
-      label_text, options = parse_label_text_and_options(label_text, options)
-      field_with_label(
-        attribute,
-        password_field(attribute, options),
-        label_text
-      )
+    def labelled_text_field(attribute, label_text = nil, options = {})
+      labelled_field(attribute, label_text, options) do |opts|
+        text_field(attribute, opts)
+      end
+    end
+
+    def labelled_time_select(attribute, label_text = nil, options = {})
+      labelled_field(attribute, label_text, options) do |opts|
+        time_select(attribute, opts)
+      end
     end
 
     protected
 
-    def parse_label_text_and_options(label_text = nil, options = {})
+    def labelled_field(attribute, label_text = nil, options = {})
       if label_text.is_a?(Hash) && options == {}
         options = label_text
         label_text = nil
       end
-      [label_text, options]
+      field_with_label(attribute, yield(options), label_text)
     end
   end
 end

data/app/helpers/pages_core/head_tags_helper.rb

@@ -2,25 +2,6 @@
 
 module PagesCore
   module HeadTagsHelper
-    # Sets a default image to use for meta tags. Supports
-    # both paths and Image objects.
-    #
-    #  default_meta_image image_path("facebook-share.png")
-    #  default_meta_image root_page.image
-    #
-    def default_meta_image(*args)
-      if args.any?
-        @default_meta_image = args.first
-      else
-        @default_meta_image
-      end
-    end
-
-    # Returns true if default meta image has been set.
-    def default_meta_image?
-      default_meta_image ? true : false
-    end
-
     # Sets a document title.
     #
     #  document_title "Dashboard"
@@ -35,7 +16,7 @@ module PagesCore
         )
       end
     end
-    alias_method :page_title, :document_title
+    alias page_title document_title
 
     # Returns true if document title has been set.
     def document_title?
@@ -52,18 +33,11 @@ module PagesCore
       feeds = Page.enabled_feeds(@locale, options)
       return unless feeds.any?
       feed_tags = [
-        rss_link_tag(
-          PagesCore.config(:site_name),
-          pages_url(@locale, format: :rss)
-        )
-      ]
-      if feeds.count < 1
-        feed_tags += feeds.map do |page|
-          rss_link_tag(
-            "#{PagesCore.config(:site_name)}: #{page.name}",
-            page_url(@locale, page, format: :rss)
-          )
-        end
+        rss_link_tag(PagesCore.config(:site_name),
+                     pages_url(@locale, format: :rss))
+      ] + feeds.map do |page|
+        rss_link_tag("#{PagesCore.config(:site_name)}: #{page.name}",
+                     page_url(@locale, page, format: :rss))
       end
       safe_join(feed_tags, "\n")
     end
@@ -74,17 +48,12 @@ module PagesCore
     #
     def google_analytics_tags(account_id)
       javascript_tag(
-        "var _gaq = _gaq || [];\n" \
-          "_gaq.push(['_setAccount', '#{account_id}']);\n" \
-          "_gaq.push(['_trackPageview']);\n" \
-          "(function() {\n" \
-          "var ga = document.createElement('script'); " \
-          "ga.type = 'text/javascript'; ga.async = true;\n" \
-          "ga.src = ('https:' == document.location.protocol ? 'https://ssl' " \
-          ": 'http://www') + '.google-analytics.com/ga.js';\n" \
-          "var s = document.getElementsByTagName('script')[0]; " \
-          "s.parentNode.insertBefore(ga, s);\n" \
-          "})();"
+        "(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||" \
+          "function(){\n (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new " \
+          "Date();a=s.createElement(o),\nm=s.getElementsByTagName(o)[0];" \
+          "a.async=1;a.src=g;m.parentNode.insertBefore(a,m)\n})(window," \
+          "document,'script','//www.google-analytics.com/analytics.js','ga');" \
+          "\n\nga('create', '#{account_id}', 'auto');\nga('send', 'pageview');"
       )
     end
 
@@ -106,89 +75,6 @@ module PagesCore
         content_tag(:head) { safe_join(head_tag_contents(block_output), "\n") }
     end
 
-    # Sets a description for meta tags.
-    #
-    #   meta_description "This is an awesome site"
-    #
-    def meta_description(*args)
-      if args.any?
-        @meta_description = args.first
-      else
-        description = @meta_description
-        description ||= @page.meta_description if @page.try(&:meta_description?)
-        description ||= @page.excerpt if @page && !@page.excerpt.empty?
-        strip_tags(description)
-      end
-    end
-
-    # Returns true if meta description has been set.
-    def meta_description?
-      !meta_description.blank?
-    end
-
-    # Sets an image to use for meta tags. Supports
-    # both paths and Image objects.
-    #
-    #   meta_image image_path("facebook-share.png")
-    #   meta_image @page.image
-    #
-    def meta_image(*args)
-      if args.any?
-        @meta_image = args.first
-      else
-        image   = @meta_image
-        image ||= @page.try(&:meta_image)
-        image ||= @page.try(&:image)
-        image ||= default_meta_image
-        if image.is_a?(Image)
-          dynamic_image_url(image, size: "1200x", only_path: false)
-        else
-          image
-        end
-      end
-    end
-
-    # Returns true if meta image has been set.
-    def meta_image?
-      !meta_image.blank? || default_meta_image?
-    end
-
-    # Sets keywords for meta tags.
-    #
-    #   meta_keywords "cialis viagra"
-    #
-    def meta_keywords(*args)
-      if args.any?
-        @meta_keywords = Array(args.first).join(" ")
-      else
-        keywords = @meta_keywords
-        keywords ||= @page.tag_list if @page && @page.tags.any?
-        strip_tags(keywords)
-      end
-    end
-
-    # Returns true if meta keywords have been set.
-    def meta_keywords?
-      !meta_keywords.blank?
-    end
-
-    def open_graph_properties
-      @_open_graph_properties ||= {}
-    end
-
-    # Outputs Open Graph tags for Facebook.
-    def open_graph_tags
-      properties = default_open_graph_properties.merge(open_graph_properties)
-      safe_join(
-        properties
-          .delete_if { |_, content| content.nil? }
-          .map do |name, content|
-          tag(:meta, property: "og:#{name}", content: content)
-        end,
-        "\n"
-      )
-    end
-
     # Generates a link to an RSS feed.
     #
     #  rss_link_tag "My feed", "feed.rss"
@@ -209,62 +95,34 @@ module PagesCore
     #
     def typekit_tags(kit_id)
       safe_join([
-        javascript_include_tag("http://use.typekit.com/#{kit_id}.js"),
-        javascript_tag("try{Typekit.load();}catch(e){}")
-      ], "\n")
+                  javascript_include_tag("http://use.typekit.com/#{kit_id}.js"),
+                  javascript_tag("try{Typekit.load();}catch(e){}")
+                ], "\n")
     end
 
     private
 
-    def default_open_graph_title
-      if @page.try(:open_graph_title?)
-        @page.open_graph_title
-      else
-        document_title
-      end
-    end
-
-    def default_open_graph_description
-      if @page.try(:open_graph_description?)
-        @page.open_graph_description
-      elsif meta_description?
-        meta_description
-      end
-    end
-
-    def default_open_graph_properties
-      {
-        type:        "website",
-        site_name:   PagesCore.config(:site_name),
-        title:       default_open_graph_title,
-        image:       (meta_image if meta_image?),
-        description: default_open_graph_description,
-        url:         request.url
-      }
-    end
-
-    def meta_description_tag
-      return unless meta_description?
-      tag(:meta, name: "description", content: meta_description)
-    end
-
-    def meta_keywords_tag
-      return unless meta_keywords?
-      tag(:meta, name: "keywords", content: meta_keywords)
-    end
-
     def head_tag_contents(block_output)
       [
         tag(:meta, charset: "utf-8"),
         tag(:meta, "http-equiv" => "X-UA-Compatible", "content" => "IE=edge"),
         content_tag(:title, document_title),
-        meta_description_tag,
-        meta_keywords_tag,
+        meta_description_tag, meta_keywords_tag,
         (tag(:link, rel: "image_src", href: meta_image) if meta_image?),
         open_graph_tags,
         csrf_meta_tags,
         block_output
       ]
     end
+
+    def meta_description_tag
+      return unless meta_description?
+      tag(:meta, name: "description", content: meta_description)
+    end
+
+    def meta_keywords_tag
+      return unless meta_keywords?
+      tag(:meta, name: "keywords", content: meta_keywords)
+    end
   end
 end