push_type_admin 0.5.0.alpha.2 → 0.5.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c8094baec79b85103933fcabc0200dd4111d012
-  data.tar.gz: e668ee21f59fe08c11fbf1a41de304f05aedd0d3
+  metadata.gz: 3bdef5d2ea0631c0570c97317206a6f96cf9c1b8
+  data.tar.gz: a2814144116433783ddd7d7c97426f15d922dc87
 SHA512:
-  metadata.gz: 4b91b21b1050c988fd13551ba66941cac2dd1fee628f339072ee9ff4d18a96d700d8cde8d2f10043f39425760246e07b7725346ae68eca1013207f06ca6460a8
-  data.tar.gz: 6b3fd75c4f019634191ac9045538af674f1c08c759430a767ca74e7cd23144351da8c07fbf3aa01569e035cb787bce5b25bd1ae38f532e1dfdfc61898213e0b4
+  metadata.gz: b5210da28c0ebe8c500a77bdabbf828ad44340ddcd76c4ad6a35970b984006f59411a4324517ee0e478671cf9e98393d73f1a9c4cdec4e5c0d7a39323914742f
+  data.tar.gz: ec6c4faad2324cc90aabca8539d01afef84ca4457abbae1faa5b867265e885d9071d0721ff0ffbea84da9057aa8bd8501aaae155fbbb9e1e4cf002247306cb2b

data/app/assets/javascripts/push_type/admin.js.coffee

@@ -52,6 +52,7 @@ $(document).on 'ready page:load', ->
 
   # Bootstrap foundation
   $(document).foundation()
+  $(document).confirmWithReveal()
 
   # Bootstrap Angular
   angular.bootstrap $('[role="main"]'), ['push_type']
@@ -63,43 +64,3 @@ $(document).on 'ready page:load', ->
     obj = { prev: ui.item.prev().data('id'), next: ui.item.next().data('id') }
     $.post "/push_type/nodes/#{ ui.item.data('id') }/position", obj, 'json'
 
-  $(document).confirmWithReveal()
-
-  $('input', '.date').pickadate
-    format: 'd mmmm yyyy'
-    formatSubmit: 'yyyy-mm-dd'
-    hiddenName: true
-
-  $('input', '.time').pickatime
-    format: 'h:i A'
-    formatSubmit: 'HH:i'
-    formatLabel: 'h:i A <sm!all>HH:i</sm!all>'
-    hiddenName: true
-
-  $('select', '.select').selectize
-    plugins:      ['remove_button']
-    hideSelected: false
-
-  $('select', '.taxonomy').selectize
-    plugins:      ['remove_button']
-    hideSelected: false
-    onInitialize: ->
-      sel     = this
-      options = sel.$input.data('options')
-      items   = sel.$input.data('items')
-      $.each options, -> sel.addOption this
-      if $.isArray items
-        $.each items, -> sel.addItem this
-      else
-        sel.addItem items
-    render: 
-      option: (item, esc) ->
-        pre = if item.depth > 0 then '- '.repeat(item.depth) else ''
-        """<div class="option">#{ pre }#{ esc item.text }</div>"""
-
-  $('select', '.tag_list').selectize
-    plugins:  ['remove_button', 'drag_drop']
-    create:   true
-    persist:  false
-    
-

data/app/assets/javascripts/push_type/fields/date_time_fields.js.coffee

@@ -0,0 +1,13 @@
+# jQuery init
+$(document).on 'ready page:load', ->
+
+  $('input', '.date').pickadate
+    format: 'd mmmm yyyy'
+    formatSubmit: 'yyyy-mm-dd'
+    hiddenName: true
+
+  $('input', '.time').pickatime
+    format: 'h:i A'
+    formatSubmit: 'HH:i'
+    formatLabel: 'h:i A <sm!all>HH:i</sm!all>'
+    hiddenName: true

data/app/assets/javascripts/push_type/fields/relation_fields.js.coffee

@@ -0,0 +1,19 @@
+# jQuery init
+$(document).on 'ready page:load', ->
+
+  $('select', '.taxonomy, .node').selectize
+    plugins:      ['remove_button']
+    hideSelected: false
+    onInitialize: ->
+      sel     = this
+      options = sel.$input.data('options')
+      items   = sel.$input.data('items')
+      $.each options, -> sel.addOption this
+      if $.isArray items
+        $.each items, -> sel.addItem this
+      else
+        sel.addItem items
+    render: 
+      option: (item, esc) ->
+        pre = if item.depth > 0 then '- '.repeat(item.depth) else ''
+        """<div class="option">#{ pre }#{ esc item.text }</div>"""

data/app/assets/javascripts/push_type/fields/select_field.js.coffee

@@ -0,0 +1,6 @@
+# jQuery init
+$(document).on 'ready page:load', ->
+
+    $('select', '.select').selectize
+    plugins:      ['remove_button']
+    hideSelected: false

data/app/assets/javascripts/push_type/fields/tag_list_field.js.coffee

@@ -0,0 +1,7 @@
+# jQuery init
+$(document).on 'ready page:load', ->
+
+  $('select', '.tag_list').selectize
+    plugins:  ['remove_button', 'drag_drop']
+    create:   true
+    persist:  false

data/app/views/push_type/fields/_asset.html.haml

@@ -1,7 +1,7 @@
-= f.label field.name, field.label
+= f.label field.json_key, field.label
 
-.asset-field{ class: ('error' if f.object.errors[field.name.to_sym].present?), ng: { controller: 'AssetFieldCtrl', init: "assetsPath='#{ push_type.assets_path }'; asset=#{ f.object.send(field.name) ? asset_hash(f.object.send(field.name)).to_json : 'null' }" } }
-  = f.hidden_field field.name, value: '{{ asset.id }}'
+.asset-field{ class: ('error' if f.object.errors[field.json_key].present?), ng: { controller: 'AssetFieldCtrl', init: "assetsPath='#{ push_type.assets_path }'; asset=#{ f.object.send(field.name.to_sym) ? asset_hash(f.object.send(field.name.to_sym)).to_json : 'null' }" } }
+  = f.hidden_field field.json_key, value: '{{ asset.id }}'
 
   .row{ ng: { show: 'asset' } }
     .small-4.medium-3.columns
@@ -47,6 +47,6 @@
             .prompt Drag files to quickly upload them…
             .icon= ficon(:upload_cloud)
 
-- if f.object.errors[field.name.to_sym].present?
-  %small.error= f.object.errors[field.name.to_sym].join(', ')
+- if f.object.errors[field.json_key].present?
+  %small.error= f.object.errors[field.json_key].join(', ')
 

data/app/views/push_type/fields/_date.html.haml

@@ -1,2 +1,2 @@
-= f.label field.name, field.label
-= f.send field.form_helper, field.name, field.html_options.merge(data: { value: f.object.field_store[field.name] })
+= f.label field.json_key, field.label
+= f.send field.form_helper, field.json_key, field.html_options.merge(data: { value: f.object.field_store[field.name] })

data/app/views/push_type/fields/_default.html.haml

@@ -1,2 +1,2 @@
-= f.label field.name, field.label
-= f.send field.form_helper, field.name, field.html_options
+= f.label field.json_key, field.label
+= f.send field.form_helper, field.json_key, field.html_options

data/app/views/push_type/fields/_matrix.html.haml

@@ -1,6 +1,6 @@
-= f.label field.name, field.label
+= f.label field.json_key, field.label
 
-.repeater-field{ ng: { controller: 'MatrixFieldCtrl', init: "initRows(#{ f.object.send(field.name).to_json })" } }
+.repeater-field{ ng: { controller: 'MatrixFieldCtrl', init: "initRows(#{ f.object.send(field.json_key).to_json })" } }
   %table
     %thead
       %tr
@@ -10,7 +10,7 @@
     %tbody
       %tr{ ng: { repeat: 'row in rows track by $index' } }
         - field.mapping.each do |key, form_helper|
-          %td= f.send form_helper, nil, field.html_options.merge(name: "#{ f.object_name }[#{ field.name }][][#{ key }]", id: "#{ f.object_name }_#{ field.name }_{{ $index }}_#{ key }", value: nil, :'ng-model' => "row.#{ key }")
+          %td= f.send form_helper, nil, field.html_options.merge(name: "#{ f.object_name }[#{ field.json_key }][][#{ key }]", id: "#{ f.object_name }_#{ field.json_key }_{{ $index }}_#{ key }", value: nil, :'ng-model' => "row.#{ key }")
         %td.remove
           %a.alert{ ng: { click: 'removeRow($index)' } }= ficon(:x)
   .plus

data/app/views/push_type/fields/_relation.html.haml

@@ -0,0 +1,2 @@
+= f.label field.json_key, field.label
+= f.select field.json_key, [], field.field_options, field.html_options.merge(data: { options: field.relation_tree.to_json, items: f.object.send(field.json_key) })

data/app/views/push_type/fields/_repeater.html.haml

@@ -1,10 +1,10 @@
-= f.label field.name, field.label
+= f.label field.json_key, field.label
 
-.repeater-field{ ng: { controller: 'RepeaterFieldCtrl', init: "initRows(#{ f.object.send(field.name).to_json })" } }
+.repeater-field{ ng: { controller: 'RepeaterFieldCtrl', init: "initRows(#{ f.object.send(field.json_key).to_json })" } }
   %table
     %tbody
       %tr{ ng: { repeat: 'row in rows track by $index' } }
-        %td= f.send field.form_helper, nil, field.html_options.merge(name: "#{ f.object_name }[#{ field.name }][]", id: "#{ f.object_name }_#{ field.name }_{{ $index }}", value: nil, :'ng-model' => 'rows[$index]')
+        %td= f.send field.form_helper, nil, field.html_options.merge(name: "#{ f.object_name }[#{ field.json_key }][]", id: "#{ f.object_name }_#{ field.json_key }_{{ $index }}", value: nil, :'ng-model' => 'rows[$index]')
         %td.remove
           %a.alert{ ng: { click: 'removeRow($index)' } }= ficon(:x)
   .plus

data/app/views/push_type/fields/_select.html.haml

@@ -1,2 +1,2 @@
-= f.label field.name, field.label
-= f.select field.name, field.choices, field.field_options, field.html_options
+= f.label field.json_key, field.label
+= f.select field.json_key, field.choices, field.field_options, field.html_options

data/app/views/push_type/fields/_tag_list.html.haml

@@ -1,3 +1,3 @@
-= f.label field.name, field.label
-= f.select field.name, f.object.send(field.name), {}, field.html_options
+= f.label field.json_key, field.label
+= f.select field.json_key, f.object.send(field.json_key), {}, field.html_options
 

data/test/dummy/app/models/page.rb

@@ -5,10 +5,6 @@ class Page < PushType::Node
 
   # Set custom fields
   # field :body, :text, validates: { presence: true }
-
-  field :complex, :matrix, mapping: [{bing: :text_area}, :foo, :bar]
-
-  field :rows, :repeater
   
 
 end

data/test/dummy/config/initializers/push_type.rb

@@ -33,6 +33,6 @@ PushType.setup do |config|
   #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
   # }
 
-  # config.dragonfly_secret = 'fc4c3287eb624efc55139ec042d9e4cece28f9f98510630e13e58ac50633b87f'
+  # config.dragonfly_secret = 'bfa6c1c00361afb27a1416d4ce21c44c16678a96d16ae7b8c979c27c51788c0b'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 70300d33099eb1ca3a1e49d4523f2ba66c19d9a2c0163a88b9fe7f21a4fb01caeddc265960f8ed75aa9f1d7b3f603eac51850b7205bc3beb6877f2e78cd4530e
+  secret_key_base: cc75bfbde02f7657fa56bb12bbddada1875370050119392e2207a5318cb434791c60456cbcd47c5af9fb112647838c60d785cdc8aae63baf8c037ee4891f78b3
 
 test:
-  secret_key_base: b09664f107bf039ce597d0c4c2f69da6d0ef3b9055f47b255acb5690790c59ab93fa96933367479b7f22b22abe213c4c10c1b37413e8d6171e9556821da1533f
+  secret_key_base: de6f519c3d43b64277e7a4c99e260b995ca06f1a0ff78dedd0ca8a17b5ee43a324810712aef146ad33e4166bbabf3ed33d05e6fa408041be8d575dd5aac1effe
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/migrate/20150601132835_add_field_store_default_values.push_type.rb

@@ -0,0 +1,7 @@
+# This migration comes from push_type (originally 20150531183944)
+class AddFieldStoreDefaultValues < ActiveRecord::Migration
+  def change
+    change_column :push_type_nodes, :field_store, :jsonb, default: {}, null: false
+    change_column :push_type_users, :field_store, :jsonb, default: {}, null: false
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150429164610) do
+ActiveRecord::Schema.define(version: 20150601132835) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -44,7 +44,7 @@ ActiveRecord::Schema.define(version: 20150429164610) do
     t.string   "type"
     t.string   "title"
     t.string   "slug"
-    t.jsonb    "field_store"
+    t.jsonb    "field_store",  default: {}, null: false
     t.uuid     "parent_id"
     t.integer  "sort_order"
     t.integer  "status"
@@ -52,8 +52,8 @@ ActiveRecord::Schema.define(version: 20150429164610) do
     t.datetime "published_to"
     t.uuid     "creator_id"
     t.uuid     "updater_id"
-    t.datetime "created_at",   null: false
-    t.datetime "updated_at",   null: false
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
     t.datetime "deleted_at"
   end
 
@@ -79,9 +79,9 @@ ActiveRecord::Schema.define(version: 20150429164610) do
   create_table "push_type_users", id: :uuid, default: "uuid_generate_v4()", force: :cascade do |t|
     t.string   "name"
     t.string   "email"
-    t.jsonb    "field_store"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.jsonb    "field_store", default: {}, null: false
+    t.datetime "created_at",               null: false
+    t.datetime "updated_at",               null: false
   end
 
 end