type_station 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1e2c875af09a5e3f22fa771972baa78601b82b7
-  data.tar.gz: e0fadc81b6d37579e9f7326260935361edf801ff
+  metadata.gz: 5c8cbbcecb160a2bcd25a314804510fc1a3a21e9
+  data.tar.gz: 3478676189a52355a610d94d5b24a6959aabc930
 SHA512:
-  metadata.gz: 4bf929a7bf80ee79adb0c8abd741777ef3d186181aaf91ce3c98cc5e47f5963fdf42d3952ac3352602cfacd37752a008d5a28b0aae19bdfbc3730fe4e0b6f9db
-  data.tar.gz: 64c468374ad6d1c4e6412f5735932c485ab444fddeab91722d981db9d5a2a57955db9f98b33025b2d9ee0ed91e746f02017cfb157bc3f43d3260dc5d08f3d074
+  metadata.gz: b27ef6da2a32344e526014f74101cb20f4384315f241379059f1fd572d0a6403fbd3d98264702476cf003ea0efb730df5655b960d905f89d76ef6f0eb975116c
+  data.tar.gz: c65c7fa87ee5d133901c83673f0f6dcfdbf101d9ae2bedfaf6a65ed303fa1031df598221b839267f193ff248518076f3302f243f7b0aeb5483c301ad8a24c328

data/app/assets/javascripts/type_station/editables/file_editor.js.coffee

@@ -23,7 +23,11 @@ buildUploader = (editor) ->
       for imageTag in $('.ts-editable-image-tag', $element)
         $(imageTag).attr('src', $.cloudinary.url(data.result.public_id, $.extend({}, {format: data.result.format}, $(imageTag).data())))
       for linkTag in $('.ts-editable-link-tag', $element)
-        $(linkTag).attr('href', $.cloudinary.url(data.result.public_id, {resource_type: 'raw', format: data.result.format}))
+        if data.result.type == "private"
+          url = $(linkTag).data('download-url').replace('IDENTIFIER', data.result.public_id).replace('FORMAT', data.result.format)
+          $(linkTag).attr('href', url)
+        else
+          $(linkTag).attr('href', $.cloudinary.url(data.result.public_id, {resource_type: 'raw', format: data.result.format}))
       $(this).prop('disabled', false)
       $('.ts-progress-bar').remove()
 

data/app/assets/javascripts/type_station/editables/text_html_editor.js.coffee

@@ -42,11 +42,11 @@ class @TypeStation.TextHtmlEditor
         # checkLinkFormat: true
 
     @editor = new MediumEditor @$el, editorOptions
-    @editor.deactivate()
+    @editor.destroy()
     @$el.attr('data-ts-id', @data.id).attr('data-ts-field', @data.field)
 
   enable: ->
-    @editor.activate()
+    @editor.setup()
     self = @
     eventName = if isIE() then 'keyup' else 'input'
     @$el.on eventName, ->
@@ -59,5 +59,5 @@ class @TypeStation.TextHtmlEditor
         updateGlobalValue($(@), $(@).html())
 
   disable: ->
-    @editor.deactivate()
+    @editor.destroy()
     @$el.off 'input'

data/app/controllers/type_station/file_controller.rb

@@ -0,0 +1,15 @@
+module TypeStation
+  class FileController < TypeStation::ApplicationController
+
+    def download
+      redirect_to private_download_url
+    end
+
+    private
+
+    def private_download_url
+      Cloudinary::Utils.private_download_url(params[:identifier], params[:format], attachment: true, expires_at: 1.minute.from_now )
+    end
+
+  end
+end

data/app/presenters/type_station/base_presenter.rb

@@ -1,9 +1,10 @@
 module TypeStation
   class BasePresenter
 
-    def initialize(object, template)
+    def initialize(object, template, options = {})
       @object = object
       @template = template
+      @options = options
     end
 
     private
@@ -21,10 +22,10 @@ module TypeStation
     def markdown(text)
       Redcarpet.new(text, :hard_wrap, :filter_html, :autolink).to_html.html_safe
     end
-    
+
     def method_missing(*args, &block)
       @template.send(*args, &block)
     end
-    
+
   end
-end
+end

data/app/presenters/type_station/content_presenter.rb

@@ -9,7 +9,7 @@ module TypeStation
 
     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: (content.present? ? cloudinary_url(content['identifier'], format: content['format']) : default)}), &block)
+      content_tag(:a, nil, html_options.merge({class: ['ts-editable-link-tag', css_class], href: link_href(default), data: link_data_attribute }), &block)
     end
 
     def value_is_hash?
@@ -26,5 +26,21 @@ module TypeStation
       @sanitized_value ||= Rails::Html::WhiteListSanitizer.new.sanitize(content)
     end
 
+    def link_href(default)
+      if content.present?
+        if @options[:private]
+          type_station.download_url(identifier: content['identifier'], format: content['format'])
+        else
+          cloudinary_url(content['identifier'], format: content['format'])
+        end
+      else
+        default
+      end
+    end
+
+    def link_data_attribute
+       @options[:private] ? {download_url: type_station.download_url(identifier: 'IDENTIFIER', format: 'FORMAT')} : nil
+    end
+
   end
 end

data/app/presenters/type_station/presenter.rb

@@ -39,7 +39,7 @@ module TypeStation
       content_attribute = @object.get name
 
       if content_attribute.present?
-        content_presenter = ContentPresenter.new(content_attribute, h)
+        content_presenter = ContentPresenter.new(content_attribute, h, options)
 
         if content_presenter.value_is_hash?
           content += h.capture(content_presenter, &block)
@@ -47,7 +47,7 @@ module TypeStation
           content += content_presenter.value
         end
       else
-        content += h.capture(ContentPresenter.new(nil,h), &block)
+        content += h.capture(ContentPresenter.new(nil,h, options), &block)
       end
 
       TypeStation::Blocks::Field.new(h.type_station_authorise, @object, options).render(content)

data/config/routes.rb

@@ -9,5 +9,7 @@ TypeStation::Engine.routes.draw do
     end
   end
 
+  get 'file-download/:identifier' => 'file#download', as: :download
+
   match "*path", to: "pages#show", via: :all
 end

data/lib/type_station/blocks/field.rb

@@ -18,7 +18,8 @@ module TypeStation
       def data_options
         case options[:type]
         when :image, :file
-          { cloudinary: (Cloudinary::Utils.sign_request(Cloudinary::Uploader.build_upload_params({}), {}) rescue {}) }
+          upload_option = options[:private].present? ? { type: 'private' } : {}
+          { cloudinary: (Cloudinary::Utils.sign_request(Cloudinary::Uploader.build_upload_params(upload_option), {}) rescue {}) }
         else
           nil
         end

data/lib/type_station/version.rb

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

data/spec/dummy/app/views/pages/index_other.html.erb

@@ -121,6 +121,12 @@
   <%- end %>
 <%- end %>
 
+<%= p.field :private_file, type: :file, private: true do |file| %>
+  <%= file.link 'http://lorempixel.com/400/200/', class: 'text', title: 'hello' do %>
+    Private
+  <%- end %>
+<%- end %>
+
 
 <h1>
 <%= p.create :team do %>