lego 0.0.3 → 0.0.4

data/lego.gemspec

@@ -12,7 +12,7 @@ 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.3'
+  gem.version       = '0.0.4'
 
   gem.add_dependency 'activesupport'
 

data/lib/lego.rb

@@ -8,15 +8,15 @@ module Lego
   require_relative 'lego/model'
 
   def self.value_parser(item, *args)
-    if item.is_a?(Symbol)
-      Lego::Value.const_get(item.to_s.camelize, false).new(*args)
+    if (Lego::Value.const_defined?(item.to_s, false) rescue false)
+      Lego::Value.const_get(item.to_s, false).new(*args)
     elsif item.respond_to?(:coerce)
       item
     else
-      fail NameError
+      raise NameError
     end
   rescue NameError
-    fail NameError, "Unknown Lego::Value parser: #{item.to_s.camelize}"
+    raise NameError, "Unknown Lego::Value parser: #{item.to_s}"
   end
 
 end

data/lib/lego/model.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/deep_merge'
+
 module Lego
   class Model
     class << self
@@ -16,9 +18,12 @@ module Lego
     end
 
     def initialize(attrs={})
+      fail ArgumentError, "attrs must be hash: '#{attrs.inspect}'" unless attrs.respond_to?(:key?)
+      attrs = attrs.dup
       @attributes = {}.tap do |h|
         self.class.parsers.each do |name, parser|
-          value = attrs.delete(name)
+          name = name.to_sym
+          value = attrs.key?(name) ? attrs.delete(name) : attrs.delete(name.to_s)
           begin
             h[name] = parser.coerce(value)
           rescue Lego::CoerceError => e
@@ -31,6 +36,10 @@ module Lego
 
     attr_reader :attributes
 
+    def merge(other)
+      self.class.new(as_json.deep_merge(other))
+    end
+
     def method_missing(name, *args, &block)
       attributes.fetch(name.to_sym) { super }
     end
@@ -58,7 +67,8 @@ module Lego
 
     # Serialize
 
-    def as_json
+    def as_json(opts={})
+      raise NotImplementedError, 'as_json with arguments' unless opts.empty?
       {}.tap do |h|
         attributes.each do |attr, val|
           h[attr] = val.as_json

data/lib/lego/value.rb

@@ -8,6 +8,7 @@ end
 
 require_relative 'value/base'
 require_relative 'value/set'
+require_relative 'value/array'
 require_relative 'value/string'
 require_relative 'value/date'
 require_relative 'value/integer'

data/lib/lego/value/array.rb

@@ -0,0 +1,50 @@
+module Lego::Value
+  class Array < Base
+
+    def initialize(type, opts={})
+      @_item_parser = Lego.value_parser(type)
+      super(opts)
+    end
+
+    def parsers
+      [
+       ->(v) { v.respond_to?(:to_ary) ? Lego.just(v.to_ary) : Lego.fail("invalid array: '#{v}'") },
+       ->(v) { check_length? ? enforce_length(v) : Lego.just(v) },
+       ->(v) { parse_items(v) },
+       ->(v) { (not allow_empty? and v.empty?) ? Lego.none : Lego.just(v) }
+      ]
+    end
+
+    private
+
+    def parse_items(items)
+      items = items.map do |item|
+        new_item = @_item_parser.parse(item)
+        if new_item.value?
+          new_item.value
+        else
+          return new_item
+        end
+      end
+      Lego.just(items)
+    end
+
+    def check_length?
+      @opts.key?(:length)
+    end
+
+    def allow_empty?
+      @opts.fetch(:allow_empty, false)
+    end
+
+    def enforce_length(items)
+      length = @opts.fetch(:length).to_i
+      if items.length == length
+        Lego.just(items)
+      else
+        Lego.fail("length not #{length}: '#{items}'")
+      end
+    end
+
+  end
+end

data/lib/lego/value/string.rb

@@ -6,6 +6,7 @@ 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) }
       ]
     end
 
@@ -16,5 +17,21 @@ module Lego::Value
     def strip?
       @opts.fetch(:strip, true)
     end
+
+    private
+
+    def check_regexp?
+      @opts.key?(:matches)
+    end
+
+    def assert_regexp(v)
+      regex = @opts.fetch(:matches)
+      if regex =~ v
+        Lego.just(v)
+      else
+        Lego.fail("does not match (#{regex.inspect}): '#{v}'")
+      end
+    end
+
   end
 end

data/spec/lego/model_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 describe Lego::Model do
 
   class Person < Lego::Model
-    attribute :name, :string
-    attribute :age,  :integer
+    attribute :name, String
+    attribute :age,  Integer
   end
 
   class Family < Lego::Model
-    attribute :last_name, :string
+    attribute :last_name, String
     attribute :father, Person
   end
 
@@ -37,6 +37,16 @@ describe Lego::Model do
       expect{ Person.new(name: 'Alice') }.to raise_error(ArgumentError, ":age => missing value")
       expect{ Person.new(name: 'Alice', age: Date.today) }.to raise_error(ArgumentError, /invalid integer/)
     end
+
+    it 'fails on non-hash initialize' do
+      expect{ Person.new(nil) }.to raise_error(ArgumentError, "attrs must be hash: 'nil'")
+    end
+
+    it 'dupes attributes' do
+      h = { name: 'Alice', age: 10 }
+      Person.new(h)
+      h.should == { name: 'Alice', age: 10 }
+    end
   end
 
   context 'equality' do
@@ -73,6 +83,13 @@ describe Lego::Model do
       family.last_name.should == 'Kowalski'
       family.father.should == Person.new(name: 'Bob', age: '55')
     end
+
+    it 'initializes from string keys' do
+      family = Family.new('last_name' => 'Kowalski', 'father' => Person.new('name' => 'Bob', 'age' => '55'))
+      family.should be_instance_of(Family)
+      family.last_name.should == 'Kowalski'
+      family.father.should == Person.new(name: 'Bob', age: '55')
+    end
   end
 
 
@@ -87,7 +104,23 @@ describe Lego::Model do
         }
       }
     end
+  end
 
+  describe '#merge' do
+    let(:one) { Family.new(last_name: 'Kowalski', father: { name: 'Bob', age: '55' }) }
+
+    it 'returns new object' do
+      two = one.merge({})
+      two.should == one
+      two.should_not equal(one)
+    end
+
+    it 'merges changes' do
+      two = one.merge(last_name: 'Tesla', father: { name: 'Nikola' })
+
+      one.should == Family.new(last_name: 'Kowalski', father: { name: 'Bob', age: '55' })
+      two.should == Family.new(last_name: 'Tesla', father: { name: 'Nikola', age: '55' })
+    end
   end
 
 end

data/spec/lego/value/array_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe Lego::Value::Array do
+
+  subject { Lego::Value::Array.new(String) }
+
+  describe '#parse' do
+    context 'nil' do
+      specify { subject.parse(nil).should be_nothing }
+    end
+
+    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'") }
+    end
+
+    it 'parses array' do
+      subject.parse(['one']).should be_just(['one'])
+    end
+
+    context 'allow empty' do
+      subject { Lego::Value::Array.new(String, allow_empty: true) }
+      specify { subject.parse([]).should be_just([]) }
+    end
+
+    context 'disallow empty' do
+      subject { Lego::Value::Array.new(String, allow_empty: false) }
+      specify { subject.parse([]).should be_nothing }
+    end
+
+    context 'check length' do
+      subject { Lego::Value::Array.new(Integer, length: 2) }
+      specify { subject.parse([]).should be_error("length not 2: '[]'") }
+      specify { subject.parse([1]).should be_error("length not 2: '[1]'") }
+      specify { subject.parse([1, 2, 3]).should be_error("length not 2: '[1, 2, 3]'") }
+      specify { subject.parse([42, 24]).should be_just([42, 24]) }
+    end
+  end
+
+  describe '#coerce' do
+    context 'missing' do
+      it 'raises error' do
+        expect{ subject.coerce(nil) }.to raise_error(Lego::CoerceError, 'missing value')
+        expect{ subject.coerce([]) }.to raise_error(Lego::CoerceError, 'missing value')
+      end
+
+      context 'with :default handler' do
+        subject { Lego::Value::Array.new(String, default: handler) }
+
+        context 'nil handler' do
+          let(:handler) { ->{ nil } }
+          specify { subject.coerce(nil).should be_nil }
+        end
+
+        context 'lambda handler' do
+          let(:handler) { proc{ ['default'] } }
+          specify { subject.coerce(nil).should == ['default'] }
+        end
+      end
+    end
+
+    context 'failure' do
+      it 'raises error' do
+        expect{ subject.coerce([123]) }.to raise_error(Lego::CoerceError, "invalid string: '123'")
+      end
+    end
+
+    context 'success' do
+      it 'returns array' do
+        subject.coerce(['foo']).should == ['foo']
+      end
+    end
+  end
+
+end

data/spec/lego/value/set_spec.rb

@@ -6,7 +6,7 @@ describe Lego::Value::Set do
     Array(elem).to_set
   end
 
-  subject { Lego::Value::Set.new(:string) }
+  subject { Lego::Value::Set.new(String) }
 
   describe '#parse' do
     context 'nil' do
@@ -28,12 +28,12 @@ describe Lego::Value::Set do
     end
 
     context 'allow empty' do
-      subject { Lego::Value::Set.new(:string, allow_empty: true) }
+      subject { Lego::Value::Set.new(String, allow_empty: true) }
       specify { subject.parse([]).should be_just(set([])) }
     end
 
     context 'disallow empty' do
-      subject { Lego::Value::Set.new(:string, allow_empty: false) }
+      subject { Lego::Value::Set.new(String, allow_empty: false) }
       specify { subject.parse([]).should be_nothing }
     end
   end
@@ -47,7 +47,7 @@ describe Lego::Value::Set do
       end
 
       context 'with :default handler' do
-        subject { Lego::Value::String.new(default: handler) }
+        subject { Lego::Value::Set.new(String, default: handler) }
 
         context 'nil handler' do
           let(:handler) { ->{ nil } }
@@ -56,7 +56,7 @@ describe Lego::Value::Set do
 
         context 'lambda handler' do
           let(:handler) { proc{ Set.new } }
-          specify { subject.coerce('').should == [].to_set }
+          specify { subject.coerce(nil).should == [].to_set }
         end
       end
     end

data/spec/lego/value/string_spec.rb

@@ -57,6 +57,16 @@ describe Lego::Value::String do
       end
     end
 
+    context 'matches' do
+      subject { Lego::Value::String.new(opts.merge(matches: /^[A-Z]{3}$/)) }
+
+      specify { subject.parse(nil).should be_nothing }
+      specify { subject.parse(123).should be_error("invalid string: '123'") }
+
+      specify { subject.parse('abc').should be_error("does not match (/^[A-Z]{3}$/): 'abc'") }
+      specify { subject.parse('TLC').should be_just('TLC') }
+    end
+
     context 'defaults' do
       subject { Lego::Value::String.new }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lego
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -78,6 +78,7 @@ files:
 - lib/lego/either.rb
 - lib/lego/model.rb
 - lib/lego/value.rb
+- lib/lego/value/array.rb
 - lib/lego/value/base.rb
 - lib/lego/value/boolean.rb
 - lib/lego/value/date.rb
@@ -89,6 +90,7 @@ files:
 - spec/lego/either/just_spec.rb
 - spec/lego/either/none_spec.rb
 - spec/lego/model_spec.rb
+- spec/lego/value/array_spec.rb
 - spec/lego/value/base_spec.rb
 - spec/lego/value/boolean_spec.rb
 - spec/lego/value/date_spec.rb
@@ -111,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 179225649257381862
+      hash: 3608539237903599197
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 179225649257381862
+      hash: 3608539237903599197
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -132,6 +134,7 @@ test_files:
 - spec/lego/either/just_spec.rb
 - spec/lego/either/none_spec.rb
 - spec/lego/model_spec.rb
+- spec/lego/value/array_spec.rb
 - spec/lego/value/base_spec.rb
 - spec/lego/value/boolean_spec.rb
 - spec/lego/value/date_spec.rb