type_station 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64198e1d0a1273b9fecb551341af5f1dd507aee8
-  data.tar.gz: bcd6250269e60220a515efc2f31aed120eaa4357
+  metadata.gz: dbc3bfe45610ed1a0658853f418a200ab072ae20
+  data.tar.gz: 242b1d85fc6f8d990db57990c3d8e010ce0917cd
 SHA512:
-  metadata.gz: 78bc062d0939b0ccbb2d8f8e5a0e640dd708192c9e6735c2bebdb6aeee1a393018ba9274fbd83fde7fd0ca1bfccc4a83a2387f261dfe684047b8752f6c242ca5
-  data.tar.gz: 15b28f3a70930074ac7ae99c4d1b58351183234cfcc9da4270ee47cdf6c928bbf8d9e3ee025af2bd05b9a618323e217338691f2d6618c6b862d537d56d97881f
+  metadata.gz: 903ab291d03f3f5cc70c5d8c5d2fffbc09e0393db2b58b5694ca1ad9eccf7b1f21a54dc54dc223692e7b2fde9ab4a7da66843dc07943967a47bc6b470376fd16
+  data.tar.gz: dc98920de5e9f4ae6f994593b3e38a6124916bdfc8b47a7706f3db81472c8faf52cae51870f4eda38a762ae424580ecace8feced32bb5b2295671bc28471eef3

data/app/presenters/type_station/content_presenter.rb

@@ -4,16 +4,26 @@ module TypeStation
 
     def tag(default, options = {})
       css_class = options.delete(:class) if options.include?(:class)
-      cl_image_tag((value.present? ? value['identifier'] : default), options.merge({class: ['ts-editable-image-tag', css_class], data: options}))
+      cl_image_tag((content.present? ? content['identifier'] : default), options.merge({class: ['ts-editable-image-tag', css_class], data: options}))
     end
 
     def link(default, html_options = nil, &block)
       css_class = html_options.delete(:class) if html_options.include?(:class)
-      content_tag(:a, nil, html_options.merge({class: ['ts-editable-link-tag', css_class], href: (value.present? ? cloudinary_url(value['identifier'], format: value['format']) : default)}), &block)
+      content_tag(:a, nil, html_options.merge({class: ['ts-editable-link-tag', css_class], href: (content.present? ? cloudinary_url(content['identifier'], format: content['format']) : default)}), &block)
+    end
+
+    def value_is_hash?
+      content.is_a? Hash
     end
 
     def value
-      content
+      sanitized_value
+    end
+
+    private
+
+    def sanitized_value
+      @sanitized_value ||= Rails::Html::WhiteListSanitizer.new.sanitize(content)
     end
 
   end

data/app/presenters/type_station/presenter.rb

@@ -41,7 +41,7 @@ module TypeStation
       if content_attribute.present?
         content_presenter = ContentPresenter.new(content_attribute, h)
 
-        if content_presenter.value.is_a? Hash
+        if content_presenter.value_is_hash?
           content += h.capture(content_presenter, &block)
         else
           content += content_presenter.value

data/lib/type_station/blocks/base.rb

@@ -15,9 +15,7 @@ module TypeStation
         @options = options
       end
 
-      def render(raw_content)
-        content = @sanitizer.sanitize(raw_content)
-
+      def render(content)
         if showifblock
           render_edit(content)
         else

data/lib/type_station/version.rb

@@ -2,7 +2,7 @@ module TypeStation
   module Version
     MAJOR = 0
     MINOR = 3
-    TINY  = 2
+    TINY  = 3
     PRE   = nil
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end