how_to 0.0.6 → 0.0.7

data/app/models/how_to/section.rb

@@ -14,7 +14,7 @@ module HowTo
     scope :roots_only, where(:parent_id => nil)
     scope :without, ->(id) {   where("id <> ? ", id) if id.present?}
     scope :with_content, where("contents_count > 0")
-    scope :ordered, order("`order` ASC")
+    scope :ordered, order("position ASC")
 
     class Translation
       attr_accessible :locale, :name

data/app/views/how_to/contents/_form.html.erb

@@ -69,9 +69,9 @@
 
 
       <div class="control-group">
-        <%= f.label :order, :class => 'control-label' %>
+        <%= f.label :position, :class => 'control-label' %>
         <div class="controls">
-          <%= f.text_field :order, :class => 'text_field' %>
+          <%= f.text_field :position, :class => 'text_field' %>
         </div>
       </div>
       <div class="form-actions">

data/app/views/how_to/faq/show.html.erb

@@ -40,7 +40,7 @@
           <h3>Select Category</h3>
 
           <div id="sidetreecontrol"><a href="?#">Collapse All</a> | <a href="?#">Expand All</a></div>
-          <%= sorted_nested_li(HowTo::Section.active, :order, "id='tree_root'") do |section| %>
+          <%= sorted_nested_li(HowTo::Section.active, :position, "id='tree_root'") do |section| %>
               <% if section.contents_count > 0 %>
                   <%= link_to section.name, "##{dom_id(section)}" %>
               <% else %>

data/app/views/how_to/sections/_form.html.erb

@@ -20,9 +20,9 @@
       <% end %>
 
       <div class="control-group">
-        <%= f.label :order, :class => 'control-label' %>
+        <%= f.label :position, :class => 'control-label' %>
         <div class="controls">
-          <%= f.text_field :order, :class => 'text_field'%>
+          <%= f.text_field :position, :class => 'text_field'%>
         </div>
       </div>
       <div class="form-actions">

data/db/migrate/20130906034009_alter_order_column.rb

@@ -0,0 +1,11 @@
+class AlterOrderColumn < ActiveRecord::Migration
+  def up
+    rename_column :how_to_sections, :order, :position
+    rename_column :how_to_contents, :order, :position
+  end
+
+  def down
+    rename_column :how_to_sections, :position, :order
+    rename_column :how_to_contents, :position, :order
+  end
+end

data/lib/how_to/version.rb

@@ -1,3 +1,3 @@
 module HowTo
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/fixtures/how_to/contents.yml

@@ -2,10 +2,10 @@
 
 one:
   section_id: 1
-  order: 1
+  position: 1
   active: false
 
 two:
   section_id: 1
-  order: 1
+  position: 1
   active: false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: how_to
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -151,6 +151,7 @@ files:
 - config/routes.rb
 - db/migrate/20130602053453_create_how_to_sections.rb
 - db/migrate/20130602054608_create_how_to_contents.rb
+- db/migrate/20130906034009_alter_order_column.rb
 - lib/generators/how_to/config_generator.rb
 - lib/generators/how_to/layout_generator.rb
 - lib/generators/how_to/templates/how_to_config.rb