concen 0.2.1 → 0.2.2

data/Gemfile

@@ -11,7 +11,7 @@ gem "mongoid", "~> 2.0.0"
 gem "mongo-rails-instrumentation", "~> 0.2.4"
 gem "bson_ext", "~> 1.3.0"
 gem "rack-gridfs", "~> 0.4.1"
-gem "chronic", "~> 0.4.3"
+gem "chronic", "~> 0.6.3"
 gem "mime-types", "~> 1.16"
 gem "bcrypt-ruby", "~> 3.0.0"
 gem "domainatrix", "~> 0.0.10"

data/Gemfile.lock

@@ -46,7 +46,7 @@ GEM
       xpath (~> 0.1.4)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
-    chronic (0.4.4)
+    chronic (0.6.4)
     chunky_png (1.2.1)
     compass (0.12.alpha.0)
       chunky_png (~> 1.2)
@@ -144,7 +144,7 @@ DEPENDENCIES
   bcrypt-ruby (~> 3.0.0)
   bson_ext (~> 1.3.0)
   capybara (>= 0.4.0)
-  chronic (~> 0.4.3)
+  chronic (~> 0.6.3)
   compass (~> 0.12.alpha)
   database_cleaner (= 0.6.0)
   domainatrix (~> 0.0.10)

data/README.md

@@ -134,6 +134,11 @@ If you have used Concen for any of your websites and would like to be listed her
 
 ## Version History
 
+- **0.2.2**:
+
+  - Update Chronic gem dependency.
+  - Fix set_position and reset_position.
+
 - **0.2.1**:
 
   - Minor bug fixes.

data/app/models/concen/page.rb

@@ -231,15 +231,16 @@ module Concen
     end
 
     def set_position
-      if Page.where(:level => self.level).count > 0
-        self.position = Page.with_position.where(:level => self.level).asc(:position).last.position + 1
+      siblings = Page.where :parent_id => self.parent_id
+      if siblings.count > 0
+        self.position = siblings.with_position.asc(:position).last.position + 1
       else
         self.position = 1
       end
     end
 
     def reset_position
-      affected_pages = Page.with_position.where(:level => self.level, :position.gt => self.position)
+      affected_pages = Page.with_position.where :parent_id => self.parent_id, :position.gt => self.position
       if affected_pages.count > 0
         for page in affected_pages
           page.position = page.position - 1

data/concen.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency("mongo-rails-instrumentation", "~> 0.2.4")
   s.add_dependency("bson_ext", "~> 1.3.0")
   s.add_dependency("rack-gridfs", "~> 0.4.1")
-  s.add_dependency("chronic", "~> 0.4.3")
+  s.add_dependency("chronic", "~> 0.6.3")
   s.add_dependency("mime-types", "~> 1.16")
   s.add_dependency("bcrypt-ruby", "~> 3.0.0")
   s.add_dependency("domainatrix", "~> 0.0.10")

data/lib/concen/version.rb

@@ -1,3 +1,3 @@
 module Concen
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/test/unit/page_test.rb

@@ -112,4 +112,17 @@ class PageTest < ActiveSupport::TestCase
     page.save
     assert_equal page.slug, "new-slug"
   end
+
+  test "should get position set/reset correctly" do
+    page = Fabricate "concen/page"
+    child_page_1 = page.children.create :title => "Position 1"
+    assert_equal child_page_1.position, 1
+    child_page_2 = page.children.create :title => "Position 2"
+    assert_equal child_page_2.position, 2
+    child_page_3 = page.children.create :title => "Position 3"
+    assert_equal child_page_3.position, 3
+
+    child_page_2.destroy
+    assert_equal child_page_3.reload.position, 2
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concen
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-14 00:00:00.000000000Z
+date: 2011-09-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70337635864260 !ruby/object:Gem::Requirement
+  requirement: &70181456877540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.alpha
   type: :development
   prerelease: false
-  version_requirements: *70337635864260
+  version_requirements: *70181456877540
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70337635863800 !ruby/object:Gem::Requirement
+  requirement: &70181456876960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70337635863800
+  version_requirements: *70181456876960
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70337635863340 !ruby/object:Gem::Requirement
+  requirement: &70181456876380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.99.4
   type: :runtime
   prerelease: false
-  version_requirements: *70337635863340
+  version_requirements: *70181456876380
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70337635862860 !ruby/object:Gem::Requirement
+  requirement: &70181456875800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.0b5
   type: :runtime
   prerelease: false
-  version_requirements: *70337635862860
+  version_requirements: *70181456875800
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70337635852400 !ruby/object:Gem::Requirement
+  requirement: &70181456866080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70337635852400
+  version_requirements: *70181456866080
 - !ruby/object:Gem::Dependency
   name: mongo-rails-instrumentation
-  requirement: &70337635851900 !ruby/object:Gem::Requirement
+  requirement: &70181456865600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70337635851900
+  version_requirements: *70181456865600
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70337635851400 !ruby/object:Gem::Requirement
+  requirement: &70181456865100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70337635851400
+  version_requirements: *70181456865100
 - !ruby/object:Gem::Dependency
   name: rack-gridfs
-  requirement: &70337635850820 !ruby/object:Gem::Requirement
+  requirement: &70181456864520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,21 +98,21 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70337635850820
+  version_requirements: *70181456864520
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70337635850360 !ruby/object:Gem::Requirement
+  requirement: &70181456863940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70337635850360
+  version_requirements: *70181456863940
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70337635849800 !ruby/object:Gem::Requirement
+  requirement: &70181456863360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70337635849800
+  version_requirements: *70181456863360
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70337635849240 !ruby/object:Gem::Requirement
+  requirement: &70181456862800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70337635849240
+  version_requirements: *70181456862800
 - !ruby/object:Gem::Dependency
   name: domainatrix
-  requirement: &70337635848680 !ruby/object:Gem::Requirement
+  requirement: &70181456862220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70337635848680
+  version_requirements: *70181456862220
 description: A Rails Engine to control and monitor Rails application from a web interface.
   It includes content capturing system, real-time traffic monitoring, and real-time
   performance monitoring. It is built to be flexible and customizable.