display_for 0.1.5 → 0.1.6

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/Rakefile

@@ -32,16 +32,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-=begin
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-=end
-
 task :default => :test
 
 require 'rdoc/task'

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/display_for.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "display_for"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mateo Murphy"]
-  s.date = "2012-10-13"
+  s.date = "2012-10-19"
   s.description = "A Rails library for display data, in tabular and other formats"
   s.email = "mateo.murphy@gmail.com"
   s.extra_rdoc_files = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rspec",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -39,8 +40,10 @@ Gem::Specification.new do |s|
     "lib/display_for/element/base.rb",
     "lib/display_for/element/html.rb",
     "lib/display_for/helper.rb",
-    "test/helper.rb",
-    "test/test_display_for.rb"
+    "spec/lib/builder/table_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/test_model.rb",
+    "spec/support/test_template.rb"
   ]
   s.homepage = "http://github.com/mateomurphy/display_for"
   s.licenses = ["MIT"]

data/lib/display_for/builder/base.rb

@@ -10,10 +10,8 @@ module DisplayFor
         @attributes = []
         @actions = []
         @html_options = html_options
-        
-        raise "invalid resource class #{resource_class}" unless resource_class.respond_to?(:human_attribute_name)
       
-        block.call(self)
+        block.call(self) if block_given?
       end
       
       def attribute(name, options = {}, &block)

data/lib/display_for/builder/table.rb

@@ -14,11 +14,13 @@ module DisplayFor
       def build_row(resource)
         result = ''
         @attributes.each do |attribute|
-          result << content_tag(:td, attribute.content(resource))
+          result << content_tag(:td, attribute.content(resource), attribute.html_options)
         end
         result << content_tag(:td, build_actions(resource)) if @actions.any?
 
-        content_tag(:tr, result.html_safe, :id => "#{@resource_class}_#{resource.id}".underscore) << "\n"
+        options = {}
+        options[:id] = "#{@resource_class}_#{resource.id}".underscore if resource
+        content_tag(:tr, result.html_safe, options) << "\n"
       end
     
       def build_actions(resource)
@@ -40,9 +42,19 @@ module DisplayFor
 
         result = build_header + content_tag(:tbody, result)
 
+        if @footer
+          result << content_tag(:tfoot, @footer.build_row(nil))
+        end
+
         html_options[:class] ||= "table table-bordered table-striped #{@resource_class.to_s.underscore}-table"
         content_tag(:table, result, html_options).html_safe
       end
+
+      def footer
+        @footer = Table.new(resource_class, [], html_options, template)
+        yield @footer
+      end
+
     end
   end
 end

data/lib/display_for/element/attribute.rb

@@ -2,6 +2,8 @@ module DisplayFor
   module Element
     class Attribute < Base
       def default_label(resource_class)
+        raise "#{resource_class} does not respond to human_attribute_name" unless resource_class.respond_to?(:human_attribute_name)
+
         resource_class.human_attribute_name(@name.to_s)
       end
     

data/lib/display_for/element/base.rb

@@ -7,6 +7,10 @@ module DisplayFor
         @builder, @name, @options, @block = builder, name, options, block
       end
     
+      def html_options
+        @options[:html] || {}
+      end
+
       def label(resource_class = nil)
         return nil if @options[:label] === false
         

data/spec/lib/builder/table_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+OUTPUT = %q|<table class="table table-bordered table-striped test_model-table"><thead><tr><th class="test_model_id">id</th><th class="test_model_first_name">first_name</th><th class="test_model_last_name">last_name</th></tr></thead>
+<tbody><tr id="test_model_1"><td>1</td><td>foo</td><td>bar</td></tr>
+</tbody><tfoot><tr><td colspan="3">&nbsp;</td></tr>
+</tfoot></table>|
+
+module DisplayFor
+  module Builder
+    describe Table, :focus => true do 
+      context 'when given a footer' do
+        subject :table do
+          Table.new(TestModel, [TestModel.new(1, 'foo', 'bar')], {}, TestTemplate.new) do |t|
+            t.attribute :id
+            t.attribute :first_name
+            t.attribute :last_name
+            t.footer do |f|
+              f.html :form, :html => { :colspan => 3 } do
+                '&nbsp;'.html_safe
+              end
+            end
+          end
+        end
+
+        describe '#to_s' do
+          it 'renders the table' do
+            table.to_s.should eq(OUTPUT)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'action_view'
+require 'display_for'
+
+Dir['./spec/support/**/*.rb'].each {|f| require f }
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+  config.order = 'random'
+end

data/spec/support/test_model.rb

@@ -0,0 +1,5 @@
+class TestModel < Struct.new(:id, :first_name, :last_name)
+  def self.human_attribute_name(string)
+    string
+  end
+end

data/spec/support/test_template.rb

@@ -0,0 +1,6 @@
+class TestTemplate
+  include ActionView::Helpers::TagHelper
+
+  attr_accessor :output_buffer
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: display_for
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-13 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -116,6 +116,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -137,8 +138,10 @@ files:
 - lib/display_for/element/base.rb
 - lib/display_for/element/html.rb
 - lib/display_for/helper.rb
-- test/helper.rb
-- test/test_display_for.rb
+- spec/lib/builder/table_spec.rb
+- spec/spec_helper.rb
+- spec/support/test_model.rb
+- spec/support/test_template.rb
 homepage: http://github.com/mateomurphy/display_for
 licenses:
 - MIT
@@ -154,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3084550570020739390
+      hash: -3711101849509490407
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'display_for'
-
-class Test::Unit::TestCase
-end

data/test/test_display_for.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestDisplayFor < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end