active_admin-sortable_tree 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f09566c21b921af0c4bcb3745a383e874b62a07
-  data.tar.gz: a339d4935ff0540a849f5f7b59bd3b96a3922347
+  metadata.gz: ac55f045f6a238adde6b30d6487a128ad22b8c2c
+  data.tar.gz: d8286fb520dec0970a45b4d8fb088a61d6a26c06
 SHA512:
-  metadata.gz: 6324e646b2016b28626d43053404d991d47fb2bf73e17288971d58c0ce596655804acdfd5904e472ebf460d3fd4252467807b0cc58e46bf66bef1718face2b45
-  data.tar.gz: 1c361bd2c79389830cf871b14c8c10134e9cba8285ca894ee741fce1ad8c23da868ceade03f52856ca1aaa358fa97a46439409d9e371a1a6d4fb9c6837653335
+  metadata.gz: 4c83e8ddf44cb139cfcfc3c1c2fd2a6d8d40fa34efc0f94129b0bfdb54826fe2826b9c535d33cc60f56ccb953118e8f054bf795def3beb8c656379616a12dc7f
+  data.tar.gz: ae9d44a4607574d7cf7ea35ab1bf85cbc0500bc0652d871b853f68c2ba5cbcb58e345f1d7193d9b084a801df6ec28e141af93552bb6c3aad6a3a7367ad123da7

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
   - "1.9.3"
-  - "2.1.0"
+  - "2.1.2"
 env:
   matrix:
     - RAILS_VERSION=3.2
     - RAILS_VERSION=4.0
+    - RAILS_VERSION=4.1

data/Changelog.md

@@ -0,0 +1,9 @@
+# Changelog
+
+## 0.1.0 - 2014-11-19
+
+- Add option to disable sorting: `sortable: false`, which causes the index view
+  to be a static tree view.
+- Ensure the default actions honor authorization checks
+  ([#43](https://github.com/nebirhos/activeadmin-sortable-tree/pull/43)).
+

data/README.md

@@ -1,10 +1,12 @@
 # ActiveAdmin::SortableTree
 
+[![Gem Version](https://badge.fury.io/rb/active_admin-sortable_tree.svg)](http://badge.fury.io/rb/active_admin-sortable_tree)
 [![Build Status](https://travis-ci.org/zorab47/active_admin-sortable_tree.svg?branch=master)](https://travis-ci.org/zorab47/active_admin-sortable_tree)
 
 This gem adds a tree and a list view to your ActiveAdmin resource index, both
 sortable via drag'n'drop.
 
+![Sortable Tree Demo](http://zorab47.github.io/active_admin-sortable_tree/images/sortable_tree.gif)
 
 ## Installation
 
@@ -13,9 +15,6 @@ sortable via drag'n'drop.
 gem "active_admin-sortable_tree"
 ```
 
-*WARNING!* Not compatible with neo/activeadmin-sortable[https://github.com/neo/activeadmin-sortable]
-
-
 ## Usage (Tree)
 
 **Admin**:
@@ -32,9 +31,9 @@ ActiveAdmin.register Page do
 end
 ```
 
-**Model**: activeadmin-sortable-tree is agnostic to the tree implementation. All
-you have to do is expose a sorting attribute and a few tree methods (:parent,
-:children and :roots).  Let's say you use
+**Model**: ActiveAdmin::SortableTree is agnostic to the tree implementation. All
+you have to do is expose a sorting attribute and a few tree methods (`:parent`,
+`:children` and `:roots`).  Let's say you use
 [Ancestry](https://github.com/stefankroes/ancestry):
 
 ```ruby
@@ -54,7 +53,7 @@ ActiveAdmin.register Page do
            children_method: :children,
            roots_method: :roots,
            roots_collection: proc { current_user.pages.roots }
-  # ...
+  # …
 end
 ```
 
@@ -66,6 +65,7 @@ in `roots_method`.
 ## Usage (List)
 
 **Admin**:
+
 ```ruby
 # app/admin/page.rb
 ActiveAdmin.register Page do
@@ -85,7 +85,7 @@ Of course it's configurable:
 ActiveAdmin.register Page do
   sortable tree: false, # default
            sorting_attribute: :my_position_field
-  ...
+  # …
 end
 ```
 
@@ -97,7 +97,6 @@ Currently supports only IndexAsBlock, more to come!
 **Admin**:
 ```ruby
 # app/admin/page.rb
-
 ActiveAdmin.register Page do
   sortable
 
@@ -109,7 +108,6 @@ end
 
 **Model**: Same as list view (see above)
 
-
 ## Customization
 
 ### Full options list with defaults
@@ -124,6 +122,7 @@ ActiveAdmin.register Page do
            children_method: :children,
            roots_method: :roots,
            roots_collection: nil,       # proc to specifiy retrieval of roots
+           sortable: true,              # Disable sorting (use only 'tree' functionality)
            collapsible: false,          # show +/- buttons to collapse children
            start_collapsed: false,      # when collapsible, start with all roots collapsed
 end
@@ -156,8 +155,12 @@ ActiveAdminSortableEvent.add('ajaxDone', function (){
 })
 ```
 
+## Alternatives
+
+- [Active Admin Sortable](https://github.com/neo/activeadmin-sortable)
+
 ## Copyright
 
 Copyright © 2013 Francesco Disperati, Cantiere Creativo. See the file
 MIT-LICENSE for details. See the full list list of
-[contributors](https://github.com/nebirhos/activeadmin-sortable-tree/graphs/contributors).
+[contributors](http://github.com/zorab47/active_admin-sortable_tree/graphs/contributors).

data/Rakefile

@@ -12,6 +12,8 @@ rescue LoadError
   RDoc::Task = Rake::RDocTask
 end
 
+ENV['RAILS_VERSION'] ||= '4.0'
+
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'ActiveAdmin::SortableTree'

data/app/assets/javascripts/active_admin/sortable.js.coffee

@@ -23,28 +23,9 @@ $ ->
   $('.disclose').bind 'click', (event) ->
     $(this).closest('li').toggleClass('mjs-nestedSortable-collapsed').toggleClass('mjs-nestedSortable-expanded')
 
-  $("[data-sortable-type=plain]").each ->
-    $this = $(@)
-    $this.sortable
-      revert: 250
-      update: ->
-        $this.sortable("disable")
-        $.ajax
-          url: $this.data("sortable-url")
-          type: "post"
-          data: $this.sortable("serialize")
-        .always ->
-          $this.sortable("enable")
-          ActiveAdminSortableEvent.trigger('ajaxAlways')
-        .done ->
-          ActiveAdminSortableEvent.trigger('ajaxDone')
-        .fail ->
-          ActiveAdminSortableEvent.trigger('ajaxFail')
-
-    .disableSelection()
-
   $(".index_as_sortable [data-sortable-type]").each ->
     $this = $(@)
+
     if $this.data('sortable-type') == "tree"
       max_levels = $this.data('max-levels')
       tab_hack = 20 # nestedSortable default

data/app/assets/stylesheets/active_admin/sortable.css.sass

@@ -6,10 +6,6 @@ $cRowError: rgb(255,87,87)
 @import bourbon
 
 body.active_admin
-  .index_content
-    .ui-sortable > *
-      cursor: move
-
   .disclose
     cursor: pointer
     width: 10px
@@ -46,10 +42,6 @@ body.active_admin
           &.odd
             background: $cOddRowBackground
 
-          &:hover
-            background-color: $cRowSelected
-            cursor: move
-
           .cell
             margin: 0
             padding: 10px 12px 8px 12px
@@ -59,6 +51,11 @@ body.active_admin
             line-height: 14px
             color: black
 
+      &.ui-sortable
+        li .item:hover
+          cursor: move
+          background-color: $cRowSelected
+
       > li > ol
         margin-left: 30px
 
@@ -73,7 +70,5 @@ body.active_admin
       li.mjs-nestedSortable-collapsed > div > .disclose > span:before
         content: '+ '
 
-      li.mjs-nestedSortable-expanded > div > .disclose > span:before 
+      li.mjs-nestedSortable-expanded > div > .disclose > span:before
         content: '- '
-
-

data/gemfiles/4.1.gemfile

@@ -0,0 +1,10 @@
+gem 'jquery-rails'
+gem 'jquery-ui-rails'
+gem 'ancestry'
+gem 'sqlite3'
+
+# ActiveAdmin 1.0.0pre
+gem 'activeadmin', github: 'gregbell/active_admin'
+gem 'devise'
+gem 'rails', '~> 4.1'
+gem 'sass-rails', '~> 4.0.2'

data/lib/active_admin/sortable_tree/controller_actions.rb

@@ -12,7 +12,8 @@ module ActiveAdmin::SortableTree
                              :max_levels => 0,
                              :protect_root => false,
                              :collapsible => false, #hides +/- buttons
-                             :start_collapsed => false
+                             :start_collapsed => false,
+                             :sortable => true
 
       # BAD BAD BAD FIXME: don't pollute original class
       @sortable_options = options

data/lib/active_admin/sortable_tree/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module SortableTree
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/lib/active_admin/views/index_as_sortable.rb

@@ -76,28 +76,40 @@ module ActiveAdmin
         @other_actions = block
       end
 
-
       protected
 
       def build_list
         resource_selection_toggle_panel if active_admin_config.batch_actions.any?
+
+        ol sortable_data_options do
+          @collection.each do |item|
+            build_nested_item(item)
+          end
+        end
+      end
+
+      def sortable_data_options
+        return {} if !sortable?
+
         sort_url = if (( sort_url_block = options[:sort_url] ))
                      sort_url_block.call(self)
                    else
                      url_for(:action => :sort)
                    end
-        data_options = {
-          "data-sortable-type" => (tree? ? "tree" : "list"),
-          "data-sortable-url" => sort_url,
+        {
+          "data-sortable-type"   => tree? ? "tree" : "list",
+          "data-sortable-url"    => sort_url,
+          "data-max-levels"      => options[:max_levels],
+          "data-start-collapsed" => options[:start_collapsed],
+          "data-protect-root"    => options[:protect_root],
         }
-        data_options["data-max-levels"] = options[:max_levels]
-        data_options["data-start-collapsed"] = options[:start_collapsed]
-        data_options["data-protect-root"] = true if options[:protect_root]
+      end
 
-        ol data_options do
-          @collection.each do |item|
-            build_nested_item(item)
-          end
+      def sortable?
+        if (sortable = options[:sortable]).respond_to? :call
+          controller.instance_exec(&sortable)
+        else
+          sortable
         end
       end
 
@@ -134,13 +146,13 @@ module ActiveAdmin
       def build_actions(resource)
         links = ''.html_safe
         if @default_actions
-          if controller.action_methods.include?('show')
+          if controller.action_methods.include?('show') && authorized?(ActiveAdmin::Auth::READ, resource)
             links << link_to(I18n.t('active_admin.view'), resource_path(resource), :class => "member_link view_link")
           end
-          if controller.action_methods.include?('edit')
+          if controller.action_methods.include?('edit') && authorized?(ActiveAdmin::Auth::UPDATE, resource)
             links << link_to(I18n.t('active_admin.edit'), edit_resource_path(resource), :class => "member_link edit_link")
           end
-          if controller.action_methods.include?('destroy')
+          if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
             links << link_to(I18n.t('active_admin.delete'), resource_path(resource), :method => :delete, :data => {:confirm => I18n.t('active_admin.delete_confirmation')}, :class => "member_link delete_link")
           end
         end

data/spec/dummy/app/admin/category.rb

@@ -1,7 +1,7 @@
 ActiveAdmin.register Category do
   sortable
 
-  permit_params :name, :ancestry, :description, :position if ENV['RAILS_VERSION'] == '4'
+  permit_params :name, :ancestry, :description, :position if Float(ENV['RAILS_VERSION']) >= 4.0
 
   index as: :sortable do
     label :name

data/spec/dummy/app/admin/category_sort_disabled.rb

@@ -0,0 +1,15 @@
+ActiveAdmin.register Category, as: "CategoryDisabledSort" do
+  sortable sortable: false
+
+  permit_params :name, :ancestry, :description, :position if Float(ENV['RAILS_VERSION']) >= 4.0
+
+  index as: :sortable do
+    label :name
+    actions
+  end
+
+  form do |f|
+    f.inputs :name, :description
+    f.actions
+  end
+end

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

@@ -1,4 +1,4 @@
 class Category < ActiveRecord::Base
   has_ancestry
-  attr_accessible :ancestry, :description, :name, :position if ENV['RAILS_VERSION'] == "3.2"
+  attr_accessible :ancestry, :description, :name, :position if Float(ENV['RAILS_VERSION']) < 4
 end

data/spec/features/sortable_spec.rb

@@ -51,8 +51,46 @@ RSpec.describe "ActiveAdmin::SortableTree", type: :feature do
     end
   end
 
+  context "with option `sortable: false`" do
+    it "disables sorting by excluding sortable data attributes" do
+      bottom = Category.create! name: "bottom", position: 0
+      top    = Category.create! name: "top",    position: 1
+      middle = Category.create! name: "middle", position: 2
+
+      visit admin_category_disabled_sorts_path
+
+      expect(page).to have_css(".index_as_sortable")
+      expect(page).not_to have_css("[data-sortable-type]")
+      expect(page).not_to have_css("[data-sortable-url]")
+    end
+
+    context "with a proc returning false as sortable option" do
+      it "disables sorting" do
+        proc_evaluated_within_controller = false
+
+        sortable_options_for("CategoryDisabledSort")[:sortable] = proc do
+          proc_evaluated_within_controller = self.is_a?(ActiveAdmin::ResourceController)
+          false
+        end
+
+        bottom = Category.create! name: "bottom", position: 0
+
+        visit admin_category_disabled_sorts_path
+
+        expect(page).to have_css(".index_as_sortable")
+        expect(page).not_to have_css("[data-sortable-type]")
+        expect(proc_evaluated_within_controller).to be true
+      end
+    end
+  end
+
   def drag_element(selector, options)
     options.reverse_merge! moves: 20
     page.execute_script(%Q($("#{selector}").simulate("drag", #{options.to_json} )))
   end
+
+  def sortable_options_for(resource)
+    resource_config = ActiveAdmin.application.namespace(:admin).resource_for(resource)
+    resource_config.dsl.sortable_options
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_admin-sortable_tree
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Francesco Disperati
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,6 +134,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Changelog.md
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -144,6 +145,7 @@ files:
 - bin/rails
 - gemfiles/3.2.gemfile
 - gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
 - lib/active_admin/sortable_tree.rb
 - lib/active_admin/sortable_tree/controller_actions.rb
 - lib/active_admin/sortable_tree/engine.rb
@@ -155,6 +157,7 @@ files:
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/admin/category.rb
+- spec/dummy/app/admin/category_sort_disabled.rb
 - spec/dummy/app/admin/category_tree.rb
 - spec/dummy/app/admin/dashboard.rb
 - spec/dummy/app/assets/javascripts/active_admin.js