ranker 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95ba813411999220469ff0cfa6abdeb92dd80cd0
-  data.tar.gz: 7c089dfa7754a24d2f35a87dd605a8e01b0dfe11
+  metadata.gz: 5c3b5746a5cdd097d78fc2823646621bc6cfc6ed
+  data.tar.gz: 1db30566ffe2483db910c37b85d0080a5be77ef1
 SHA512:
-  metadata.gz: aaf519717eb324031eb13c5fac87b581d6b60f4135876d8f43a5d2c5dd7172e536c5a623c48f2b31f5dccd3608d29af31e4122b479ffab2ae38f71577e638ad1
-  data.tar.gz: c8fa18492eaaba497d03e57cfee32ec6d6c3f0f0ae7d1f16e140ff63fc255c72672628769cc5d93e7bd56f8fbdb114385573888f594007763b0bacd5460d7ca8
+  metadata.gz: c57616642e3d8e62f1f876dbf929b6a94f85c40b94bd5ad89415b9d528268481d2e681a4e6a61b657e2713975c6918098be65369fcf0ab39fc5f8a4cce913a53
+  data.tar.gz: 3aa2ee9a5e3c13dc10ce62c8b1ad2fb6c918fa9ea524ddeb73b01034877e712a2b9f3bbf284d04097b111b7c95aec17d16b05c21e31375d1a6ede6ce15b1c0c5

data/lib/ranker/rankings.rb

@@ -38,9 +38,8 @@ module Ranker
     end
 
     def total
-      unless valid?
-        raise RankingsError.new(errors)
-      end
+      raise Error.new(errors) unless valid?
+
       @total ||= scores.reduce(:+)
     end
 
@@ -85,19 +84,21 @@ module Ranker
       }
     end
 
-  end # Rankings class
 
+    # Inner classes:
 
-  class RankingsError < StandardError
+    class Error < StandardError
 
-    def initialize(errors)
-      message = 'Rankings has errors: '
-      message << errors.map { |name, error|
-        "#{name} #{error}"
-      }.join(', ')
-      super(message)
-    end
+      def initialize(errors)
+        message = 'Rankings has errors: '
+        message << errors.map { |name, error|
+          "#{name} #{error}"
+        }.join(', ')
+        super(message)
+      end
+
+    end # Error class
 
-  end # RankingError class
+  end # Rankings class
 
 end # Ranker module

data/lib/ranker/strategies/strategy.rb

@@ -17,15 +17,30 @@ module Ranker::Strategies
 
     # Properties:
 
+    def errors
+      @errors ||= {}
+    end
+
     def rankings
       @rankings ||= Ranker::Rankings.new(self)
     end
 
+    def scores
+      rankables_grouped_by_score.keys
+    end
+
+    def valid?
+      validate
+      errors.empty?
+    end
+
 
     # Methods:
 
 
     def rank
+      raise Error.new(errors) unless valid?
+
       execute
       rankings
     end
@@ -77,6 +92,38 @@ module Ranker::Strategies
       rankables_grouped_by_score[score]
     end
 
-  end # class
+    def validate
+      errors.clear
+      validate_scores
+    end
+
+    def validate_scores
+      if scores_have_nil_values?
+        errors['scores'] = 'contains nil values'
+      end
+    end
+
+    def scores_have_nil_values?
+      scores.any? { |score|
+        score == nil
+      }
+    end
+
+
+    # Inner classes:
+
+    class Error < StandardError
+
+      def initialize(errors)
+        message = 'Strategy has errors: '
+        message << errors.map { |name, error|
+          "#{name} #{error}"
+        }.join(', ')
+        super(message)
+      end
+
+    end # Error class
+
+  end # Strategy class
 
-end # module
+end # Ranker::Strategies module

data/lib/ranker/version.rb

@@ -1,3 +1,3 @@
 module Ranker
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/spec/lib/ranker/rankings_spec.rb

@@ -29,7 +29,7 @@ describe Ranker::Rankings do
       context 'when rankables contain nil values' do
         let(:rankables) { [1, 2, 3, nil, 5, 6, 7] }
         it 'should raise an error' do
-          lambda { rankings.mean }.should raise_error(Ranker::RankingsError)
+          lambda { rankings.mean }.should raise_error(Ranker::Rankings::Error)
         end
       end
 
@@ -62,7 +62,7 @@ describe Ranker::Rankings do
       context 'when rankables contain nil values' do
         let(:rankables) { [1, 2, 3, nil, 5, 6, 7] }
         it 'should raise an error' do
-          lambda { rankings.standard_deviation }.should raise_error(Ranker::RankingsError)
+          lambda { rankings.standard_deviation }.should raise_error(Ranker::Rankings::Error)
         end
       end
 

data/spec/lib/ranker/strategies/strategy_spec.rb

@@ -13,6 +13,36 @@ describe Ranker::Strategies::StandardCompetition do
     its(:score) { should be }
   end
 
+  describe :properties do
+
+    describe :valid? do
+      let(:rankables) { raise NotImplementedError }
+      let(:strategy) { klass.new(rankables) }
+      let(:valid) { strategy.valid? }
+      subject { valid }
+      before {
+        valid
+      }
+
+      context 'when rankables are not nil' do
+        let(:rankables) { [1, 2, 3, 4, 5, 6, 7] }
+        it { should == true }
+      end
+
+      context 'when rankables contain nil values' do
+        let(:rankables) { [1, 2, 3, nil, 5, 6, 7] }
+        it { should == false }
+
+        context 'errors' do
+          subject { strategy.errors['scores'] }
+          it { should == 'contains nil values' }
+        end
+      end
+
+    end # valid?
+
+  end # properties
+
   describe :methods do
 
     describe :rank do
@@ -21,6 +51,15 @@ describe Ranker::Strategies::StandardCompetition do
       it 'should be an abstract method' do
         lambda { strategy.rank }.should raise_error(NotImplementedError)
       end
+
+      context 'when rankables has nil values' do
+        let(:rankables) { [1, 2, 3, nil, 5, 6, 7] }
+        let(:strategy) { klass.new(rankables) }
+        it 'should raise an error' do
+          lambda { strategy.rank }.should raise_error(Ranker::Strategies::Strategy::Error)
+        end
+      end # when rankables had nil values
+
     end # rank
 
   end # methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ranker
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Ilya Scharrenbroich