rubicure 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e71b8a8d5de2e5f6a95ddacf68d3eac30f031d31
-  data.tar.gz: 9f3251bbcd7124a8d82b462ac603f09eef04e60a
+  metadata.gz: a7ce6948fbd7c3fa80aaf39c61f5b1ab8ce98fbe
+  data.tar.gz: a3eb296887ba93f63f35fbdab08ea5f60b19aebd
 SHA512:
-  metadata.gz: c0b8fd44da9ed44e5c88f2b4159422c9cfffce6b48b0053a4a36459e2b98ccb98c63bbfbe776197f44441672a7c26eb61c8a86bc4f9e3803371e4a66597d0903
-  data.tar.gz: fa325ecb30e69086502298dabf8a8b371ef56441ded85d07d08ba2b6187f59f5b370277f2f62b7ff2cc168448d1062aff4cce57b9004e06d86803beebd5b8a28
+  metadata.gz: fd439d2bfa4f82f83fb8bd223c4baa084914a5802525106256a6de2e86955ef6619ef8b2334137c036353f3ae10e146211b5c553bccdf49fd19414b80de9da48
+  data.tar.gz: 8036dc70d3f46041dddd1beede49b7f77c531a589ca1732ae154f1612f9adc8eb7248a534e53fdbf961473be123ea07b0fc9cb92765279642887c128a379e2c1

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
 rvm:
   - 2.0.0
+  - 2.1.0
+before_install:
+  - gem install bundler -v '= 1.5.1'
 script: CODECLIMATE_REPO_TOKEN=ae44e61ae42dc9114b3cd92bed8dc553d9e9f119634c8b95273d3048e6026aa5 bundle exec rspec --tag category:verbose && bundle exec rspec
 branches:
   only:

data/CHANGELOG.md

@@ -1,10 +1,22 @@
 ## master
-[full changelog](http://github.com/sue445/rubicure/compare/v0.0.3...master)
+[full changelog](http://github.com/sue445/rubicure/compare/v0.0.4...master)
+
+## v0.0.4
+[full changelog](http://github.com/sue445/rubicure/compare/v0.0.3...v0.0.4)
+
+### Enhancements
+* Add cure heart engage mode :sparkling_heart:
+* Add cure bright and cure windy (thx @kaosf)
+  * https://github.com/sue445/rubicure/pull/15
+* Impl `Precure#each_with_series` (alias to `Precure#each`)
+  * https://github.com/sue445/rubicure/pull/13
+* Add arg to `Precure#all_stars`
+  * https://github.com/sue445/rubicure/pull/16
 
 ## v0.0.3
 [full changelog](http://github.com/sue445/rubicure/compare/v0.0.2...v0.0.3)
 
-# Enhancements
+### Enhancements
 * define operators(`Girl#==`, `Series#===`) (thx @zonuexe)
   * https://github.com/sue445/rubicure/pull/7
 * Remove last linebreaks of transform_messages (thx @zonuexe)

data/README.md

@@ -81,6 +81,25 @@ Precure.find(:smile).title
 
 and [more aliases!](config/series.yml)
 
+### each with precure series
+```ruby
+Precure.each{|series| puts series.title  }
+ふたりはプリキュア
+ふたりはプリキュア Max Heart
+ふたりはプリキュア Splash Star
+Yes！ プリキュア5
+Yes！ プリキュア5 Go Go！
+フレッシュプリキュア！
+ハートキャッチプリキュア！
+スイートプリキュア♪
+スマイルプリキュア！
+ドキドキ！プリキュア
+#=> [:unmarked, :max_heart, :splash_star, :yes, :yes_gogo, :fresh, :heart_catch, :suite, :smile, :dokidoki]
+
+Precure.inject([]){|girl_count_of_series, series| girl_count_of_series << series.girls.count; girl_count_of_series  }
+#=> [2, 3, 2, 5, 6, 4, 4, 4, 5, 5]
+```
+
 ### Get current precure series
 `Precure#now` (alias to `#current` ) return current precure series
 
@@ -203,8 +222,24 @@ Precure.all_stars.count
 
 Precure.all_stars.map(&:precure_name)
 #=> ["キュアブラック", "キュアホワイト", "シャイニールミナス", "キュアブルーム", "キュアイーグレット", "キュアドリーム", "キュアルージュ", "キュアレモネード", "キュアミント", "キュアアクア", "ミルキィローズ", "キュアピーチ", "キュアベリー", "キュアパイン", "キュアパッション", "キュアブロッサム", "キュアマリン", "キュアサンシャイン", "キュアムーンライト", "キュアメロディ", "キュアリズム", "キュアビート", "キュアミューズ", "キュアハッピー", "キュアサニー", "キュアピース", "キュアマーチ", "キュアビューティ", "キュアハート", "キュアダイヤモンド", "キュアロゼッタ", "キュアソード", "キュアエース"]
+
+Precure.all_stars("2013-10-26").count
+#=> 33
+Precure.all_stars(:dx).count
+#=> 14
+Precure.all_stars(:dx2).count
+#=> 17
+Precure.all_stars(:dx3).count
+#=> 21
+Precure.all_stars(:new_stage).count
+#=> 28
+Precure.all_stars(:new_stage2).count
+#=> 32
 ```
 
+and [more aliases!](config/movies.yml)
+
+
 ### Equivalence
 ```ruby
 yayoi = Cure.peace.dup

data/config/girls.yml

@@ -2,6 +2,7 @@
 cure_black: &cure_black
   human_name:   美墨なぎさ
   precure_name: キュアブラック
+  created_date: 2004-02-01 # episode 1
   transform_message: |-
     デュアル・オーロラ・ウェイブ！！
     光の使者、キュアブラック！
@@ -12,6 +13,7 @@ cure_black: &cure_black
 cure_white: &cure_white
   human_name:   雪城ほのか
   precure_name: キュアホワイト
+  created_date: 2004-02-01 # episode 1
   transform_message: |-
     デュアル・オーロラ・ウェイブ！！
     光の使者、キュアホワイト！
@@ -28,6 +30,7 @@ white:
 shiny_luminous: &shiny_luminous
   human_name:   九条ひかり
   precure_name: シャイニールミナス
+  created_date: 2005-03-06 # episode 5
   transform_message: |-
     ルミナス・シャイニングストリーム！
     輝く命、シャイニールミナス！
@@ -40,6 +43,7 @@ luminous:
 cure_bloom: &cure_bloom
   human_name:   日向咲
   precure_name: キュアブルーム
+  created_date: 2006-02-05 # episode 1
   transform_message: |-
     デュアル・スピリチュアル・パワー！
     花開け大地に！
@@ -47,11 +51,10 @@ cure_bloom: &cure_bloom
     ふたりはプリキュア！
     聖なる泉を汚す者よ！
     阿漕な真似はお止めなさい！
-  extra_names:
-  - キュアブライト
 cure_egret: &cure_egret
   human_name:   美翔舞
   precure_name: キュアイーグレット
+  created_date: 2006-02-05 # episode 1
   transform_message: |-
     デュアル・スピリチュアル・パワー！
     羽ばたけ空に！
@@ -59,17 +62,42 @@ cure_egret: &cure_egret
     ふたりはプリキュア！
     聖なる泉を汚す者よ！
     阿漕な真似はお止めなさい！
-  extra_names:
-  - キュアウィンディ
+cure_bright: &cure_bright
+  human_name:   日向咲
+  precure_name: キュアブライト
+  created_date: 2006-09-03 # episode 30
+  transform_message: |-
+    デュアル・スピリチュアル・パワー！
+    未来を照らし！
+    天空に満ちる月！ キュアブライト！
+    ふたりはプリキュア！
+    聖なる泉を汚す者よ！
+    阿漕な真似はお止めなさい！
+cure_windy: &cure_windy
+  human_name:   美翔舞
+  precure_name: キュアウィンディ
+  created_date: 2006-09-03 # episode 30
+  transform_message: |-
+    デュアル・スピリチュアル・パワー！
+    勇気を運べ！
+    大地に薫る月！ キュアウィンディ！
+    ふたりはプリキュア！
+    聖なる泉を汚す者よ！
+    阿漕な真似はお止めなさい！
 bloom:
   <<: *cure_bloom
 egret:
   <<: *cure_egret
+bright:
+  <<: *cure_bright
+windy:
+  <<: *cure_windy
 
 # yes
 cure_dream:  &cure_dream
   human_name:   夢原のぞみ
   precure_name: キュアドリーム
+  created_date: 2007-02-04 # episode 1
   transform_message: |-
     プリキュア！メタモルフォーゼ！
     大いなる希望の力、キュアドリーム！
@@ -80,6 +108,7 @@ cure_dream:  &cure_dream
 cure_rouge:  &cure_rouge
   human_name:   夏木りん
   precure_name: キュアルージュ
+  created_date: 2007-02-11 # episode 2
   transform_message: |-
     プリキュア！メタモルフォーゼ！
     情熱の赤い炎、キュアルージュ！
@@ -90,6 +119,7 @@ cure_rouge:  &cure_rouge
 cure_lemonade:  &cure_lemonade
   human_name:   春日野うらら
   precure_name: キュアレモネード
+  created_date: 2007-02-18 # episode 3
   transform_message: |-
     プリキュア！メタモルフォーゼ！
     はじけるレモンの香り、キュアレモネード！
@@ -100,6 +130,7 @@ cure_lemonade:  &cure_lemonade
 cure_mint:  &cure_mint
   human_name:   秋元こまち
   precure_name: キュアミント
+  created_date: 2007-02-25 # episode 4
   transform_message: |-
     プリキュア！メタモルフォーゼ！
     安らぎの緑の大地、キュアミント！
@@ -110,6 +141,7 @@ cure_mint:  &cure_mint
 cure_aqua:  &cure_aqua
   human_name:   水無月かれん
   precure_name: キュアアクア
+  created_date: 2007-03-11 # episode 6
   transform_message: |-
     プリキュア！メタモルフォーゼ！
     知性の青き泉、キュアアクア！
@@ -132,6 +164,7 @@ aqua:
 milky_rose: &milky_rose
   human_name:   美々野くるみ
   precure_name: ミルキィローズ
+  created_date: 2008-04-06 # episode 10
   transform_message: |-
     スカイローズ・トランスレイト！
     青いバラは秘密のしるし！ ミルキィローズ！
@@ -143,6 +176,7 @@ rose:
 cure_peach: &cure_peach
   human_name:   桃園ラブ
   precure_name: キュアピーチ
+  created_date: 2009-02-01 # episode 1
   transform_message: |-
     チェインジ！プリキュア・ビートアップ！
     ピンクのハートは愛あるしるし！
@@ -153,6 +187,7 @@ cure_peach: &cure_peach
 cure_berry: &cure_berry
   human_name:   蒼乃美希
   precure_name: キュアベリー
+  created_date: 2009-02-08 # episode 2
   transform_message: |-
     チェインジ！プリキュア・ビートアップ！
     ブルーのハートは希望のしるし！
@@ -163,6 +198,7 @@ cure_berry: &cure_berry
 cure_pine: &cure_pine
   human_name:   山吹祈里
   precure_name: キュアパイン
+  created_date: 2009-02-15 # episode 3
   transform_message: |-
     チェインジ！プリキュア・ビートアップ！
     イエローハートは祈りのしるし！
@@ -173,6 +209,7 @@ cure_pine: &cure_pine
 cure_passion: &cure_passion
   human_name:   東せつな
   precure_name: キュアパッション
+  created_date: 2009-07-12 # episode 23
   transform_message: |-
     チェインジ！プリキュア・ビートアップ！
     真っ赤なハートは幸せの証！
@@ -193,6 +230,7 @@ passion:
 cure_blossom: &cure_blossom
   human_name:   花咲つぼみ
   precure_name: キュアブロッサム
+  created_date: 2010-02-07 # episode 1
   transform_message: |-
     (プリキュアの種、いくですぅ！)
     プリキュア！オープンマイハート！
@@ -203,6 +241,7 @@ cure_blossom: &cure_blossom
 cure_marine: &cure_marine
   human_name:   来海えりか
   precure_name: キュアマリン
+  created_date: 2010-02-21 # episode 3
   transform_message: |-
     (プリキュアの種、いくですぅ！)
     プリキュア！オープンマイハート！
@@ -213,6 +252,7 @@ cure_marine: &cure_marine
 cure_sunshine: &cure_sunshine
   human_name:   明堂院いつき
   precure_name: キュアサンシャイン
+  created_date: 2010-07-18 # episode 23
   transform_message: |-
     (プリキュアの種、いくですぅ！)
     プリキュア！オープンマイハート！
@@ -223,6 +263,7 @@ cure_sunshine: &cure_sunshine
 cure_moonlight: &cure_moonlight
   human_name:   月影ゆり
   precure_name: キュアムーンライト
+  created_date: 2010-09-26 # episode 33
   transform_message: |-
     (プリキュアの種、いくですぅ！)
     プリキュア！オープンマイハート！
@@ -243,6 +284,7 @@ moonlight:
 cure_melody: &cure_melody
   human_name:   北条響
   precure_name: キュアメロディ
+  created_date: 2011-02-06 # episode 1
   transform_message: |-
     レッツプレイ！プリキュアモジュレーション！！
     爪弾くは荒ぶる調べ！ キュアメロディ！
@@ -252,6 +294,7 @@ cure_melody: &cure_melody
 cure_rhythm: &cure_rhythm
   human_name:   南野奏
   precure_name: キュアリズム
+  created_date: 2011-02-06 # episode 1
   transform_message: |-
     レッツプレイ！プリキュアモジュレーション！！
     爪弾くはたおやかな調べ！ キュアリズム！
@@ -261,6 +304,7 @@ cure_rhythm: &cure_rhythm
 cure_beat: &cure_beat
   human_name:   黒川エレン
   precure_name: キュアビート
+  created_date: 2011-07-10 # episode 21
   transform_message: |-
     レッツプレイ！プリキュアモジュレーション！！
     爪弾くは魂の調べ！ キュアビート！
@@ -270,6 +314,7 @@ cure_beat: &cure_beat
 cure_muse: &cure_muse
   human_name:   調辺アコ
   precure_name: キュアミューズ
+  created_date: 2011-10-16 # episode 35
   transform_message: |-
     レッツプレイ！プリキュアモジュレーション！！
     爪弾くは女神の調べ！ キュアミューズ！
@@ -289,6 +334,7 @@ muse:
 cure_happy: &cure_happy
   human_name:   星空みゆき
   precure_name: キュアハッピー
+  created_date: 2012-02-05 # episode 1
   transform_message: |-
     (レディ？)
     プリキュア・スマイルチャージ！
@@ -302,6 +348,7 @@ cure_happy: &cure_happy
 cure_sunny: &cure_sunny
   human_name:   日野あかね
   precure_name: キュアサニー
+  created_date: 2012-02-12 # episode 2
   transform_message: |-
     (レディ？)
     プリキュア・スマイルチャージ！
@@ -315,6 +362,7 @@ cure_sunny: &cure_sunny
 cure_peace: &cure_peace
   human_name:   黄瀬やよい
   precure_name: キュアピース
+  created_date: 2012-02-19 # episode 3
   transform_message: |-
     (レディ？)
     プリキュア・スマイルチャージ！
@@ -328,6 +376,7 @@ cure_peace: &cure_peace
 cure_march: &cure_march
   human_name:   緑川なお
   precure_name: キュアマーチ
+  created_date: 2012-02-26 # episode 4
   transform_message: |-
     (レディ？)
     プリキュア・スマイルチャージ！
@@ -341,6 +390,7 @@ cure_march: &cure_march
 cure_beauty: &cure_beauty
   human_name:   青木れいか
   precure_name: キュアビューティ
+  created_date: 2012-03-04 # episode 5
   transform_message: |-
     (レディ？)
     プリキュア・スマイルチャージ！
@@ -366,6 +416,7 @@ beauty:
 cure_heart: &cure_heart
   human_name:   相田マナ
   precure_name: キュアハート
+  created_date: 2013-02-03 # episode 1
   transform_message: |-
     プリキュアラブリンク！
     L! O! V! E!
@@ -374,9 +425,11 @@ cure_heart: &cure_heart
     愛を無くした悲しいジコチューさん、
     このキュアハートがあなたのドキドキ取り戻してみせる！
   extra_names:
+  - キュアハート・エンゲージモード
 cure_diamond: &cure_diamond
   human_name:   菱川六花
   precure_name: キュアダイヤモンド
+  created_date: 2013-02-17 # episode 3
   transform_message: |-
     プリキュアラブリンク！
     L! O! V! E!
@@ -388,6 +441,7 @@ cure_diamond: &cure_diamond
 cure_rosetta: &cure_rosetta
   human_name:   四葉ありす
   precure_name: キュアロゼッタ
+  created_date: 2013-02-24 # episode 4
   transform_message: |-
     プリキュアラブリンク！
     L! O! V! E!
@@ -399,6 +453,7 @@ cure_rosetta: &cure_rosetta
 cure_sword: &cure_sword
   human_name:   剣崎真琴
   precure_name: キュアソード
+  created_date: 2013-02-03 # episode 1
   transform_message: |-
     プリキュアラブリンク！
     L! O! V! E!
@@ -410,6 +465,7 @@ cure_sword: &cure_sword
 cure_ace: &cure_ace
   human_name:   円亜久里
   precure_name: キュアエース
+  created_date: 2013-06-30 # episode 22
   transform_message: |-
     プリキュアドレスアップ！
     (キュピラッパー！)

data/config/movies.yml

@@ -0,0 +1,35 @@
+dx1: &dx1
+  title: 映画 プリキュアオールスターズDX みんなともだちっ☆奇跡の全員大集合!
+  started_date: 2009-03-20
+dx:
+  <<: *dx1
+
+dx2: &dx2
+  title: 映画 プリキュアオールスターズDX2 希望の光☆レインボージュエルを守れ!
+  started_date: 2010-03-20
+
+dx3: &dx3
+  title: 映画 プリキュアオールスターズDX3 未来にとどけ! 世界をつなぐ☆虹色の花
+  started_date: 2011-03-19
+
+ns1: &ns1
+  title: 映画 プリキュアオールスターズNewStage みらいのともだち
+  started_date: 2012-03-17
+ns:
+  <<: *ns1
+new_stage:
+  <<: *ns1
+new_stage1:
+  <<: *ns1
+
+ns2: &ns2
+  title: 映画 プリキュアオールスターズNewStage2 こころのともだち
+  started_date: 2013-03-16
+new_stage2:
+  <<: *ns2
+
+ns3: &ns3
+  title: 映画 プリキュアオールスターズ NewStage3 永遠のともだち
+  started_date: 2014-03-15
+new_stage3:
+  <<: *ns3

data/lib/rubicure.rb

@@ -2,9 +2,11 @@ require "active_support/core_ext"
 require 'yaml'
 require 'hashie'
 require "rubicure/version"
+require "rubicure/concerns/util"
 require "rubicure/series"
 require "rubicure/girl"
 require "rubicure/core"
+require "rubicure/movie"
 
 module Rubicure
   def self.core
@@ -13,8 +15,8 @@ module Rubicure
 end
 
 module Precure
-  def self.method_missing(name, *args)
-    Rubicure.core.send(name, *args)
+  def self.method_missing(name, *args, &block)
+    Rubicure.core.send(name, *args, &block)
   end
 end
 

data/lib/rubicure/concerns/util.rb

@@ -0,0 +1,20 @@
+module Rubicure
+  module Concerns
+    module Util
+      # @param arg
+      # @return [Date] arg is String or Date
+      # @return [Time] arg is Time
+      # @return [nil] arg is other
+      def to_date(arg)
+        case arg
+          when Date, Time
+            arg
+          when String
+            Date.parse(arg)
+          else
+            nil
+        end
+      end
+    end
+  end
+end

data/lib/rubicure/core.rb

@@ -3,6 +3,8 @@ module Rubicure
 
   class Core
     include Singleton
+    include Enumerable
+    include Rubicure::Concerns::Util
 
     def method_missing(name, *args)
       unmarked_precure = Rubicure::Series::find(:unmarked)
@@ -20,8 +22,7 @@ module Rubicure
     # @raise not onair!
     def now
       current_time = Time.now
-      Rubicure::Series.names.each do |name|
-        series = Rubicure::Series.find(name)
+      each_with_series do |series|
         return series if series.on_air?(current_time)
       end
       raise "Not on air precure!"
@@ -29,18 +30,42 @@ module Rubicure
 
     alias :current :now
 
+    # @param [Time,Date,String,Symbol] arg Time, Date or date like String (ex. "2013-12-16")
     # @return [Array<Rubicure::Girl>]
-    def all_stars
+    def all_stars(arg=Time.current)
       unless @all_stars
         @all_stars = []
         Rubicure::Girl.names.each do |girl_name|
           @all_stars << Rubicure::Girl.find(girl_name)
         end
 
-        @all_stars.uniq!{|girl| girl.precure_name }
+        @all_stars.uniq!{|girl| girl.human_name }
       end
 
-      @all_stars
+      begin
+        movie = Rubicure::Movie.find(arg.to_sym)
+        date = movie.started_date
+      rescue
+        # args is Time or Date
+        date = to_date(arg)
+      end
+
+      @all_stars.select{|girl| girl.created_date <= date }
+    end
+
+    # iterate with :unmarked, :max_heart, ...
+    #
+    # @yield series
+    # @yieldparam series [Rubicure::Series]
+    #
+    # @return [Array<Symbol>] ex. :unmarked, :max_heart, ...
+    def each_with_series
+      Rubicure::Series.uniq_names.each do |series_name|
+        series = Rubicure::Series.find(series_name)
+        yield series
+      end
     end
+
+    alias :each :each_with_series
   end
 end

data/lib/rubicure/girl.rb

@@ -1,15 +1,16 @@
 module Rubicure
   class Girl
-    attr_reader :human_name, :precure_name, :transform_message, :extra_names, :current_state, :state_names
+    attr_reader :human_name, :precure_name, :transform_message, :extra_names, :current_state, :state_names, :created_date
 
     @@cache = {}
     @@config = nil
 
-    def initialize(human_name: nil, precure_name: nil, transform_message: nil, extra_names: [])
+    def initialize(human_name: nil, precure_name: nil, transform_message: nil, extra_names: [], created_date: nil)
       @human_name        = human_name
       @precure_name      = precure_name
       @transform_message = transform_message
       @extra_names       = extra_names || []
+      @created_date      = created_date
       @current_state     = 0
       @state_names = [@human_name, @precure_name]
       @state_names += @extra_names unless @extra_names.empty?

data/lib/rubicure/movie.rb

@@ -0,0 +1,59 @@
+module Rubicure
+  class Movie < Hash
+    include Hashie::Extensions::MethodAccess
+
+    @@cache = {}
+    @@config = nil
+
+    # @return [Array<Symbol>]
+    def self.names
+      config.keys
+    end
+
+    # @return [Array<Symbol>]
+    def self.uniq_names
+      uniq_names = []
+      config.each do |name, series|
+        uniq_names << name unless uniq_names.any?{|uniq_name| config[uniq_name][:title] == series[:title] }
+      end
+      uniq_names
+    end
+
+    # @return [Hash] content of config/movies.yml
+    def self.config
+      unless @@config
+        config_file = "#{File.dirname(__FILE__)}/../../config/movies.yml"
+        @@config = YAML.load_file(config_file).deep_symbolize_keys
+      end
+      @@config
+    end
+
+    # @return [Hash] content of config/movies.yml
+    def self.reload_config!
+      @@cache = {}
+      @@config = nil
+      config
+    end
+
+    # @param [Symbol] series_name
+    def self.valid?(series_name)
+      names.include?(series_name)
+    end
+
+    # @param movie_name [Symbol]
+    # @return [Rubicure::Movie]
+    # @raise arg is invalid
+    def self.find(movie_name)
+      raise "unknown movie: #{movie_name}" unless valid?(movie_name)
+
+      unless @@cache[movie_name]
+        movie_config = config[movie_name] || {}
+        movie_config.reject! { |k, v| v.nil? }
+
+        @@cache[movie_name] = Rubicure::Movie[movie_config]
+      end
+
+      @@cache[movie_name]
+    end
+  end
+end

data/lib/rubicure/series.rb

@@ -1,6 +1,7 @@
 module Rubicure
   class Series < Hash
     include Hashie::Extensions::MethodAccess
+    include Rubicure::Concerns::Util
 
     @@cache = {}
     @@config = nil
@@ -98,21 +99,5 @@ module Rubicure
 
       @@cache[series_name]
     end
-
-    private
-      # @param arg
-      # @return [Date] arg is String or Date
-      # @return [Time] arg is Time
-      # @return [nil] arg is other
-      def to_date(arg)
-        case arg
-          when Date, Time
-            arg
-          when String
-            Date.parse(arg)
-          else
-            nil
-        end
-      end
   end
 end

data/lib/rubicure/version.rb

@@ -1,3 +1,3 @@
 module Rubicure
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/rubicure.gemspec

@@ -23,9 +23,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", "~> 4.0.1"
   spec.add_dependency "hashie", "~> 2.0.5"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", ">= 1.3.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0.0.beta1"
+  spec.add_development_dependency "rspec-its", "~> 1.0.0.pre"
+  spec.add_development_dependency "rspec-collection_matchers", "~> 0.0.2"
   #spec.add_development_dependency "rspec-parameterized"
   spec.add_development_dependency "delorean"
   spec.add_development_dependency "yard"

data/spec/core_spec.rb

@@ -9,7 +9,7 @@ describe Rubicure::Core do
         time_travel_to "2013-01-01"
       end
 
-      it{ expect(subject.title).to eq "スマイルプリキュア！" }
+      its(:title){ should == "スマイルプリキュア！" }
     end
 
     context "when not on air" do
@@ -17,15 +17,14 @@ describe Rubicure::Core do
         time_travel_to "2013-02-01"
       end
 
-      it{ expect{ subject.title }.to raise_error }
+      it{ expect{ subject }.to raise_error }
     end
   end
 
   it "output all precure methods", category: :verbose do
-    Rubicure::Series.names.each do |series_name|
-      puts "[#{series_name}] ===================="
-      series = Rubicure::Series.find(series_name)
+    Precure.each_with_series do |series|
       puts <<EOS
+====================
 title:     #{series.title}
 broadcast: #{series.started_date} - #{series.ended_date}
 girls:     #{series.girls.count}
@@ -44,4 +43,60 @@ EOS
       end
     end
   end
+
+  describe "#each_with_series" do
+    before do
+      @expected_series = []
+      Rubicure::Series.uniq_names.each do |series_name|
+        @expected_series << Rubicure::Series.find(series_name)
+      end
+    end
+
+    it{ expect{|b| instance.each_with_series(&b) }.to yield_successive_args *@expected_series }
+  end
+
+  describe "#all_stars" do
+    context "Without arg" do
+      subject{ instance.all_stars }
+
+      before do
+        human_names = []
+        config_file = "#{File.dirname(__FILE__)}/../config/girls.yml"
+        Pathname(config_file).each_line do |line|
+          human_names << $1 if line =~ /human_name:\s*(.+)\s*/
+        end
+        @precure_count = human_names.uniq.count
+      end
+
+      its(:count){ should == @precure_count }
+    end
+
+    context "With arg" do
+      subject{ instance.all_stars(arg) }
+
+      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],
+        ]
+      end
+
+      with_them do
+        its(:count){ should == expected_count }
+      end
+    end
+  end
 end

data/spec/girl_spec.rb

@@ -97,14 +97,14 @@ EOF
     let(:girl_name){ :peace }
 
     it{ should be_an_instance_of Rubicure::Girl }
-    it{ expect(subject.precure_name).to eq "キュアピース" }
+    its(:precure_name){ should == "キュアピース" }
   end
 
   describe "#uniq_names" do
     subject{ Rubicure::Girl.uniq_names }
 
-    let(:all_stars_count){ Rubicure.core.all_stars.count }
+    let(:containing_name_alias_count){ Rubicure::Girl.names.count }
 
-    it{ expect(subject.count).to eq all_stars_count }
+    its(:count){ should < containing_name_alias_count }
   end
 end

data/spec/movie_spec.rb

@@ -0,0 +1,42 @@
+describe Rubicure::Movie do
+  let(:movie_names) {
+    [
+        :dx1,
+        :dx2,
+        :dx3,
+        :ns1,
+        :ns2,
+        :ns3,
+    ]
+  }
+
+  describe "#names" do
+    subject{ Rubicure::Movie.names }
+
+    it{ should include *movie_names }
+  end
+
+  describe "#uniq_names" do
+    subject{ Rubicure::Movie.uniq_names }
+
+    it{ should include *movie_names }
+    its(:count){ should == movie_names.count }
+  end
+
+  describe "#find" do
+    subject{ Rubicure::Movie.find(movie_name) }
+
+    context "when exists" do
+      let(:movie_name){ :dx }
+
+      its(:title){ should == "映画 プリキュアオールスターズDX みんなともだちっ☆奇跡の全員大集合!" }
+    end
+
+    context "when not exists" do
+      let(:movie_name){ :ashita_no_nadja  }
+
+      it{ expect{subject}.to raise_error }
+    end
+  end
+
+end

data/spec/rubicure_spec.rb

@@ -109,18 +109,4 @@ describe Rubicure do
       it{ expect( Milky.rose.precure_name ).to eq "ミルキィローズ"}
     end
   end
-
-  describe "#all_stars" do
-    subject{ Precure.all_stars }
-
-    before do
-      @precure_count = 0
-      config_file = "#{File.dirname(__FILE__)}/../config/girls.yml"
-      Pathname(config_file).each_line do |line|
-        @precure_count += 1 if line =~ /[a-z_]+:\s*&[a-z_]+/
-      end
-    end
-
-    it{ expect(subject.count).to eq @precure_count }
-  end
 end

data/spec/series_spec.rb

@@ -45,10 +45,7 @@ describe Rubicure::Series do
       ]
     }
 
-    it'has 5 girls' do
-      expect(subject.size).to eq(5)
-    end
-
+    it{ should have_exactly(5).girls }
     it{ should array_instance_of Rubicure::Girl }
   end
 
@@ -105,17 +102,17 @@ describe Rubicure::Series do
     subject{ Rubicure::Series.uniq_names }
 
     it{ should include *series_names }
-    it{ expect(subject.count).to eq series_names.count }
+    its(:count){ should == series_names.count }
   end
 
   describe "#find" do
-    subject(:series){ Rubicure::Series.find(series_name) }
+    subject{ Rubicure::Series.find(series_name) }
 
     context "when exists" do
       let(:series_name){ :smile }
 
-      it{ expect(series.title).to eq "スマイルプリキュア！" }
-      it{ expect(series.girls.count).to eq 5 }
+      its(:title){ should == "スマイルプリキュア！" }
+      its(:girls){ should have_exactly(5).girls }
     end
 
     context "when not exists" do

data/spec/spec_helper.rb

@@ -8,6 +8,8 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'rubicure'
 require 'rspec'
 require 'rspec-parameterized'
+require 'rspec/its'
+require 'rspec/collection_matchers'
 require 'delorean'
 
 # Requires supporting ruby files with custom matchers and macros, etc,

metadata

@@ -1,139 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: rubicure
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.beta1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.beta1
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.pre
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.pre
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: delorean
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: All about Japanese battle heroine "Pretty Cure (Precure)".
@@ -143,26 +171,30 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - config/girls.yml
+- config/movies.yml
 - config/series.yml
 - lib/rubicure.rb
+- lib/rubicure/concerns/util.rb
 - lib/rubicure/core.rb
 - lib/rubicure/girl.rb
+- lib/rubicure/movie.rb
 - lib/rubicure/series.rb
 - lib/rubicure/version.rb
 - rubicure.gemspec
 - spec/core_spec.rb
 - spec/girl_spec.rb
+- spec/movie_spec.rb
 - spec/rubicure_spec.rb
 - spec/series_spec.rb
 - spec/spec_helper.rb
@@ -177,23 +209,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: All about Japanese battle heroine "Pretty Cure (Precure)".
 test_files:
 - spec/core_spec.rb
 - spec/girl_spec.rb
+- spec/movie_spec.rb
 - spec/rubicure_spec.rb
 - spec/series_spec.rb
 - spec/spec_helper.rb