tabulatr2 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 457d8adce27f3f902cc4df5215a32cc4672ebe6f
-  data.tar.gz: b8f3703af996ac13ba561401e113e34bf1b165fc
+  metadata.gz: a677eed252e25251243c72fcd9273a5fa2a3e4d0
+  data.tar.gz: fe38b3b4eccad2e746772356203cb233e5a76a71
 SHA512:
-  metadata.gz: c81f75442ed064dfb4918af18cc310e3185e06c8f500ce327117427e2e7cb42a6b64ed43c88be3317418f5d8a783def68e8a1c47ab44f18eedae4d211dd09f69
-  data.tar.gz: f6817a83f7bfe03822dde8e343148cea2337721ce6a2efa2f382e8d3bf4f7fa0188c91f156392ed7750d8c317131a30c9f1ac473497680e31b194e1728962290
+  metadata.gz: f9824d54ec64a5c7cbe4aac03861f6aa4e9beee8d5a2a4d849a74c3a8193b4a51a7c4055d566d37627222741d39f64969b8a644b280e37f6e3695faf6be0ff86
+  data.tar.gz: 1a3f528cb8f4198086384f163c65638002cd5348eb46db70c53170be40f488f3470fd3ddec59945660b350b40521c376c86bf9f94d136cc832e04aff776e98a1

data/.gitignore

@@ -7,3 +7,4 @@ tags
 log
 .DS_Store
 .rake_tasks~
+tabulatr2*.gem

data/LICENSE

@@ -1,7 +1,7 @@
 The MIT License
 
-Copyright (c) 2010-2014 by tickettoaster GmbH, Peter Horn & Florian Thomas
-http://www.provideal.net, peter.horn@provideal.net
+Copyright (c) 2010-2014 by metaminded UG, Peter Horn & Florian Thomas
+http://www.metaminded.com, open-source@metaminded.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,7 +1,7 @@
 # Tabulatr2 - Index Tables made easy
 [![Gem Version](https://badge.fury.io/rb/tabulatr2.png)](http://badge.fury.io/rb/tabulatr2)
-[![Code Climate](https://codeclimate.com/github/provideal/tabulatr2.png)](https://codeclimate.com/github/provideal/tabulatr2)
-[![Travis CI](https://api.travis-ci.org/provideal/tabulatr2.png)](https://travis-ci.org/provideal/tabulatr2)
+[![Code Climate](https://codeclimate.com/github/metaminded/tabulatr2.png)](https://codeclimate.com/github/metaminded/tabulatr2)
+[![Travis CI](https://api.travis-ci.org/metaminded/tabulatr2.png)](https://travis-ci.org/metaminded/tabulatr2)
 
 ## Requirements
 
@@ -322,6 +322,7 @@ They change the appearance and behaviour of the table.
   path: '#',             # where to send the AJAX-requests to
   order_by: nil          # default order,
   html_class: ''         # html classes for the table element
+  counter_position: :top # position of the counter row, can by :top, :bottom or :both
 ```
 
 #### Example:

data/app/assets/javascripts/tabulatr/_tabulatr.js

@@ -6,6 +6,7 @@ function Tabulatr(id){
   this.locked = false;
   this.isAPersistedTable = false;
   this.initialRequest = true;
+  this.hasInfiniteScrolling = false;
 }
 
 var tabulatr_tables;
@@ -226,7 +227,7 @@ Tabulatr.prototype = {
   },
 
   submitFilterForm: function(){
-    if($('.pagination[data-table='+ this.id +']').length === 0){
+    if(this.hasInfiniteScrolling){
       $('.pagination_trigger[data-table='+ this.id +']').unbind('inview', cbfn);
       $('.pagination_trigger[data-table='+ this.id +']').bind('inview', cbfn);
     }
@@ -245,7 +246,9 @@ Tabulatr.prototype = {
       pagesize = $('table#'+ this.id).data('pagesize');
     }
     if(hash.page === undefined){
-      hash.page = Math.floor($('#'+ this.id +' tbody tr[class!=empty_row]').length/pagesize) + 1;
+      if(this.hasInfiniteScrolling){
+        hash.page = Math.floor($('#'+ this.id +' tbody tr[class!=empty_row]').length/pagesize) + 1;
+      }
       if(!isFinite(hash.page)){
         hash.page = 1;
       }
@@ -302,7 +305,7 @@ $(document).on('ready page:load', function(){
     $('.tabulatr_filter_form[data-table='+ tableId +'] input[name='+ tableName +'_sort]').val(sort_by + ' '+  dir);
     if(!table_obj.moreResults){
       table_obj.moreResults = true;
-      if($('.pagination[data-table='+ tableId +']').length === 0){
+      if(table_obj.hasInfiniteScrolling){
         $('.pagination_trigger[data-table='+ tableId +']').bind('inview', cbfn);
       }
     }
@@ -340,16 +343,16 @@ $(document).on('ready page:load', function(){
 
   $('form.tabulatr-fuzzy-search').submit(function(){
     var tableId = $(this).data('table');
-    if($('.pagination[data-table='+ tableId +']').length === 0){
-      $('.pagination_trigger[data-table='+ tableId +']').unbind('inview', cbfn);
-      $('.pagination_trigger[data-table='+ tableId +']').bind('inview', cbfn);
-    }
     var table_obj;
     for(var i = 0; i < tabulatr_tables.length; i++){
       if(tabulatr_tables[i].id == tableId){
         table_obj = tabulatr_tables[i];
       }
     }
+    if(table_obj.hasInfiniteScrolling){
+      $('.pagination_trigger[data-table='+ tableId +']').unbind('inview', cbfn);
+      $('.pagination_trigger[data-table='+ tableId +']').bind('inview', cbfn);
+    }
     table_obj.updateTable({page: 1, append: false}, true);
     return false;
   });
@@ -379,15 +382,15 @@ $(document).on('ready page:load', function(){
     }
     var tableId = $(this).closest('.tabulatr_table').attr('id');
     $(this).remove();
-    if($('.pagination[data-table='+ tableId +']').length === 0){
-      $('.pagination_trigger[data-table='+ tableId +']').bind('inview', cbfn);
-    }
     var table_obj;
     for(var i = 0; i < tabulatr_tables.length; i++){
       if(tabulatr_tables[i].id == tableId){
         table_obj = tabulatr_tables[i];
       }
     }
+    if(table_obj.hasInfiniteScrolling){
+      $('.pagination_trigger[data-table='+ tableId +']').bind('inview', cbfn);
+    }
     table_obj.updateTable({});
     return false;
   });
@@ -459,7 +462,7 @@ $(document).on('ready page:load', function(){
       }
     }
     table_obj.moreResults = true;
-    if($('.pagination[data-table='+ tableId +']').length === 0){
+    if(table_obj.hasInfiniteScrolling){
       $('.pagination_trigger[data-table='+ tableId +']').bind('inview', cbfn);
     }
     if(typeof(Storage) !== undefined){
@@ -496,6 +499,9 @@ $(document).on('ready page:load', function(){
       if($(el).data('persistent')){
         tabulatrTable.isAPersistedTable = true;
       }
+      if($('.pagination[data-table='+ tableId +']').length === 0){
+        tabulatrTable.hasInfiniteScrolling = true;
+      }
       tabulatr_tables.push(tabulatrTable);
       for(var i = 0; i < tabulatr_tables.length; i++){
         if(tabulatr_tables[i].id == tableId){

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

@@ -1,4 +1,4 @@
-//  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+//  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 //
 //  Permission is hereby granted, free of charge, to any person obtaining
 //  a copy of this software and associated documentation files (the

data/app/views/tabulatr/_tabulatr_actual_table.html.slim

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the

data/app/views/tabulatr/_tabulatr_batch_actions_menu.html.slim

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the

data/app/views/tabulatr/_tabulatr_filter_dialog.html.slim

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the

data/app/views/tabulatr/_tabulatr_filter_menu.html.slim

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the

data/app/views/tabulatr/_tabulatr_fuzzy_search_field.html.slim

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the

data/app/views/tabulatr/_tabulatr_info_string.html.slim

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the

data/app/views/tabulatr/_tabulatr_paginator.html.slim

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the

data/app/views/tabulatr/_tabulatr_static_table.html.slim

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the

data/app/views/tabulatr/_tabulatr_table.html.slim

@@ -1,4 +1,4 @@
-/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+/  Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 /
 /  Permission is hereby granted, free of charge, to any person obtaining
 /  a copy of this software and associated documentation files (the
@@ -38,14 +38,19 @@
     .tabulatr-paginator-wrapper.col-xs-12.col-sm-8 data-table-id=table_id
       = render '/tabulatr/tabulatr_paginator', opts
 
-
 .tabulatr-filter-dialog-wrapper data-table-id=table_id
   = render '/tabulatr/tabulatr_filter_dialog', opts
 
-.tabulatr-info-string-wrapper data-table-id=table_id
-  = render '/tabulatr/tabulatr_info_string', opts
+- if table_options[:counter_position].in?([:top, :both])
+  .tabulatr-info-string-wrapper data-table-id=table_id
+    = render '/tabulatr/tabulatr_info_string', opts
 
 = render '/tabulatr/tabulatr_actual_table', opts
+
+- if table_options[:counter_position].in?([:bottom, :both])
+  .tabulatr-info-string-wrapper data-table-id=table_id
+    = render '/tabulatr/tabulatr_info_string', opts
+
 - if table_options[:pagination_position].in?([:bottom, :both])
   .tabulatr-paginator-wrapper.col-xs-12 data-table-id=table_id
     = render '/tabulatr/tabulatr_paginator', opts

data/lib/tabulatr/data/button_builder.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/data/data.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -33,6 +33,7 @@ class Tabulatr::Data
     @batch_actions = nil
     @row = self.class.instance_variable_get('@row')
     table_columns.map do |col|
+      next if col.is_a? Tabulatr::Renderer::Checkbox
       col.klass = @base.reflect_on_association(col.table_name).try(:klass) || @base
       col.determine_appropriate_filter! if col.filter === true
     end

data/lib/tabulatr/data/dsl.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/data/filtering.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/data/formatting.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/data/invoker.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/data/pagination.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/data/proxy.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/data/sorting.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/engine.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/generators/railtie.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/generators/resource_override.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/generators/tabulatr/install_generator.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/generators/tabulatr/table_generator.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/generators/tabulatr/templates/tabulatr.yml

@@ -17,8 +17,8 @@ en:
       from_to: From - To
     boolean_filter:
       both: All
-      yes: Yes
-      no: No
+      'yes': Yes
+      'no': No
 
 de:
   tabulatr:
@@ -39,5 +39,5 @@ de:
       from_to: Von - Bis
     boolean_filter:
       both: Alle
-      yes: Ja
-      no: Nein
+      'yes': Ja
+      'no': Nein

data/lib/tabulatr/json_builder.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/rails/action_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/rails/action_view.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/rails/active_record.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/renderer/action.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/renderer/association.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/renderer/buttons.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/renderer/checkbox.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/renderer/column.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/renderer/columns_from_block.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/renderer/renderer.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -35,6 +35,7 @@ class Tabulatr::Renderer
       order_by: nil,         # default order
       html_class: '',
       pagination_position: :top,
+      counter_position: :top,
       persistent: true)
     @klass = klass
     @view = view
@@ -50,6 +51,7 @@ class Tabulatr::Renderer
       order_by: order_by,
       html_class: 'table tabulatr_table '.concat(html_class),
       pagination_position: pagination_position,
+      counter_position: counter_position,
       persistent: paginate ? persistent : false
     }
     @classname = @klass.name.underscore

data/lib/tabulatr/utility/utility.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tabulatr/version.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
 end

data/lib/tabulatr.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, tickettoaster GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, metaminded UG
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/spec/dummy/config/locales/tabulatr.yml

@@ -17,8 +17,8 @@ en:
       from_to: From - To
     boolean_filter:
       both: All
-      yes: Yes
-      no: No
+      'yes': Yes
+      'no': No
 
 de:
   tabulatr:
@@ -39,5 +39,5 @@ de:
       from_to: Von - Bis
     boolean_filter:
       both: Alle
-      yes: Ja
-      no: Nein
+      'yes': Ja
+      'no': Nein

data/tabulatr.gemspec

@@ -9,14 +9,14 @@ Gem::Specification.new do |s|
   s.summary     = "A tight DSL to build tables of ActiveRecord "+
                   "models with sorting, pagination, finding/filtering, "+
                   "selecting and batch actions."
-  s.email       = "info@provideal.net"
-  s.homepage    = "http://github.com/provideal/tabulatr2"
+  s.email       = "open-source@metaminded.com"
+  s.homepage    = "http://github.com/metaminded/tabulatr2"
   s.description = "A tight DSL to build tables of ActiveRecord "+
                   "models with sorting, pagination, finding/filtering, "+
                   "selecting and batch actions. " +
                   "Tries to do for tables what formtastic and simple_form did "+
                   "for forms."
-  s.authors     = ['Peter Horn', 'René Sprotte', 'Florian Thomas']
+  s.authors     = ['Peter Horn', 'Florian Thomas', 'René Sprotte']
   s.license       = 'MIT'
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -25,6 +25,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('rails', '~> 4.0')
   s.add_dependency('slim', '~> 2.0.0', '>= 2.0.0')
-  s.add_dependency('tilt', '~> 1.4.1')
+  s.add_dependency('tilt', '~> 1.4', '>= 1.4.1')
   s.add_dependency('font-awesome-rails', '~> 4.0')
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Peter Horn
-- René Sprotte
 - Florian Thomas
+- René Sprotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,6 +51,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
@@ -58,6 +61,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
@@ -77,7 +83,7 @@ dependencies:
 description: A tight DSL to build tables of ActiveRecord 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
+email: open-source@metaminded.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -216,7 +222,7 @@ files:
 - spec/lib/tabulatr/renderer/renderer_spec.rb
 - spec/spec_helper.rb
 - tabulatr.gemspec
-homepage: http://github.com/provideal/tabulatr2
+homepage: http://github.com/metaminded/tabulatr2
 licenses:
 - MIT
 metadata: {}