ar-orderable 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eef4d72d4d551698488cc09c1f8c3f61aa18d0d0
-  data.tar.gz: 081e3058c8877e0c493b5835dd8bb3950df096cb
+  metadata.gz: 21bcc3926a7cbcadc327c1f008ca5e8aa95e954a
+  data.tar.gz: c0d61f2f0ab04dc166bdb5a01f13a22355624fd2
 SHA512:
-  metadata.gz: cc0a587b1a6bf201eadeaed343ef9cc8860aba707a9cf77f050ab3a590a49794e32140cc738c77c34084845221d2c81b24a5518637110c738689b1b7d9e500c7
-  data.tar.gz: ab8cf47b4a991fe8cf1b04aa9bb736646ec460401598d0c43422ceb594aed5e2682fba899c0c08ca4ca605fe3e5e421dbba247eead3dbb546c62a5a2619e74e8
+  metadata.gz: ea2627a7dd7bfe624ccda2af506c4863c9a72b86935c978d180651588cd87613991e4544ac076aab64b5650200cfb9cffce2b4b9fe1417658d04ad6bf09b78f9
+  data.tar.gz: 2843f200c252e198d48460e8adff5c4ef0f62dedca02f7273f45be74a81901c320b59f240dbccd3ab7efe1ac152c2fbdc058032a28b9842d1d0850aaeedf5d87

data/README.md

@@ -6,19 +6,21 @@ Rails 3 plugin for simple ordering.
 
 Insert into your `Gemfile`:
 
-    gem 'ar-orderable'
-    
+    gem "ar-orderable"
+
 then `bundle install`
 
 ### Setup
 
-1. Add order field, like "order_nr" as integer
-2. In model add line "acts_as_orderable" and if needed add :column => "my_orderfield_name".
-3. If your table already has some rows of data then use the 'order_unordered' after adding new column:
+1. Add order field, like `order_nr` as integer
+2. In model add line `acts_as_orderable` and if needed add options
+	- `column: "my_custom_order_field" # default it's order_nr`
+	- `scope: :locale # to order in some scope, you can add also as array [:locale, :some_type]`
+3. If your table already has some rows of data then call the `YourModel.order_unordered` after adding new column.
 
 Example migration:
 
-    add_column :categories, :order_nr, :integer
+    add_column :categories, :order_nr, :integer # change to your column name
     Category.order_unordered # remove this for new table
     add_index :categories, :order_nr
 
@@ -44,4 +46,4 @@ To skip model callbacks and just update order information you can specify `:skip
 
     rspec spec # all examples should be green
 
-Copyright (c) 2009 IT House, released under the MIT license
+Copyright (c) 2009 IT House, released under the MIT license

data/ar-orderable.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "ar-orderable"
-  s.version     = '1.0.5'
+  s.version     = '1.0.6'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["ITHouse (Latvia)", "Gatis Tomsons"]
   s.email       = "support@ithouse.lv"

data/lib/ar-orderable.rb

@@ -8,17 +8,18 @@ module ActiveRecord
       attr_accessor :orderable_scope, :orderable_column, :skip_callbacks_for_orderable
 
       # @:column [string] column name
+      # @:scope [string] column name to scope by
+      # @:scope Array[string] column names to scope by
       # acts_as_orderable :column => "order_nr"
       def acts_as_orderable options = {}
         return unless self.connection.table_exists?(self.table_name)
         self.orderable_column = (options[:column] || "order_nr").to_s
         self.skip_callbacks_for_orderable = options[:skip_callbacks]
         if self.columns_hash.keys.include? self.orderable_column
-          self.orderable_scope  = options[:scope]
+          self.orderable_scope = Array(options[:scope])
           self.before_save :pre_save_ordering
           self.before_destroy :pre_destroy_ordering
           self.default_scope { order(self.orderable_column) }
-          #self.validates_uniqueness_of self.orderable_column, :scope => @orderable_scope
           include ActiveRecord::Orderable::InstanceMethods
         else
           msg = "[IMPORTANT] ActiveRecord::Orderable plugin: class #{self} has missing column '#{self.orderable_column}'"
@@ -34,12 +35,12 @@ module ActiveRecord
 
       # updates all unordered items puts them into the end of list
       def order_unordered
-        self.reset_column_information # because before this usual 'add_column' is executed and the new column isn't fetched yet
+        self.reset_column_information
         self.group(self.orderable_scope).each do |obj|
           unordered_conditions = "#{self.orderable_column} IS NULL OR #{self.table_name}.#{self.orderable_column} = 0"
           ordered_conditions   = "#{self.orderable_column} IS NOT NULL AND #{self.table_name}.#{self.orderable_column} != 0"
           order_nr = obj.all_orderable.order(self.orderable_column).last[self.orderable_column] || 0
-          obj.all_orderable.where(unordered_conditions).each do |item|
+          obj.all_orderable.where(unordered_conditions).find_each do |item|
             order_nr += 1
             raw_orderable_update(item.id, order_nr)
           end
@@ -72,9 +73,14 @@ module ActiveRecord
         move_to(self[self.class.orderable_column] + 1, options) if self[self.class.orderable_column]
       end
 
+      # returns all elements in current scope
       def all_orderable
-        if self.class.orderable_scope
-          self.class.where(:"#{self.class.orderable_scope}" => self[self.class.orderable_scope])
+        if self.class.orderable_scope.any?
+          scope = self.class.orderable_scope.inject({}) do |where, scope_name|
+            where[scope_name] = self[scope_name]
+            where
+          end
+          self.class.where(scope)
         else
           self.class.scoped
         end
@@ -97,7 +103,7 @@ module ActiveRecord
         end
 
         return unless self.all_orderable.where("id != ? and #{column_name} = ?", self.id, self[column_name]).count > 0
-        self.all_orderable.where("#{self.class.table_name}.id != ?",self.id || 0).each do |item|
+        self.all_orderable.where("#{self.class.table_name}.id != ?",self.id || 0).find_each do |item|
           item[column_name] = 0 if item[column_name].nil?
           if self.id
             if item[column_name] > (self.send("#{column_name}_was") || 0 )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-orderable
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - ITHouse (Latvia)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: You can order AR records and skip callbacks