From 39175ab11d8771cd1c2fc023c5118cd6e0c53c14 Mon Sep 17 00:00:00 2001 From: sue445 Date: Thu, 1 Jan 2015 01:57:40 +0900 Subject: [PATCH 1/5] Tweak indent --- spec/core_spec.rb | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/spec/core_spec.rb b/spec/core_spec.rb index bc5e8c8..a01bf7f 100644 --- a/spec/core_spec.rb +++ b/spec/core_spec.rb @@ -72,23 +72,23 @@ where(:arg, :expected_count) do [ - ["2009-03-20" , 14], - [Date.parse("2010-03-20"), 17], - [Time.parse("2011-03-19"), 21], - - [:dx , 14], - [:dx1 , 14], - [:dx2 , 17], - [:dx3 , 21], - - [:ns , 28], - [:ns1 , 28], - [:new_stage , 28], - [:new_stage1, 28], - [:ns2 , 32], - [:new_stage2, 32], - [:ns3 , 36], - [:new_stage3, 36], + ["2009-03-20" , 14], + [Date.parse("2010-03-20"), 17], + [Time.parse("2011-03-19"), 21], + + [:dx , 14], + [:dx1 , 14], + [:dx2 , 17], + [:dx3 , 21], + + [:ns , 28], + [:ns1 , 28], + [:new_stage , 28], + [:new_stage1, 28], + [:ns2 , 32], + [:new_stage2, 32], + [:ns3 , 36], + [:new_stage3, 36], ] end From faa6b21f9d9a1babf2194efcdddf8fb6033df347 Mon Sep 17 00:00:00 2001 From: sue445 Date: Thu, 1 Jan 2015 01:52:34 +0900 Subject: [PATCH 2/5] Add go! princess precure, spring_carnival --- config/girls/012_go_princess.yml | 49 ++++++++++++++++++++++++++++++++ config/movies.yml | 6 ++++ config/series.yml | 11 +++++++ spec/core_spec.rb | 5 +++- spec/movie_spec.rb | 1 + spec/series_spec.rb | 1 + 6 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 config/girls/012_go_princess.yml diff --git a/config/girls/012_go_princess.yml b/config/girls/012_go_princess.yml new file mode 100644 index 0000000..d7e6e72 --- /dev/null +++ b/config/girls/012_go_princess.yml @@ -0,0 +1,49 @@ +cure_flora: &cure_flora + human_name: 春野はるか + precure_name: キュアフローラ + cast_name: 嶋村侑 + color: pink + created_date: 2015-02-01 # episode 1 + transform_message: |- + プリキュア！プリンセスエンゲージ！ + 咲き誇る花のプリンセス！キュアフローラ！ + extra_names: + attack_messages: + - | + エクスチェンジ！モードエレガント！ + 舞え、花よ！プリキュア・フローラル・トルビヨン！ + transform_calls: +cure_mermaid: &cure_mermaid + human_name: 海藤みなみ + precure_name: キュアマーメイド + cast_name: 浅野真澄 + color: blue + created_date: 2015-02-08 # episode + transform_message: |- + プリキュア！プリンセスエンゲージ！ + 澄み渡る海のプリンセス！キュアマーメイド！ + extra_names: + attack_messages: + - | + transform_calls: + - princess_engage +cure_twinkle: &cure_twinkle + human_name: 天ノ川きらら + precure_name: キュアトゥインクル + cast_name: 山村響 + color: yellow + created_date: 2015-02-15 # episode + transform_message: |- + プリキュア！プリンセスエンゲージ！ + きらめく星のプリンセス！キュアトゥインクル！ + extra_names: + attack_messages: + - | + transform_calls: + - princess_engage +flora: + <<: *cure_flora +mermaid: + <<: *cure_mermaid +twinkle: + <<: *cure_twinkle diff --git a/config/movies.yml b/config/movies.yml index aabdc55..5ed8fc5 100644 --- a/config/movies.yml +++ b/config/movies.yml @@ -34,3 +34,9 @@ ns3: &ns3 started_date: 2014-03-15 new_stage3: <<: *ns3 +####################################################### +sc: &sc + title: 映画 プリキュアオールスターズ 春のカーニバル + started_date: 2015-03-14 +spring_carnival: + <<: *sc diff --git a/config/series.yml b/config/series.yml index c0c3043..e720bb7 100644 --- a/config/series.yml +++ b/config/series.yml @@ -134,3 +134,14 @@ happiness_charge: &happiness_charge - cure_fortune happiness_charge_precure: <<: *happiness_charge +####################################################### +go_princess: &go_princess + title: Go!プリンセスプリキュア + started_date: 2015-02-01 + # ended_date: 2016-01- + girls: + - cure_flora + - cure_mermaid + - cure_twincle +go_princess_precure: + <<: *go_princess diff --git a/spec/core_spec.rb b/spec/core_spec.rb index a01bf7f..e99d946 100644 --- a/spec/core_spec.rb +++ b/spec/core_spec.rb @@ -62,7 +62,7 @@ context "Without arg" do subject { instance.all_stars } - let(:precure_count){ 37 } + let(:precure_count){ 40 } its(:count) { should == precure_count } end @@ -89,6 +89,9 @@ [:new_stage2, 32], [:ns3 , 36], [:new_stage3, 36], + + [:sc , 40], + [:spring_carnival, 40], ] end diff --git a/spec/movie_spec.rb b/spec/movie_spec.rb index ddca5d0..f02b71b 100644 --- a/spec/movie_spec.rb +++ b/spec/movie_spec.rb @@ -7,6 +7,7 @@ :ns1, :ns2, :ns3, + :sc, ] end diff --git a/spec/series_spec.rb b/spec/series_spec.rb index d98b33e..b97fcd1 100644 --- a/spec/series_spec.rb +++ b/spec/series_spec.rb @@ -62,6 +62,7 @@ :smile, :dokidoki, :happiness_charge, + :go_princess, ] end From f55adb2f40780fae89e19ad1619f01f8207fd021 Mon Sep 17 00:00:00 2001 From: Go Sueyoshi Date: Mon, 2 Feb 2015 20:59:41 +0900 Subject: [PATCH 3/5] Add example code for Go! princess precure --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index b501293..f54a20b 100644 --- a/README.md +++ b/README.md @@ -474,6 +474,9 @@ Precure.all_stars.select(&:pink?).map(&:precure_name) Precure.all_stars.select(&:yellow?).map(&:precure_name) #=> ["シャイニールミナス", "キュアレモネード", "キュアパイン", "キュアサンシャイン", "キュアミューズ", "キュアピース", "キュアロゼッタ", "キュアハニー"] + +Precure.all_stars.group_by{ |girl| girl.color }.map{ |color, girls| [color, girls.count] }.sort_by{ |color, girl_count| girl_count }.reverse +#=> [["pink", 9], ["yellow", 8], ["blue", 7], ["purple", 4], ["red", 4], ["white", 3], ["green", 2], ["black", 1]] ``` ## More reference From 05852fa36d66c8841ddb7b483a3f66bca356b5c6 Mon Sep 17 00:00:00 2001 From: Go Sueyoshi Date: Mon, 2 Feb 2015 22:35:57 +0900 Subject: [PATCH 4/5] Tweak --- config/girls/012_go_princess.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/girls/012_go_princess.yml b/config/girls/012_go_princess.yml index d7e6e72..bd8fed9 100644 --- a/config/girls/012_go_princess.yml +++ b/config/girls/012_go_princess.yml @@ -12,6 +12,8 @@ cure_flora: &cure_flora - | エクスチェンジ！モードエレガント！ 舞え、花よ！プリキュア・フローラル・トルビヨン！ + (ドリーミー) + ごきげんよう transform_calls: cure_mermaid: &cure_mermaid human_name: 海藤みなみ From 4021c7046c39297c3692af88717288f8484363ea Mon Sep 17 00:00:00 2001 From: sue445 Date: Mon, 2 Feb 2015 23:42:31 +0900 Subject: [PATCH 5/5] fix typo --- config/series.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/series.yml b/config/series.yml index e720bb7..9b3c91a 100644 --- a/config/series.yml +++ b/config/series.yml @@ -142,6 +142,6 @@ go_princess: &go_princess girls: - cure_flora - cure_mermaid - - cure_twincle + - cure_twincke go_princess_precure: <<: *go_princess