rails_admin_nestable 0.1.7 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWFjMGUyNGEwMzc4OWFiOTVhYzlmZWM3YmM0MzcyZjJhNzI2YjQwOA==
-  data.tar.gz: !binary |-
-    MTM2YWRiODk0ZmM3NTM4NWE4NWI1ODFlMTcwNTFhZjg5Y2MxYjZkOA==
+SHA1:
+  metadata.gz: 77f2ba26c0c2b45db61c79f119a76e7a925d3834
+  data.tar.gz: 965559bbcc203cbccd748974266be6bba5323f03
 SHA512:
-  metadata.gz: !binary |-
-    NDBmN2ViZDRjZWQ0MWMzYWM3YjBlZWM2MzQ4MmIyMTYzMGZhMTNiMzE1MjE0
-    ZDMxNjMzMmQxYTM5OWE1YTdhZjhhZmU3MzdiODA3NWFmYTM2NGEzOGUyYjY5
-    N2JhNGEzNWFlNjcxZGUyYTQyMjk0YTI5MDZhNDAzODk5ZDI5YmU=
-  data.tar.gz: !binary |-
-    MWJhYjMwZDA5ZDViZjg0YTRmYTAxYzM5ZjA4NTA4YjRlNWM3YTUyMjZiN2Y2
-    NmJjY2FhMzNiZDI4ZTRjZmM4YTg0Y2U4NzAzYzlkMjQ3ZmJmODYyM2FjZGU4
-    MWRiYmY3OWQzYjQ4ZWMzZTQ4NmM4NWEwMTU4M2M1ODAzMDY0ZDg=
+  metadata.gz: 7c772fb273a6f1ddcd274f05767b89f645bac71d0870a941490553bc252a5a100b52c3820a92ec72447820ef5b7505dd5007a558aef3b4dd857b9bc5bf5975dd
+  data.tar.gz: 4eefd1dc75a210dbdae1288157c83e4908893d847943b59033dbb4c265e26896b27609494e6f26195f198a0331aafc50ec7bfc0c76eb61b0c2376ec300833237

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 Andrea Dal Ponte
+Copyright 2014 Andrea Dal Ponte
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,10 +1,11 @@
 # Rails Admin Nestable
 
-Reorganise model data with a drag and drop tree/list structure.
+RailsAdmin Drag and drop tree view for Ancestry gem
 
 Sample demo available at: https://github.com/dalpo/rails_admin_nestable_demo
 
 [![Gem Version](https://badge.fury.io/rb/rails_admin_nestable.png)](http://badge.fury.io/rb/rails_admin_nestable)
+[![Code Climate](https://codeclimate.com/github/dalpo/rails_admin_nestable.png)](https://codeclimate.com/github/dalpo/rails_admin_nestable)
 
 ## Installation
 
@@ -43,14 +44,15 @@ end
 You could choose between two different configurations for your model:
 
 ### 1. Nestable tree:
-To use this configuration, you need to organize your tree model with [Ancestry](https://github.com/stefankroes/ancestry).
+To use this configuration, you need to organize your tree model with [Ancestry](https://github.com/stefankroes/ancestry) or [Mongoid Ancestry](https://github.com/skyeagle/mongoid-ancestry).
 Otherwise your model have to respond to the `parent`, `arrange` and `children` methods.
 
 The `nestable_tree` methods supports the following options:
   * `position_field`: (symbol) default => `nil`
   * `max_depth`: (integer) default => `nil`
   * `enable_callback`: (boolean) default => `false`
-  * `scope`: (symbol | proc) default => `nil`, must be a `ActiveRecord::Relation` object of models
+  * `scope`: (symbol | proc) default => `nil`
+  * `live_update`: (boolean | :only) default => true (:only is for live updating only)
 
 In your `config/initializers/rails_admin.rb` initializer:
 ```ruby
@@ -75,7 +77,8 @@ To use this configuration, you need a position field
 The `nestable_list` methods supports the following options:
   * `position_field`: (symbol) default `:position`
   * `enable_callback`: (boolean) default => `false`
-  * `scope`: (symbol | proc) default => `nil`, must be a `ActiveRecord::Relation` object of models
+  * `scope`: (symbol | proc) default => `nil`
+  * `live_update`: (boolean | :only) default => true (:only is for live updating only)
 
 In your `config/initializers/rails_admin.rb` initializer:
 ```ruby
@@ -149,7 +152,7 @@ Submitting a Pull Request:
 ## License
 **This project rocks and uses MIT-LICENSE.**
 
-Copyright 2013 Andrea Dal Ponte
+Copyright 2014 Andrea Dal Ponte
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -169,4 +172,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

data/app/assets/javascripts/rails_admin/rails_admin_nestable.js.coffee

@@ -25,7 +25,7 @@ jQuery ->
   $tree_nodes_max_depth = $tree_nodes.data('max-depth')
   $live_update = $('#rails_admin_nestable input[type=checkbox]')
   $update_button = $('#rails_admin_nestable button')
-  live_update_mode = $live_update.prop('checked')
+  live_update_mode = if (!$live_update.length && !$update_button.length) then true else $live_update.prop('checked')
   $('#rails_admin_nestable button').prop('disabled', $live_update.prop('checked'))
 
   $live_update.change ->

data/app/views/rails_admin/main/nestable.html.haml

@@ -1,13 +1,16 @@
 .row-fluid
   .span12#rails_admin_nestable
-    .control-group
-      %label{:class => 'checkbox inline' }
-        %input{ :type => 'checkbox' }= t('admin.actions.nestable.live_update')
+    - if [false, :only].exclude?(@options[:live_update])
+      .control-group
+        %label{:class => 'checkbox inline' }
+          %input{ :type => 'checkbox' }= t('admin.actions.nestable.live_update')
     #tree_nodes.dd{:'data-update-path' => nestable_path(model_name: @abstract_model), :'data-max-depth' => tree_max_depth}
       %ol.dd-list
         = nested_tree_nodes @tree_nodes
-    .form-actions
-      %button{ :type => 'submit', :class => 'btn btn-small btn-primary' }= t('admin.actions.nestable.update')
+    - if @options[:live_update] != :only
+      .form-actions
+        %button{ :type => 'submit', :class => 'btn btn-small btn-primary' }= t('admin.actions.nestable.update')
+
 
 = stylesheet_link_tag    'rails_admin/rails_admin_nestable'
 = javascript_include_tag 'rails_admin/jquery.nestable'

data/config/locales/nestable.vi.yml

@@ -0,0 +1,14 @@
+vi:
+  admin:
+    actions:
+      nestable:
+        title: "Sắp xếp cho %{model_label}"
+        menu: "Tạo Menu"
+        breadcrumb: "Tạo menu"
+        link: "Tạo menu"
+        bulk_link: "Sắp xếp những %{model_label_plural} đã chọn"
+        done: "Đã sắp xếp"
+        success: "Thành công"
+        error: "Lỗi"
+        update: "Cập nhập"
+        live_update: "Cập nhật trực tiếp"

data/lib/rails_admin_nestable.rb

@@ -9,5 +9,4 @@ require 'rails_admin/config/model'
 require 'rails_admin_nestable/configuration'
 require 'rails_admin_nestable/nestable'
 require 'rails_admin_nestable/model'
-require 'rails_admin_nestable/helper'
-
+require 'rails_admin_nestable/helper'

data/lib/rails_admin_nestable/configuration.rb

@@ -1,8 +1,8 @@
 module RailsAdminNestable
   class Configuration
 
-    TREE_DEFAULT_OPTIONS = { enable_callback: false, scope: nil }
-    LIST_DEFAULT_OPTIONS = { position_field: :position, max_depth: 1, enable_callback: false, scope: nil }
+    TREE_DEFAULT_OPTIONS = { live_update: true, enable_callback: false, scope: nil }
+    LIST_DEFAULT_OPTIONS = { position_field: :position, max_depth: 1, live_update: true, enable_callback: false, scope: nil }
 
     def initialize(abstract_model)
       @abstract_model = abstract_model
@@ -17,32 +17,30 @@ module RailsAdminNestable
     end
 
     def options
-      if tree?
-        @nestable_options ||= self.tree_options
-      elsif list?
-        @nestable_options ||= self.list_options
+      @nestable_options ||= begin
+        options = self.tree_options if tree?
+        options = self.list_options if list?
+        options || {}
       end
-
-      @nestable_options || {}
     end
 
-  protected
+    protected
 
-    def tree_options
-      tree.class == Hash ? TREE_DEFAULT_OPTIONS.merge(tree) : TREE_DEFAULT_OPTIONS
-    end
+      def tree_options
+        tree.class == Hash ? TREE_DEFAULT_OPTIONS.merge(tree) : TREE_DEFAULT_OPTIONS
+      end
 
-    def list_options
-      LIST_DEFAULT_OPTIONS.merge(list.class == Hash ? list : {})
-    end
+      def list_options
+        LIST_DEFAULT_OPTIONS.merge(list.class == Hash ? list : {})
+      end
 
-    def tree
-      @nestable_tree ||= ::RailsAdmin::Config.model(@abstract_model.model).nestable_tree
-    end
+      def tree
+        @nestable_tree ||= ::RailsAdmin::Config.model(@abstract_model.model).nestable_tree
+      end
 
-    def list
-      @nestable_list ||= ::RailsAdmin::Config.model(@abstract_model.model).nestable_list
-    end
+      def list
+        @nestable_list ||= ::RailsAdmin::Config.model(@abstract_model.model).nestable_list
+      end
 
   end
 end

data/lib/rails_admin_nestable/helper.rb

@@ -1,6 +1,5 @@
 module RailsAdminNestable
   module Helper
-
     def nested_tree_nodes(tree_nodes = [])
       tree_nodes.map do |tree_node, sub_tree_nodes|
         li_classes = 'dd-item dd3-item'
@@ -8,15 +7,12 @@ module RailsAdminNestable
         content_tag :li, class: li_classes, :'data-id' => tree_node.id do
 
           output = content_tag :div, 'drag', class: 'dd-handle dd3-handle'
-          output+= content_tag :div, class: 'dd3-content' do
+          output += content_tag :div, class: 'dd3-content' do
             content = link_to @model_config.with(object: tree_node).object_label, edit_path(@abstract_model, tree_node.id)
-            content+= content_tag :div, action_links(tree_node), class: 'pull-right links'
-          end
-
-          if sub_tree_nodes && sub_tree_nodes.any?
-            output+= content_tag :ol, nested_tree_nodes(sub_tree_nodes), class: 'dd-list'
+            content += content_tag :div, action_links(tree_node), class: 'pull-right links'
           end
 
+          output+= content_tag :ol, nested_tree_nodes(sub_tree_nodes), class: 'dd-list' if sub_tree_nodes && sub_tree_nodes.any?
           output
         end
       end.join.html_safe
@@ -31,6 +27,5 @@ module RailsAdminNestable
     def tree_max_depth
       @nestable_conf.options[:max_depth] || 'false'
     end
-
   end
-end
+end

data/lib/rails_admin_nestable/model.rb

@@ -12,4 +12,4 @@ module RailsAdmin
 
     end
   end
-end
+end

data/lib/rails_admin_nestable/nestable.rb

@@ -5,7 +5,7 @@ module RailsAdmin
         RailsAdmin::Config::Actions.register(self)
 
         register_instance_option :pjax? do
-          false
+          true
         end
 
         register_instance_option :root? do
@@ -23,49 +23,41 @@ module RailsAdmin
         register_instance_option :controller do
           Proc.new do |klass|
             @nestable_conf = ::RailsAdminNestable::Configuration.new @abstract_model
+            @position_field = @nestable_conf.options[:position_field]
+            @enable_callback = @nestable_conf.options[:enable_callback]
+            @nestable_scope = @nestable_conf.options[:scope]
+            @options = @nestable_conf.options
+            @adapter = @abstract_model.adapter
 
             # Methods
             def update_tree(tree_nodes, parent_node = nil)
               tree_nodes.each do |key, value|
-                model = @abstract_model.model.find(value['id'].to_i)
-
-                if parent_node.present?
-                  model.parent = parent_node
-                else
-                  model.parent = nil
-                end
-
-                if @nestable_conf.options[:position_field].present?
-                  model.send("#{@nestable_conf.options[:position_field]}=".to_sym, (key.to_i + 1))
-                end
-
-                model.save!(validate: @nestable_conf.options[:enable_callback])
-
-                if value.has_key?('children')
-                  update_tree(value['children'], model)
-                end
+                model = @abstract_model.model.find(value['id'].to_s)
+                model.parent = parent_node || nil
+                model.send("#{@position_field}=".to_sym, (key.to_i + 1)) if @position_field.present?
+                model.save!(validate: @enable_callback)
+                update_tree(value['children'], model) if value.has_key?('children')
               end
             end
 
             def update_list(model_list)
               model_list.each do |key, value|
-                model = @abstract_model.model.find(value['id'].to_i)
-                model.send("#{@nestable_conf.options[:position_field]}=".to_sym, (key.to_i + 1))
-                model.save!(validate: @nestable_conf.options[:enable_callback])
+                model = @abstract_model.model.find(value['id'].to_s)
+                model.send("#{@position_field}=".to_sym, (key.to_i + 1))
+                model.save!(validate: @enable_callback)
               end
             end
 
             if request.post? && params['tree_nodes'].present?
               begin
-                ActiveRecord::Base.transaction do
-                  if @nestable_conf.tree?
-                    update_tree params[:tree_nodes]
-                  end
-
-                  if @nestable_conf.list?
-                    update_list params[:tree_nodes]
-                  end
-                end
+                update = ->{
+                  update_tree params[:tree_nodes] if @nestable_conf.tree?
+                  update_list params[:tree_nodes] if @nestable_conf.list?
+                }
+
+                ActiveRecord::Base.transaction { update.call } if @adapter == :active_record
+                update.call if @adapter == :mongoid
+
                 message = "<strong>#{I18n.t('admin.actions.nestable.success')}!</strong>"
               rescue Exception => e
                 message = "<strong>#{I18n.t('admin.actions.nestable.error')}</strong>: #{e}"
@@ -75,26 +67,25 @@ module RailsAdmin
             end
 
             if request.get?
-              scope = begin
-                case @nestable_conf.options[:scope].class.to_s
+              query = list_entries(@model_config, :nestable, false, false).reorder(nil)
+
+              case @options[:scope].class.to_s
                 when 'Proc'
-                  @nestable_conf.options[:scope].call
+                  query.merge(@options[:scope].call)
                 when 'Symbol'
-                  @abstract_model.model.public_send(@nestable_conf.options[:scope])
-                else
-                  nil
-                end
+                  query.merge(@abstract_model.model.public_send(@options[:scope]))
               end
 
-              query = list_entries(@model_config, :nestable, false, false).reorder(nil).merge(scope)
-              position_field = @nestable_conf.options[:position_field]
-
               if @nestable_conf.tree?
-                @tree_nodes = position_field.present?? query.arrange(order: position_field) : query.arrange
+                @tree_nodes = if @options[:position_field].present?
+                  query.arrange(order: @options[:position_field])
+                else
+                  query.arrange
+                end
               end
 
               if @nestable_conf.list?
-                @tree_nodes = query.order(position_field)
+                @tree_nodes = query.order("#{@options[:position_field]} ASC")
               end
 
               render action: @action.template_name
@@ -103,7 +94,7 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-move'
+          'icon-move fa fa-arrows'
         end
 
         register_instance_option :http_methods do

data/lib/rails_admin_nestable/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminNestable
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,93 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_nestable
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrea Dal Ponte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rails_admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Rails Admin plugin to organise Tree/List models with a simple drag and
-  drop custom action
+description: RailsAdmin Drag and drop tree view for Ancestry gem with ActiveRecord
+  and MongoID
 email:
 - info@andreadalponte.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/assets/javascripts/rails_admin/jquery.nestable.js
 - app/assets/javascripts/rails_admin/rails_admin_nestable.js.coffee
 - app/assets/stylesheets/rails_admin/rails_admin_nestable.css.scss
@@ -98,16 +101,14 @@ files:
 - config/locales/nestable.es.yml
 - config/locales/nestable.it.yml
 - config/locales/nestable.sv.yml
+- config/locales/nestable.vi.yml
+- lib/rails_admin_nestable.rb
 - lib/rails_admin_nestable/configuration.rb
 - lib/rails_admin_nestable/engine.rb
 - lib/rails_admin_nestable/helper.rb
 - lib/rails_admin_nestable/model.rb
 - lib/rails_admin_nestable/nestable.rb
 - lib/rails_admin_nestable/version.rb
-- lib/rails_admin_nestable.rb
-- MIT-LICENSE
-- Rakefile
-- README.md
 homepage: https://github.com/dalpo/rails_admin_nestable
 licenses:
 - MIT
@@ -118,18 +119,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Reorganise model data with a drag and drop tree/list structure
+summary: RailsAdmin Drag and drop tree view for Ancestry gem
 test_files: []