val_required 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c186595ba205deac0604e32d3426cfa6808dfcb6
-  data.tar.gz: 979dae2227b0f98c9d8c0d33f10c7ae0838c28d7
+  metadata.gz: d00fca36470a747766eaf8b7792c977454fa7128
+  data.tar.gz: 27080d47c434f9b599201f3a485aeca05429d782
 SHA512:
-  metadata.gz: 608367b9f54474ac01c4298a976cc5a5baf54f37a60cc790d451555d88b2b420d0a8dc90a49ac683884275a0e0286dc37679c02fd9c9405524dbe6b4f1c57907
-  data.tar.gz: 13044c01216fd7d015e6e0306a32f50573492146273be7463c85f227f00c03e3b29f3b17eb657ef1c52fa950829ec00ef790cc91dd555bf9f36989b4adf2b69d
+  metadata.gz: 8b6cc87fcb4e8f57c908da8fecfcd9e05f24a0c4fc5da1dd49b75a74e670139db9efcfaddaf4ebf266e9554b6b98d1dc918eb910dcb237d9f73fc66d252b40e6
+  data.tar.gz: 4ac34c71eefd4dc2b39b8f0e82165e89bd0b749ed0dd407273ee46d57b93e782d8520c60a018794bef631644f6a99eeb8467c8ec91d187e49c235a350477a266

data/README.md

@@ -1,6 +1,6 @@
 # Required!
 
-This gem adds the methods required!(val) to main object as well as val.required!. See usage.
+This gem adds the method #required! to Object, raises an error if nil or String that doesn't match /\S/, otherwise returns self.
 
 ## Installation
 
@@ -19,18 +19,22 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-expect("moo".required!).to_not raise_error
-expect(required! "moo").to_not raise_error
+expect(ValRequired.set?(nil)).to be_false
+expect(ValRequired.set?("")).to be_false
+expect(ValRequired.set?(" ")).to be_false
+# Otherwise true
+
+expect("token".required!).to_not raise_error
 
 expect("".required!).to raise_error
 expect(nil.required!).to raise_error
-expect(required! nil).to raise_error
 
+# The return value for each method on c is checked against ValRequired.set?
 expect do
-  config.required! do |obj|
-    obj.api_service_token # Raises an error if #blank?
+  required(config)! do |c|
+    c.api_service_token = "TOKEN"
   end
-end
+end.to_not raise_error
 ```
 
 ## Contributing

data/lib/val_required/version.rb

@@ -1,3 +1,3 @@
 module ValRequired
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/val_required.rb

@@ -1,16 +1,20 @@
-# TODO: remove dependency
-require 'active_support/core_ext/object/blank'
-
 module ValRequired
+  # Returns false unless non-empty String or other non-nil object.
+  def self.set? obj
+    if obj.instance_of? String
+      !!(obj =~ /\S/)
+    else
+      !obj.nil?
+    end
+  end
+
   module Method
-    def required!(val = (val_not_set = true; nil))
+    def required!(context=nil)
       if block_given?
-        yield(RequiredHelper.new(self))
-      elsif !val_not_set
-        raise BlankError.new("argument is blank!") if val.blank?
-        val
+        yield(RequiredHelper.new(context.required!))
+        self
       else
-        raise BlankError.new("object is blank") if self.blank?
+        raise BlankError.new("Object is not set: #{self.inspect}") unless ValRequired.set?(self)
         self
       end
     end
@@ -18,7 +22,10 @@ module ValRequired
 
   class RequiredHelper < Struct.new(:obj)
     def method_missing method, *args
-      obj.send(method, *args).required!
+      (res = obj.send(method, *args)).required!
+
+    rescue BlankError
+      raise BlankError, "#{method} returned #{res.inspect}"
     end
   end
 

data/spec/required_spec.rb

@@ -2,53 +2,52 @@ require 'spec_helper'
 
 require 'ostruct'
 
-def does_not_fail val
-  expect { required! val }.to_not raise_error
-  expect { val.required! }.to_not raise_error
-end
-
-def fails val
-  expect { val.required! }.to raise_error(ValRequired::BlankError)
-  expect { required!(val) }.to raise_error(ValRequired::BlankError)
-end
-
 describe ValRequired do
-  it { does_not_fail "moo" }
-  it { does_not_fail 2 }
-  it { does_not_fail 0 }
+  describe ".set?" do
+    def set? obj
+      ValRequired.set?(obj)
+    end
 
-  it { fails nil }
-  it { fails "" }
+    def set! obj
+      expect(set? obj).to be_true
+    end
 
-  it "works with assignment" do
-    m = "moo".required!
-    expect(m).to eq "moo"
+    def not_set! obj
+      expect(set? obj).to be_false
+    end
 
-    expect { required!("") }.to raise_error
+    it { set! "token" }
+    it { set! 2 }
+    it { set! 0 }
+    it { set! false }
+    it { set! true }
+    it { set! [] }
+    it { set!({}) }
+
+    it { not_set! nil }
+    it { not_set! "" }
+    it { not_set! " " }
+  end
 
-    m = required!("moo")
-    expect(m).to eq "moo"
+  it "works with assignment" do
+    expect("token".required!).to eq "token"
   end
 
   it "takes a block" do
-    user = OpenStruct.new(moo: "mo", fish: "")
+    user = OpenStruct.new(email: "", name: "Arnold")
 
-    expect { user.required!(&:fish) }.to raise_error
-    expect { user.required!(&:moo) }.to_not raise_error
+    expect { required!(user, &:email) }.to raise_error(ValRequired::BlankError, /email/)
+    expect { required!(user, &:name) }.to_not raise_error
   end
 
   it "takes an assignment block (config style)" do
     config = OpenStruct.new
-    required! do
-      config.moo = "moo"
-    end
+    required!(config) {|config| config.service_token = "token" }
 
-    expect(config.moo).to eq "moo"
+    expect(config.service_token).to eq "token"
 
     expect do
-      config.required! do |c|
-        c.moo = ""
-      end
-    end.to raise_error
+      required!(config) {|c| c.service_token = "" }
+    end.to raise_error(ValRequired::BlankError, /service_token=/)
   end
 end

data/val_required.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'active_support'
-
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: val_required
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Frans Krojegård
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: active_support
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement