tabulatr2 0.9.4 → 0.9.6

data/spec/lib/tabulatr/json_builder_spec.rb

@@ -2,15 +2,29 @@ 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
+  describe '.insert_attribute_in_hash' 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
 
-  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
+    # it 'accepts arguments without table name' do
+    #   attribute = {action: :title}
+    #   data = {"products"=>
+    #     {"title"=>"title 9", "id"=>10, "price"=>"32.0 EUR",
+    #       "vendor_product_name"=>"title 9 from my first vendor"},
+    #   "vendor"=>
+    #     {"name"=>"my first vendor"},
+    #   "tags"=>{"title"=>"''", "count"=>0},
+    #   "_row_config"=>{"class"=>"tabulatr-row"}, "id"=>10}
+    #   expect{Tabulatr::JsonBuilder.insert_attribute_in_hash(attribute, data)}.to_not raise_error
+    # end
   end
 end

data/spec/lib/tabulatr/renderer/checkbox_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Tabulatr::Renderer::Checkbox do
+
+  describe "#human_name" do
+
+    it "generates a checkbox" do
+      checkbox = Tabulatr::Renderer::Checkbox.new
+      expect(checkbox.human_name).to eq('<input class="tabulatr_mark_all" id="mark_all" name="mark_all" type="checkbox" value="1" />')
+    end
+
+  end
+
+end

data/spec/lib/tabulatr/renderer/renderer_spec.rb

@@ -2,14 +2,26 @@ require 'spec_helper'
 
 describe Tabulatr::Renderer do
 
-  describe "#generate_id"
-
-  it "generates a 'unique' id for a table" do
-    klass = Product
-    renderer = Tabulatr::Renderer.new(klass, nil)
-    first_id = renderer.generate_id
-    second_id = renderer.generate_id
-    expect(first_id).to_not eq second_id
+  def double_view
+    view = double(controller: double(controller_name: 'products', action_name: 'index'))
+    view.instance_variable_set('@_tabulatr_table_index', 0)
+    view
   end
 
+  describe '.initialize' do
+    it 'sets pagination_position to top if not set explicitely' do
+      renderer = Tabulatr::Renderer.new(Product, double_view)
+      expect(renderer.instance_variable_get('@table_options')[:pagination_position]).to eq :top
+    end
+
+    it 'sets persistent to false if not set explicitely' do
+      renderer = Tabulatr::Renderer.new(Product, double_view)
+      expect(renderer.instance_variable_get('@table_options')[:persistent]).to eq false
+    end
+
+    it 'sets persistent to true if paginate is true' do
+      renderer = Tabulatr::Renderer.new(Product, double_view, paginate: true)
+      expect(renderer.instance_variable_get('@table_options')[:persistent]).to eq true
+    end
+  end
 end

data/tabulatr.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ['--charset=UTF-8']
 
 
-  s.add_runtime_dependency('rails', '>= 4.0.0')
-  s.add_dependency('slim', '>= 2.0.1')
-  s.add_runtime_dependency('activerecord_outer_joins', '~> 0.0.1')
+  s.add_runtime_dependency('rails', '~> 4.0.0', '>= 4.0.0')
+  s.add_dependency('slim', '~> 2.0.0', '>= 2.0.0')
+  s.add_dependency('tilt', '~> 1.4.1')
+  s.add_dependency('font-awesome-rails', '~> 4.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.6
 platform: ruby
 authors:
 - Peter Horn
@@ -10,12 +10,15 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -23,6 +26,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -30,30 +36,50 @@ dependencies:
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
-  name: activerecord_outer_joins
+  name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '4.0'
 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.
@@ -73,6 +99,8 @@ files:
 - app/assets/images/pacman-loader.gif
 - app/assets/images/standard-loader.gif
 - app/assets/javascripts/tabulatr.js
+- app/assets/javascripts/tabulatr/_storage.js
+- app/assets/javascripts/tabulatr/_tabulatr.js
 - app/assets/javascripts/tabulatr/application.js
 - app/assets/javascripts/tabulatr/jquery.inview.min.js
 - app/assets/stylesheets/tabulatr.css
@@ -89,7 +117,6 @@ files:
 - app/views/tabulatr/_tabulatr_table.html.slim
 - init.rb
 - lib/tabulatr.rb
-- lib/tabulatr/data/column_name_builder.rb
 - lib/tabulatr/data/data.rb
 - lib/tabulatr/data/dsl.rb
 - lib/tabulatr/data/filtering.rb
@@ -117,6 +144,7 @@ files:
 - lib/tabulatr/renderer/columns_from_block.rb
 - lib/tabulatr/renderer/renderer.rb
 - lib/tabulatr/utility/request_data_not_included_error.rb
+- lib/tabulatr/utility/unexpected_search_result_error.rb
 - lib/tabulatr/utility/utility.rb
 - lib/tabulatr/version.rb
 - lib/tabulatr2.rb
@@ -142,6 +170,7 @@ files:
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/products/count_tags.html.erb
 - spec/dummy/app/views/products/implicit_columns.html.erb
+- spec/dummy/app/views/products/local_storage.html.slim
 - spec/dummy/app/views/products/one_item_per_page.html.erb
 - spec/dummy/app/views/products/simple_index.html.erb
 - spec/dummy/app/views/products/stupid_array.html.erb
@@ -182,8 +211,11 @@ files:
 - spec/features/tabulatrs_spec.rb
 - spec/lib/tabulatr/data/data_spec.rb
 - spec/lib/tabulatr/data/filtering_spec.rb
+- spec/lib/tabulatr/data/formatting_spec.rb
 - spec/lib/tabulatr/data/pagination_spec.rb
+- spec/lib/tabulatr/data/sorting_spec.rb
 - spec/lib/tabulatr/json_builder_spec.rb
+- spec/lib/tabulatr/renderer/checkbox_spec.rb
 - spec/lib/tabulatr/renderer/renderer_spec.rb
 - spec/spec_helper.rb
 - tabulatr.gemspec
@@ -208,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A tight DSL to build tables of ActiveRecord models with sorting, pagination,
@@ -236,6 +268,7 @@ test_files:
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/products/count_tags.html.erb
 - spec/dummy/app/views/products/implicit_columns.html.erb
+- spec/dummy/app/views/products/local_storage.html.slim
 - spec/dummy/app/views/products/one_item_per_page.html.erb
 - spec/dummy/app/views/products/simple_index.html.erb
 - spec/dummy/app/views/products/stupid_array.html.erb
@@ -276,7 +309,10 @@ test_files:
 - spec/features/tabulatrs_spec.rb
 - spec/lib/tabulatr/data/data_spec.rb
 - spec/lib/tabulatr/data/filtering_spec.rb
+- spec/lib/tabulatr/data/formatting_spec.rb
 - spec/lib/tabulatr/data/pagination_spec.rb
+- spec/lib/tabulatr/data/sorting_spec.rb
 - spec/lib/tabulatr/json_builder_spec.rb
+- spec/lib/tabulatr/renderer/checkbox_spec.rb
 - spec/lib/tabulatr/renderer/renderer_spec.rb
 - spec/spec_helper.rb

data/lib/tabulatr/data/column_name_builder.rb

@@ -1,86 +0,0 @@
-#--
-# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-module Tabulatr
-  class Data
-    module ColumnNameBuilder
-      #--
-      # Access the actual data
-      #++
-      def build_column_name(colname, table_name: nil, use_for: nil, assoc_name: nil)
-        if column_with_table? colname
-          t,c = split_column_name_from_table(colname)
-          return build_column_name(c, table_name: t, use_for: use_for)
-        end
-        table_name ||= @table_name
-        if table_name == @table_name
-          mapping = get_mapping(requested_method: @columns[colname.to_sym], usage: use_for)
-          return mapping if mapping.present?
-        else
-          assoc_name = table_name unless assoc_name
-          include_relation! assoc_name
-          mapping = get_mapping(requested_method: @assocs[assoc_name.to_sym][colname.to_sym], usage: use_for)
-          return mapping if mapping.present?
-        end
-
-        complete_column_name table_name, colname
-      end
-
-      private
-
-      def split_column_name_from_table column_name
-        if column_with_table?(column_name)
-          column_name.split(/\.|:/)
-        else
-          column_name
-        end
-      end
-
-      def column_with_table? column_name
-        column_name['.'] || column_name[':']
-      end
-
-      def complete_column_name table, column
-        t = "#{table.tableize}.#{column}"
-        raise "SECURITY violation, field name is '#{t}'" unless /^[\d\w]+(\.[\d\w]+)?$/.match t
-        t
-      end
-
-      def get_mapping requested_method: nil, usage: nil
-        return if requested_method.nil? || usage.nil?
-        case usage.to_sym
-        when :filter
-          requested_method[:filter_sql]
-        when :sort
-          requested_method[:sort_sql]
-        end
-      end
-
-      def include_relation! name_of_relation
-        @includes << name_of_relation.to_sym
-      end
-    end
-  end
-end
-
-Tabulatr::Data.send :include, Tabulatr::Data::ColumnNameBuilder