sakura_gakuin 1.0.7 → 1.1.0

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: 208777b365f5efe6276fe1b78984f7a82fa4b3f8
4
- data.tar.gz: 42786ad3acd4da3555b5f753841e32a2a7754284
3
+ metadata.gz: b4bcdd1043ab40be722ecac6ba4b882824e1cd8c
4
+ data.tar.gz: 5bea1113e91d39f0e2eca293311206b881ff97b7
5
5
  SHA512:
6
- metadata.gz: ddafd200d49daa46018f632dbedb4189a6a2b2d9928be7ef5b337c84bf5d4c7fde30188c21f4dd8b162785913ab54c69a1d4b7fa3ca52d5aef334c1f13a5fef6
7
- data.tar.gz: ccdfb76a46fa54028397dc4ed427d05b4470462bf59f97bef78bff34ea3a7288f7bf3558276988d2923df79bf123cc0b36b3b59177e1423a2254553911c1fea2
6
+ metadata.gz: e3c59a836da8e511818edd05e0d31db268df8950ef6a68ed5667381b4059913ef851ecc374262883ca490c77591bc8a547ced5b3155c1716b7a6392e9f9e996d
7
+ data.tar.gz: 3a6c579fbced84993bc1aa90aa8d25303da52b2e124854b293922b6427c8235af3bc3bf6d0d20edef906e23da4bee7880dced2187c06b661964210ebdeacc714
@@ -6,10 +6,9 @@ module SakuraGakuin
6
6
 
7
7
  yaml_load "config/angels.yml"
8
8
 
9
- primary_key :name_en
9
+ primary_key :id
10
10
 
11
-
12
- # personal data
11
+ # angel data
13
12
 
14
13
  attr_reader :name_ja
15
14
  attr_reader :name_en
@@ -1,3 +1,3 @@
1
1
  module SakuraGakuin
2
- VERSION = "1.0.7"
2
+ VERSION = "1.1.0"
3
3
  end
@@ -9,9 +9,6 @@ module SakuraGakuin
9
9
  @data = []
10
10
  @indexes = {}
11
11
  @index_values = {}
12
-
13
- attr_reader :id
14
- create_index(:id, true)
15
12
  end
16
13
 
17
14
  module ClassMethods
@@ -27,10 +24,16 @@ module SakuraGakuin
27
24
  @index_values = {}
28
25
  end
29
26
 
30
- def primary_key(*keys)
31
- define_method(:id, ->() {
32
- @id ||= keys.map{|k| send(k)}.join("_").downcase.gsub(" ", "_").to_sym
33
- })
27
+ def primary_key(key, *keys)
28
+ keys = ([key] + keys).flatten
29
+ if keys.length==1 && keys.first==:id
30
+ attr_reader :id
31
+ else
32
+ define_method(:id, ->() {
33
+ @id ||= keys.map{|k| send(k)}.join("_").downcase.gsub(" ", "_").to_sym
34
+ })
35
+ end
36
+ create_index(:id, true)
34
37
  end
35
38
 
36
39
  def create_index(key, uniq=false)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sakura_gakuin
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.7
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yoshida Tetsuya