tableficate 0.3.0 → 0.3.1

data/README.markdown

@@ -13,20 +13,28 @@ If you're using Bundler, add this to your Gemfile:
 
 ## Support
 
-### Ruby
-1.9+
-
-### Rails
-3.1+
-
-### Templating
-Any templating engine can be used. The default theme uses ERB.
-
-### Database Framework
-ActiveRecord
-
-### Pagination
-Any pagination can be used. The default theme has built-in support for Kaminari and will_paginate.
+<table>
+  <tr>
+    <td><strong>Ruby</strong></td>
+    <td>1.9</td>
+  </tr>
+  <tr>
+    <td><strong>Rails</strong></td>
+    <td>3.1</td>
+  </tr>
+  <tr>
+    <td><strong>Database Framework</strong></td>
+    <td>ActiveRecord</td>
+  </tr>
+  <tr>
+    <td><strong>Templating</strong></td>
+    <td>Any templating engine can be used. The default theme uses ERB.</td>
+  </tr>
+  <tr>
+    <td><strong>Pagination</strong></td>
+    <td>Any pagination can be used. The default theme has built-in support for Kaminari and will_paginate.</td>
+  </tr>
+</table>
 
 ## Basic Usage
 Let's say that we want to create a table that lists active accounts in the system with their time of creation and the name on the account.
@@ -118,6 +126,8 @@ The theme can then be applied to a table.
     <%= table_for @records, theme: 'foo' do |t| %>
       ...
     <% end %>
+    
+[Find out more about themes.](https://github.com/sei-mi/tableficate/wiki/Custom-Themes)
 
 ## Changes Needed to Upgrade From 0.2
 

data/changelog.markdown

@@ -1,3 +1,6 @@
+## 0.3.1
+ * converting scope to an array through functions like `all` no longer breaks
+
 ## 0.3.0
  * tables no longer take the :html option, all non-recognized options are passed through as HTML attributes
  * The `options` attribute on a variety of objects has been removed. It has been replaced with specialized functions such as `label_options` and `collection` with all unrecognized options placed into the `attrs` attribute.

data/lib/tableficate/active_record_extension.rb

@@ -1,18 +1,23 @@
 module Tableficate
   module ActiveRecordExtension
+    module Functions
+      attr_accessor :tableficate_data
+    end
+
     extend ActiveSupport::Concern
 
     included do
       extend Tableficate::Finder
 
       self.scope :tableficate_ext, ->{} do
-        def tableficate_add_data(key, value)
-          @tableficate_data ||= {}
-          @tableficate_data[key] = value
-        end
+        include Functions
+
+        def to_a
+          a = super.extend(Functions)
+
+          a.tableficate_data = self.tableficate_data
 
-        def tableficate_get_data
-          @tableficate_data || {}
+          a
         end
       end
     end

data/lib/tableficate/finder.rb

@@ -92,9 +92,10 @@ module Tableficate
         sorting[:column] = column.to_sym
         sorting[:dir]    = ['asc', 'desc'].include?(dir) ? dir : 'asc'
       end
-      scope.tableficate_add_data(:current_sort, sorting)
+      scope.tableficate_data = {}
+      scope.tableficate_data[:current_sort] = sorting
       filters_with_field = @filter ? @filter.select{|name, options| not options.is_a?(Proc) and options and options.has_key?(:field)} : {}
-      scope.tableficate_add_data(:field_map, Hash[filters_with_field.map{|name, options| [name, options[:field]]}])
+      scope.tableficate_data[:field_map] = Hash[filters_with_field.map{|name, options| [name, options[:field]]}]
       scope
     end
 

data/lib/tableficate/helper.rb

@@ -1,7 +1,7 @@
 module Tableficate
   module Helper
     def table_for(rows, options = {})
-      t = Tableficate::Table.new(self, rows, options, rows.tableficate_get_data)
+      t = Tableficate::Table.new(self, rows, options, rows.tableficate_data)
       yield(t)
       t.template.render(partial: Tableficate::Utils::template_path(t.template, 'table_for', t.theme), locals:  {table: t})
     end

data/lib/tableficate/version.rb

@@ -1,3 +1,3 @@
 module Tableficate
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/active_record_extension_spec.rb

@@ -3,7 +3,26 @@ require 'spec_helper'
 describe 'Tableficate::ActiveRecordExtention' do
   it 'should add and retreive data from the scope' do
     scope = NobelPrizeWinner.tableficate_ext
-    scope.tableficate_add_data(:name, 'Aaron')
-    scope.tableficate_get_data.should == {name: 'Aaron'}
+    scope.tableficate_data = {}
+    scope.tableficate_data[:name] = 'Aaron'
+    scope.tableficate_data.should == {name: 'Aaron'}
+  end
+
+  it 'maintains functionality if converted to an array' do
+    scope = NobelPrizeWinner.tableficate_ext.to_a
+    scope.tableficate_data = {}
+    scope.tableficate_data[:name] = 'Aaron'
+    scope.tableficate_data.should == {name: 'Aaron'}
+
+    class NobelPrizeWinnerWithDefaultSorting < Tableficate::Base
+      scope :nobel_prize_winner
+
+      default_sort(:first_name)
+    end
+    scope = NobelPrizeWinnerWithDefaultSorting.tableficate({}).all
+    scope.tableficate_data[:current_sort].should == {column: :first_name, dir: 'asc'}
+
+    scope = NobelPrizeWinnerWithDefaultSorting.tableficate({}).find(1,2)
+    scope.tableficate_data[:current_sort].should == {column: :first_name, dir: 'asc'}
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tableficate
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000Z
+date: 2012-01-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70355461259820 !ruby/object:Gem::Requirement
+  requirement: &70275949519680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70355461259820
+  version_requirements: *70275949519680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70355461255640 !ruby/object:Gem::Requirement
+  requirement: &70275949517100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355461255640
+  version_requirements: *70275949517100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70355461255140 !ruby/object:Gem::Requirement
+  requirement: &70275949515400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355461255140
+  version_requirements: *70275949515400
 - !ruby/object:Gem::Dependency
   name: genspec
-  requirement: &70355461254700 !ruby/object:Gem::Requirement
+  requirement: &70275949511500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355461254700
+  version_requirements: *70275949511500
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70355461254200 !ruby/object:Gem::Requirement
+  requirement: &70275949510000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355461254200
+  version_requirements: *70275949510000
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70355461253760 !ruby/object:Gem::Requirement
+  requirement: &70275949508160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355461253760
+  version_requirements: *70275949508160
 description: A DSL for Rails that provides easy table creation with sorting and filtering.
 email:
 - alasseigne@sei-mi.com
@@ -239,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3947316157518683488
+      hash: -3271381889509859658
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3947316157518683488
+      hash: -3271381889509859658
 requirements: []
 rubyforge_project: tableficate
 rubygems_version: 1.8.6