alphabetical_paginate_uk 1.0.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 20c014f705ed4c606a723e1db2cbbe59c2c01712
4
- data.tar.gz: e6e00c27c9b80f1d6586fa42cd241c376f9e4945
3
+ metadata.gz: 32e3d23ed54eb8cccb49db517e0de97d7d0653db
4
+ data.tar.gz: 81fafa088fe6ce82c30188d59bb89d41fc3132a4
5
5
  SHA512:
6
- metadata.gz: f08d76a9082b4acc60bee32083bce9b942d033716a17f1959f3b42f47ed67a8d0e1cfd6201429a1666e94a11a5eb96f2467780082b8b45b710198ea42de33f60
7
- data.tar.gz: 1b395b487c6cc97a5d5d15a18139cc4e2a1182cd3805fd2928222e74ffeb0b54c307fed3f7b5df4942b6b4166c5bb5f3d50bc68f1f910b7eb3d0f00885de526f
6
+ metadata.gz: 72d870a7cead3d1321725007dcf176f6f3f1591711d3b4b3f65b899a5a6b31b10a3548c2deb90817b5c83c90764bbfc3a68b6828b6d96dee43620343eda26203
7
+ data.tar.gz: 80d1d291fdd5d063524ca8de46b1fea7f7ae609d32384da37e0e975c9f935e37783e845209678207f1d573129def1e6b40ea7ef164fa93b3e80fd96e9fed7f62
@@ -37,8 +37,8 @@ class Array
37
37
  output << x if all || current_field == "0-9"
38
38
  end
39
39
  else
40
- availableLetters['*'] = true if !availableLetters.has_key? 'other'
41
- output << x if all || current_field == "*"
40
+ availableLetters['a-z'] = true if !availableLetters.has_key? 'other'
41
+ output << x if all || current_field == "a-z"
42
42
  end
43
43
  end
44
44
 
@@ -43,7 +43,7 @@ module AlphabeticalPaginate
43
43
  output = self
44
44
  else
45
45
  case current_field
46
- when /[а-їА-їa-zA-Z]/
46
+ when /[а-їА-ї]/
47
47
  output = self.where("LOWER(%s) REGEXP '^[^а-ї].*'" % [params[:db_field], current_field])
48
48
  when /[0-9]/
49
49
  if params[:enumerate]
@@ -52,7 +52,7 @@ module AlphabeticalPaginate
52
52
  output = self.where("LOWER(%s) REGEXP '^[0-9].*'" % [params[:db_field], current_field])
53
53
  end
54
54
  else
55
- output = self.where("LOWER(%s) REGEXP '^[^а-їa-z].*'" % [params[:db_field], current_field])
55
+ output = self.where("LOWER(%s) REGEXP '^[^a-z].*'" % [params[:db_field], current_field])
56
56
  end
57
57
  end
58
58
  else
@@ -73,8 +73,8 @@ module AlphabeticalPaginate
73
73
  output << x if all || current_field == "0-9"
74
74
  end
75
75
  else
76
- availableLetters['*'] = true if !availableLetters.has_key? 'other'
77
- output << x if all || current_field == "*"
76
+ availableLetters['a-z'] = true if !availableLetters.has_key? 'other'
77
+ output << x if all || current_field == "a-z"
78
78
  end
79
79
  end
80
80
  params[:availableLetters] = availableLetters.collect{ |k,v| k.mb_chars.capitalize.to_s }
@@ -12,7 +12,7 @@ module AlphabeticalPaginate
12
12
  end
13
13
 
14
14
  def letters_regexp
15
- russian? ? /[а-їА-їa-zA-Z]/ : /[a-zA-Z]/
15
+ russian? ? /[а-їА-ї]/ : /[a-zA-Z]/
16
16
  end
17
17
 
18
18
  def default_letter
@@ -1,3 +1,3 @@
1
1
  module AlphabeticalPaginate
2
- VERSION = "1.0.0"
2
+ VERSION = "1.0.1"
3
3
  end
@@ -10,7 +10,7 @@ module AlphabeticalPaginate
10
10
  if params[:paginate_all]
11
11
  range = params[:language].letters_range
12
12
  if params[:others]
13
- range += ["*"]
13
+ range += ["a-z"]
14
14
  end
15
15
  if params[:enumerate] && params[:numbers]
16
16
  range = (0..9).to_a.map{|x| x.to_s} + range
@@ -30,10 +30,10 @@ module AlphabeticalPaginate
30
30
  end
31
31
  else
32
32
  params[:availableLetters].sort!
33
- params[:availableLetters] = params[:availableLetters][1..-1] + ["*"] if params[:availableLetters][0] == "*"
33
+ params[:availableLetters] = params[:availableLetters][1..-1] + ["a-z"] if params[:availableLetters][0] == "a-z"
34
34
  params[:availableLetters].unshift "All" if params[:include_all]
35
35
  params[:availableLetters] -= (1..9).to_a.map{|x| x.to_s} if !params[:numbers]
36
- params[:availableLetters] -= ["*"] if !params[:others]
36
+ params[:availableLetters] -= ["a-z"] if !params[:others]
37
37
 
38
38
  params[:availableLetters].each do |l|
39
39
  value = params[:language].output_letter(l)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alphabetical_paginate_uk
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - lingz
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-04-06 00:00:00.000000000 Z
11
+ date: 2017-04-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler