ar-orderable 1.0.0 → 1.0.1

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Gatis Tomsons
+Copyright (c) 2009 IT House, Gatis Tomsons
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/ar-orderable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar-orderable}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gatis Tomsons", "IT House"]
@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
   s.description = %q{You can order AR records and skip callbacks}
   s.email = %q{gatis@ithouse.cc}
   s.extra_rdoc_files = [
-    "LICENSE.txt",
     "README.md"
   ]
   s.files = [
@@ -21,15 +20,12 @@ Gem::Specification.new do |s|
     ".rspec",
     "Gemfile",
     "Gemfile.lock",
-    "LICENSE.txt",
     "MIT-LICENSE",
     "README.md",
     "Rakefile",
     "VERSION",
     "ar-orderable.gemspec",
-    "init.rb",
     "lib/ar-orderable.rb",
-    "lib/ar_orderable.rb",
     "spec/ar-orderable_spec.rb",
     "spec/ar_orderable_spec.rb",
     "spec/spec.opts",

data/lib/ar-orderable.rb

@@ -1,3 +1,4 @@
+$:<<File.dirname(__FILE__) unless $:.include?(File.dirname(__FILE__))
 module ActiveRecord # :nodoc:
   module Orderable # :nodoc:
     def self.included(base) # :nodoc:
@@ -124,3 +125,5 @@ module ActiveRecord # :nodoc:
     end
   end
 end
+
+ActiveRecord::Base.class_eval { include ActiveRecord::Orderable }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-orderable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &89325120 !ruby/object:Gem::Requirement
+  requirement: &82064910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *89325120
+  version_requirements: *82064910
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &89324880 !ruby/object:Gem::Requirement
+  requirement: &82064670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *89324880
+  version_requirements: *82064670
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &89324640 !ruby/object:Gem::Requirement
+  requirement: &82064430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *89324640
+  version_requirements: *82064430
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &89324400 !ruby/object:Gem::Requirement
+  requirement: &82064190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.11.6
   type: :development
   prerelease: false
-  version_requirements: *89324400
+  version_requirements: *82064190
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &89324160 !ruby/object:Gem::Requirement
+  requirement: &82063950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *89324160
+  version_requirements: *82063950
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &89323920 !ruby/object:Gem::Requirement
+  requirement: &82063710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *89323920
+  version_requirements: *82063710
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &89323680 !ruby/object:Gem::Requirement
+  requirement: &82063470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,28 +89,24 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *89323680
+  version_requirements: *82063470
 description: You can order AR records and skip callbacks
 email: gatis@ithouse.cc
 executables: []
 extensions: []
 extra_rdoc_files:
-- LICENSE.txt
 - README.md
 files:
 - .document
 - .rspec
 - Gemfile
 - Gemfile.lock
-- LICENSE.txt
 - MIT-LICENSE
 - README.md
 - Rakefile
 - VERSION
 - ar-orderable.gemspec
-- init.rb
 - lib/ar-orderable.rb
-- lib/ar_orderable.rb
 - spec/ar-orderable_spec.rb
 - spec/ar_orderable_spec.rb
 - spec/spec.opts
@@ -131,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 660910161
+      hash: -183352115
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2011 IT House, Gatis Tomsons
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-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/init.rb

@@ -1,2 +0,0 @@
-require 'ar-orderable'
-ActiveRecord::Base.send(:include, ActiveRecord::Orderable)

data/lib/ar_orderable.rb

@@ -1,126 +0,0 @@
-module ActiveRecord # :nodoc:
-  module Orderable # :nodoc:
-    def self.included(base) # :nodoc:
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-      attr_accessor :orderable_scope, :orderable_column, :skip_callbacks_for_orderable
-
-      # @:column [string] column name
-      # acts_as_orderable :column => "order_nr"
-      def acts_as_orderable options = {}
-        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.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}'"
-          puts msg if Rails.env == "development"
-          RAILS_DEFAULT_LOGGER.error msg
-        end
-      end
-
-      # 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.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|
-            order_nr += 1
-            raw_orderable_update(item.id, order_nr)
-          end
-        end
-      end
-
-      def raw_orderable_update id, nr
-        self.connection.execute("update #{self.table_name} set #{self.orderable_column} = #{nr.to_i} where #{self.table_name}.id = #{id.to_i};")
-      end
-    end
-
-    module InstanceMethods
-      
-      # Moves Item to given position
-      def move_to nr, options = {}
-        if options[:skip_callbacks].nil? ? self.class.skip_callbacks_for_orderable : options[:skip_callbacks]
-          self[self.class.orderable_column] = nr
-          self.send(:pre_save_ordering)
-          self.class.raw_orderable_update(self.id, nr)
-        else
-          self.update_attribute(self.class.orderable_column, nr)
-        end
-      end
-
-      def move_up options = {}
-        move_to(self[self.class.orderable_column] - 1, options) if self[self.class.orderable_column]
-      end
-
-      def move_down options = {}
-        move_to(self[self.class.orderable_column] + 1, options) if self[self.class.orderable_column]
-      end
-
-      def all_orderable
-        if self.class.orderable_scope
-          self.class.where(:"#{self.class.orderable_scope}" => self[self.class.orderable_scope])
-        else
-          self.class.scoped
-        end
-      end
-
-      private
-
-      def pre_save_ordering
-        self[self.class.orderable_column] = 0 if self[self.class.orderable_column].nil?
-        if self.id
-          if self[self.class.orderable_column] == 0
-            self[self.class.orderable_column] = 1
-          end
-          if self[self.class.orderable_column] > self.all_orderable.count
-            self[self.class.orderable_column] = self[self.class.orderable_column] -1
-          end
-        else
-          self[self.class.orderable_column] = self.all_orderable.count + 1 if self[self.class.orderable_column] == 0
-        end
-        self.all_orderable.where("#{self.class.table_name}.id != ?",self.id || 0).each do |item|
-          item[self.class.orderable_column] = 0 if item[self.class.orderable_column].nil?
-          if self.id
-            if item[self.class.orderable_column] > (self.send("#{self.class.orderable_column}_was") || 0 )
-              if item[self.class.orderable_column] <= self[self.class.orderable_column]
-                item[self.class.orderable_column] -= 1
-              end
-            else
-              if item[self.class.orderable_column] >= self[self.class.orderable_column]
-                item[self.class.orderable_column] += 1
-              end
-            end
-            
-            if item[self.class.orderable_column] != item.send("#{self.class.orderable_column}_was")
-              self.class.raw_orderable_update(item.id, item[self.class.orderable_column])
-            end
-          else
-            if item[self.class.orderable_column] >= self[self.class.orderable_column]
-              item[self.class.orderable_column] += 1
-              self.class.raw_orderable_update(item.id, item[self.class.orderable_column])
-            end
-          end
-        end
-      end
-
-      def pre_destroy_ordering
-        self.all_orderable.each do |item|
-          if item[self.class.orderable_column].to_i > self[self.class.orderable_column].to_i
-            item[self.class.orderable_column] -= 1
-            self.class.raw_orderable_update(item.id, item[self.class.orderable_column])
-          end
-        end
-      end
-    end
-  end
-end