ar-orderable 1.0.1 → 1.0.2

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/ar-orderable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar-orderable}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gatis Tomsons", "IT House"]
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
     "ar-orderable.gemspec",
     "lib/ar-orderable.rb",
     "spec/ar-orderable_spec.rb",
-    "spec/ar_orderable_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]

data/spec/spec_helper.rb

@@ -1,13 +1,19 @@
-require "rubygems"
-require "bundler/setup"
+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 'rails'
 require 'active_record'
 require 'rspec'
 require 'logger'
 require 'ruby-debug'
-
-require File.dirname(__FILE__)+'/../init.rb'
+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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-orderable
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &82064910 !ruby/object:Gem::Requirement
+  requirement: &84282840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *82064910
+  version_requirements: *84282840
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &82064670 !ruby/object:Gem::Requirement
+  requirement: &84282600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *82064670
+  version_requirements: *84282600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &82064430 !ruby/object:Gem::Requirement
+  requirement: &84282360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *82064430
+  version_requirements: *84282360
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &82064190 !ruby/object:Gem::Requirement
+  requirement: &84282120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.11.6
   type: :development
   prerelease: false
-  version_requirements: *82064190
+  version_requirements: *84282120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &82063950 !ruby/object:Gem::Requirement
+  requirement: &84281880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *82063950
+  version_requirements: *84281880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &82063710 !ruby/object:Gem::Requirement
+  requirement: &84281640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *82063710
+  version_requirements: *84281640
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &82063470 !ruby/object:Gem::Requirement
+  requirement: &84281400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82063470
+  version_requirements: *84281400
 description: You can order AR records and skip callbacks
 email: gatis@ithouse.cc
 executables: []
@@ -108,7 +108,6 @@ files:
 - ar-orderable.gemspec
 - lib/ar-orderable.rb
 - spec/ar-orderable_spec.rb
-- spec/ar_orderable_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -127,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -183352115
+      hash: -365549233
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/ar_orderable_spec.rb

@@ -1,130 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe ActiveRecord::Orderable do
-  it "should order simple categories correctly" do
-    5.times{|i| Category.create(:name => "Cat #{i+1}")}
-    Category.count.should == 5
-    Category.first.order_nr.should == 1
-    Category.last.order_nr.should == 5
-    c = Category.first
-    c.update_attribute(:order_nr, 4)
-    Category.find_by_name("Cat 1").order_nr.should == 4
-    Category.first.name.should == "Cat 2"
-    c = Category.first
-    Category.find_by_name("Cat 4").move_to 1
-    Category.find_by_name("Cat 4").order_nr.should == 1
-    Category.find(c.id).order_nr.should == 2
-  end
-
-  it "should order categories correct by scope" do
-    cat_types = [
-      CatType.create(:name => "Type 1"),
-      CatType.create(:name => "Type 2")
-    ]
-
-    5.times{|i| Category.create(:name => "Cat #{i+1}", :cat_type => cat_types.first)}
-    5.times{|i| Category.create(:name => "Cat #{i+6}", :cat_type => cat_types.last)}
-
-    Category.find_by_name("Cat 9").move_to 1
-    Category.find_by_name("Cat 9").order_nr.should == 1
-    Category.find_by_name("Cat 6").order_nr.should == 2
-    Category.find_by_name("Cat 7").order_nr.should == 3
-    Category.find_by_name("Cat 8").order_nr.should == 4
-    Category.find_by_name("Cat 10").order_nr.should == 5
-    
-    Category.find_by_name("Cat 7").move_to 5
-
-    Category.find_by_name("Cat 9").order_nr.should == 1
-    Category.find_by_name("Cat 6").order_nr.should == 2
-    Category.find_by_name("Cat 8").order_nr.should == 3
-    Category.find_by_name("Cat 10").order_nr.should == 4
-    Category.find_by_name("Cat 7").order_nr.should == 5
-
-    Category.find_by_name("Cat 7").move_to 4
-
-    Category.find_by_name("Cat 9").order_nr.should == 1
-    Category.find_by_name("Cat 6").order_nr.should == 2
-    Category.find_by_name("Cat 8").order_nr.should == 3
-    Category.find_by_name("Cat 7").order_nr.should == 4
-    Category.find_by_name("Cat 10").order_nr.should == 5
-
-    Category.find_by_name("Cat 9").move_to 5
-
-    Category.find_by_name("Cat 6").order_nr.should == 1
-    Category.find_by_name("Cat 8").order_nr.should == 2
-    Category.find_by_name("Cat 7").order_nr.should == 3
-    Category.find_by_name("Cat 10").order_nr.should == 4
-    Category.find_by_name("Cat 9").order_nr.should == 5
-
-    Category.find_by_name("Cat 10").move_to 2
-
-    Category.find_by_name("Cat 6").order_nr.should == 1
-    Category.find_by_name("Cat 10").order_nr.should == 2
-    Category.find_by_name("Cat 8").order_nr.should == 3
-    Category.find_by_name("Cat 7").order_nr.should == 4
-    Category.find_by_name("Cat 9").order_nr.should == 5
-  end
-
-  it "should create unordered list and order it with order_unordered method" do
-    1.upto(4){|i| Category.create(:name => "Cat #{i}")}
-    cat = Category.create(:name => "Cat 0")
-    Category.update_all("order_nr = NULL")
-    Category.order_unordered
-    cat.order_nr.should_not == 1
-    cat.move_to 1
-    cat.reload
-    cat.order_nr.should == 1
-    Category.find_by_name("Cat 4").order_nr.should == 5
-  end
-
-  it "should create scoped unordered list and order it with order_unordered method" do
-    cat_types = [
-      CatType.create(:name => "Type 1"),
-      CatType.create(:name => "Type 2")
-    ]
-    5.times{|i| Category.create(:name => "Cat #{i+1}", :cat_type => cat_types.first)}
-    5.times{|i| Category.create(:name => "Cat #{i+6}", :cat_type => cat_types.last)}
-    Category.update_all("order_nr = NULL")
-    Category.all.map(&:order_nr).should == [nil, nil, nil, nil, nil, nil, nil, nil, nil, nil]
-    Category.order_unordered
-    Category.all.map(&:order_nr).should == [1, 1, 2, 2, 3, 3, 4, 4, 5, 5]
-  end
-
-  it "should move_up" do
-    5.times{|i| Category.create(:name => "Cat #{i+1}")}
-    c = Category.find_by_name("Cat 2")
-    c.order_nr.should == 2
-    c.move_up
-    c.reload
-    c.order_nr.should == 1
-    c.move_up
-    c.reload
-    c.order_nr.should == 1
-  end
-
-  it "should move_down" do
-    5.times{|i| Category.create(:name => "Cat #{i+1}")}
-    c = Category.find_by_name("Cat 2")
-    c.order_nr.should == 2
-    c.move_down
-    c.reload
-    c.order_nr.should == 3
-    c.move_to(5)
-    c.reload
-    c.order_nr.should == 5
-    c.move_down
-    c.reload
-    c.order_nr.should == 5
-  end
-
-  it "should skip_callbacks" do
-    5.times{|i| Category.create(:name => "Cat #{i+1}")}
-    c = Category.find_by_name("Cat 2")
-    c.background_task.should be_nil
-    c.move_down
-    c.background_task.should == :done
-    c.background_task = nil
-    c.move_up(:skip_callbacks => true)
-    c.background_task.should be_nil
-  end
-end