type_station 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec652817ab6918fbe486f6b374531705b2bfd2c8
-  data.tar.gz: e4104767a7a20410f50a3da0509b8dd905894c89
+  metadata.gz: e507c0e25eee2de86875f7172277436418e1a4d2
+  data.tar.gz: 1903bb9f88c274a6170e11da85b6a63df96a3a70
 SHA512:
-  metadata.gz: 5e4edd03b0122d983b77a0f15626e6356886e229d4b93dc15c18277023433a35c3b9ea1593ba8a119585e34bf66dbce7f35984355e6645517af4b10bbd1e4cb7
-  data.tar.gz: 517a87e210d4281e1e85b6b806e9d93064d111786dfea52e84bb6bf296431d6a39aaa65fa19ab1ed9dba250cfbaf06a6d9c00229aec154e5eb318f4cdc978f88
+  metadata.gz: 8f713d3ced71678522a84a7c8a8ea9029aa6bc582bad598739b67bbfb183a2815d4acf3d9084114cc5f7b738b069d0baddf7f27237db9aae063b83b9c9c7677f
+  data.tar.gz: 246292b7fc6246cc8f2d898414a191be736c46865a936841eff17c7e1b1a5ebe22b1de13f40226f7ec8dca46eb6fc35153e9e2901978095100ea6fec1324519e

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

@@ -10,6 +10,12 @@ class window.TS.AdminBar
 
     $('#ts-admin-bar-cancel').on 'click', ->
       window.TS.disable()
+      if window.TS.isChanged()
+        vex.dialog.confirm
+          message: 'You have unsaved changes, Do you want to discard them?'
+          callback: (value) ->
+            if value
+              window.location.reload()
       false
     
     $('#ts-admin-bar-save').on 'click', ->

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

@@ -18,11 +18,13 @@ deletePage = (element) ->
 
 buildFields = (element) ->
   tsFields = element.data('tsFields')
+  tsFieldTypes = {}
   inputs = ''
   model = window.TS.getModel element.data('ts-url')
   modelValues = element.data('ts-data')['ts_values']
 
   for field in tsFields
+    tsFieldTypes[field.name] = field.type
     label = "<label for='#{field.name}'>#{field.label}</label>"
     input = switch field.type
       when "text" then "<input type='text' name='#{field.name}' id='#{field.name}' value='#{modelValues[field.name]}' />"
@@ -41,6 +43,7 @@ buildFields = (element) ->
         select 
     inputs += "<div class'vex-custom-field-wrapper'>#{label}<div class='vex-custom-input-wrapper'>#{input}</div></div>"
 
+  element.data('tsFieldTypes', tsFieldTypes)
   inputs
 
 class window.TS.EditPage
@@ -53,6 +56,12 @@ class window.TS.EditPage
           when 'left_to_right'
             $(element).append($('<span>').addClass('ts-editable-button').addClass('ts-move-up-button').addClass('ts-button').html("<i class='ion-arrow-left-b'></i>"))
             $(element).append($('<span>').addClass('ts-editable-button').addClass('ts-move-down-button').addClass('ts-button').html("<i class='ion-arrow-right-b'></i>"))
+          when 'invert_left_to_right'
+            $(element).append($('<span>').addClass('ts-editable-button').addClass('ts-move-down-button-invert').addClass('ts-button').html("<i class='ion-arrow-left-b'></i>"))
+            $(element).append($('<span>').addClass('ts-editable-button').addClass('ts-move-up-button-invert').addClass('ts-button').html("<i class='ion-arrow-right-b'></i>"))
+          when 'invert'
+            $(element).append($('<span>').addClass('ts-editable-button').addClass('ts-move-down-button-invert').addClass('ts-button').html("<i class='ion-arrow-up-b'></i>"))
+            $(element).append($('<span>').addClass('ts-editable-button').addClass('ts-move-up-button-invert').addClass('ts-button').html("<i class='ion-arrow-down-b'></i>"))
           else
             $(element).append($('<span>').addClass('ts-editable-button').addClass('ts-move-up-button').addClass('ts-button').html("<i class='ion-arrow-up-b'></i>"))
             $(element).append($('<span>').addClass('ts-editable-button').addClass('ts-move-down-button').addClass('ts-button').html("<i class='ion-arrow-down-b'></i>"))
@@ -72,6 +81,7 @@ class window.TS.EditPage
         callback: (data) ->
           if data
             $el = @$element
+            tsFieldTypes = $el.data('tsFieldTypes')
             model = window.TS.getModel $el.data('ts-url')
           
             vex.dialog.confirm
@@ -79,13 +89,14 @@ class window.TS.EditPage
               callback: (value) ->
                 if value
                   for k,v of data
-                    model.set(k, { field: k, value: v, type: if $.isArray(v) then 'multiple_select' else 'text' })
+                    type = tsFieldTypes[k]
+                    model.set(k, { field: k, value: v, type: if type == 'multiple_select' then 'multiple_select' else 'text' })
                   model.save ->
                     window.location.reload()
 
-    $('.ts-move-up-button', @elements).on 'click', ->
+    $('.ts-move-up-button, .ts-move-up-button-invert', @elements).on 'click', ->
       move $(@).parent(), 'move_up'
-    $('.ts-move-down-button', @elements).on 'click', ->
+    $('.ts-move-down-button, .ts-move-down-button-invert', @elements).on 'click', ->
       move $(@).parent(), 'move_down'
 
     $('.ts-delete-page-button', @elements).on 'click', ->

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

@@ -20,7 +20,7 @@ buildUploader = (element, data)->
     .bind 'cloudinarydone', (e, data) ->
       $element = $("##{$(this).data('elementId')}")
       for imageTag in $('.ts-editable-link-tag', $element)
-        $(imageTag).attr('href', $.cloudinary.url(data.result.public_id, {}))
+        $(imageTag).attr('href', $.cloudinary.url(data.result.public_id, {resource_type: 'raw'}))
       $element.data('drop').close()
       $(this).prop('disabled', false)
       $('.ts-progress-bar').remove()

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

@@ -68,6 +68,7 @@ class window.TS.NewPage
                       data: JSON.stringify(json)
                       success: (data, status) -> window.location.reload()
             else
+              vex.dialog.buttons.YES.text = 'Ok'
               vex.dialog.alert
                 message: 'Please fill in all required fields'
                 callback: ->

data/app/assets/javascripts/type_station/init.js.coffee

@@ -23,9 +23,7 @@ window.TS.enable = ->
   @editors.each (id, editor) -> editor.enable()
   @onEnabled()
   $(window).on 'beforeunload', =>
-    dirtyArray = []
-    @models.each (id, model) -> dirtyArray.push model.isChanged()
-    if $.grep(dirtyArray, (a) ->  a == true ).length > 0
+    if @isChanged()
       return 'You have unsaved changes. Are you sure you want to leave?'
     else
       return
@@ -42,6 +40,11 @@ window.TS.save = ->
   @models.each (id, model) -> model.save()
   @onSaved()
 
+window.TS.isChanged = ->
+  dirtyArray = []
+  @models.each (id, model) -> dirtyArray.push model.isChanged()
+  $.grep(dirtyArray, (a) ->  a == true ).length > 0
+
 window.TS.init = ->
   @editors.set 'ts-admin-bar', new window.TS.AdminBar $('#ts-admin-bar-template')
   @editors.set 'ts-editable-text', new window.TS.EditableText $('span.ts-editable-text')

data/app/assets/javascripts/type_station/lib/models.js.coffee

@@ -18,10 +18,13 @@ class window.TS.Model extends window.TS.Store
     super key, value
     @DIRTY[key] = 1
 
-
   changedKeys: -> Object.keys(@DIRTY)
   isChanged: -> @changedKeys().length > 0
 
+  _reset: ->
+    @STORE = {}
+    @DIRTY = {}
+
   save: (callback = ->) ->
     self = @
     data = []
@@ -35,4 +38,6 @@ class window.TS.Model extends window.TS.Store
       dataType: 'json'
       contentType: 'application/json'
       data: JSON.stringify({contents: data})
-      success: (data) -> callback(data)
+      success: (data) -> 
+        self._reset() #reset model to a clean state
+        callback(data)

data/app/assets/stylesheets/type_station/base.css.scss

@@ -80,14 +80,14 @@ bottom: auto;
 left: auto;
 }
 
-.ts-move-up-button {
+.ts-move-up-button, .ts-move-down-button-invert {
 top: 0px;
 right: 120px;
 bottom: auto;
 left: auto;
 }
 
-.ts-move-down-button {
+.ts-move-down-button, .ts-move-up-button-invert {
 top: 0px;
 right: 80px;
 bottom: auto;

data/app/models/type_station/content.rb

@@ -15,7 +15,7 @@ module TypeStation
 
     # VALIDATIONS
 
-    validates :name, presence: true
+    validates :name, presence: true, uniqueness: { scope: :type }
     validates :type, presence: true
 
     # INSTANT METHODS

data/app/models/type_station/page.rb

@@ -55,15 +55,17 @@ module TypeStation
 
     def update_contents(params)
       params.each do |data|
-        if content?(data[:field])
-          set(data[:field], data[:value])
+        field, value, type = data[:field].to_sym, data[:value], data[:type].to_sym
+
+        if page_fields?(field) && !changed.include?(field) #and not changed already
+          self[field] = value
         else
-          if self[data[:field]].present? && !changed.include?(data[:field].to_sym) #and not changed already
-            self[data[:field]] = data[:value]
+          if content?(field)
+            set(field, value)
           else
-            contents.build(name: data[:field], type: data[:type]).set(data[:value])
+            contents.build(name: field, type: type).set(value)
           end
-        end
+        end 
       end
 
       save
@@ -90,6 +92,10 @@ module TypeStation
       content_attributes[key].present?
     end
 
+    def page_fields?(key)
+      page_fields.include?(key)
+    end
+
     def content_attributes
       @content_attributes ||= Hash[self.contents.map {|c| [c.name, c]}]
     end
@@ -114,6 +120,10 @@ module TypeStation
 
     private
 
+    def page_fields
+      @page_fields ||= self.class.fields.keys.map(&:to_sym)
+    end
+
     # Generates a slug based of the title give by the user
     def generate_slug
       self.slug = root? ? "" : title.parameterize

data/app/presenters/type_station/page_presenter.rb

@@ -30,12 +30,18 @@ module TypeStation
       @parent ||= PagePresenter.new(page.parent, @template)
     end
 
+    def root
+      @root ||= PagePresenter.new(TypeStation::Page.root, @template)
+    end
+
     private
 
     def build_content_methods
       page.content_attributes.each do |key, content_object|
-        define_singleton_method key do
-          ContentPresenter.new(content_object, @template)
+        unless page.page_fields? key
+          define_singleton_method key do
+            ContentPresenter.new(content_object, @template)
+          end
         end
       end
     end

data/lib/type_station/version.rb

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

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

@@ -91,14 +91,14 @@
   proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
 <%- end %>
 
-<%= ts_new :page, @page, content_tag: :div, fields: [{name: :title, type: 'text', label: 'Section name'}, {name: :template_name, type: 'select', label: 'Section template', options: [['Cool', 'v'], ['Blah', 'b']]}, {name: :test_value, type: 'text', label: 'test value'}, {name: :another_test, type: 'textarea', label: 'Blah'}, {name: :tags, type: 'multiple_select', label: 'Tags', options: [['Cool', 'v'], ['Blah', 'b'], ['sdfsdfdf', 'dd']]}], data: {name: 'Section', default: {type: :hidden, name: :section}} do %>
+<%= ts_new :page, @page, content_tag: :div, fields: [{name: :title, type: 'text', label: 'Section name'}, {name: :redirect_to, type: 'text', label: 'Redirect'}, {name: :template_name, type: 'select', label: 'Section template', options: [['Cool', 'v'], ['Blah', 'b']]}, {name: :test_value, type: 'text', label: 'test value'}, {name: :another_test, type: 'textarea', label: 'Blah'}, {name: :tags, type: 'multiple_select', label: 'Tags', options: [['Cool', 'v'], ['Blah', 'b'], ['sdfsdfdf', 'dd']]}], data: {name: 'Section', default: {type: :hidden, name: :section}} do %>
   <h1>New Section</h1>
 <%- end %>
 
 <ul>
 <%- ts_pages(:section, @page).each do |page| %>
-  <%= ts_edit :page, page, content_tag: :li, fields: [{name: :title, type: 'text', label: 'Section name'}, {name: :template_name, type: 'select', label: 'Section template', options: [['Cool', 'v'], ['Blah', 'b']]}, {name: :test_value, type: 'text', label: 'test value'}, {name: :another_test, type: 'textarea', label: 'Blah'}, {name: :tags, type: 'multiple_select', label: 'Tags', options: [['Cool', 'v'], ['Blah', 'b'], ['sdfsdfdf', 'dd']]}], data: {name: 'Section', default: {type: :hidden, name: :section}, moveable: 'left_to_right'} do %>
-    <%= page.title %> - <%= page.test_value.value %> - <%= page.template_name %> - <%= page.another_test.value %> - <%= page.try(:tags).try(:value) %></li>
+  <%= ts_edit :page, page, content_tag: :li, fields: [{name: :title, type: 'text', label: 'Section name'}, {name: :redirect_to, type: 'text', label: 'Redirect'}, {name: :template_name, type: 'select', label: 'Section template', options: [['Cool', 'v'], ['Blah', 'b']]}, {name: :test_value, type: 'text', label: 'test value'}, {name: :another_test, type: 'textarea', label: 'Blah'}, {name: :tags, type: 'multiple_select', label: 'Tags', options: [['Cool', 'v'], ['Blah', 'b'], ['sdfsdfdf', 'dd']]}], data: {name: 'Section', default: {type: :hidden, name: :section}, moveable: 'left_to_right'} do %>
+    <%= page.title %> - <%= page.test_value.value %> - <%= page.template_name %> - <%= page.another_test.value %> - <%= page.try(:tags).try(:value) %> - <%= page.redirect_to %></li>
   <%- end %>
 <%- end %>
 </ul>