contentment 0.3.2 → 0.4.0

data/lib/generators/contentment/contentment_views_templates/contents/edit.html.erb

@@ -10,7 +10,7 @@
       <div class="main">
         <%= f.text_field :title, :placeholder => "Content Title", :class => 'title' %>
         <%= f.label :body %>
-        <%= f.textarea :body %>
+        <%= f.text_area :body %>
       </div>
       <div class="side">
         <p>

data/lib/generators/contentment/templates/content.rb

@@ -29,19 +29,11 @@ class Content < ActiveRecord::Base
 
 	private
   	def adjust_positions
-	
-			# return true unless changed.include?('position')
-			# 
-			# @contents = brothers.order('position ASC')
-			# @contents.each_with_index do |x, idx|
-			# 	unless x.position > self.position
-			# 		if x.position
-			# 			x.update_attribute :position, x.position + 1
-			# 		else
-			# 			x.update_attribute :position, self.position + idx
-			# 		end
-			# 	end
-			# end
+			return true unless changed.include?('position')	
+			return true unless brothers.map{|x| x.position}.include?(self.position)
+			
+			brothers.where("position < ?", self.position).update_all("position = (position - 1)")
+			brothers.where("position >= ?", self.position).update_all("position = (position + 1)")
 		end
 		
 		

data/lib/generators/contentment/templates/content_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class ContentTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "content should fix position on save" do
+    a = Content.create(:position => 1, :title => 'a', :tipe => 'test')
+    b = Content.create(:position => 2, :title => 'b', :tipe => 'test')
+    c = Content.create(:position => 3, :title => 'c', :tipe => 'test')
+		c.position = 1
+		c.save
+		
+		assert(c.reload.position == 1)
+		assert(a.reload.position == 2)
+		assert(b.reload.position == 3)
+  end
+end

data/lib/generators/contentment_generator.rb

@@ -25,6 +25,7 @@ class ContentmentGenerator < Rails::Generators::Base
 			# Need to figure out how to ask the user if they would like to overwrite their model.
 		else
 			template 'content.rb', content_model
+			template 'content_test.rb', 'test/unit/content_test.rb'
 		end
 		
 		contents_controller = 'app/controllers/contents_controller.rb'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Bob Larrick
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -05:00
+date: 2011-01-12 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -38,6 +38,7 @@ files:
 - lib/generators/contentment/contentment_views_templates/contents/show.html.erb
 - lib/generators/contentment/contentment_views_templates/contents_helper.rb
 - lib/generators/contentment/templates/content.rb
+- lib/generators/contentment/templates/content_test.rb
 - lib/generators/contentment/templates/contents_controller.rb
 - lib/generators/contentment/templates/migration.rb
 - lib/generators/contentment_generator.rb