acts_as_flexigrid 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/lib/acts_as_flexigrid.rb +1 -1
  2. data/lib/acts_as_flexigrid/version.rb +1 -1
  3. data/spec/models/acts_as_flexigrid_spec.rb +9 -0
  4. metadata +15 -15
data/lib/acts_as_flexigrid.rb CHANGED
@@ -39,7 +39,7 @@ module ActsAsFlexigrid
39
39
  cell.merge!(yield(site)) if block_given?
40
40
  { :id => site.id, :cell => cell }
41
41
  end
42
- { :rows => rows, :total => self.count, :page => params["page"] }
42
+ { :rows => rows, :total => self.flexigrid_where(params['qtype'], params['query']).count, :page => params["page"] }
43
43
  end
44
44
  end
45
45
  end
data/lib/acts_as_flexigrid/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ActsAsFlexigrid
2
- VERSION = "0.0.4"
2
+ VERSION = "0.0.5"
3
3
  end
data/spec/models/acts_as_flexigrid_spec.rb CHANGED
@@ -40,6 +40,15 @@ describe ActsAsFlexigrid do
40
40
  res[:rows].first[:cell][:ext_key].should == ext_val
41
41
  end
42
42
  end
43
+
44
+ describe "with search query" do
45
+ before do
46
+ @opt = @opt.merge({ "qtype" => "name", "query" => "001"})
47
+ end
48
+ it "should return 1 by total" do
49
+ subject[:total].should == 1
50
+ end
51
+ end
43
52
  end
44
53
 
45
54
  describe ".flexigrid_where" do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: acts_as_flexigrid
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.4
4
+ version: 0.0.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -14,7 +14,7 @@ default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: activesupport
17
- requirement: &2161613700 !ruby/object:Gem::Requirement
17
+ requirement: &2153603400 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: 3.0.0
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *2161613700
25
+ version_requirements: *2153603400
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: activerecord
28
- requirement: &2161613060 !ruby/object:Gem::Requirement
28
+ requirement: &2153602560 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: 3.0.0
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *2161613060
36
+ version_requirements: *2153602560
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: kaminari
39
- requirement: &2161612400 !ruby/object:Gem::Requirement
39
+ requirement: &2153601760 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: '0'
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *2161612400
47
+ version_requirements: *2153601760
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: rake
50
- requirement: &2161611840 !ruby/object:Gem::Requirement
50
+ requirement: &2153600980 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: '0'
56
56
  type: :development
57
57
  prerelease: false
58
- version_requirements: *2161611840
58
+ version_requirements: *2153600980
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: sqlite3
61
- requirement: &2161611360 !ruby/object:Gem::Requirement
61
+ requirement: &2153600500 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: '0'
67
67
  type: :development
68
68
  prerelease: false
69
- version_requirements: *2161611360
69
+ version_requirements: *2153600500
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: bundler
72
- requirement: &2161610880 !ruby/object:Gem::Requirement
72
+ requirement: &2153600000 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: 1.0.0
78
78
  type: :development
79
79
  prerelease: false
80
- version_requirements: *2161610880
80
+ version_requirements: *2153600000
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: rspec
83
- requirement: &2161610380 !ruby/object:Gem::Requirement
83
+ requirement: &2153599460 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ! '>='
@@ -88,7 +88,7 @@ dependencies:
88
88
  version: '0'
89
89
  type: :development
90
90
  prerelease: false
91
- version_requirements: *2161610380
91
+ version_requirements: *2153599460
92
92
  description: acts_as_flexigrid is ActiveRecord plugin for Flexigrid
93
93
  email:
94
94
  - matsumura.aki@gmail.com