weak_headers 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67bf706a0a6eec746ed7530ae3d02177d0a2d51e
-  data.tar.gz: 1213eb7a09fd4cb7135ed919fe355c5f5ba71803
+  metadata.gz: 58700e3b49ba0705de37817e8b7aae413b8e0977
+  data.tar.gz: 692db95d3af43b416cd76f46836ed63159c5386a
 SHA512:
-  metadata.gz: ed52f5c92cdbfad718d19b4498bc7f7e82503a68fe56b70335bf78643d91459762552799eaae3e7db65cd44882229ae1ed709c16fe703dddc8121e882921ef62
-  data.tar.gz: 964885429dd42d1e41bcea3ad676f5bfaa0e5cbda066ba47fc496bababcbcb8a9099dcdde71be8951df75e5c8c1341e1a722da0c084bbf4f1afb62bf69b8c074
+  metadata.gz: 36de3758696f8c5f8f807f1adc002b0a8c08ac7d58efd70f519fde129ea0709981c45d864a72543c45e606a28d95af453d9e73bfabc7b575f15414998f04f6fc
+  data.tar.gz: 3f3c8ae210bc5b0c7c20152f1ac18ce1e3f68942c53dd7e5ac7a28b96353037f5b81432286e66e9451ad1aa31b19586ee2807aa6ffaeb3b532c7e848fad07e64

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.0
+- Change execution context of validator block
+
 ## 0.1.0
 - Support variable arguments for the validates_headers method
 

data/lib/weak_headers/base_validator.rb

@@ -12,7 +12,7 @@ module WeakHeaders
     end
 
     def type
-      self.class.name.split("::").last.sub(/Validator\z/, '').underscore.to_sym
+      self.class.name.split('::').last.sub(/Validator\z/, '').underscore.to_sym
     end
 
     private
@@ -25,7 +25,7 @@ module WeakHeaders
         false
       when requires? && @block && !@block.call(value)
         false
-      when optional? && present? && @block && !@block.call(value)
+      when optional? && present? && @block && !@controller.instance_exec(value, &@block)
         false
       else
         true
@@ -66,12 +66,12 @@ module WeakHeaders
 
     def exceptional?
       case
-        when @options[:only].try(:exclude?, value)
-          true
-        when @options[:except].try(:include?, value)
-          true
-        else
-          false
+      when @options[:only].try(:exclude?, value)
+        true
+      when @options[:except].try(:include?, value)
+        true
+      else
+        false
       end
     end
 

data/lib/weak_headers/version.rb

@@ -1,3 +1,3 @@
 module WeakHeaders
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/weak_headers_spec.rb

@@ -24,13 +24,19 @@ RSpec.describe 'Anything', type: :controller do
     validates_headers :index do
       requires 'X-Test-Token'
       optional 'X-Test-Id' do |value|
-        value =~ /\A\d+\z/
+        number?(value)
       end
     end
 
     validates_headers :update, :destory do
       requires 'X-Test-Id'
     end
+
+    private
+
+    def number?(value)
+      !!(value =~ /\A\d+\z/)
+    end
   end
 
   context 'with incorrect headers' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weak_headers
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tadayuki Onishi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2016-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails