knight 0.0.3 → 0.0.4

data/README.md

@@ -22,36 +22,44 @@ Or install it yourself as:
 
 ```ruby
 class User
-  attr_reader :username
+  attr_reader :username, :password
 
-  def initialize(username)
+  def initialize(username, password)
     @username = username
+    @password = password
   end
 end
-user = User.new('john')
+user = User.new('john', '')
 
-validator = Knight::Validator.new(Rule::Presence.new(:username))
+validator = Knight::Validator.new(Knight::Rule::Presence.new(:username))
 result = validator.run(user)
 result.valid? # => true
 
-
 class UserValidator
-  include Knight::InstanceMethod
+  include Knight::InstanceMethods
 
   validator.add(Knight::Rule::Presence.new(:username))
 
   context :login do |validator|
-    validator.add(Knight::Rule::Presence.new(:username))
     validator.add(Knight::Rule::Presence.new(:password))
   end
 end
 validator = UserValidator.new(user)
-
 result = validator.run
 result.valid? # => true
 
 result = validator.run(:login)
 result.valid? # => false
+
+user = User.new('', 'password')
+validator = UserValidator.new(user)
+result = validator.run(:login)
+result.valid? # => false
+
+user = User.new('john', 'password')
+validator = UserValidator.new(user)
+result = validator.run(:login)
+result.valid? # => true
 ```
 
 ## Contributing

data/lib/knight/instance_methods.rb

@@ -38,6 +38,8 @@ module Knight
 
     # Return the validation result
     #
+    # @param [Symbol] context
+    #
     # @example
     #   user = User.new
     #
@@ -58,6 +60,8 @@ module Knight
 
       # Return the validator object
       #
+      # @param [Symbol] context
+      #
       # @example
       #   class RegistrationValidator
       #     include Knight::InstanceMethods
@@ -76,6 +80,8 @@ module Knight
 
       # Return the validator object
       #
+      # @param [Symbol] name
+      #
       # @example
       #   class RegistrationValidator
       #     include Knight::InstanceMethods
@@ -89,12 +95,14 @@ module Knight
       #
       # @api public
       def context(name)
-        yield validator(name)
+        validator = validator(name)
+        validator.rules.merge(shared_rules) unless name == DEFAULT_CONTEXT
+        yield validator
       end
 
       private
 
-      # Return the validators contextual based
+      # Return all validators
       #
       # @return [Hash]
       #
@@ -102,6 +110,15 @@ module Knight
       def validators
         @validators = @validators || {}
       end
+
+      # Return rules for default context
+      #
+      # @return [Set(Rule)]
+      #
+      # @api private
+      def shared_rules
+        validator.rules
+      end
     end
   end
 end

data/lib/knight/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Knight
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/integration/context_spec.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Knight do
+
+  let(:klass) do
+    Class.new do
+      include InstanceMethods
+
+      validator.add(Rule::Presence.new(:foo))
+
+      context :context1 do |validator|
+        validator.add(Rule::Presence.new(:bar))
+      end
+
+      validator.add(Rule::Presence.new(:baz))
+
+      context :default do |validator|
+        validator.add(Rule::Presence.new(:username))
+      end
+
+      context :context1 do |validator|
+        validator.add(Rule::Presence.new(:password))
+      end
+
+      context :context2 do |validator|
+        validator.add(Rule::Presence.new(:title))
+      end
+    end
+  end
+
+  context 'default context' do
+    subject { klass.validator }
+    specify { expect(subject.rules.size).to eql(3) }
+  end
+
+  context 'context1' do
+    subject { klass.validator(:context1) }
+    specify { expect(subject.rules.size).to eql(5) }
+  end
+
+  context 'context2' do
+    subject { klass.validator(:context2) }
+    specify { expect(subject.rules.size).to eql(4) }
+  end
+
+  context 'not exists context' do
+    subject { klass.validator(:registration) }
+    specify { expect(subject.rules.size).to eql(0) }
+  end
+end

data/spec/unit/knight/instance_methods/class_methods/context_spec.rb

@@ -6,10 +6,19 @@ describe InstanceMethods, '.context' do
 
   let(:described_class) { Class.new { include InstanceMethods } }
 
+  it 'only call validator once' do
+    described_class.should_receive(:validator).once.and_return(Validator.new)
+    described_class.context(:default) do |validator|
+      validator.add Rule::Presence.new(:foo)
+    end
+  end
+
   it do
-    described_class.should_receive(:validator).with(:registration).and_return(Validator.new)
+    described_class.validator.add(Rule::Presence.new(:foo))
     described_class.context(:registration) do |validator|
-      validator.add Rule::Presence.new(:foo)
+      validator.add Rule::Presence.new(:bar)
     end
+    expect(described_class.validator(:default).rules.size).to eql(1)
+    expect(described_class.validator(:registration).rules.size).to eql(2)
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: knight
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Handi Wiguna
@@ -75,6 +75,7 @@ files:
 - lib/knight/version.rb
 - metrics/flog.yml
 - metrics/rubocop.yml
+- spec/integration/context_spec.rb
 - spec/integration/knight_spec.rb
 - spec/spec_helper.rb
 - spec/unit/knight/error/class_methods/new_spec.rb
@@ -125,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -2162189312537362928
+      hash: 592111569675221754
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -134,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -2162189312537362928
+      hash: 592111569675221754
       version: '0'
   none: false
 requirements: []
@@ -144,6 +145,7 @@ signing_key:
 specification_version: 3
 summary: ''
 test_files:
+- spec/integration/context_spec.rb
 - spec/integration/knight_spec.rb
 - spec/spec_helper.rb
 - spec/unit/knight/error/class_methods/new_spec.rb