tabulatr2 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33bcdd2d48f79be42e48d96f15856c24731b6543
-  data.tar.gz: db9ecdc0fb072cd452233d3a181bf1524cc0e6d1
+  metadata.gz: 3a100eb6202380170c5e957e104a93d5b359f3ba
+  data.tar.gz: 65259c8ffd88e967eaf1d51dcd888d4446f379e7
 SHA512:
-  metadata.gz: b88025d3af65dd7cceaa36ab28512767de961cd4bbd35878ec5be326456112aaf2ef7ed695ad9f8d8a7b87118c0330f0df1f09ee96aa79986048fd3946754725
-  data.tar.gz: 695b0ee5be5f34b8c6464b014ce11e5c4a814ec817469f6100f8f76bc7ec77a9c41190c4da675a7a9c2753c1500993209bd02ab74cefebd73790499001e8fee2
+  metadata.gz: f9516e1047006e55ba663b9a86d6f31bff0d45733e0da4ae78fb0c0cf13d562b8dcf4d5bfbc88daaed98613633d29c3061ba532dcff1b93fb12c670abb2615a9
+  data.tar.gz: ebb911b6ce9d4abcf4003abc1898745a03b4f9167b082516ef023c0592bfd12a76dbea9d7998b76390d4d579d43887a0fd950d9c07752486be6f93a40261d911

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.9.1
+
+* Show spinner when data is loading. Type of spinner can be overriden via
+  `Tabulatr.spinner` option. Possible values are :standard and :pacman.
+
+  Example:
+  ```
+    Tabulatr.config do |tc|
+      tc.spinner = :pacman
+    end
+  ```
+
+* does not complain when no id is manually provided in TabulatrData
+
 ## 0.9
 
 * Added `row` to the TabulatrData DSL to provide HTML attributes for the

data/README.md

@@ -1,6 +1,6 @@
 # Tabulatr2 - Index Tables made easy
 [![Code Climate](https://codeclimate.com/github/provideal/tabulatr2.png)](https://codeclimate.com/github/provideal/tabulatr2)
-
+[![Gem Version](https://badge.fury.io/rb/tabulatr2.png)](http://badge.fury.io/rb/tabulatr2)
 **WARNING: Tabulatr2 is not production ready yet!**
 
 ## Installation

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

@@ -98,7 +98,7 @@ Tabulatr.prototype = {
     var $table = $('#'+ this.id);
     if(hash.page !== undefined && !forceReload){
       //old page should be stored
-      Tabulatr.storePage = true;
+      this.storePage = true;
       // check if this page was already loaded
       if($table.find('tbody tr[data-page='+ hash.page +']').length > 0){
         $table.find('tbody tr').hide();
@@ -115,12 +115,14 @@ Tabulatr.prototype = {
     if(this.locked){ return; }
     this.locked = true;
     var curTable = this;
+    this.showLoadingSpinner();
     $.ajax({
       context: this,
       type: 'GET',
       url: $('table#'+ this.id).data('path') + '.json',
       data: this.createParameterString(hash, this.id),
-      success: this.handleResponse
+      success: this.handleResponse,
+      complete: this.hideLoadingSpinner
     });
   },
 
@@ -241,6 +243,14 @@ Tabulatr.prototype = {
 
   localDate: function(value, $td, $tr, obj){
     return new Date(value).toLocaleString();
+  },
+
+  showLoadingSpinner: function(){
+    $('.tabulatr-spinner-box[data-table='+ this.id +']').show();
+  },
+
+  hideLoadingSpinner: function(){
+    $('.tabulatr-spinner-box[data-table='+ this.id +']').hide();
   }
 
 }

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

@@ -155,3 +155,11 @@ table.tabulatr_table {
   }
 }
 
+.tabulatr-spinner-box{
+  width: 100%;
+  height: 50px;
+  display: none;
+  position: relative;
+  text-align: center;
+}
+

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

@@ -35,5 +35,7 @@ table.table.tabulatr_table id=table_id data-path=table_options[:path] data-pages
         - classes = column.sortable ? ['tabulatr-sortable'] : []
         - classes = [classes, column.classes].flatten.compact.join(' ')
         td data-tabulatr-column-name=column.full_name data-tabulatr-type=column.coltype style=column.cell_style class=classes
+.tabulatr-spinner-box data-table=table_id
+  = image_tag "#{Tabulatr.spinner}-loader.gif"
 span.pagination_trigger data-table="#{table_id}"
 

data/lib/tabulatr/json_builder.rb

@@ -29,7 +29,6 @@ module Tabulatr::JsonBuilder
           each_serializer: klass
         }).as_json
     else
-      id_included = false
       attrs = build_hash_from requested_attributes, id
       result = []
       data.each do |f|
@@ -77,7 +76,7 @@ module Tabulatr::JsonBuilder
       # end
       begin
         raise Tabulatr::RequestDataNotIncludedError.raise_error(rel, f) if !f.has_key?(rel)
-        raise Tabulatr::RequestDataNotIncludedError.raise_error(action, rel) if !f[rel].has_key?(action)
+        raise Tabulatr::RequestDataNotIncludedError.raise_error(action, rel) if !f[rel].has_key?(action) && action != :id
         r["#{at[:relation]}:#{at[:action]}"] = f[rel][action]
       rescue TypeError, NoMethodError => e
         Tabulatr::RequestDataNotIncludedError.raise_error(at[:action], at[:relation])
@@ -85,7 +84,7 @@ module Tabulatr::JsonBuilder
     else
       begin
         action = at[:action].to_sym
-        raise Tabulatr::RequestDataNotIncludedError.raise_error(action, f) if !f.has_key?(action) && action != :checkbox
+        raise Tabulatr::RequestDataNotIncludedError.raise_error(action, f) if !f.has_key?(action) && [:checkbox, :id].exclude?(action)
         r[at[:action]] = f[action]
       rescue TypeError, NoMethodError => e
         raise Tabulatr::RequestDataNotIncludedError.raise_error(action, f)

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/tabulatr.rb

@@ -25,6 +25,10 @@ module Tabulatr
   def self.config &block
     yield self
   end
+
+  mattr_accessor :spinner
+
+  self.spinner = :standard
 end
 
 require 'tabulatr/engine'

data/spec/lib/tabulatr/json_builder_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Tabulatr::JsonBuilder do
+
+  it "does not complain when no id is manually provided" do
+    attribute = {action: :id}
+    data = {title: 'test', price: '7.0 EUR'}
+    expect{Tabulatr::JsonBuilder.insert_attribute_in_hash(attribute, data)}.to_not raise_error
+  end
+
+  it "complains when a non given attribute other than id is requested" do
+    attribute = {action: :bar}
+    data = {title: 'test', price: '7.0 EUR'}
+    expect{Tabulatr::JsonBuilder.insert_attribute_in_hash(attribute, data)}.to raise_error
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Peter Horn
@@ -70,6 +70,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/images/pacman-loader.gif
+- app/assets/images/standard-loader.gif
 - app/assets/javascripts/tabulatr.js
 - app/assets/javascripts/tabulatr/application.js
 - app/assets/javascripts/tabulatr/jquery.inview.min.js
@@ -178,6 +180,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/features/tabulatrs_spec.rb
 - spec/lib/tabulatr/data/data_spec.rb
+- spec/lib/tabulatr/json_builder_spec.rb
 - spec/spec_helper.rb
 - tabulatr.gemspec
 homepage: http://github.com/provideal/tabulatr2
@@ -267,5 +270,6 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/features/tabulatrs_spec.rb
 - spec/lib/tabulatr/data/data_spec.rb
+- spec/lib/tabulatr/json_builder_spec.rb
 - spec/spec_helper.rb
 has_rdoc: