File tree Expand file tree Collapse file tree 3 files changed +19
-23
lines changed Expand file tree Collapse file tree 3 files changed +19
-23
lines changed Original file line number Diff line number Diff line change 1
1
source "http://rubygems.org"
2
2
3
- gem "sinatra" , "~> 1.1.0"
4
- gem "activerecord" , "~> 3.0.0 " , :require => "active_record"
3
+ gem "sinatra"
4
+ gem "activerecord" , "~> 3.0.6 " , :require => "active_record"
5
5
gem "json" , "~> 1.5.1"
6
6
gem "authlogic"
7
7
gem "rake"
@@ -12,7 +12,6 @@ group :development do
12
12
end
13
13
14
14
group :production do
15
- gem "daemons" , "1.0.10"
16
15
gem "thin"
17
16
gem "mysql" , "~> 2.8.1"
18
17
end
Original file line number Diff line number Diff line change 1
1
GEM
2
2
remote: http://rubygems.org/
3
3
specs:
4
- activemodel (3.0.0 )
5
- activesupport (= 3.0.0 )
4
+ activemodel (3.0.6 )
5
+ activesupport (= 3.0.6 )
6
6
builder (~> 2.1.2 )
7
- i18n (~> 0.4.1 )
8
- activerecord (3.0.0 )
9
- activemodel (= 3.0.0 )
10
- activesupport (= 3.0.0 )
11
- arel (~> 1 .0.0 )
7
+ i18n (~> 0.5.0 )
8
+ activerecord (3.0.6 )
9
+ activemodel (= 3.0.6 )
10
+ activesupport (= 3.0.6 )
11
+ arel (~> 2 .0.2 )
12
12
tzinfo (~> 0.3.23 )
13
- activesupport (3.0.0 )
14
- arel (1.0.1 )
15
- activesupport (~> 3.0.0 )
13
+ activesupport (3.0.6 )
14
+ arel (2.0.9 )
16
15
authlogic (2.1.6 )
17
16
activesupport
18
17
builder (2.1.2 )
19
- daemons (1.0.10 )
18
+ daemons (1.1.2 )
20
19
eventmachine (0.12.10 )
21
- i18n (0.4.1 )
20
+ i18n (0.5.0 )
22
21
json (1.5.1 )
23
22
mysql (2.8.1 )
24
- rack (1.2.1 )
23
+ rack (1.2.2 )
25
24
rake (0.8.7 )
26
25
shotgun (0.9 )
27
26
rack (>= 1.0 )
28
- sinatra (1.1.2 )
27
+ sinatra (1.2.3 )
29
28
rack (~> 1.1 )
30
- tilt (~> 1.2 )
29
+ tilt (>= 1.2.2 , < 2.0 )
31
30
sqlite3 (1.3.3 )
32
31
sqlite3-ruby (1.3.3 )
33
32
sqlite3 (>= 1.3.3 )
36
35
eventmachine (>= 0.12.6 )
37
36
rack (>= 1.0.0 )
38
37
tilt (1.2.2 )
39
- tzinfo (0.3.23 )
38
+ tzinfo (0.3.26 )
40
39
41
40
PLATFORMS
42
41
ruby
43
42
44
43
DEPENDENCIES
45
- activerecord (~> 3.0.0 )
44
+ activerecord (~> 3.0.6 )
46
45
authlogic
47
- daemons (= 1.0.10 )
48
46
json (~> 1.5.1 )
49
47
mysql (~> 2.8.1 )
50
48
rake
51
49
shotgun
52
- sinatra ( ~> 1.1.0 )
50
+ sinatra
53
51
sqlite3-ruby (~> 1.3.3 )
54
52
thin
Original file line number Diff line number Diff line change @@ -89,7 +89,6 @@ def output options={}
89
89
90
90
if options [ :pagination ]
91
91
count = options [ :count ] ? options [ :count ] : params [ :model ] . singularize . capitalize . constantize . count
92
- puts count
93
92
#only add paging if the limit is smaller than the amount of all datarecords
94
93
if params [ :limit ] < count
95
94
output [ :paging ] = { }
You can’t perform that action at this time.
0 commit comments