positionable 1.0.8 → 1.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dea4446e013f0d3c7e57d4bf2e8d74c7af721686
+  data.tar.gz: 9970c900f6539bb9927e8453778a660e71a97499
+SHA512:
+  metadata.gz: 5e4b68e82b37b1924ce4c867522459c0edf8f0b2bce39d1bacfbf9a4430c8a05eed4b914de6636950d7d059fff10816a33540578e2cb12f94896f6aee2c5cfb3
+  data.tar.gz: f62639878cbc83cfe151c1c4769baecdf42c785bab701f7cd1b2384d0a2376afbbe40ea816957dd7e4f6ce92ae8d2ca3726bde79f81688fea622b2b51c3eceac

data/lib/positionable.rb

@@ -66,7 +66,7 @@ module Positionable
       start = options[:start] || 0
       order = options[:order] || :asc
 
-      default_scope order("\"#{self.table_name}\".\"position\" #{order}")
+      default_scope { order("#{ActiveRecord::Base.connection.quote_table_name self.table_name}.#{ActiveRecord::Base.connection.quote_column_name 'position'} #{order}") }
 
       before_create :add_to_bottom
       before_update :update_position
@@ -88,7 +88,11 @@ module Positionable
             # Does its best to retrieve the target scope...
             target_scope_id = scope.nil? ? scope_id : scope.id
             # Number of records whithin the target scope
-            count = self.class.where("#{scope_id_attr} = ?", target_scope_id).count
+            count = if target_scope_id.nil?
+              self.class.where("#{scope_id_attr} IS NULL").count
+            else
+              self.class.where("#{scope_id_attr} = ?", target_scope_id).count
+            end
             # An additional position is available if this record is new, or if it's moved to another scope
             if new_record? or target_scope_id != scope_id
               (start..(start + count))
@@ -120,7 +124,11 @@ module Positionable
           end
 
           def scoped_condition_was
-            "#{scope_id_attr} = " + scope_id_was.to_s
+            if scope_id_was.nil?
+              "#{scope_id_attr} IS NULL"
+            else
+              "#{scope_id_attr} = " + scope_id_was.to_s
+            end
           end
 
           def scoped_position_was

data/lib/positionable/version.rb

@@ -1,3 +1,3 @@
 module Positionable
-  VERSION = "1.0.8"
+  VERSION = "1.1.1"
 end

data/positionable.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov"
   s.add_development_dependency "factory_girl"
 
-  s.add_runtime_dependency "activerecord", "~> 3.1"
+  s.add_runtime_dependency "activerecord", ">= 3.1"
 end

data/spec/lib/positionable_spec.rb

@@ -13,31 +13,25 @@ describe Positionable do
 
     it "does not extend non positionable models" do
       dummy = Dummy.new
-      dummy.respond_to?(:previous).should be_false
-      dummy.respond_to?(:next).should be_false
-      dummy.respond_to?(:position=).should be_false
+      expect(dummy.respond_to?(:previous)).to eq(false)
+      expect(dummy.respond_to?(:next)).to eq(false)
+      expect(dummy.respond_to?(:position=)).to eq(false)
     end
 
     it "extends positionable models" do
       item = DefaultItem.new
-      item.respond_to?(:previous).should be_true
-      item.respond_to?(:next).should be_true
-      item.respond_to?(:position=).should be_true
-    end
-
-    it "prepends the table name in SQL 'order by' clause" do
-      sql = DefaultItem.where("1 = 1").to_sql
-      table = DefaultItem.table_name
-      sql.should include("ORDER BY \"#{table}\".\"position\"")
+      expect(item.respond_to?(:previous)).to eq(true)
+      expect(item.respond_to?(:next)).to eq(true)
+      expect(item.respond_to?(:position=)).to eq(true)
     end
 
     context "inheritance" do
 
       it "extends positionable sub-models" do
         item = SubItem1.new
-        item.respond_to?(:previous).should be_true
-        item.respond_to?(:next).should be_true
-        item.respond_to?(:position=).should be_true
+        expect(item.respond_to?(:previous)).to eq(true)
+        expect(item.respond_to?(:next)).to eq(true)
+        expect(item.respond_to?(:position=)).to eq(true)
       end
 
     end

data/spec/support/models.rb

@@ -5,7 +5,6 @@ end
 class Document < ActiveRecord::Base
   belongs_to :folder
   is_positionable :scope => :folder
-  attr_accessible :position, :folder_id
 end
 
 class Item < ActiveRecord::Base
@@ -40,7 +39,6 @@ end
 class ComplexItem < Item
   belongs_to :group
   is_positionable :scope => :group, :order => :desc, :start => 1
-  attr_accessible :position, :group_id
 end
 
 class Dummy < ActiveRecord::Base

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: positionable
 version: !ruby/object:Gem::Version
-  version: 1.0.8
-  prerelease: 
+  version: 1.1.1
 platform: ruby
 authors:
 - Philippe Guégan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 description: This extension provides contiguous positionning capabilities to your
@@ -115,8 +102,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENCE
 - README.rdoc
@@ -132,27 +119,26 @@ files:
 - spec/support/schema.rb
 homepage: https://github.com/pguegan/positionable
 licenses: []
+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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: positionable
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A gem for positionning your ActiveRecord models.
 test_files:
 - spec/factories.rb