activerecord-sortable 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a898883ef7551d4ba504901b2943b51cc241003c
-  data.tar.gz: 494f354c4ae817169cdc68d25e96dc47a988afa8
+  metadata.gz: 4956bd13ab72e2f0f964c4910fc5ab8b93af7cd4
+  data.tar.gz: a5bf9144ef1c2d9dd40c99f92aa2244922870ecb
 SHA512:
-  metadata.gz: 038c282ec667ae7a7adadd73bc8781ac89feec5daf7c936a0fc002cbbd6b5dae5e0ad4b7e26bcfa0857fe35886f532e59f9bf91339e44b953ca8d98a4f147c90
-  data.tar.gz: 316b92099e3310f6285c4ed0eb4c36b6e8c4516347c47545e056238ecb2eadc0654a13ef170a688a3f4139afad98a28c8a2ae0874aaaa0dd9cbc3afaccf206f3
+  metadata.gz: b243649509ccb9ef317ed9aa4b1f0e10b12b600f51796fec58cfc254842b92f72a1474a020d09833de2eadf9c2931aad1a5901ea918d6141dca0a63b3f818727
+  data.tar.gz: fafdffeadde9a2bb701345bde5162df130f13e2b402a168f5eaa7e0050c5e7b90d7c517ddcd3c4ad657268d9115b4ba0075f80586fcdfa5186559a61f4d88be3

data/lib/activerecord/sortable/acts_as_sortable.rb

@@ -10,21 +10,21 @@ module ActiveRecord
       module ClassMethods
         def acts_as_sortable(&block)
           options = {
-            :relation => ->(instance) {instance.class},
-            :append => false,
-            :position_column => :position
+            relation: ->(instance) { instance.class },
+            append: false,
+            position_column: :position
           }
           block.call(options) if block_given?
 
-          cattr_accessor :sortable_relation, :instance_reader => false, :instance_writer => false
-          cattr_accessor :sortable_append, :instance_reader => true, :instance_writer => false
-          cattr_accessor :sortable_position_column, :instance_reader => true, :instance_writer => false
+          cattr_accessor :sortable_relation, instance_reader: false, instance_writer: false
+          cattr_accessor :sortable_append, instance_reader: true, instance_writer: false
+          cattr_accessor :sortable_position_column, instance_reader: true, instance_writer: false
 
           self.sortable_relation = options[:relation]
           self.sortable_append = options[:append]
           self.sortable_position_column = options[:position_column]
 
-          scope "ordered_by_#{self.sortable_position_column}_asc".to_sym, -> { order(self.sortable_position_column => :asc) }
+          scope "ordered_by_#{sortable_position_column}_asc".to_sym, -> { order(arel_table[sortable_position_column].asc) }
 
           before_create :sortable_set_default_position
           after_destroy :sortable_shift_on_destroy

data/lib/activerecord/sortable/acts_as_sortable/instance_methods.rb

@@ -2,33 +2,31 @@ module ActiveRecord
   module Sortable
     module ActsAsSortable
       module InstanceMethods
-
         def move_to!(new_position)
           new_position = Integer(new_position)
 
           transaction do
-            if new_position > self.send(sortable_position_column)
+            if new_position > send(sortable_position_column)
               sortable_relation_shift_left(new_position)
             else
               sortable_relation_shift_right(new_position)
             end
 
-            self.update_attribute(sortable_position_column, new_position)
+            update_attribute(sortable_position_column, new_position)
           end
         end
 
-
         private
 
         def sortable_relation_shift_left(new_position)
           sortable_relation
-            .where(["#{sortable_position_column} > ? AND #{sortable_position_column} <= ?", self.send(sortable_position_column), new_position])
+            .where(["#{sortable_position_column} > ? AND #{sortable_position_column} <= ?", send(sortable_position_column), new_position])
             .update_all sortable_updates_with_timestamps("#{sortable_position_column} = #{sortable_position_column} - 1")
         end
 
         def sortable_relation_shift_right(new_position)
           sortable_relation
-            .where(["#{sortable_position_column} >= ? AND #{sortable_position_column} < ?", new_position, self.send(sortable_position_column)])
+            .where(["#{sortable_position_column} >= ? AND #{sortable_position_column} < ?", new_position, send(sortable_position_column)])
             .update_all sortable_updates_with_timestamps("#{sortable_position_column} = #{sortable_position_column} + 1")
         end
 
@@ -37,7 +35,7 @@ module ActiveRecord
         end
 
         def sortable_set_default_position
-          sortable_assign_default_position unless self.send(sortable_position_column).present?
+          sortable_assign_default_position unless send(sortable_position_column).present?
 
           true
         end
@@ -51,13 +49,13 @@ module ActiveRecord
         end
 
         def sortable_append_instance
-          next_position = (max_position = sortable_relation.pluck(self.sortable_position_column).max).present? ? max_position + 1 : 0
-          self.send("#{sortable_position_column}=".to_sym, next_position)
+          next_position = (max_position = sortable_relation.pluck(sortable_position_column).max).present? ? max_position + 1 : 0
+          send("#{sortable_position_column}=".to_sym, next_position)
         end
 
         def sortable_prepend_instance
           sortable_relation.update_all sortable_updates_with_timestamps("#{sortable_position_column} = #{sortable_position_column} + 1")
-          self.send("#{sortable_position_column}=".to_sym, 0)
+          send("#{sortable_position_column}=".to_sym, 0)
         end
 
         def sortable_updates_with_timestamps(base_query)
@@ -69,11 +67,11 @@ module ActiveRecord
             query_items << "#{attr} = ?"
             current_time
           end
-          updates = [query_items.join(', ')] + update_values
+          [query_items.join(', ')] + update_values
         end
 
         def sortable_shift_on_destroy
-          sortable_relation.where(["#{sortable_position_column} > ?", self.send(sortable_position_column)]).update_all sortable_updates_with_timestamps("#{sortable_position_column} = #{sortable_position_column} - 1")
+          sortable_relation.where(["#{sortable_position_column} > ?", send(sortable_position_column)]).update_all sortable_updates_with_timestamps("#{sortable_position_column} = #{sortable_position_column} - 1")
           true
         end
       end

data/lib/activerecord/sortable/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Sortable
-    VERSION = "0.0.3"
+    VERSION = '0.0.4'
   end
 end

data/spec/dummy-3.2/Rakefile

@@ -0,0 +1,7 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Dummy::Application.load_tasks

data/spec/dummy-3.2/app/assets/javascripts/application.js

@@ -0,0 +1,10 @@
+//= require jquery
+//= require jquery_ujs
+//= require sortable
+
+//= require jquery-ui/sortable
+
+$(document).ready(function(){
+  $('*[data-role=activerecord_sortable]').activerecord_sortable();
+});
+

data/spec/dummy-3.2/app/controllers/parents_controller.rb

@@ -0,0 +1,24 @@
+class ParentsController < ApplicationController
+  def new
+    @parent = Parent.new
+    3.times do |position|
+      @parent.children.build(
+        :name => "Child #{position}",
+        :position => position
+      )
+    end
+  end
+
+  def create
+    @parent = Parent.new params[:parent]
+    if @parent.save
+      redirect_to parent_path(@parent)
+    else
+      render :new
+    end
+  end
+
+  def show
+    @parent = Parent.find(params[:id])
+  end
+end

data/spec/dummy-3.2/app/models/child.rb

@@ -0,0 +1,9 @@
+class Child < ActiveRecord::Base
+  acts_as_sortable do |config|
+    config[:relation] = ->(instance) {instance.parent.children}
+  end
+
+  belongs_to :parent
+
+  attr_accessible :name, :position
+end

data/spec/dummy-3.2/app/models/parent.rb

@@ -0,0 +1,7 @@
+class Parent < ActiveRecord::Base
+  has_many :children
+
+  accepts_nested_attributes_for :children
+
+  attr_accessible :children_attributes
+end

data/spec/dummy-3.2/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Dummy::Application

data/spec/dummy-3.2/config/application.rb

@@ -0,0 +1,65 @@
+require File.expand_path('../boot', __FILE__)
+
+# Pick the frameworks you want:
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "active_resource/railtie"
+require "sprockets/railtie"
+# require "rails/test_unit/railtie"
+
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    config.assets.enabled = true
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+
+    # Enable escaping HTML in JSON.
+    config.active_support.escape_html_entities_in_json = true
+
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    config.active_record.whitelist_attributes = true
+
+  end
+end

data/spec/dummy-3.2/config/boot.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/spec/dummy-3.2/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Dummy::Application.initialize!

data/spec/dummy-3.2/config/environments/development.rb

@@ -0,0 +1,32 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
+
+end

data/spec/dummy-3.2/config/environments/production.rb

@@ -0,0 +1,54 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = false
+
+
+  # Specifies the header that your server uses for sending files
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Prepend all log lines with the following tags
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+end

data/spec/dummy-3.2/config/environments/test.rb

@@ -0,0 +1,37 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite. You never need to work with it otherwise. Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs. Don't rely on the data there!
+  config.cache_classes = true
+
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Log error messages when you accidentally call methods on nil
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end