tabulatr2 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6cc8ca903e127f8312818a5a85faf7a01fb7b85
-  data.tar.gz: 90df54794f6c5699ac87809a3513ed5845fa34f5
+  metadata.gz: 0b11a5d5bda9718541550adc016fca03765e3e06
+  data.tar.gz: 5281e726afe6e44bec05af2a31d72e3546201180
 SHA512:
-  metadata.gz: 6c4ce4dfcb2f5caf2e57a9c89b0a380989cc73112a074dceb6055837844817fb1271f0b10f4cab36c89d9f8e80d282a94d401b0d7b14785f061f3b352423b047
-  data.tar.gz: 66121f0ea6dc15b810fbaa31bc86385afd96f5a9632889a0a5ffe44f288a0a02981d48f4e6dccf45b1d524b6ec4eb483a78e83b717775a0c77646a5ebfce567b
+  metadata.gz: 1cb47ebf2433da0db9280acb652d833fd4311629d111b03b175ff94ca3e695249222ce841dc7ba94e9e881ac935ebdb095aa1eaf2884670e93ce6284d95596e7
+  data.tar.gz: 231823bbb5a39e6f95c0991d3debab968f978d9a8ae8fe07203b9266eacb5f9ff729fa8ce9da26fcffd04ecfa7b93f2f5b5d828369c60e63ba8105d50586e5bb

data/CHANGELOG.md

@@ -1,4 +1,11 @@
+## 0.9.4
+
+ * Fixed date filters
+
+ * Added missing translations to the install generator.
+
 ## 0.9.3
+
  * Tabulatr is now stopped from retrieving data in endless pagination mode when all data
    is already on the client.
 

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

@@ -29,35 +29,36 @@ form.form.form-horizontal.tabulatr_filter_form data-table=table_id  data-remote=
         - iname = "#{formatted_name}_filter[#{name}]"
         - filter_name = "tabulatr_form_#{name}"
 
-        label.control-label.col-md-3 for=filter_name
+        label.control-label.col-sm-3.col-xs-12 for=filter_name
           = column.human_name
 
-        .controls.col-md-9.row
+        .controls.col-sm-9.col-xs-12.row
           - if column.filter.is_a?(Hash) || column.filter.is_a?(Array) || column.filter.is_a?(String)
-            select.form-control id=name name=iname
-              - if column.filter.class.is_a?(String)
-                = column.filter
-              - else
-                option
-                = options_for_select(column.filter)
+            .col-sm-11
+              select.form-control id=name name=iname
+                - if column.filter.class.is_a?(String)
+                  = column.filter
+                - else
+                  option
+                  = options_for_select(column.filter)
           - elsif column.filter == :range
-            .col-md-5
+            .col-sm-5
               input.tabulatr_filter.form-control type="text" id="#{name}_from" data-tabulatr-attribute="#{name}_from" name="#{iname}[from]"
-            span.col-md-1.text-center —
-            .col-md-5
+            span.col-sm-1.text-center —
+            .col-sm-5
               input.tabulatr_filter.form-control type="text" id="#{name}_to" data-tabulatr-attribute="#{name}_to" name="#{iname}[to]"
           - elsif column.filter == :checkbox
-            .col-md-11
+            .col-sm-11
               = select_tag(iname, options_for_select([ \
                   [t('tabulatr.boolean_filter.both'), ""],
                   [t('tabulatr.boolean_filter.no'), "false"],
                   [t('tabulatr.boolean_filter.yes'), "true"]] \
                 ), class: 'form-control')
           - elsif column.filter == :exact
-            .col-md-11
+            .col-sm-11
               input.tabulatr_filter.form-control type="text" id="#{name}_exact" data-tabulatr-attribute="#{name}" name="#{iname}"
           - elsif column.filter == :date
-            .col-md-3
+            .col-sm-3
               select.form-control name="#{iname}[date][simple]" data-tabulatr-date-filter="#{formatted_name}_#{name}_filter"
                 option= I18n.t("tabulatr.date_filter.none")
                 option value="today"= I18n.t("tabulatr.date_filter.today")
@@ -67,18 +68,18 @@ form.form.form-horizontal.tabulatr_filter_form data-table=table_id  data-remote=
                 option value="this_month"= I18n.t("tabulatr.date_filter.this_month")
                 option value="last_30_days"= I18n.t("tabulatr.date_filter.last_30_days")
                 option value="from_to"= I18n.t("tabulatr.date_filter.from_to")
-            .col-md-1
-            .col-md-3
+            .col-sm-1
+            .col-sm-3
               input.tabulatr_filter.form-control.date-picker.hidden.from_to type="text" id="#{formatted_name}_#{name}_filter_from" name="#{iname}[date][from]"
-            .col-md-1.text-center
+            .col-sm-1.text-center
               .span.from_to.hidden
                 |—
-            .col-md-3
+            .col-sm-3
               input.tabulatr_filter.form-control.date-picker.from_to.hidden type="text" id="#{formatted_name}_#{name}_filter_to" name="#{iname}[date][to]"
           - else
-            .col-md-11
+            .col-sm-11
               input.tabulatr_filter.form-control type="text" id="#{name}_like" data-tabulatr-attribute="#{name}" name="#{iname}[like]"
-          .col-md-1
+          .col-sm-1
             = link_to "✕", '#', 'data-hide-table-filter' => name, class: 'form-control btn btn-danger btn-mini'
 
     .control-group.form-group data-filter-column-name="_submit"

data/lib/tabulatr/data/filtering.rb

@@ -78,17 +78,30 @@ module Tabulatr::Data::Filtering
     today = Date.today
     case cond[:simple]
     when 'none' then return
-    when 'today' then since = today
-    when 'yesterday' then since = today - 1.day
-    when 'this_week' then since = today.at_beginning_of_week
-    when 'last_7_days' then since = today - 7.day
-    when 'this_month' then since = today.at_beginning_of_month
-    when 'last_30_days' then since = today - 30.day
+    when 'today'
+      since = today
+      to = today.at_end_of_day
+    when 'yesterday'
+      since = today - 1.day
+      to = since.at_end_of_day
+    when 'this_week'
+      since = today.at_beginning_of_week.beginning_of_day
+      to = today.at_end_of_week.end_of_day
+    when 'last_7_days'
+      since = (today - 6.day).beginning_of_day
+      to = today.at_end_of_day
+    when 'this_month'
+      since = today.at_beginning_of_month.beginning_of_day
+      to = today.at_end_of_month.end_of_day
+    when 'last_30_days'
+      since = (today - 29.day).beginning_of_day
+      to = today.at_end_of_day
     when 'from_to'
       since = Date.parse(cond[:from]) if cond[:from].present?
-      @relation = @relation.where("#{n} <= ?", Date.parse(cond[:to])) if cond[:to].present?
+      to = Date.parse(cond[:to]) if cond[:to].present?
     end
     @relation = @relation.where("#{n} >= ?", since) if since.present?
+    @relation = @relation.where("#{n} <= ?", to) if to.present?
   end
 
   def apply_string_condition(replacement_string, value)

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

@@ -6,6 +6,20 @@ en:
     count: 'Showing: %{current} of total %{total}. %{per_page} items per page.'
     apply_filters: 'Apply'
     search: 'Search'
+    date_filter:
+      none: ''
+      today: "Today"
+      yesterday: Yesterday
+      this_week: This Week
+      last_7_days: Last 7 Days
+      this_month: This Month
+      last_30_days: Last 30 Days
+      from_to: From - To
+    boolean_filter:
+      both: All
+      yes: Yes
+      no: No
+
 de:
   tabulatr:
     rows_per_page: 'Ergebnisse pro Seite'
@@ -14,3 +28,16 @@ de:
     count: 'Zeige %{current} von insgesamt %{total}. %{per_page} pro Seite.'
     apply_filters: 'Anwenden'
     search: 'Suche'
+    date_filter:
+      none: ''
+      today: "Heute"
+      yesterday: Gestern
+      this_week: Diese Woche
+      last_7_days: Letzte 7 Tage
+      this_month: Dieser Monat
+      last_30_days: Letzte 30 Tage
+      from_to: Von - Bis
+    boolean_filter:
+      both: Alle
+      yes: Ja
+      no: Nein

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/spec/dummy/db/migrate/20140128140114_add_publish_at_to_products.rb

@@ -0,0 +1,5 @@
+class AddPublishAtToProducts < ActiveRecord::Migration
+  def change
+    add_column :products, :publish_at, :datetime
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20130730132348) do
+ActiveRecord::Schema.define(version: 20140128140114) do
 
   create_table "products", force: true do |t|
     t.integer  "vendor_id"
@@ -20,6 +20,7 @@ ActiveRecord::Schema.define(version: 20130730132348) do
     t.boolean  "active"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.datetime "publish_at"
   end
 
   add_index "products", ["vendor_id"], name: "index_products_on_vendor_id"

data/spec/lib/tabulatr/data/filtering_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe Tabulatr::Data::Filtering do
+  class DummySpecClass
+    include Tabulatr::Data::Filtering
+  end
+
+  before(:each) do
+    @dummy = DummySpecClass.new
+    @dummy.instance_variable_set('@relation', Product.all)
+    @yesterday = Product.create!(publish_at: DateTime.new(2013, 12, 31, 0, 0))
+    @today = Product.create!(publish_at: DateTime.new(2014, 1, 1, 15, 0))
+    @week_one = Product.create!(publish_at: DateTime.new(2013, 12, 30, 0, 0))
+    @week_two = Product.create!(publish_at: DateTime.new(2014, 1, 5, 8, 0))
+    @last_seven_days = Product.create!(publish_at: DateTime.new(2013, 12, 26, 0, 0))
+    @last_thirty_days = Product.create!(publish_at: DateTime.new(2013, 12, 3, 0, 0))
+    @outside_last_thirty_days = Product.create!(publish_at: DateTime.new(2013, 12, 2, 23, 59))
+    @this_month = Product.create!(publish_at: DateTime.new(2014, 1, 15, 0, 0))
+    @next_year = Product.create!(publish_at: DateTime.new(2015, 1, 1, 12, 0))
+    Date.stub(:today).and_return(Date.new(2014,1,1))
+  end
+  describe '.apply_date_condition' do
+    it "filters for 'today'" do
+      @dummy.apply_date_condition('publish_at', {simple: 'today'})
+      result = @dummy.instance_variable_get('@relation')
+      expect(result.count).to be 1
+      expect(result[0].id).to be @today.id
+    end
+
+    it "filters for 'yesterday'" do
+      @dummy.apply_date_condition('publish_at', {simple: 'yesterday'})
+      result = @dummy.instance_variable_get('@relation')
+      expect(result.count).to be 1
+      expect(result[0].id).to be @yesterday.id
+    end
+
+    it "filters for 'this week'" do
+      @dummy.apply_date_condition('publish_at', {simple: 'this_week'})
+      result = @dummy.instance_variable_get('@relation')
+      expect(result.count).to be 4
+      expect(result.map(&:id).sort).to eq [@yesterday.id, @today.id, @week_one.id, @week_two.id].sort
+    end
+
+    it "filters for 'last 7 days'" do
+      @dummy.apply_date_condition('publish_at', {simple: 'last_7_days'})
+      result = @dummy.instance_variable_get('@relation')
+      expect(result.map(&:id).sort).to eq ([@last_seven_days.id, @yesterday.id, @today.id, @week_one.id].sort)
+    end
+
+    it "filters for 'this month'" do
+      @dummy.apply_date_condition('publish_at', {simple: 'this_month'})
+      result = @dummy.instance_variable_get('@relation')
+      expect(result.map(&:id).sort).to eq ([@today.id, @week_two.id, @this_month.id])
+    end
+
+    it "filters for 'last 30 days'" do
+      @dummy.apply_date_condition('publish_at', {simple: 'last_30_days'})
+      result = @dummy.instance_variable_get('@relation')
+      expect(result.map(&:id).sort).to eq ([
+        @last_thirty_days.id, @yesterday.id, @last_seven_days.id, @today.id,
+        @week_one.id].sort)
+    end
+
+    it "filters from 'start_date' to 'end_date'" do
+      @dummy.apply_date_condition('publish_at', {
+        simple: 'from_to', from: '31.12.2013 15:00',
+        to: '15.01.2014 00:00'})
+      result = @dummy.instance_variable_get('@relation')
+      expect(result.map(&:id)).to eq ([@yesterday.id, @today.id, @week_two.id].sort)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -171,6 +171,7 @@ files:
 - spec/dummy/db/migrate/20130730132101_create_vendors.rb
 - spec/dummy/db/migrate/20130730132321_create_products.rb
 - spec/dummy/db/migrate/20130730132348_create_tags.rb
+- spec/dummy/db/migrate/20140128140114_add_publish_at_to_products.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
@@ -180,6 +181,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/features/tabulatrs_spec.rb
 - spec/lib/tabulatr/data/data_spec.rb
+- spec/lib/tabulatr/data/filtering_spec.rb
 - spec/lib/tabulatr/data/pagination_spec.rb
 - spec/lib/tabulatr/json_builder_spec.rb
 - spec/lib/tabulatr/renderer/renderer_spec.rb
@@ -263,6 +265,7 @@ test_files:
 - spec/dummy/db/migrate/20130730132101_create_vendors.rb
 - spec/dummy/db/migrate/20130730132321_create_products.rb
 - spec/dummy/db/migrate/20130730132348_create_tags.rb
+- spec/dummy/db/migrate/20140128140114_add_publish_at_to_products.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
@@ -272,6 +275,7 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/features/tabulatrs_spec.rb
 - spec/lib/tabulatr/data/data_spec.rb
+- spec/lib/tabulatr/data/filtering_spec.rb
 - spec/lib/tabulatr/data/pagination_spec.rb
 - spec/lib/tabulatr/json_builder_spec.rb
 - spec/lib/tabulatr/renderer/renderer_spec.rb