tableficate 0.1.3 → 0.2.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tableficate
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-27 00:00:00.000000000Z
+date: 2011-12-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70183465929100 !ruby/object:Gem::Requirement
+  requirement: &70096246764520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70183465929100
+  version_requirements: *70096246764520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70183465928680 !ruby/object:Gem::Requirement
+  requirement: &70096246764080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183465928680
+  version_requirements: *70096246764080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70183465928220 !ruby/object:Gem::Requirement
+  requirement: &70096246763620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183465928220
+  version_requirements: *70096246763620
+- !ruby/object:Gem::Dependency
+  name: genspec
+  requirement: &70096246763180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70096246763180
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70183465927800 !ruby/object:Gem::Requirement
+  requirement: &70096246762740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70096246762740
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: &70096246762320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,8 +76,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70183465927800
-description: Simple tables for Rails.
+  version_requirements: *70096246762320
+description: A DSL for Rails that provides easy table creation with sorting and filtering.
 email:
 - alasseigne@sei-mi.com
 executables: []
@@ -67,13 +89,16 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
-- app/views/tableficate/_column_header.html.erb
 - app/views/tableficate/_data.html.erb
-- app/views/tableficate/_input_filter.html.erb
-- app/views/tableficate/_input_range_filter.html.erb
+- app/views/tableficate/_header.html.erb
 - app/views/tableficate/_row.html.erb
-- app/views/tableficate/_select_filter.html.erb
 - app/views/tableficate/_table.html.erb
+- app/views/tableficate/filters/_check_box.html.erb
+- app/views/tableficate/filters/_input.html.erb
+- app/views/tableficate/filters/_input_range.html.erb
+- app/views/tableficate/filters/_radio.html.erb
+- app/views/tableficate/filters/_select.html.erb
+- app/views/tableficate/filters/_select_range.html.erb
 - changelog.markdown
 - lib/generators/tableficate/table/table_generator.rb
 - lib/generators/tableficate/table/templates/table.rb
@@ -85,9 +110,15 @@ files:
 - lib/tableficate/column.rb
 - lib/tableficate/engine.rb
 - lib/tableficate/exceptions.rb
-- lib/tableficate/filters/filter.rb
-- lib/tableficate/filters/input_filters.rb
-- lib/tableficate/filters/select_filter.rb
+- lib/tableficate/filters/base.rb
+- lib/tableficate/filters/check_box.rb
+- lib/tableficate/filters/choice.rb
+- lib/tableficate/filters/collection.rb
+- lib/tableficate/filters/input.rb
+- lib/tableficate/filters/input_range.rb
+- lib/tableficate/filters/radio.rb
+- lib/tableficate/filters/select.rb
+- lib/tableficate/filters/select_range.rb
 - lib/tableficate/finder.rb
 - lib/tableficate/helper.rb
 - lib/tableficate/table.rb
@@ -97,10 +128,15 @@ files:
 - spec/active_record_extension_spec.rb
 - spec/base_spec.rb
 - spec/column_spec.rb
-- spec/filter_spec.rb
+- spec/filters/base_spec.rb
+- spec/filters/choice_spec.rb
+- spec/filters/collection_spec.rb
+- spec/filters/input_range_spec.rb
+- spec/filters/input_spec.rb
 - spec/finder_spec.rb
-- spec/input_filter_spec.rb
-- spec/select_filter_spec.rb
+- spec/generators/tableficate_table_spec.rb
+- spec/generators/tableficate_theme_spec.rb
+- spec/helper_spec.rb
 - spec/spec_helper.rb
 - spec/table_spec.rb
 - spec/test_app/.gitignore
@@ -111,12 +147,39 @@ files:
 - spec/test_app/app/assets/javascripts/application.js
 - spec/test_app/app/assets/stylesheets/application.css
 - spec/test_app/app/controllers/application_controller.rb
+- spec/test_app/app/controllers/filters_controller.rb
 - spec/test_app/app/helpers/application_helper.rb
 - spec/test_app/app/mailers/.gitkeep
 - spec/test_app/app/models/.gitkeep
 - spec/test_app/app/models/nobel_prize.rb
 - spec/test_app/app/models/nobel_prize_winner.rb
+- spec/test_app/app/views/filters/check_box_tags.html.erb
+- spec/test_app/app/views/filters/multi_select_from_string.html.erb
+- spec/test_app/app/views/filters/multi_select_tag.html.erb
+- spec/test_app/app/views/filters/radio_tags.html.erb
+- spec/test_app/app/views/filters/select_from_string.html.erb
+- spec/test_app/app/views/filters/select_tag.html.erb
 - spec/test_app/app/views/layouts/application.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/_data.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/_header.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/_row.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/_table.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/filters/_check_box.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/filters/_input.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/filters/_input_range.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/filters/_radio.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/filters/_select.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/filters/_select_range_filter.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/_data.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/_header.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/_row.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/_table.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/filters/_check_box.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/filters/_input.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/filters/_input_range.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/filters/_radio.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/filters/_select.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/filters/_select_range_filter.html.erb
 - spec/test_app/config.ru
 - spec/test_app/config/application.rb
 - spec/test_app/config/boot.rb
@@ -167,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3799563162300104254
+      hash: -4309695575052773710
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -176,22 +239,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3799563162300104254
+      hash: -4309695575052773710
 requirements: []
 rubyforge_project: tableficate
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: Simple tables for Rails.
+summary: A DSL for Rails that provides easy table creation with sorting and filtering.
 test_files:
 - spec/action_column_spec.rb
 - spec/active_record_extension_spec.rb
 - spec/base_spec.rb
 - spec/column_spec.rb
-- spec/filter_spec.rb
+- spec/filters/base_spec.rb
+- spec/filters/choice_spec.rb
+- spec/filters/collection_spec.rb
+- spec/filters/input_range_spec.rb
+- spec/filters/input_spec.rb
 - spec/finder_spec.rb
-- spec/input_filter_spec.rb
-- spec/select_filter_spec.rb
+- spec/generators/tableficate_table_spec.rb
+- spec/generators/tableficate_theme_spec.rb
+- spec/helper_spec.rb
 - spec/spec_helper.rb
 - spec/table_spec.rb
 - spec/test_app/.gitignore
@@ -202,12 +270,39 @@ test_files:
 - spec/test_app/app/assets/javascripts/application.js
 - spec/test_app/app/assets/stylesheets/application.css
 - spec/test_app/app/controllers/application_controller.rb
+- spec/test_app/app/controllers/filters_controller.rb
 - spec/test_app/app/helpers/application_helper.rb
 - spec/test_app/app/mailers/.gitkeep
 - spec/test_app/app/models/.gitkeep
 - spec/test_app/app/models/nobel_prize.rb
 - spec/test_app/app/models/nobel_prize_winner.rb
+- spec/test_app/app/views/filters/check_box_tags.html.erb
+- spec/test_app/app/views/filters/multi_select_from_string.html.erb
+- spec/test_app/app/views/filters/multi_select_tag.html.erb
+- spec/test_app/app/views/filters/radio_tags.html.erb
+- spec/test_app/app/views/filters/select_from_string.html.erb
+- spec/test_app/app/views/filters/select_tag.html.erb
 - spec/test_app/app/views/layouts/application.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/_data.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/_header.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/_row.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/_table.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/filters/_check_box.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/filters/_input.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/filters/_input_range.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/filters/_radio.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/filters/_select.html.erb
+- spec/test_app/app/views/tableficate/custom_check_box_block/filters/_select_range_filter.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/_data.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/_header.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/_row.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/_table.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/filters/_check_box.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/filters/_input.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/filters/_input_range.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/filters/_radio.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/filters/_select.html.erb
+- spec/test_app/app/views/tableficate/custom_radio_block/filters/_select_range_filter.html.erb
 - spec/test_app/config.ru
 - spec/test_app/config/application.rb
 - spec/test_app/config/boot.rb

data/lib/tableficate/filters/filter.rb

@@ -1,19 +0,0 @@
-module Tableficate
-  class Filter
-    attr_reader :name, :label, :options, :template, :table, :field_name
-
-    def initialize(table, name, options = {})
-      @table   = table
-      @name    = name
-      @options = options
-
-      @template   = self.class.name.demodulize.underscore
-      @label      = @options[:label] || table.columns.detect{|column| column.name == @name}.try(:header) || name.to_s.titleize
-      @field_name = "#{table.as}[filter][#{@name}]"
-    end
-
-    def field_value(params)
-      params[:filter][@name] rescue ''
-    end
-  end
-end

data/lib/tableficate/filters/input_filters.rb

@@ -1,64 +0,0 @@
-module Tableficate
-  class InputFilter < Filter
-    def initialize(table, name, options = {})
-      super(table, name, options)
-
-      type = @options[:field_options][:type] rescue 'text'
-
-      if not Dir.glob('app/views/' + Tableficate::Utils::template_path("_#{type}_#{@template}.html.*", table.options[:theme])).empty?
-        @template = "#{type}_#{@template}"
-      end
-    end
-  end
-
-  class InputStartFilter < InputFilter
-    def initialize(table, name, options = {})
-      super(table, name, options)
-
-      @field_name += '[start]'
-    end
-
-    def name
-      "#{@name}_start".to_sym
-    end
-
-    def field_value(params)
-      params[:filter][@name][:start] rescue ''
-    end
-  end
-
-  class InputStopFilter < InputFilter
-    def initialize(table, name, options = {})
-      super(table, name, options)
-
-      @field_name += '[stop]'
-    end
-
-    def name
-      "#{@name}_stop".to_sym
-    end
-
-    def field_value(params)
-      params[:filter][@name][:stop] rescue ''
-    end
-  end
-
-  class InputRangeFilter < Filter
-    attr_reader :start, :stop
-
-    def initialize(table, name, options = {})
-      start_options = options.delete(:start) || {}
-      stop_options  = options.delete(:stop)  || {}
-
-      super(table, name, options)
-
-      start_options.reverse_merge!(@options)
-      start_options.reverse_merge!(label: self.label)
-      stop_options.reverse_merge!(@options)
-      stop_options.reverse_merge!(label: self.label)
-
-      @start = InputStartFilter.new(table, name, start_options)
-      @stop  = InputStopFilter.new(table, name, stop_options)
-    end
-  end
-end

data/lib/tableficate/filters/select_filter.rb

@@ -1,11 +0,0 @@
-module Tableficate
-  class SelectFilter < Filter
-    attr_reader :choices
-
-    def initialize(table, name, choices, options = {})
-      super(table, name, options)
-
-      @choices = choices
-    end
-  end
-end

data/spec/filter_spec.rb

@@ -1,30 +0,0 @@
-require 'spec_helper'
-
-describe Tableficate::Filter do
-  before(:all) do
-    @table = Tableficate::Table.new(nil, NobelPrizeWinner.limit(1), {}, {})
-    @table.column(:first_name, header: 'Given Name')
-  end
-
-  it 'should find the correct template type' do
-    Tableficate::Filter.new(@table, :first_name).template.should == 'filter'
-  end
-
-  it 'should use the provided label or default to the column header' do
-    Tableficate::Filter.new(@table, :first_name).label.should == 'Given Name'
-    Tableficate::Filter.new(@table, :first_name, label: 'First').label.should == 'First'
-  end
-
-  it 'should provide a field name' do
-    Tableficate::Filter.new(@table, :first_name).field_name.should == "#{@table.as}[filter][first_name]"
-  end
-
-  it 'should provide a field value when given params or a blank value' do
-    Tableficate::Filter.new(@table, :first_name).field_value({filter: {first_name: 'Aaron'}}).should == 'Aaron'
-    Tableficate::Filter.new(@table, :first_name).field_value({}).should == ''
-  end
-
-  it 'should allow for filters that do not match a particular field' do
-    Tableficate::Filter.new(@table, :custom_field).label.should == 'Custom Field'
-  end
-end

data/spec/input_filter_spec.rb

@@ -1,90 +0,0 @@
-require 'spec_helper'
-
-describe Tableficate::InputFilter do
-  before(:all) do
-    @table = Tableficate::Table.new(nil, NobelPrizeWinner.joins(:nobel_prizes).limit(1), {}, {})
-    @table.column(:first_name)
-  end
-
-  it 'should find the correct template type' do
-    Tableficate::InputFilter.new(@table, :first_name).template.should == 'input_filter'
-
-    Tableficate::InputFilter.new(@table, :first_name, field_options: {type: 'email'}).template.should == 'input_filter'
-
-    file = File.open('app/views/tableficate/_email_input_filter.html.erb', 'w')
-    Tableficate::InputFilter.new(@table, :first_name, field_options: {type: 'email'}).template.should == 'email_input_filter'
-    File.delete(file.path)
-
-    file = File.open('app/views/tableficate/_email_input_filter.html.haml', 'w')
-    Tableficate::InputFilter.new(@table, :first_name, field_options: {type: 'email'}).template.should == 'email_input_filter'
-    File.delete(file.path)
-  end
-end
-
-describe Tableficate::InputStartFilter do
-  before(:all) do
-    @table = Tableficate::Table.new(nil, NobelPrizeWinner.joins(:nobel_prizes).limit(1), {}, {})
-    @table.column(:year)
-  end
-
-  it 'should append "[start]" to field_name' do
-    Tableficate::InputStartFilter.new(@table, :year).field_name == "#{@table.as}[filter][year][start]"
-  end
-
-  it 'should append "_start" to the name' do
-    Tableficate::InputStartFilter.new(@table, :year).name == :year_start
-  end
-
-  it 'should provide a field value when given params or a blank value' do
-    Tableficate::InputStartFilter.new(@table, :year).field_value({filter: {year: {start: '2011'}}}).should == '2011'
-    Tableficate::InputStartFilter.new(@table, :year).field_value({}).should == ''
-  end
-end
-
-describe Tableficate::InputStopFilter do
-  before(:all) do
-    @table = Tableficate::Table.new(nil, NobelPrizeWinner.joins(:nobel_prizes).limit(1), {}, {})
-    @table.column(:year)
-  end
-
-  it 'should append "[stop]" to field_name' do
-    Tableficate::InputStopFilter.new(@table, :year).field_name == "#{@table.as}[filter][year][stop]"
-  end
-
-  it 'should append "_stop" to the name' do
-    Tableficate::InputStopFilter.new(@table, :year).name == :year_stop
-  end
-
-  it 'should provide a field value when given params or a blank value' do
-    Tableficate::InputStopFilter.new(@table, :year).field_value({filter: {year: {stop: '2011'}}}).should == '2011'
-    Tableficate::InputStopFilter.new(@table, :year).field_value({}).should == ''
-  end
-end
-
-describe Tableficate::InputRangeFilter do
-  before(:all) do
-    @table = Tableficate::Table.new(nil, NobelPrizeWinner.joins(:nobel_prizes).limit(1), {}, {})
-    @table.column(:year)
-  end
-
-  it 'should find the correct template type' do
-    Tableficate::InputRangeFilter.new(@table, :year).template.should == 'input_range_filter'
-  end
-
-  it 'should create a start and stop input' do
-    filter = Tableficate::InputRangeFilter.new(@table, :year)
-
-    filter.start.is_a?(Tableficate::InputStartFilter).should be true
-    filter.stop.is_a?(Tableficate::InputStopFilter).should be true
-  end
-
-  it 'should use the :start and :stop option hashes for the individual filters and default any values not passed to the range options provided' do
-    filter = Tableficate::InputRangeFilter.new(@table, :year, label: 'Nobel Prize Won In')
-    filter.start.label.should == 'Nobel Prize Won In'
-    filter.stop.label.should == 'Nobel Prize Won In'
-
-    filter = Tableficate::InputRangeFilter.new(@table, :birth_date, label: 'Nobel Prize Won In', start: {label: 'Nobel Prize Won Between'}, stop: {label: 'and'})
-    filter.start.label.should == 'Nobel Prize Won Between'
-    filter.stop.label.should == 'and'
-  end
-end

data/spec/select_filter_spec.rb

@@ -1,10 +0,0 @@
-require 'spec_helper'
-
-describe Tableficate::SelectFilter do
-  it 'should find the correct template type' do
-    table = Tableficate::Table.new(nil, NobelPrizeWinner.joins(:nobel_prizes).limit(1), {}, {})
-    table.column(:year)
-
-    Tableficate::SelectFilter.new(table, :year, []).template.should == 'select_filter'
-  end
-end