rubicure 1.0.0.pre2 → 1.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c1cad6a95b079098637acf02fa89d4285235ca8
-  data.tar.gz: d52fb184daabf5e00a1e5f328bb46b10ba375ffa
+  metadata.gz: c176af2bff658da89c24243c92da38146630a597
+  data.tar.gz: 0ad486115ec51b5f0fd317b8fe9e88e1621080d1
 SHA512:
-  metadata.gz: 9035f345de085e3e1ba40074ab3822621a35ff6c15a24cffcb577d2240420b298f35192aac9893fa542d24df4b1866dc938656f0f8b68313b2e27e58c48b56aa
-  data.tar.gz: 76b0bb2243515b2e9e08cb05757db0ba7aa06fa9e77b564afaf83e91130a4737a42135e25f71e8c670c9b3318722e4dd8ac2370ca8bb8702bfb2272f45ff8fd8
+  metadata.gz: 6ed03551dd1464f1db0fa78ccd13b24da2d3a1a5bd5cd44d9313695b15f7f97dbd8a1c8b4a21147a55e0b375375f526f71b17178c967ddcc725c7551f8c08507
+  data.tar.gz: 7da17c3bec7e18f4cb6eb97212fdbd26ac793a40c4b5ba433fea7d36ab859bb1002895e7d588c7b52930ae431bb220c86f6f8f373690bd37e9edce57ebccd53e

data/CHANGELOG.md

@@ -2,19 +2,27 @@
 [full changelog](http://github.com/sue445/rubicure/compare/v0.4.12...master)
 
 ## v1.0.0
-[full changelog](http://github.com/sue445/rubicure/compare/v0.4.12...v1.0.0.pre1)
 
 ### Breaking changes :bomb:
 * Remove `Girl#humanize`
-  * https://github.com/sue445/rubicure/pull/124
+    * https://github.com/sue445/rubicure/pull/124
 * Drop support ruby 2.0 and 2.1
-  * https://github.com/sue445/rubicure/pull/122
+    * https://github.com/sue445/rubicure/pull/122
 * Rename: human name of cure princess
-  * https://github.com/sue445/rubicure/pull/133
-  
+    * https://github.com/sue445/rubicure/pull/133
+* `Precure.all_stars` returns only from "Futari wa Pretty Cure" to "Maho Girls PreCure"
+    * https://github.com/sue445/rubicure/pull/138
+    * https://github.com/sue445/rubicure/issues/136
+    * i.e. "Kirakira Precure Alamode" is not included
+    * If necessary, please rewrite as follows.
+        * `Precure.all_stars` -> `Precure.all_girls`
+
 ### Enhancements
 * Impl `Girl#full_name`
   * https://github.com/sue445/rubicure/pull/135
+* Impl `Precure.all_girls` (a.k.a. `Precure.all`)
+  * https://github.com/sue445/rubicure/pull/138
+  * https://github.com/sue445/rubicure/issues/136
 
 ## v0.4.12
 [full changelog](http://github.com/sue445/rubicure/compare/v0.4.11...v0.4.12)

data/README.md

@@ -417,10 +417,11 @@ Cure.miracle.full_name
 ### Precure allstars
 ```ruby
 Precure.all_stars.count
-#=> 36
-
 Precure.all_stars.map(&:precure_name)
-#=> ["キュアブラック", "キュアホワイト", "シャイニールミナス", "キュアブルーム", "キュアイーグレット", "キュアドリーム", "キュアルージュ", "キュアレモネード", "キュアミント", "キュアアクア", "ミルキィローズ", "キュアピーチ", "キュアベリー", "キュアパイン", "キュアパッション", "キュアブロッサム", "キュアマリン", "キュアサンシャイン", "キュアムーンライト", "キュアメロディ", "キュアリズム", "キュアビート", "キュアミューズ", "キュアハッピー", "キュアサニー", "キュアピース", "キュアマーチ", "キュアビューティ", "キュアハート", "キュアダイヤモンド", "キュアロゼッタ", "キュアソード", "キュアエース", "キュアラブリー", "キュアプリンセス", "キュアハニー"]
+# returns current precure count and names
+
+Precure.all_stars.include?(Cure.echo)
+#=> false
 
 Precure.all_stars("2013-10-26").count
 #=> 33
@@ -458,6 +459,22 @@ Precure.all_stars(:sing_together_miracle_magic).include?(Cure.echo)
 
 and [more aliases!](config/movies.yml)
 
+### `Precure.all_girls` (a.k.a. `Precure.all`)
+```ruby
+Precure.all_girls.count
+Precure.all_girls.map(&:precure_name)
+# returns current precure count and names
+
+Precure.all_girls("2013-10-26").count
+#=> 33
+
+Precure.all_girls.include?(Cure.echo)
+#=> true
+```
+
+#### `Precure.all_girls` vs `Precure.all_stars`
+* `Precure.all_girls` returns all precure. (includes "Kirakira Precure Alamode")
+* `Precure.all_stars` returns only from "Futari wa Pretty Cure" to "Maho Girls PreCure"
 
 ### Equivalence
 ```ruby

data/config/girls/movie.yml

@@ -3,7 +3,7 @@ cure_echo: &cure_echo
   human_name:   坂上あゆみ
   precure_name: キュアエコー
   cast_name:    能登麻美子
-  created_date:
+  created_date: 2012-03-17
   color:        white
   transform_message: |-
     みんなの思いを守るために

data/lib/rubicure/core.rb

@@ -34,15 +34,6 @@ module Rubicure
     # @param [Time,Date,String,Symbol] arg Time, Date or date like String (ex. "2013-12-16")
     # @return [Array<Rubicure::Girl>]
     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!(&:human_name)
-      end
-
       extra_girls = []
 
       # args is Time or Date
@@ -58,10 +49,28 @@ module Rubicure
         end
       end
 
-      girls = @all_stars.select { |girl| girl.created_date && girl.created_date <= date }
-      girls + extra_girls
+      all_girls(date) - [Cure.echo] + extra_girls
+    end
+
+    # @param [Time,Date] arg Time, Date or date like String (ex. "2013-12-16")
+    # @return [Array<Rubicure::Girl>]
+    def all_girls(arg = Time.current)
+      date = to_date(arg)
+
+      unless @all_girls
+        @all_girls = []
+        Rubicure::Girl.names.each do |girl_name|
+          @all_girls << Rubicure::Girl.find(girl_name)
+        end
+
+        @all_girls.uniq!(&:human_name)
+      end
+
+      @all_girls.select { |girl| girl.created_date && girl.created_date <= date }
     end
 
+    alias_method :all, :all_girls
+
     # iterate with :unmarked, :max_heart, ...
     #
     # @yield series

data/lib/rubicure/version.rb

@@ -1,3 +1,3 @@
 module Rubicure
-  VERSION = "1.0.0.pre2"
+  VERSION = "1.0.0.pre3"
 end

data/spec/core_spec.rb

@@ -48,6 +48,7 @@ describe Rubicure::Core do
 
       where(:arg, :expected_count, :include_cure_echo) do
         "2009-03-20"             | 14 | false
+        "2017-01-17"             | 44 | false
         Date.parse("2010-03-20") | 17 | false
         Time.parse("2011-03-19") | 21 | false
 
@@ -78,4 +79,33 @@ describe Rubicure::Core do
       end
     end
   end
+
+  describe "#all_girls" do
+    context "Without arg" do
+      subject { instance.all_girls }
+
+      let(:precure_count) { 45 }
+
+      its(:count) { should == precure_count }
+      it { should include Cure.echo }
+    end
+
+    context "With arg" do
+      subject { instance.all_girls(arg) }
+
+      using RSpec::Parameterized::TableSyntax
+
+      where(:arg, :expected_count, :include_cure_echo) do
+        "2009-03-20"             | 14 | false
+        "2017-01-17"             | 45 | true
+        Date.parse("2010-03-20") | 17 | false
+        Time.parse("2011-03-19") | 21 | false
+      end
+
+      with_them do
+        its(:count) { should == expected_count }
+        it { expect(subject.include?(Cure.echo)).to be include_cure_echo }
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubicure
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre2
+  version: 1.0.0.pre3
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport