push_type_admin 0.3.3 → 0.4.0.beta.3

data/app/views/push_type/nodes/_form_fields.html.haml

@@ -1,37 +1,38 @@
-%div{ ng: { controller: 'NodeFormCtrl', init: "node=#{ node_hash(@node).to_json }" } }
-  .large-8.columns
-    .container
-      .head
-        .left.btn= link_to ficon(:previous), node_back_link(@node)
-        .title= yield :title
-      .body.padded
-        .row.title
-          .columns
-            = f.label :title
-            = f.text_field :title, :'ng-model' => 'node.title', :'ng-keyup' => 'setSlug()'
-        .row.permalink
-          .columns{ ng: { class: 'permalinkVisibility()' } }
-            %span.key Permalink
-            %span.value
-              %span.show-for-medium-up http://#{ request.host_with_port }/
-              = content_tag :span, @node.parent.permalink+'/' if @node.parent
-              %span {{ node.slug }}
-            %button.button.tiny.radius.secondary{ data: { dropdown: 'slug-field' }} Edit
-            #slug-field.f-dropdown.content{ data: { dropdown: { content: true } } }
-              = f.label :slug
-              = f.text_field :slug, :'ng-model' => 'node.slug'
-            - if @node.errors.include? :slug
-              .error-icon= ficon :info, 'Error'
+= form_for @node, url: url do |f|
+  %div{ ng: { controller: 'NodeFormCtrl', init: "node=#{ node_hash(@node).to_json }" } }
+    .large-8.columns
+      .container
+        .head
+          .left.btn= link_to ficon(:previous), node_back_link(@node)
+          .title= yield :title
+        .body.padded
+          .row.title
+            .columns
+              = f.label :title
+              = f.text_field :title, :'ng-model' => 'node.title', :'ng-keyup' => 'setSlug()'
+          .row.permalink
+            .columns{ ng: { class: 'permalinkVisibility()' } }
+              %span.key Permalink
+              %span.value
+                %span.show-for-medium-up http://#{ request.host_with_port }/
+                = content_tag :span, @node.parent.permalink+'/' if @node.parent
+                %span {{ node.slug }}
+              %button.button.tiny.radius.secondary{ data: { dropdown: 'slug-field' } } Edit
+              #slug-field.f-dropdown.content{ data: { dropdown: { content: true } } }
+                = f.label :slug
+                = f.text_field :slug, :'ng-model' => 'node.slug'
+              - if @node.errors.include? :slug
+                .error-icon= ficon :info, 'Error'
 
-        .row.custom-fields
-          - @node.fields.each do |key, field|
-            = render_custom_field field, f
+          .row.custom-fields
+            - @node.fields.each do |key, field|
+              = render_custom_field field, f
 
-  .large-4.columns
-    .side-panel{ :'side-panel' => true }
-      .padded
-        = render 'meta_table', f: f
-      .submit.text-center
-        = render 'form_submit', f: f
+    .large-4.columns
+      .side-panel{ :'side-panel' => true }
+        .padded
+          = render 'meta_table', f: f
+        .submit.text-center
+          = render 'form_submit', f: f
 
       

data/app/views/push_type/nodes/_form_submit.html.haml

@@ -1,6 +1,6 @@
 - unless @node.trashed?
   = f.hidden_field :status, value: '{{ node.status }}'
-  %button.button.radius.split{ ng: { class: 'saveButtonClass()' } }
+  %a.button.radius.split{ ng: { class: 'saveButtonClass()' }, node: { submit: true } }
     = ficon :check, "{{ saveButtonText() }}"
     %span{ data: { dropdown: 'publish-toggle', options: 'align:bottom' } }
   %ul#publish-toggle.f-dropdown.tiny{ data: { dropdown: { content: true } } }

data/app/views/push_type/nodes/edit.html.haml

@@ -7,5 +7,4 @@
     - breadcrumbs.add node.title, push_type.node_nodes_path(node)
 - breadcrumbs.add @node.title, push_type.edit_node_path(@node)
 
-= form_for @node, url: push_type.node_path(@node) do |f|
-  = render 'form_fields', f: f
+= render 'form_fields', url: push_type.node_path(@node)

data/app/views/push_type/nodes/new.html.haml

@@ -7,5 +7,4 @@
 - else
   - breadcrumbs.add yield(:title), push_type.new_node_path
 
-= form_for @node, url: (@parent ? push_type.node_nodes_path(@parent, kind: @node.type.underscore) : push_type.nodes_path(kind: @node.type.underscore)) do |f|
-  = render 'form_fields', f: f
+= render 'form_fields', url: @parent ? push_type.node_nodes_path(@parent, kind: @node.type.underscore) : push_type.nodes_path(kind: @node.type.underscore)

data/app/views/push_type/taxonomies/index.html.haml

@@ -0,0 +1,16 @@
+- title 'Taxonomies'
+
+.columns
+  %section
+    %ul.taxonomies-list.small-block-grid-1.medium-block-grid-2.large-block-grid-3
+      - for taxonomy in @taxonomies
+        %li
+          %article.taxonomies-list-item
+            = link_to push_type.taxonomy_path(taxonomy.name.underscore) do
+              .title= taxonomy.title
+              .meta
+                - if taxonomy.exposed?
+                  %span.label.success.radius Exposed
+                - else
+                  %span.label.secondary.radius Unexposed
+                %span= pluralize taxonomy.all.count, 'term'

data/app/views/push_type/taxonomies/show.html.haml

@@ -0,0 +1,57 @@
+- title "Manage #{ @taxonomy.title.downcase }"
+- breadcrumbs.add @taxonomy.title, push_type.taxonomy_path(@taxonomy.name.underscore)
+
+%div{ ng: { controller: 'TaxonomyTermsCtrl', init: "param='#{ @taxonomy.name.underscore }'; baseSlug='#{ @taxonomy.base_slug }'; terms=#{ @terms.to_json }" } }
+  .large-8.columns
+    .container
+      .head
+        .left.btn= link_to ficon(:previous), push_type.taxonomies_path
+        .title= yield :title
+      .body{ :'ui-tree' => 'treeFuncs' }
+        .empty-default{ ng: { hide: 'termCount() > 0' } }
+          %h2 No #{ @taxonomy.title.downcase }
+          %p Organise content through taxonomies. Get started by creating your first #{ @taxonomy.title.downcase.singularize }.
+          %a.button.success.radius{ ng: { click: 'newTerm()' } }
+            = ficon :plus, "Add #{ @taxonomy.title.downcase.singularize }"
+        %ul.taxonomy-term-list{ :'ui-tree-nodes' => true, ng: { model: 'terms' } }
+          %li.taxonomy-term-item{ :'ui-tree-node' => true, ng: { repeat: 'term in terms', include: "'taxonomy.html'" } }
+
+  .large-4.columns
+    .side-panel{ :'side-panel' => true }
+      .cta.text-center
+        %a.button.success.radius{ ng: { click: 'newTerm()' } }
+          = ficon :plus, "Add #{ @taxonomy.title.downcase.singularize }"
+
+
+= content_tag :script, type: 'text/ng-template', id: 'taxonomy.html' do
+  %div{ ng: { controller: 'TaxonomyTermCtrl' } }
+    %div.show{ ng: { hide: 'isEditing()' } }
+      .title {{ term.title }}
+      .meta
+        %span {{ termPermalink() }}
+      .edit
+        %a{ ng: { click: 'edit()' } }
+          .icon= ficon(:pencil)
+          .meta Edit
+      .handle{ :'ui-tree-handle' => true }
+    %form{ name: 'termForm', ng: { show: 'isEditing()' } }
+      .columns
+        .row.collapse
+          .small-1.columns{ ng: { class: 'errorClass("title")' } }
+            %label.prefix Title
+          .small-11.columns{ ng: { class: 'errorClass("title")' } }
+            %input{ type: 'text', name: 'title', ng: { model: 'term.title', keyup: 'setSlug()' } }
+            %small.error{ ng: { show: 'errors.title' } } {{ errors.title }}
+        .row.collapse
+          .small-1.columns{ ng: { class: 'errorClass("slug")' } }
+            %label.prefix Slug
+          .small-5.columns{ ng: { class: 'errorClass("slug")' } }
+            %input{ type: 'text', name: 'slug', ng: { model: 'term.slug' } }
+            %small.error{ ng: { show: 'errors.slug' } } {{ errors.slug }}
+          .small-6.columns.text-right
+            %button.tiny.radius.success{ ng: { click: 'save()' } } Save
+            %button.tiny.radius.alert{ :'pt-confirm-reveal' => 'delete()', ng: { hide: 'isNewTerm()' }, data: { body: "This action cannot be undone. All child #{ @taxonomy.title.downcase } will also be permanently deleted."} } Delete
+            %button.tiny.radius.secondary{ ng: { click: 'reset()' } } Cancel
+      %input{ type: 'hidden', value: '{{ term.id }}', ng: { if: 'term.id' } }
+    %ul.nested-taxonomy-term-list{ :'ui-tree-nodes' => true, ng: { init: 'terms = term.children', model: 'terms' } }<
+      %li.taxonomy-term-item{ :'ui-tree-node' => true, ng: { repeat: 'term in terms', include: "'taxonomy.html'" } }

data/config/routes.rb

@@ -12,6 +12,12 @@ PushType::Core::Engine.routes.draw do
     resources :nodes, only: [:index, :new, :create]
   end
 
+  resources :taxonomies, only: [:index, :show] do
+    resources :terms, only: [:create, :update, :destroy], controller: 'taxonomy_terms' do
+      post 'position', on: :member
+    end
+  end
+
   resources :assets, except: :show, path: 'media' do
     collection do
       post 'upload'

data/lib/push_type/admin/engine.rb

@@ -48,6 +48,15 @@ module PushType
         end
       end
 
+      config.after_initialize do
+        if PushType::Taxonomy.descendants.present?
+          PushType.menu(:main).insert_after :content, :taxonomies do
+            link    { push_type.taxonomies_path }
+            active  { request.fullpath.match %r{^#{ push_type.taxonomies_path }} }
+          end
+        end
+      end
+
     end
   end
 end

data/test/controllers/push_type/taxonomies_controller_test.rb

@@ -0,0 +1,25 @@
+require "test_helper"
+
+module PushType
+  describe TaxonomiesController do
+    
+    describe 'GET #index' do
+      before { get :index }
+      it { response.must_render_template 'index' }
+      it { assigns[:taxonomies].size.must_equal 1 }
+      it { assigns[:taxonomies].first.must_equal Category }
+    end
+
+    describe 'GET #show' do
+      before do
+        3.times { @parent = FactoryGirl.create :taxonomy, type: 'Category' }
+        @child  = FactoryGirl.create :taxonomy, type: 'Category', parent: @parent
+        get :show, id: 'category'
+      end
+      it { response.must_render_template 'show' }
+      it { assigns[:terms].size.must_equal 3 }
+      it { assigns[:terms].map { |h| h[:children] }.flatten.size.must_equal 1 }
+    end
+
+  end
+end

data/test/controllers/push_type/taxonomy_terms_controller_test.rb

@@ -0,0 +1,84 @@
+require "test_helper"
+
+module PushType
+  describe TaxonomyTermsController do
+
+    let(:json_response) { JSON.parse(response.body) }
+  
+    describe 'POST #create' do
+      let(:taxonomy_attrs) { FactoryGirl.attributes_for :taxonomy }
+      let(:action!) { post :create, format: :json, taxonomy_id: 'category', category: taxonomy_attrs }
+      describe 'with valid taxonomy' do
+        before { action! }
+        it { response.must_respond_with :success }
+        it { json_response['term'].must_be :present? }
+      end
+      describe 'taxonomy count' do
+        it { proc { action! }.must_change 'Category.count', 1 }
+      end
+      describe 'with in-valid taxonomy' do
+        let(:taxonomy_attrs) { {} }
+        before { action! }
+        it { response.must_respond_with :unprocessable_entity }
+        it { json_response['errors'].must_be :present? }
+      end
+    end
+
+    describe 'PUT #update' do
+      let(:category) { FactoryGirl.create :taxonomy, type: 'Category' }
+      before { put :update, format: :json, taxonomy_id: 'category', id: category.id, category: { title: new_title } }
+      describe 'with valid taxonomy' do
+        let(:new_title) { 'Foo bar baz' }
+        it { response.must_respond_with :success }
+        it { category.reload.title.must_equal new_title }
+      end
+      describe 'with in-valid taxonomy' do
+        let(:new_title) { '' }
+        it { response.must_respond_with :unprocessable_entity }
+        it { json_response['errors'].must_be :present? }
+      end
+    end
+
+    describe 'DELETE #destroy' do
+      let(:category) { FactoryGirl.create :taxonomy, type: 'Category' }
+      before { delete :destroy, format: :json, taxonomy_id: 'category', id: category.id }
+      it { response.must_respond_with :success }
+      it { proc { category.reload }.must_raise ActiveRecord::RecordNotFound }
+    end
+
+    describe 'PUT #position' do
+      let(:terms) { Category.roots.all }
+      before do
+        @first_node = Category.create FactoryGirl.attributes_for(:taxonomy)
+        3.times { Category.create FactoryGirl.attributes_for(:taxonomy) }
+        @last_node = Category.create FactoryGirl.attributes_for(:taxonomy)
+      end
+      describe 'without reponsitioning' do
+        it { terms.first.must_equal @first_node }
+        it { terms.last.must_equal @last_node }
+      end
+      describe 'append sibling' do
+        before do
+          post :position, format: :json, taxonomy_id: 'category', id: @last_node.id, prev: @first_node.id
+        end
+        it { terms.first.must_equal @first_node }
+        it { terms[1].must_equal @last_node }
+      end
+      describe 'prepend sibling' do
+        before do
+          post :position, format: :json, taxonomy_id: 'category', id: @last_node.id, next: @first_node.id
+        end
+        it { terms[1].must_equal @first_node }
+        it { terms.first.must_equal @last_node }
+      end
+      describe 'append child' do
+        before do
+          post :position, format: :json, taxonomy_id: 'category', id: @last_node.id, parent: @first_node.id
+        end
+        it { terms.first.must_equal @first_node }
+        it { terms.first.children.must_include @last_node }
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,6 @@
+class Category < PushType::Taxonomy
+
+  # Set base slug
+  # base_slug :category
+
+end

data/test/dummy/app/views/taxonomies/category.html.erb

@@ -0,0 +1,3 @@
+<h1><%= @taxonomy.title %></h1>
+<p>This is a generated Category template.</p>
+<p>Find me at: app/views/taxonomies/category.html.erb</p>

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

@@ -6,6 +6,8 @@ PushType.setup do |config|
 
   config.home_slug = 'home'
 
+  config.unexposed_taxonomies = []
+
   config.media_styles = {
     large:    '1024x1024>',
     medium:   '512x512>',
@@ -31,6 +33,6 @@ PushType.setup do |config|
   #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
   # }
 
-  # config.dragonfly_secret = '1a53010fcc5c4a800084125092caacfa006ac6430985031f1951b65528255ab4'
+  # config.dragonfly_secret = '1cb5196e0940fe96ce4ce9df12aec5176b2a38dc339a6ac0b90558237fa9dc96'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: ee0172d114828fe66ff65f4120ccda252886c4f8b3ab65bfcc58d328c25a933d4e4a83319783bfa0ac20ced3675f2e362a4e5ae70e71e91dbba11cdf54ab1cc7
+  secret_key_base: 523246cbd83acda2aecad3cb5434c0de7b34368a7f8be6800c346849b6468f01916b71ea3f29716c7de699e7ee1cbcd9e9274b782a7b1ebad4dce3248a85c6c9
 
 test:
-  secret_key_base: 74b1a04a2bd50acdcfaca217854c683f4192b11f285d940bf7e051a3e2fc1b752d582e65aeb3986a07e905c63125b325bc361a3bc8b5f1b5ed36bc008bc6e895
+  secret_key_base: f47c67b36ee09e6e1171106ee687521f7de5d2e0d742c4fcc81f92069ef76046d40944f21b3587f2787fd6a938142ae76820b96db3cd11849d7ecfc8582864f2
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/migrate/{20150310192202_create_push_type_users.push_type.rb → 20150406131551_create_push_type_users.push_type.rb}

@@ -7,7 +7,7 @@ class CreatePushTypeUsers < ActiveRecord::Migration
       t.string    :email
       t.jsonb     :field_store
       
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/test/dummy/db/migrate/{20150310192203_create_push_type_nodes.push_type.rb → 20150406131552_create_push_type_nodes.push_type.rb}

@@ -18,7 +18,7 @@ class CreatePushTypeNodes < ActiveRecord::Migration
       t.uuid      :creator_id
       t.uuid      :updater_id
 
-      t.timestamps
+      t.timestamps null: false
       t.datetime  :deleted_at
     end
   end

data/test/dummy/db/migrate/{20150310192204_create_push_type_node_hierarchies.push_type.rb → 20150406131553_create_push_type_node_hierarchies.push_type.rb}

@@ -9,9 +9,9 @@ class CreatePushTypeNodeHierarchies < ActiveRecord::Migration
 
     add_index :push_type_node_hierarchies, [:ancestor_id, :descendant_id, :generations],
       unique: true,
-      name: "anc_desc_idx"
+      name: "node_anc_desc_idx"
 
     add_index :push_type_node_hierarchies, [:descendant_id],
-      name: "desc_idx"
+      name: "node_desc_idx"
   end
 end

data/test/dummy/db/migrate/{20150310192205_create_push_type_assets.push_type.rb → 20150406131554_create_push_type_assets.push_type.rb}

@@ -12,7 +12,7 @@ class CreatePushTypeAssets < ActiveRecord::Migration
 
       t.uuid      :uploader_id
 
-      t.timestamps
+      t.timestamps null: false
       t.datetime  :deleted_at
     end
   end

data/test/dummy/db/migrate/20150406131555_create_push_type_taxonomies.push_type.rb

@@ -0,0 +1,19 @@
+# This migration comes from push_type (originally 20150310115933)
+class CreatePushTypeTaxonomies < ActiveRecord::Migration
+  def change
+    enable_extension 'uuid-ossp' unless extension_enabled?('uuid-ossp')
+    create_table :push_type_taxonomies, id: :uuid, default: 'uuid_generate_v4()'  do |t|
+      t.string    :type
+      t.string    :title
+      t.string    :slug
+
+      t.uuid      :parent_id
+      t.integer   :sort_order
+
+      t.timestamps null: false
+    end
+
+    # Also add a tags array to Assets
+    add_column :push_type_assets, :tags, :string, array: true
+  end
+end

data/test/dummy/db/migrate/20150406131556_create_push_type_taxonomy_hierarchies.push_type.rb

@@ -0,0 +1,17 @@
+# This migration comes from push_type (originally 20150310123230)
+class CreatePushTypeTaxonomyHierarchies < ActiveRecord::Migration
+  def change
+    create_table :push_type_taxonomy_hierarchies, id: false do |t|
+      t.uuid      :ancestor_id,     null: false
+      t.uuid      :descendant_id,   null: false
+      t.integer   :generations,     null: false
+    end
+
+    add_index :push_type_taxonomy_hierarchies, [:ancestor_id, :descendant_id, :generations],
+      unique: true,
+      name: "taxonomy_anc_desc_idx"
+
+    add_index :push_type_taxonomy_hierarchies, [:descendant_id],
+      name: "taxonomy_desc_idx"
+  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: 20150310192205) do
+ActiveRecord::Schema.define(version: 20150406131556) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -25,9 +25,10 @@ ActiveRecord::Schema.define(version: 20150310192205) do
     t.string   "mime_type"
     t.string   "description"
     t.uuid     "uploader_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
     t.datetime "deleted_at"
+    t.string   "tags",                     array: true
   end
 
   create_table "push_type_node_hierarchies", id: false, force: :cascade do |t|
@@ -36,8 +37,8 @@ ActiveRecord::Schema.define(version: 20150310192205) do
     t.integer "generations",   null: false
   end
 
-  add_index "push_type_node_hierarchies", ["ancestor_id", "descendant_id", "generations"], name: "anc_desc_idx", unique: true, using: :btree
-  add_index "push_type_node_hierarchies", ["descendant_id"], name: "desc_idx", using: :btree
+  add_index "push_type_node_hierarchies", ["ancestor_id", "descendant_id", "generations"], name: "node_anc_desc_idx", unique: true, using: :btree
+  add_index "push_type_node_hierarchies", ["descendant_id"], name: "node_desc_idx", using: :btree
 
   create_table "push_type_nodes", id: :uuid, default: "uuid_generate_v4()", force: :cascade do |t|
     t.string   "type"
@@ -51,17 +52,36 @@ ActiveRecord::Schema.define(version: 20150310192205) do
     t.datetime "published_to"
     t.uuid     "creator_id"
     t.uuid     "updater_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   null: false
+    t.datetime "updated_at",   null: false
     t.datetime "deleted_at"
   end
 
+  create_table "push_type_taxonomies", id: :uuid, default: "uuid_generate_v4()", force: :cascade do |t|
+    t.string   "type"
+    t.string   "title"
+    t.string   "slug"
+    t.uuid     "parent_id"
+    t.integer  "sort_order"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "push_type_taxonomy_hierarchies", id: false, force: :cascade do |t|
+    t.uuid    "ancestor_id",   null: false
+    t.uuid    "descendant_id", null: false
+    t.integer "generations",   null: false
+  end
+
+  add_index "push_type_taxonomy_hierarchies", ["ancestor_id", "descendant_id", "generations"], name: "taxonomy_anc_desc_idx", unique: true, using: :btree
+  add_index "push_type_taxonomy_hierarchies", ["descendant_id"], name: "taxonomy_desc_idx", using: :btree
+
   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"
-    t.datetime "updated_at"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
   end
 
 end