simple_table 0.0.3 → 0.0.4

data/lib/simple_table/body.rb

@@ -17,10 +17,10 @@ module SimpleTable
       end
 
       def options_for_record(record, ix, options = {})
-        options = options.dup
-        options[:id] = dom_id(record) if record.respond_to?(:new_record?)
-        add_class!(options, 'alternate') if ix % 2 == 1
-        options
+        options.dup.tap do |options|
+          options[:id] = dom_id(record) if record.respond_to?(:new_record?)
+          add_class!(options, 'alternate') if ix % 2 == 1
+        end
       end
   end
 end

data/lib/simple_table/column.rb

@@ -1,6 +1,6 @@
 module SimpleTable
   class Column
-    attr_reader :name, :options
+    attr_reader :name, :table, :options
 
     def initialize(table, name, options = {})
       @table = table
@@ -15,7 +15,7 @@ module SimpleTable
     end
 
     def translate(content)
-      scope = [SimpleTable.options[:i18n_scope], @table.collection_name, :columns].compact
+      scope = [SimpleTable.options[:i18n_scope], table.collection_name, :columns].compact
       I18n.t(content, :scope => scope)
     end
 

data/lib/simple_table/head.rb

@@ -10,7 +10,7 @@ module SimpleTable
         table.columns.each do |column|
           row.cell(column.content, column.options.reverse_merge(:scope => 'col'))
         end
-        @rows << row
+        rows << row
       end
   end
 end

data/lib/simple_table/row.rb

@@ -2,6 +2,8 @@ module SimpleTable
   class Row < Tag
     self.level = 2
     self.tag_name = :tr
+    
+    attr_reader :cells
 
     def initialize(parent, record = nil, options = {}, &block)
       super(parent, options)
@@ -17,12 +19,12 @@ module SimpleTable
       options = contents.last.is_a?(Hash) ? contents.pop : {}
       add_class!(options, current_column_class) if parent.is_a?(Body)
       contents.each do |content|
-        @cells << Cell.new(self, content, options)
+        cells << Cell.new(self, content, options)
       end
     end
 
     def render
-      super(@cells.map(&:render))
+      super(cells.map(&:render))
     end
 
     protected
@@ -33,7 +35,7 @@ module SimpleTable
       end
 
       def current_column_class
-        column = table.columns[@cells.size]
+        column = table.columns[cells.size]
         column && column.options[:class] || ''
       end
   end

data/lib/simple_table/rows.rb

@@ -10,17 +10,17 @@ module SimpleTable
     end
 
     def empty?
-      @rows.empty?
+      rows.empty?
     end
 
     def row(*args, &block)
       options = args.extract_options!
-      @rows << Row.new(self, args.shift, options, &block)
+      rows << Row.new(self, args.shift, options, &block)
     end
 
     def render
       build if respond_to?(:build)
-      super(@rows.map(&:render))
+      super(rows.map(&:render))
     end
   end
 end

data/lib/simple_table/table.rb

@@ -26,13 +26,11 @@ module SimpleTable
 
     def column(*names)
       options = names.last.is_a?(Hash) ? names.pop : {}
-      names.each do |name|
-        @columns << Column.new(self, name, options)
-      end
+      names.each { |name| columns << Column.new(self, name, options) }
     end
 
     def empty(*args, &block)
-      @empty = (args << block).compact
+      @empty ||= (args << block).compact
     end
 
     def row(*args, &block)
@@ -41,33 +39,33 @@ module SimpleTable
 
     def collection_class
       # @collection.first.class.base_class
-      @collection.first.class
+      collection.first.class
     end
 
     def collection_name
-      @collection_name ||= collection_class.name.tableize.gsub('/', '_').gsub('rails_', '')
+      collection_name ||= collection_class.name.tableize.gsub('/', '_').gsub('rails_', '')
     end
 
     def render
-      (@collection.empty? && @empty) ? render_empty : begin
-        column(*collection_attribute_names) if @columns.empty?
+      (collection.empty? && empty) ? render_empty : begin
+        column(*collection_attribute_names) if columns.empty?
         super do |html|
           html << head.render
           html << body.render
-          html << foot.render if @foot && !@foot.empty?
+          html << foot.render if foot && !foot.empty?
         end.gsub(/\n\s*\n/, "\n")
       end
     end
 
     def render_empty
-      @empty.insert(1, @empty.pop.call) if @empty.last.respond_to?(:call)
-      content_tag(*@empty)
+      empty.insert(1, empty.pop.call) if empty.last.respond_to?(:call)
+      content_tag(*empty)
     end
 
     protected
 
       def collection_attribute_names
-        record = @collection.first
+        record = collection.first
         names = record.respond_to?(:attribute_names) ? record.attribute_names : []
         names.map(&:titleize)
       end

data/lib/simple_table/tag.rb

@@ -1,9 +1,11 @@
+require 'active_support/core_ext/class/inheritable_attributes'
+
 module SimpleTable
   class Tag
-    class_inheritable_accessor :level, :tag_name
-
     include ActionView::Helpers::TagHelper
 
+    class_inheritable_accessor :level, :tag_name
+
     attr_reader :options, :parent
 
     def initialize(parent = nil, options = {})

data/lib/simple_table/version.rb

@@ -0,0 +1,3 @@
+module SimpleTable
+  VERSION = '0.0.4'
+end

data/lib/simple_table.rb

@@ -1,19 +1,20 @@
-require 'simple_table/tag'
-require 'simple_table/cell'
-require 'simple_table/row'
-require 'simple_table/rows'
-require 'simple_table/body'
-require 'simple_table/head'
-require 'simple_table/foot'
-require 'simple_table/column'
-require 'simple_table/table'
-
+require 'active_support/core_ext/module/attribute_accessors'
 
 module SimpleTable
+  autoload :Tag,    'simple_table/tag'
+  autoload :Cell,   'simple_table/cell'
+  autoload :Row,    'simple_table/row'
+  autoload :Rows,   'simple_table/rows'
+  autoload :Body,   'simple_table/body'
+  autoload :Head,   'simple_table/head'
+  autoload :Foot,   'simple_table/foot'
+  autoload :Column, 'simple_table/column'
+  autoload :Table,  'simple_table/table'
+
   mattr_accessor :options
   self.options = {
     :alternate_rows => true,
-    :i18n_scope => nil
+    :i18n_scope     => nil
   }
 
   def table_for(collection = [], options = {}, &block)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_table
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -16,26 +16,57 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-01 00:00:00 +02:00
+date: 2010-08-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: actionpack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1848230024
+        hash: 7712042
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
+        - rc
+        version: 3.0.0.rc
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7712042
+        segments: 
+        - 3
+        - 0
+        - 0
+        - rc
+        version: 3.0.0.rc
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: gem_patching
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: "[description]"
 email: raphaela.wrede@gmail.com
 executables: []
@@ -54,6 +85,7 @@ files:
 - lib/simple_table/rows.rb
 - lib/simple_table/table.rb
 - lib/simple_table/tag.rb
+- lib/simple_table/version.rb
 - lib/simple_table.rb
 has_rdoc: true
 homepage: http://github.com/rwrede/simple_table