tabulatr 0.2.0 → 0.3.0

data/Changelog.textile

@@ -1,5 +1,14 @@
 h1. Changelog for tabulatr
 
+h2. 0.3.0
+
+* Converted into a Rails 3.1 engine and moved css and images to use the new asset pipeline. Works with 3.0.x -- 'opefully. Thanks to all that reported the problem.
+* Header cells are now auto translated. Thanks to <a href="https://github.com/niedhui">niedhui</a>!
+
+h2. 0.2.1
+
+* Fixed a ruby 1.8 syntax issue. Thanks to <a href="https://github.com/TBAA">TBAA</a> for reporting!
+
 h2. 0.2.0
 
 * Mongoid can also be used in place of ActiveRecord

data/README.textile

@@ -1,6 +1,11 @@
 h1. Tabulatr - Index Tables made easy, finally
 
-(there is a <a href="https://github.com/provideal/tabulatr-demo">demo app repository</a>)
+<b>Notes:</b>
+
+<ul>
+  <li>there is a <a href="https://github.com/provideal/tabulatr-demo">demo app repository</a></li>
+  <li>note the spelling, it's tabulatr, not tabulat<b>o</b>r.
+</ul>
 
 h2. Mission Objective
 

data/app/assets/stylesheets/tabulatr.css

@@ -0,0 +1 @@
+/*= require tabulatr/application */

data/app/assets/stylesheets/tabulatr/application.scss

@@ -0,0 +1,102 @@
+body {
+  font: 9pt Verdana;
+}
+
+table {
+  border-collapse: collapse;
+  width:100%;
+}
+
+td, th {
+  border: 1px solid gray;
+  padding:5px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: ellipsis;
+}
+
+th {
+  background-color: #ccc;
+  text-shadow: 1px 1px 1px rgba(0,0,0,.2);
+}
+
+div.table-controls {
+  font: 9pt Verdana;
+  width: 100%-10px;
+  border: 1px solid gray;
+  padding:5px;
+  margin-bottom: 10px;
+  background-color: #eee;
+  border-radius: 5px;
+  position: relative;
+}
+
+div.table-controls input {
+  font: 9pt Verdana;
+}
+
+div.table-controls input[type=submit] {
+  position: relative;
+  background-repeat: repeat-x;
+  color: #efefef;
+  font-weight: bold;
+  display: inline-block;
+  text-decoration: none;
+  border-width: 1px;
+  border-style: solid;
+  padding: 0 12px;
+  margin: 0;
+  text-shadow: 1px 1px 1px rgba(0,0,0,.2);
+  -moz-box-shadow: 1px 1px 1px rgba(0,0,0,.25);
+  -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,.25);
+  box-shadow: 1px 1px 1px rgba(0,0,0,.25);
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+  cursor: pointer;
+  background-position: 0 -80px;
+  font-size: 11px;
+  height: 24px;
+  line-height: 24px;
+}
+
+div.table-controls input[type=submit] {
+  background-image: asset-url("buttons_lite_background.png", "image");
+  background-color: #263849;
+  border-color: #16222c;
+  color: #efefef;
+}
+
+div.table-controls input[type=submit]:hover {
+  background-color: #16222c;
+  color: #efefef;
+  text-decoration: none;
+}
+
+div.paginator {
+  display: inline-block;
+  margin-right: 40px;
+}
+
+div.batch-actions {
+  display: inline-block;
+}
+
+div.check-controls {
+  margin-top: 10px;
+  position: absolute;
+  bottom: 5px;
+  right: 5px;
+}
+
+div.check-controls input[type=submit] {
+  font-size: 9px;
+  height: 20px;
+  line-height: 20px;
+  margin:3px;
+}
+
+div.info-text {
+  margin-top:10px;
+  font-size: 9pt;
+}

data/lib/tabulatr.rb

@@ -22,6 +22,7 @@
 #++
 
 require 'tabulatr/tabulatr'
+require 'tabulatr/engine'
 require 'whiny_hash'
 require 'id_stuffer'
 

data/lib/tabulatr/engine.rb

@@ -0,0 +1,3 @@
+class Tabulatr::Engine < Rails::Engine
+
+end

data/lib/tabulatr/tabulatr.rb

@@ -42,6 +42,8 @@ class Tabulatr
   include ActionView::Helpers::FormOptionsHelper
   include ActionView::Helpers::TranslationHelper
   include ActionView::Helpers::RecordTagHelper
+#  include ActionView::Helpers::AssetTagHelper
+#  include Rails::Application::Configurable
 
   # Constructor of Tabulatr
   #
@@ -57,7 +59,7 @@ class Tabulatr
     @val = []
     @record = nil
     @row_mode = false
-    @classname, @id, @id_type = @records.__classinfo
+    @klaz, @classname, @id, @id_type = @records.__classinfo
     @pagination = @records.__pagination
     @filters = @records.__filters
     @sorting = @records.__sorting
@@ -237,6 +239,21 @@ private
     end
     nil
   end
+  
+  def make_image_button(iname, options)
+    inactive = options.delete(:inactive)
+    psrc = @view.image_path File.join(@table_options[:image_path_prefix], iname)
+    if !inactive
+      make_tag(:input, 
+        options.merge(
+          :type => 'image',
+          :src => psrc
+        )
+      )
+    else
+      make_tag(:img, :src => psrc)
+    end
+  end
 end
 
 Dir[File.join(File.dirname(__FILE__), "tabulatr", "*.rb")].each do |file|

data/lib/tabulatr/tabulatr/finder.rb

@@ -45,8 +45,8 @@ module Tabulatr::Finder
     if !str.present?
       []
     elsif str.starts_with?("GzB")
-      Zlib::Inflate.inflate(Base64.decode64(str[3..-1]))
-        .split(Tabulatr.table_form_options[:checked_separator])
+      Zlib::Inflate.inflate(Base64.decode64(str[3..-1])).split(
+      Tabulatr.table_form_options[:checked_separator])
     else
       IdStuffer.unstuff(str)
     end

data/lib/tabulatr/tabulatr/finder/find_for_table.rb

@@ -99,7 +99,8 @@ module Tabulatr::Finder
     if opts[:stateful]
       session = opts[:stateful]
       sname = "#{cname}#{form_options[:state_session_postfix]}"
-      raise "give the session as the :stateful parameter in find_for_table" unless session.is_a?(ActionDispatch::Session::AbstractStore::SessionHash)
+      raise "give the session as the :stateful parameter in find_for_table, not a '#{session.class}'" \
+        unless session.is_a?(Rails::version.to_f >= 3.1 ? ActiveSupport::HashWithIndifferentAccess : ActionDispatch::Session::AbstractStore::SessionHash)
       session[sname] ||= {}
       
       if params["#{cname}#{form_options[:reset_state_postfix]}"]
@@ -188,19 +189,23 @@ module Tabulatr::Finder
     page += 1 if paginate_options[:page_right]
     page -= 1 if paginate_options[:page_left]
     c = rel.count
+    # Group statments return a hash
+    c = c.count unless c.class == Fixnum
     pages = (c/pagesize).ceil
     page = [1, [page, pages].min].max
     total = klaz
     total = total.where(opts[:precondition]) if opts[:precondition]
+    # here too
     total = total.count
+    total = total.count unless total.class == Fixnum
     
     # Now, actually find the stuff
-    found = rel.limit(pagesize.to_i).offset(((page-1)*pagesize).to_i)
-      .order(order).to_a #, :include => includes
+    found = rel.limit(pagesize.to_i).offset(((page-1)*pagesize).to_i
+     ).order(order).to_a #, :include => includes
 
     # finally, inject methods to retrieve the current 'settings'
     found.define_singleton_method(:__filters) do filter_param end
-    found.define_singleton_method(:__classinfo) do [cname, id, id_type] end
+    found.define_singleton_method(:__classinfo) do [klaz, cname, id, id_type] end
     found.define_singleton_method(:__pagination) do
       { :page => page, :pagesize => pagesize, :count => c, :pages => pages,
         :pagesizes => paginate_options[:pagesizes],

data/lib/tabulatr/tabulatr/header_cell.rb

@@ -37,25 +37,22 @@ class Tabulatr
     bid = "#{@classname}#{@table_form_options[:sort_postfix]}"
     opts = normalize_column_options opts
     make_tag(:th, opts[:th_html]) do
-      concat(t(opts[:header] || name.to_s.humanize.titlecase), :escape_html)
+      concat(t(opts[:header] || @klaz.human_attribute_name(name).titlecase), :escape_html)
       if opts[:sortable] and @table_options[:sortable]
         if @sorting and @sorting[:by].to_s == name.to_s
           pname = "#{sortparam}[_resort][#{name}][#{@sorting[:direction] == 'asc' ? 'desc' : 'asc'}]"
           bid = "#{bid}_#{name}_#{@sorting[:direction] == 'asc' ? 'desc' : 'asc'}"
-          psrc = File.join(@table_options[:image_path_prefix], @table_options[@sorting[:direction] == 'desc' ?
-            :sort_down_button : :sort_up_button])
+          psrc = @table_options[@sorting[:direction] == 'desc' ?
+            :sort_down_button : :sort_up_button]
           make_tag(:input, :type => :hidden,
             :name => "#{sortparam}[#{name}][#{@sorting[:direction]}]",
             :value => "#{@sorting[:direction]}")
         else
           pname = "#{sortparam}[_resort][#{name}][desc]"
           bid = "#{bid}_#{name}_desc"
-          psrc = File.join(@table_options[:image_path_prefix], @table_options[:sort_down_button_inactive])
+          psrc = @table_options[:sort_down_button_inactive]
         end
-        make_tag(:input, :type => 'image',
-          :id => bid,
-          :src => psrc,
-          :name => pname)
+        make_image_button(psrc, :id => bid, :name => pname)
       end
     end # </th>
   end

data/lib/tabulatr/tabulatr/paginator.rb

@@ -35,17 +35,11 @@ class Tabulatr
     # render the 'wrapping' div
     make_tag(:div, :class => @table_options[:paginator_div_class]) do
       # << Page Left
-      if page > 1
-        make_tag(:input, :type => 'image', 
-          :src => File.join(@table_options[:image_path_prefix], @table_options[:pager_left_button]),
-          :class => @table_options[:page_left_class],
-          :id => "#{pagination_name}_page_left",
-          :name => "#{pagination_name}[page_left]")
-      else
-        make_tag(:img, 
-          :src => File.join(@table_options[:image_path_prefix], @table_options[:pager_left_button_inactive]),
-          :class => @table_options[:page_left_class])
-      end  # page > 1
+      make_image_button(@table_options[page > 1 ? :pager_left_button : :pager_left_button_inactive],
+        :class => @table_options[:page_left_class],
+        :id => "#{pagination_name}_page_left",
+        :name => "#{pagination_name}[page_left]",
+        :inactive => (page <= 1))
       # current page number
       concat(make_tag(:input,
         :type => :hidden,
@@ -58,16 +52,11 @@ class Tabulatr
         :value => page))
       concat("/#{pages}")
       # >> Page Right
-      if page < pages
-        make_tag(:input, :type => 'image', 
-          :src => File.join(@table_options[:image_path_prefix], @table_options[:pager_right_button]),
-          :class => @table_options[:page_right_class],
-          :id => "#{pagination_name}_page_right",
-          :name => "#{pagination_name}[page_right]")
-      else
-        make_tag(:img, :src => File.join(@table_options[:image_path_prefix], @table_options[:pager_right_button_inactive]),
-          :class => @table_options[:page_right_class])
-      end  # page < pages
+      make_image_button(@table_options[page < pages ? :pager_right_button : :pager_right_button_inactive],
+        :class => @table_options[:page_right_class],
+        :id => "#{pagination_name}_page_right",
+        :name => "#{pagination_name}[page_right]",
+        :inactive => (page >= pages))
       if pagesizes.length > 1
         make_tag(:select, :name => "#{pagination_name}[pagesize]", :class => @table_options[:pagesize_select_class]) do
           pagesizes.each do |n|

data/lib/tabulatr/tabulatr/settings.rb

@@ -75,7 +75,7 @@ class Tabulatr
     :select_controls => [:select_all, :select_none, :select_visible, :unselect_visible,
                       :select_filtered, :unselect_filtered],
 
-    :image_path_prefix => '/images/tabulatr/',
+    :image_path_prefix => (Rails::version.to_f >= 3.1 ? 'tabulatr/' : '/images/tabulatr/'),
     :pager_left_button => 'pager_arrow_left.gif',
     :pager_left_button_inactive => 'pager_arrow_left_off.gif',
     :pager_right_button => 'pager_arrow_right.gif',

data/lib/tabulatr/version.rb

@@ -1,3 +1,3 @@
 class Tabulatr
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/tabulatr.gemspec

@@ -15,14 +15,10 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = []
-  s.require_paths = ["lib"]
   s.rdoc_options  = ['--charset=UTF-8']
   
 
-  s.add_runtime_dependency('rails', '~> 3.0')
+  s.add_runtime_dependency('rails', '>= 3.0.0')
   s.add_dependency('whiny_hash', '>= 0.0.2')
   s.add_dependency('id_stuffer', '>= 0.0.1')
-
-  s.rubyforge_project = "tabulatr"
 end

metadata

@@ -1,76 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tabulatr
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Peter Horn
-- "Ren\xC3\xA9 Sprotte"
+- René Sprotte
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-26 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-20 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70348423259000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: whiny_hash
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70348423259000
+- !ruby/object:Gem::Dependency
+  name: whiny_hash
+  requirement: &70348423258260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: id_stuffer
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70348423258260
+- !ruby/object:Gem::Dependency
+  name: id_stuffer
+  requirement: &70348423257540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
-  version_requirements: *id003
-description: A tight DSL to build tables of ActiveRecord or Mongoid models with sorting, pagination, finding/filtering, selecting and batch actions. Tries to do for tables what formtastic and simple_form did for forms.
+  prerelease: false
+  version_requirements: *70348423257540
+description: A tight DSL to build tables of ActiveRecord or Mongoid models with sorting,
+  pagination, finding/filtering, selecting and batch actions. Tries to do for tables
+  what formtastic and simple_form did for forms.
 email: info@provideal.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Changelog.textile
@@ -78,6 +60,17 @@ files:
 - LICENSE
 - README.textile
 - Rakefile
+- app/assets/images/tabulatr/buttons_lite_background.png
+- app/assets/images/tabulatr/pager_arrow_left.gif
+- app/assets/images/tabulatr/pager_arrow_left_off.gif
+- app/assets/images/tabulatr/pager_arrow_right.gif
+- app/assets/images/tabulatr/pager_arrow_right_off.gif
+- app/assets/images/tabulatr/sort_arrow_down.gif
+- app/assets/images/tabulatr/sort_arrow_down_off.gif
+- app/assets/images/tabulatr/sort_arrow_up.gif
+- app/assets/images/tabulatr/sort_arrow_up_off.gif
+- app/assets/stylesheets/tabulatr.css
+- app/assets/stylesheets/tabulatr/application.scss
 - assets/images/buttons_lite_background.png
 - assets/images/pager_arrow_left.gif
 - assets/images/pager_arrow_left_off.gif
@@ -97,6 +90,7 @@ files:
 - lib/initializers/mark_as_localizable.rb
 - lib/initializers/mongoid.rb
 - lib/tabulatr.rb
+- lib/tabulatr/engine.rb
 - lib/tabulatr/tabulatr.rb
 - lib/tabulatr/tabulatr/batch_actions.rb
 - lib/tabulatr/tabulatr/check_controls.rb
@@ -185,39 +179,33 @@ files:
 - spec/requests/tabulatrs_spec.rb
 - spec/spec_helper.rb
 - tabulatr.gemspec
-has_rdoc: true
 homepage: http://github.com/provideal/tabulatr
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: tabulatr
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: A tight DSL to build tables of ActiveRecord or Mongoid models with sorting, pagination, finding/filtering, selecting and batch actions.
-test_files: 
+summary: A tight DSL to build tables of ActiveRecord or Mongoid models with sorting,
+  pagination, finding/filtering, selecting and batch actions.
+test_files:
 - spec/dummy_app/.gitignore
 - spec/dummy_app/app/controllers/application_controller.rb
 - spec/dummy_app/app/controllers/products_controller.rb