valcro 0.0.2 → 0.1

data/README.md

@@ -1,6 +1,7 @@
 # Valcro
 
-[![Build Status](https://secure.travis-ci.org/hgimenez/valcro.png?branch=master)](http://travis-ci.org/hgimenez/valcro)
+[![Build Status](https://secure.travis-ci.org/hgmnz/valcro.png?branch=master)](http://travis-ci.org/hgmnz/valcro)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/hgmnz/valcro)
 
 Valcro is the simple validation library for Ruby. It provides 
 
@@ -25,8 +26,7 @@ class Dog
 
   attr_accessor :name
 
-  def validate
-    super
+  validate do
     errors.add(:name, 'must be great') unless name =~ /super|great|cool/
   end
 end

data/lib/valcro.rb

@@ -24,6 +24,9 @@ module Valcro
     self.class.validators.each do |validator_class|
       validation_runner.add_validator validator_class.new(self)
     end
+    self.class.validation_blocks.each do |validation_block|
+      instance_eval(&validation_block)
+    end
     validation_runner.validate
   end
 
@@ -39,5 +42,12 @@ module Valcro
     def validators
       @validators ||= []
     end
+    def validation_blocks
+      @validation_blocks ||= []
+    end
+
+    def validate(&block)
+      validation_blocks << block
+    end
   end
 end

data/lib/valcro/version.rb

@@ -1,3 +1,3 @@
 module Valcro
-  VERSION = "0.0.2"
+  VERSION = "0.1"
 end

data/spec/error_list_spec.rb

@@ -5,7 +5,7 @@ describe Valcro::ErrorList, 'adding errors' do
     list = Valcro::ErrorList.new
     list << Valcro::Error.new(:prop, 'message')
 
-    list.should have(1).errors
+    expect(list.errors.length).to eq(1)
   end
 end
 
@@ -13,13 +13,13 @@ describe Valcro::ErrorList, '#add' do
   it 'finds and agregates error messages' do
     list = Valcro::ErrorList.new
 
-    list[:one].should == []
+    expect(list[:one]).to be_empty
 
     list.add(:one, 'message one')
     list.add(:two, 'message two')
     list.add(:one, 'another message one')
 
-    list[:one].should == ['message one', 'another message one']
+    expect(list[:one]).to eq(['message one', 'another message one'])
   end
 end
 
@@ -31,7 +31,7 @@ describe Valcro::ErrorList, '#full_messages' do
     list.add :prop, 'two'
     list.add :prop,'three'
 
-    list.full_messages.should == ["prop one", "prop two", "prop three"]
+    expect(list.full_messages).to eq(["prop one", "prop two", "prop three"])
   end
 end
 
@@ -43,7 +43,7 @@ describe Valcro::ErrorList, '#to_s' do
     list.add :prop, 'two'
     list.add :prop, 'three'
 
-    list.to_s.should == "prop one prop two prop three"
+    expect(list.to_s).to eq("prop one prop two prop three")
   end
 end
 
@@ -51,10 +51,10 @@ describe Valcro::ErrorList, '#any?' do
   it 'is true when there are errors 'do
     list = Valcro::ErrorList.new
 
-    list.any?.should be_false
+    expect(list.any?).to be_false
     list.add :prop, 'some error'
 
-    list.any?.should be_true
+    expect(list.any?).to be_true
   end
 end
 
@@ -62,9 +62,9 @@ describe Valcro::ErrorList, '#clear!' do
   it 'removes all errors' do
     list = Valcro::ErrorList.new
     list.add :prop, 'some error'
-    list.any?.should be_true
+    expect(list.any?).to be_true
 
     list.clear!
-    list.any?.should be_false
+    expect(list.any?).to be_false
   end
 end

data/spec/error_spec.rb

@@ -4,18 +4,18 @@ describe Valcro::Error do
   it 'has a property and a message' do
     error = create_error(:prop, 'message')
 
-    error.property.should == :prop
-    error.message.should == 'message'
+    expect(error.property).to eq(:prop)
+    expect(error.message).to eq('message')
   end
 
   it 'can coerce to a string' do
     error = create_error
-    error.to_s.should == 'prop message'
+    expect(error.to_s).to eq('prop message')
   end
 
   it 'does not include property if it is base' do
     error = create_error(:base)
-    error.to_s.should == 'message'
+    expect(error.to_s).to eq('message')
   end
 
   def create_error(prop = :prop, message = 'message')

data/spec/runner_spec.rb

@@ -4,7 +4,7 @@ describe Valcro::Runner do
   it 'can store validators' do
     runner = Valcro::Runner.new
     runner.add_validator :some_validator
-    runner.validators.should have(1).validator
+    expect(runner.validators).to have(1).validator
   end
 
   it 'runs validators' do
@@ -14,6 +14,6 @@ describe Valcro::Runner do
 
     runner.validate
 
-    error_list.any?.should be_true
+    expect(error_list.any?).to be_true
   end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,16 @@
-require 'rspec'
 require 'valcro'
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

data/spec/valcro_spec.rb

@@ -5,29 +5,31 @@ describe Valcro do
     include Valcro
   end
 
-  subject { TestClass.new }
-  it { should be_valid }
+  it 'is valid with no validations defined' do
+    expect(TestClass.new.valid?).to be_true
+  end
 end
 
 describe Valcro, 'adding some errors' do
-  class TestClass
+  let(:test_class) do
+    Class.new do
     include Valcro
+    end
   end
 
   it 'gives access to the error list' do
-    test_instance = TestClass.new
-    test_instance.should be_valid
+    test_instance = test_class.new
 
     test_instance.errors.add(:foo, 'too foo for my taste')
 
-    test_instance.errors[:foo].should have(1).error
+    expect(test_instance.errors[:foo]).to have(1).error
 
-    test_instance.should_not be_valid
+    expect(test_instance).not_to be_valid
   end
 end
 
 describe Valcro, 'validators' do
-  class StatusFail
+  class StatusFailValidator
     def initialize(context)
       @context = context
     end
@@ -36,43 +38,68 @@ describe Valcro, 'validators' do
     end
   end
 
-  class TestClass
-    include Valcro
-    attr_accessor :status
-    def status
-      @status ||= "fail"
+  let(:test_class) do
+    Class.new do
+      include Valcro
+      attr_accessor :status
+      def status
+        @status ||= "fail"
+      end
+      validates_with StatusFailValidator
     end
-    validates_with StatusFail
   end
 
   it 'can be added validators' do
-    test_instance = TestClass.new
+    test_instance = test_class.new
 
     test_instance.validate
-    test_instance.should_not be_valid
+    expect(test_instance).not_to be_valid
   end
 
   it 'clears validations on subsequent runs' do
-    test_instance = TestClass.new
+    test_instance = test_class.new
 
     test_instance.validate
-    test_instance.should_not be_valid
+    expect(test_instance).not_to be_valid
 
     test_instance.status = 'win'
     test_instance.validate
-    test_instance.should be_valid
+    expect(test_instance).to be_valid
   end
 end
 
 describe Valcro, '#error_messages' do
-  class TestClass
-    include Valcro
+  let(:test_class) do
+    Class.new { include Valcro }
   end
 
   it 'delegates to errors' do
-    test_instance = TestClass.new
+    test_instance = test_class.new
     test_instance.stub!(errors: double(to_s: 'some errors'))
 
-    test_instance.error_messages.should == 'some errors'
+    expect(test_instance.error_messages).to eq('some errors')
+  end
+end
+
+describe Valcro, '.validate' do
+  let(:test_class) do
+    Class.new do
+      include Valcro
+      attr_accessor :works
+      validate do
+        errors.add(:works, 'does not work') unless works
+      end
+    end
+  end
+
+  it 'sets validations on the included class' do
+    test_instance = test_class.new
+    test_instance.works = false
+    test_instance.validate
+    expect(test_instance.valid?).to be_false
+
+    test_instance.works = true
+    test_instance.validate
+    expect(test_instance.valid?).to be_true
   end
 end

data/valcro.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |s|
   s.version     = Valcro::VERSION
   s.authors     = ["Harold Giménez"]
   s.email       = ["harold.gimenez@gmail.com"]
-  s.homepage    = ""
-  s.summary     = %q{The simplest possible validation library for ruby}
-  s.description = %q{The simplest possible validation library for ruby}
+  s.homepage    = "https://github.com/hgimenez/valcro"
+  s.summary     = %q{The simplest possible validation library for Ruby}
+  s.description = %q{Valcro is a validation library for arbitrary ruby objects. I's primary goal is to remain as simple as possible so that it can be useful to a large surface of use cases remaining easily extensible.}
 
   s.rubyforge_project = "valcro"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valcro
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: '0.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70251622748220 !ruby/object:Gem::Requirement
+  requirement: &70279594936620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251622748220
+  version_requirements: *70279594936620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70251622747460 !ruby/object:Gem::Requirement
+  requirement: &70279594952580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,8 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251622747460
-description: The simplest possible validation library for ruby
+  version_requirements: *70279594952580
+description: Valcro is a validation library for arbitrary ruby objects. I's primary
+  goal is to remain as simple as possible so that it can be useful to a large surface
+  of use cases remaining easily extensible.
 email:
 - harold.gimenez@gmail.com
 executables: []
@@ -57,7 +59,7 @@ files:
 - spec/spec_helper.rb
 - spec/valcro_spec.rb
 - valcro.gemspec
-homepage: ''
+homepage: https://github.com/hgimenez/valcro
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -71,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -250877099063039284
+      hash: -54788049467793668
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -80,13 +82,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -250877099063039284
+      hash: -54788049467793668
 requirements: []
 rubyforge_project: valcro
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: The simplest possible validation library for ruby
+summary: The simplest possible validation library for Ruby
 test_files:
 - spec/error_list_spec.rb
 - spec/error_spec.rb