Merge branch 'activeadmin#2619' of https://github.com/krzysztofbialek/active_admin

Conflicts:
	lib/active_admin/views/components/table_for.rb
	spec/unit/views/components/table_for_spec.rb

Author: seanlinsley

features/index/index_as_table.feature

@@ -168,13 +168,13 @@ Feature: Index as Table
     When I am on the index page for posts
     Then I should see the "index_table_posts" table:
       | [ ] | Id | Title        | Body | Published At | Starred | Created At | Updated At | |
-      | [ ] | 2 | Bye bye world | Move your...  |  |  | /.*/ | /.*/ | ViewEditDelete |
-      | [ ] | 1 | Hello World   | From the body |  |  | /.*/ | /.*/ | ViewEditDelete |
+      | [ ] | 2 | Bye bye world | Move your...  |  | No | /.*/ | /.*/ | ViewEditDelete |
+      | [ ] | 1 | Hello World   | From the body |  | No | /.*/ | /.*/ | ViewEditDelete |
     When I follow "Id"
     Then I should see the "index_table_posts" table:
       | [ ] | Id | Title        | Body | Published At | Starred | Created At | Updated At | |
-      | [ ] | 1 | Hello World   | From the body |  |  | /.*/ | /.*/ | ViewEditDelete |
-      | [ ] | 2 | Bye bye world | Move your...  |  |  | /.*/ | /.*/ | ViewEditDelete |
+      | [ ] | 1 | Hello World   | From the body |  | No | /.*/ | /.*/ | ViewEditDelete |
+      | [ ] | 2 | Bye bye world | Move your...  |  | No | /.*/ | /.*/ | ViewEditDelete |
 
   Scenario: Sorting by a virtual column
     Given a post with the title "Hello World" exists

lib/active_admin/views/components/status_tag.rb

@@ -36,6 +36,7 @@ def build(*args)
         type = args[1]
         label = options.delete(:label)
         classes = options.delete(:class)
+        status = convert_to_boolean_status(status) 
 
         content = label || status.titleize if status
 
@@ -48,6 +49,16 @@ def build(*args)
 
       protected
 
+      def convert_to_boolean_status(status)
+        if status == 'true'
+          'Yes'
+        elsif ['false', nil].include?(status)
+          'No'
+        else
+          status
+        end
+      end
+
       def status_to_class(status)
         status.titleize.gsub(/\s/, '').underscore
       end

lib/active_admin/views/components/table_for.rb

@@ -94,9 +94,16 @@ def render_data(data, item)
           item[data]
         end
         value = pretty_format(value) if data.is_a?(Symbol)
+        value = status_tag value     if is_boolean? data, item
         value
       end
 
+      # Returns true or false depending on the attr being boolean 
+      def is_boolean?(data, item)
+        attr = item.column_for_attribute data
+        attr.present? && attr.type == :boolean 
+      end
+
       # Returns an array for the current sort order
       #   current_sort[0] #=> sort_key
       #   current_sort[1] #=> asc | desc

spec/unit/views/components/status_tag_spec.rb

@@ -46,12 +46,19 @@ def status_tag(*args)
       its(:class_list)  { should include('status_tag') }
       its(:content)     { should eq '' }
     end
+    
+    context "when status is false" do
+      subject { status_tag('false') }
+
+      its(:class_list)  { should include('status_tag') }
+      its(:content)     { should == 'No' }
+    end
 
     context "when status is nil" do
       subject { status_tag(nil) }
 
       its(:class_list)  { should include('status_tag') }
-      its(:content)     { should eq '' }
+      its(:content)     { should == 'No' }
     end
 
     context "when status is 'Active' and type is :ok" do

spec/unit/views/components/table_for_spec.rb

@@ -4,7 +4,7 @@
   describe "creating with the dsl" do
 
     let(:collection) do
-      [Post.new(:title => "First Post"), Post.new(:title => "Second Post"), Post.new(:title => "Third Post")]
+      [Post.new(:title => "First Post", :starred => true), Post.new(:title => "Second Post"), Post.new(:title => "Third Post", :starred => false)]
     end
 
     let(:assigns){ { :collection => collection } }
@@ -179,6 +179,25 @@
       end
     end
 
+    context "when record attribute is boolean" do
+      let(:table) do
+        render_arbre_component assigns, helpers do
+          table_for(collection) do
+            column :starred
+          end
+        end
+      end
+      
+      it "should render boolean attribute within status tag" do
+        table.find_by_tag("span").first
+          .class_list.to_a.join(' ').should == "status_tag yes"
+        table.find_by_tag("span").first.content.should == "Yes"
+        table.find_by_tag("span").last
+          .class_list.to_a.join(' ').should == "status_tag no"
+        table.find_by_tag("span").last.content.should == "No"
+      end
+    end
+
   end
 
   describe "column sorting" do