ar-orderable 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6db5662b4903bbb0be3eb2c6a9a1ecc51842257f
+  data.tar.gz: cd2f93a4bdcfdb250aeb452e9111b3512d9e28de
+SHA512:
+  metadata.gz: 36042d7a30634bb9f937afabb65b2837601ee3a5d9ccfac964938fcb952d93b10073a8a2ed19be0c8836be6ffe48ae6dcb40fecddc2cf13d38d90a558a0d001f
+  data.tar.gz: ebb6b1a90e1929328dd0d1b74902651b4f701721dfd5b00f37bc7af9580d0663dd7a038d17e58356df355ffa5a24525358b9898f6d796f32788831e0014f17e0

data/.gitignore

@@ -0,0 +1,24 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+#.\#*
+
+# For vim:
+*.swp
+
+# log
+
+spec/*.log

data/Gemfile

@@ -3,10 +3,11 @@ source "http://rubygems.org"
 gem 'rails', '>= 3.0.0'
 
 group :development do
-  gem 'sqlite3', '~> 1.3.4'
-  gem 'rspec', '~> 2.6.0'
-  gem 'ruby-debug19', '~> 0.11.6'
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem 'sqlite3', '~> 1.3.7'
+  gem 'byebug', '~> 1.7.0'
+end
+
+group :test do
+  gem "simplecov", "~> 0.7.1"
+  gem 'rspec', '~> 2.14.0'
 end

data/Gemfile.lock

@@ -1,110 +1,103 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
-      mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
-    archive-tar-minitar (0.5.2)
-    arel (2.0.10)
-    builder (2.1.2)
-    columnize (0.3.4)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    atomic (1.1.12)
+    builder (3.1.4)
+    byebug (1.7.0)
+      columnize (~> 0.3.6)
+      debugger-linecache (~> 1.2.0)
+    columnize (0.3.6)
+    debugger-linecache (1.2.0)
+    diff-lcs (1.2.4)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.4)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.2)
-    rack (1.2.3)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    mime-types (1.23)
+    minitest (4.7.5)
+    multi_json (1.7.8)
+    polyglot (0.3.3)
+    rack (1.5.2)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
-      bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (0.9.2)
-    rcov (0.9.9)
-    rdoc (3.9.1)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    sqlite3 (1.3.4)
-    thor (0.14.6)
-    treetop (1.4.10)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.2)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sprockets (2.10.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.7)
+    thor (0.18.1)
+    thread_safe (0.1.2)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.6.4)
+  byebug (~> 1.7.0)
   rails (>= 3.0.0)
-  rcov
-  rspec (~> 2.6.0)
-  ruby-debug19 (~> 0.11.6)
-  sqlite3 (~> 1.3.4)
+  rspec (~> 2.14.0)
+  simplecov (~> 0.7.1)
+  sqlite3 (~> 1.3.7)

data/Rakefile

@@ -1,44 +1,7 @@
-# encoding: utf-8
-
 require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "ar-orderable"
-  gem.homepage = "http://github.com/ithouse/ar-orderable"
-  gem.license = "MIT"
-  gem.summary = %Q{Rails 3 plugin for simple ordering.}
-  gem.description = %Q{You can order AR records and skip callbacks}
-  gem.email = "gatis@ithouse.cc"
-  gem.authors = ["Gatis Tomsons","IT House"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'spec'
-  test.pattern = 'spec/**/_spec*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+require 'rspec/core/rake_task'
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "ar-orderable #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/ar-orderable.gemspec

@@ -1,69 +1,22 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{ar-orderable}
-  s.version = "1.0.3"
+  s.name        = "ar-orderable"
+  s.version     = '1.0.4'
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["ITHouse (Latvia)", "Gatis Tomsons"]
+  s.email       = "support@ithouse.lv"
+  s.homepage    = "http://github.com/ithouse/ar-orderable"
+  s.summary = %q{You can order AR records and skip callbacks}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Gatis Tomsons}, %q{IT House}]
-  s.date = %q{2011-11-08}
-  s.description = %q{You can order AR records and skip callbacks}
-  s.email = %q{gatis@ithouse.cc}
   s.extra_rdoc_files = [
     "README.md"
   ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "MIT-LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "ar-orderable.gemspec",
-    "lib/ar-orderable.rb",
-    "spec/ar-orderable_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/ithouse/ar-orderable}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.8}
-  s.summary = %q{Rails 3 plugin for simple ordering.}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.licenses = ["MIT"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_development_dependency(%q<sqlite3>, ["~> 1.3.4"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_development_dependency(%q<ruby-debug19>, ["~> 0.11.6"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<sqlite3>, ["~> 1.3.4"])
-      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-      s.add_dependency(%q<ruby-debug19>, ["~> 0.11.6"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<sqlite3>, ["~> 1.3.4"])
-    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
-    s.add_dependency(%q<ruby-debug19>, ["~> 0.11.6"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
+  s.add_runtime_dependency(%q<activerecord>, [">= 3.0", "< 4.0"])
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
 end
-

data/lib/ar-orderable.rb

@@ -1,7 +1,6 @@
-$:<<File.dirname(__FILE__) unless $:.include?(File.dirname(__FILE__))
-module ActiveRecord # :nodoc:
-  module Orderable # :nodoc:
-    def self.included(base) # :nodoc:
+module ActiveRecord
+  module Orderable
+    def self.included(base)
       base.extend(ClassMethods)
     end
 
@@ -11,13 +10,14 @@ module ActiveRecord # :nodoc:
       # @:column [string] column name
       # 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.before_save :pre_save_ordering
           self.before_destroy :pre_destroy_ordering
-          self.default_scope :order => self.orderable_column
+          self.default_scope { order(self.orderable_column) }
           #self.validates_uniqueness_of self.orderable_column, :scope => @orderable_scope
           include ActiveRecord::Orderable::InstanceMethods
         else
@@ -130,4 +130,4 @@ module ActiveRecord # :nodoc:
   end
 end
 
-ActiveRecord::Base.class_eval { include ActiveRecord::Orderable }
+ActiveRecord::Base.class_eval { include ActiveRecord::Orderable }

data/spec/spec_helper.rb

@@ -1,19 +1,16 @@
 require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+Bundler.setup(:default, :test)
 
+require 'simplecov'
+SimpleCov.start
 require 'rails'
 require 'active_record'
 require 'rspec'
 require 'logger'
-require 'ruby-debug'
+require 'byebug'
 require 'ar-orderable'
+
 ActiveRecord::Base.logger = Logger.new(File.open("#{File.dirname(__FILE__)}/database.log", 'w+'))
 ActiveRecord::Base.establish_connection({ :database => ":memory:", :adapter => 'sqlite3', :timeout => 500 })
 

metadata

@@ -1,102 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: ar-orderable
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
+- ITHouse (Latvia)
 - Gatis Tomsons
-- IT House
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &17147740 !ruby/object:Gem::Requirement
-    none: false
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *17147740
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &17146680 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+        version: '3.0'
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.3.4
-  type: :development
-  prerelease: false
-  version_requirements: *17146680
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &17145080 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-  type: :development
-  prerelease: false
-  version_requirements: *17145080
-- !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &17144280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.6
-  type: :development
-  prerelease: false
-  version_requirements: *17144280
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &17143240 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
+        version: '4.0'
+  type: :runtime
   prerelease: false
-  version_requirements: *17143240
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &17142480 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
-  type: :development
-  prerelease: false
-  version_requirements: *17142480
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &17141560 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+        version: '3.0'
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *17141560
-description: You can order AR records and skip callbacks
-email: gatis@ithouse.cc
+        version: '4.0'
+description: 
+email: support@ithouse.lv
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
 - .document
+- .gitignore
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -112,29 +55,28 @@ files:
 homepage: http://github.com/ithouse/ar-orderable
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -531530570232780643
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 2.0.4
 signing_key: 
-specification_version: 3
-summary: Rails 3 plugin for simple ordering.
-test_files: []
+specification_version: 4
+summary: You can order AR records and skip callbacks
+test_files:
+- spec/ar-orderable_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb