lego 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f79015b4662b0c8d1e004410950275e887cab739
+  data.tar.gz: 18d9a62cc10a1de37489bd00d660141063728dfe
+SHA512:
+  metadata.gz: 2b27fb559b3c0640acd2af7327205b373618b238dc112cc77e4b8a9fd1a2b24da5c849aca075ed83bbc6b4dd50c256784d11c7b0d3cc4a20d5bcade73a2952bb
+  data.tar.gz: 451fccb9ad32d000e22a01ff8f7e0aa9678660dabdd0f65507efbb9d9275a30d702c9a968316c97a31fb0242aaea3a99be944552418b24dc7148361a106b26ac

data/lego.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "lego"
   gem.require_paths = ["lib"]
-  gem.version       = '0.0.5'
+  gem.version       = '0.0.6'
 
   gem.add_dependency 'activesupport'
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rspec", '~> 2.14.1'
 end

data/lib/lego/value/array.rb

@@ -18,15 +18,23 @@ module Lego::Value
     private
 
     def parse_items(items)
+      errors = []
+
       items = items.map do |item|
         new_item = @_item_parser.parse(item)
         if new_item.value?
+          errors << nil
           new_item.value
         else
-          return new_item
+          errors << new_item.error
         end
       end
-      Lego.just(items)
+
+      if errors.compact.empty?
+        Lego.just(items)
+      else
+        Lego.fail(errors)
+      end
     end
 
     def check_length?

data/lib/lego/value/set.rb

@@ -19,16 +19,24 @@ module Lego::Value
     private
 
     def parse_items(set)
+      errors = []
+
       new_set = ::Set.new
       set.each do |item|
         new_item = @_item_parser.parse(item)
         if new_item.value?
+          errors << nil
           new_set << new_item.value
         else
-          return new_item
+          errors << new_item.error
         end
       end
-      Lego.just(new_set)
+
+      if errors.compact.empty?
+        Lego.just(new_set)
+      else
+        Lego.fail(errors)
+      end
     end
 
     def allow_empty?

data/lib/lego/value/string.rb

@@ -6,7 +6,8 @@ module Lego::Value
        ->(v) { v.respond_to?(:to_str) ? Lego.just(v.to_str) : Lego.fail("invalid string: '#{v}'") },
        ->(v) { strip? ? Lego.just(v.strip) : Lego.just(v) },
        ->(v) { (not allow_blank? and v.blank?) ? Lego.none : Lego.just(v) },
-       ->(v) { check_regexp? ? assert_regexp(v) : Lego.just(v) }
+       ->(v) { check_regexp? ? assert_regexp(v) : Lego.just(v) },
+       ->(v) { whitelist? ? assert_whitelist(v) : Lego.just(v) }
       ]
     end
 
@@ -18,6 +19,10 @@ module Lego::Value
       @opts.fetch(:strip, true)
     end
 
+    def whitelist?
+      !!@opts.fetch(:allow, false)
+    end
+
     private
 
     def check_regexp?
@@ -33,5 +38,14 @@ module Lego::Value
       end
     end
 
+    def assert_whitelist(v)
+      whitelist = Array(@opts.fetch(:allow))
+      if whitelist.include?(v)
+        Lego.just(v)
+      else
+        Lego.fail("not allowed: '#{v}'")
+      end
+    end
+
   end
 end

data/spec/lego/model_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'date'
+require 'set'
 
 describe Lego::Model do
 
@@ -196,6 +197,39 @@ describe Lego::Model do
       klass.parse(start: today.to_s, stop: (today + 2).to_s).should be_error(start: 'at least 3 days after')
       klass.parse(start: today.to_s, stop: (today + 3).to_s).should be_value
     end
+
+    it 'validates custom requirements for groups' do
+      klass = Class.new(Lego::Model) do
+        attribute :people, Array, Person
+
+        validates :people, :check_unique_names
+
+        def check_unique_names
+          names, errors = Set.new, []
+
+          people.map do |person|
+            if names.include?(person.name)
+              errors << {name: 'must be unique'}
+            else
+              names << person.name
+              errors << nil
+            end
+          end
+
+          if errors.compact.empty?
+            Lego.just(self)
+          else
+            Lego.fail(errors)
+          end
+        end
+      end
+
+      alice  = Person.coerce(name: 'Alice', age: '10')
+      alice2 = Person.coerce(name: 'Alice', age: '50')
+      bob    = Person.coerce(name: 'Bob', age: '50')
+      klass.parse(people: [alice, alice2]).should be_error(people: [nil, {name: 'must be unique'}])
+      klass.parse(people: [alice, bob]).should be_value
+    end
   end
 
   it 'correctly handles array values' do

data/spec/lego/value/array_spec.rb

@@ -13,7 +13,7 @@ describe Lego::Value::Array do
     context 'invalid array or item' do
       specify { subject.parse('').should be_error("invalid array: ''") }
       specify { subject.parse('2012-02').should be_error("invalid array: '2012-02'") }
-      specify { subject.parse(['one', 123, 'two']).should be_error("invalid string: '123'") }
+      specify { subject.parse(['one', 123, 'two']).should be_error([nil, "invalid string: '123'", nil]) }
     end
 
     it 'parses array' do
@@ -63,7 +63,7 @@ describe Lego::Value::Array do
 
     context 'failure' do
       it 'raises error' do
-        expect{ subject.coerce([123]) }.to raise_error(Lego::CoerceError, "invalid string: '123'")
+        expect{ subject.coerce([123]) }.to raise_error(Lego::CoerceError, ["invalid string: '123'"].inspect)
       end
     end
 

data/spec/lego/value/set_spec.rb

@@ -16,7 +16,7 @@ describe Lego::Value::Set do
     context 'invalid set or item' do
       specify { subject.parse('').should be_error("invalid set: ''") }
       specify { subject.parse('2012-02').should be_error("invalid set: '2012-02'") }
-      specify { subject.parse(['one', 123, 'two']).should be_error("invalid string: '123'") }
+      specify { subject.parse(['one', 123, 'two']).should be_error([nil, "invalid string: '123'", nil]) }
     end
 
     it 'parses array' do
@@ -65,7 +65,7 @@ describe Lego::Value::Set do
 
     context 'failure' do
       it 'raises error' do
-        expect{ subject.coerce([123]) }.to raise_error(Lego::CoerceError, "invalid string: '123'")
+        expect{ subject.coerce([123]) }.to raise_error(Lego::CoerceError, ["invalid string: '123'"].inspect)
       end
     end
 

data/spec/lego/value/string_spec.rb

@@ -74,6 +74,17 @@ describe Lego::Value::String do
       its(:allow_blank?){ should == false }
       its(:strip?){ should == true }
     end
+
+    context 'allow' do
+      subject { Lego::Value::String.new(allow: %w{mon tue wed thu fri sat sun}) }
+
+      specify { subject.parse('mon').should be_just('mon') }
+      specify { subject.parse('sat').should be_just('sat') }
+
+      specify { subject.parse('Mon').should be_error("not allowed: 'Mon'") }
+      specify { subject.parse('foo').should be_error("not allowed: 'foo'") }
+    end
+
   end
 
 

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: lego
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Norbert Wojtowicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
 description: Data building blocks for you app.
 email:
 - wojtowicz.norbert@gmail.com
@@ -66,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Guardfile
 - LICENSE
@@ -101,33 +94,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/pithyless/lego
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3624199644753223561
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3624199644753223561
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Data building blocks for you app.
 test_files:
 - spec/lego/either/fail_spec.rb