typed 0.2.8 → 0.2.9

data/lib/typed.rb

@@ -4,8 +4,11 @@ require "typed/version"
 require "typed/hash"
 
 module Typed
-  NotDefined = Class.new(RuntimeError)
-  FixedValue = Class.new(RuntimeError)
+  Boolean = Must::Boolean
+
+  NotDefined   = Class.new(RuntimeError)
+  FixedValue   = Class.new(RuntimeError)
+  SizeMismatch = Class.new(RuntimeError)
 
   autoload :Schema , "typed/schema"
   autoload :Default, "typed/default"

data/lib/typed/scala/accessors.rb

@@ -15,19 +15,16 @@ module Typed
       end
 
       def [](key)
-        if __attrs__.schema.exist?(key)
-          __attrs__[key.to_s]
+        if self.class.variables[key.to_s]
+          self.__send__(key)
         else
           raise Typed::NotDefined, "#{key} is not a member of #{self.class}"
         end
       end
 
       def []=(key, val)
-        if __attrs__.schema.exist?(key)
-          if self.class.vals[key.to_s] and __attrs__.exist?(key)
-            raise Typed::FixedValue, "reassignment to #{key}"
-          end
-          __attrs__[key.to_s] = val
+        if self.class.variables[key.to_s]
+          self.__send__("#{key}=", val)
         else
           raise Typed::NotDefined, "#{key} is not a member of #{self.class}"
         end

data/lib/typed/scala/builder.rb

@@ -4,8 +4,25 @@ module Typed
     ######################################################################
     ### Builder
     module Builder
+      def check(hash)
+        build(hash)
+        return hash
+      end
+
       # Build instance from hash
-      def build(hash = {})
+      def build(hash)
+        hash.must(::Hash) { raise ArgumentError, "#{self} expects Hash, but got #{hash.class}" }
+
+        if hash.size != variables.size
+          keys1 = variables.keys
+          keys2 = hash.keys.map(&:to_s)
+          minus = (keys1 - keys2).map{|i| "-#{i}"}
+          plus  = (keys2 - keys1).map{|i| "+#{i}"}
+          
+          msg = "#{self} expects #{variables.size}, but got #{hash.size} (%s)" % (minus + plus).join(",")
+          raise Typed::SizeMismatch, msg
+        end
+
         obj = new
         hash.each_pair do |k,v|
           obj[k] = v
@@ -16,7 +33,7 @@ module Typed
       # Build instance from array
       def apply(*args)
         if args.size > variables.size
-          raise "#{self}.apply expect #{variables.size} args, but got #{args.size}"
+          raise Typed::SizeMismatch, "#{self}.apply expects #{variables.size} args, but got #{args.size}"
         end
 
         obj = new
@@ -30,7 +47,7 @@ module Typed
       # Build instance from array strictly. Raised when args size is differ.
       def apply!(*args)
         if args.size != variables.size
-          raise "#{self}.apply expect #{variables.size} args, but got #{args.size}"
+          raise Typed::SizeMismatch, "#{self} expects #{variables.size} args, but got #{args.size}"
         end
 
         obj = new

data/lib/typed/scala/variables.rb

@@ -10,7 +10,7 @@ module Typed
 
       def apply(klass, type, caller, obj)
         dcl = parse(klass, type, caller)
-        dcl.value = obj
+        dcl.value = (obj == Typed::Hash) ? ::Hash : obj
 
         define_schema(dcl)
         define_method(dcl)
@@ -25,14 +25,26 @@ module Typed
       end
 
       def define_method(dcl)
-        name = dcl.name
+        name  = dcl.name
+        klass = dcl.klass
+        typed = [dcl.value].flatten.map{|k| (k == ::Hash) ? '::Hash' : k.to_s}.join(', ')
+
         dcl.klass.class_eval <<-STR, __FILE__, __LINE__ + 1
           def #{name}
-            self['#{name}']
+            k = '#{name}'
+            h = __attrs__
+            raise Typed::NotDefined, "'#{name}' is not initialized" unless h.key?(k)
+            return h[k]
           end
 
           def #{name}=(v)
-            self['#{name}'] = v
+            k = '#{name}'
+            h = __attrs__
+            if self.class.vals[k] and h.key?(k)
+              raise Typed::FixedValue, "reassignment to %s" % k
+            end
+            v.must(#{typed}) { raise TypeError, '#{klass}##{name}= expected #{typed} but got %s' % [v.class] }
+            h[k] = v
           end
         STR
       end
@@ -60,10 +72,7 @@ module Typed
       end
 
       def build_attrs(klass)
-        attrs = Typed::Hash.new
-        klass.vals.each_pair{|name, obj| attrs[name] = obj}
-        klass.vars.each_pair{|name, obj| attrs[name] = obj}
-        return attrs
+        return {}
       end
 
       def build(klass)

data/lib/typed/version.rb

@@ -1,3 +1,3 @@
 module Typed
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/spec/scala/attrs_spec.rb

@@ -27,12 +27,6 @@ describe Typed::Scala do
     end
 
     describe ".build" do
-      context "()" do
-        subject { A.build }
-        specify { lambda { subject.key   }.should raise_error(Typed::NotDefined) }
-        specify { lambda { subject.attrs }.should raise_error(Typed::NotDefined) }
-      end
-
       context '(:key=>"x", :attrs=>{:a=>1})' do
         subject { A.build(:key=>"x", :attrs=>{:a=>1}) }
         its(:key)   { should == "x" }

data/spec/scala/build_spec.rb

@@ -41,13 +41,13 @@ describe Typed::Scala do
       end
 
       specify "more args" do
-        lambda { User.apply("001", "aya", 12, "!") }.should raise_error(/expect 3 args/)
+        lambda { User.apply("001", "aya", 12, "!") }.should raise_error(/expects 3 args/)
       end
     end
 
     describe ".apply!" do
       specify "less args" do
-        lambda { User.apply!("001", "aya") }.should raise_error(/expect 3 args/)
+        lambda { User.apply!("001", "aya") }.should raise_error(/expects 3 args/)
       end
 
       specify "exact args" do
@@ -58,29 +58,64 @@ describe Typed::Scala do
       end
 
       specify "more args" do
-          lambda { User.apply!("001", "aya", 12, "!") }.should raise_error(/expect 3 args/)
+          lambda { User.apply!("001", "aya", 12, "!") }.should raise_error(/expects 3 args/)
       end
     end
 
-    describe ".build" do
-      # "creates a new instance"
-      its(:build) { should be_kind_of User }
+    describe ".check" do
+      before  { @hash = {:key=>"turi", :name=>"aya", :age=>12 } }
+      subject { User.check(@hash) }
 
-      specify "ok" do
-        User.build.should be_kind_of(User)
-        User.build(:name=>"foo").name.should == "foo"
+      specify "(valid hash) return given hash itself" do
+        expect( subject ).to eq @hash
+      end
 
-        user = User.build(:key=>"x", :age=>12)
-        user.key.should == "x"
-        user.age.should == 12
+      specify "(invalid hash) raise errors" do
+        @hash.clear
+        expect { subject }.to raise_error(Typed::SizeMismatch)
+      end
+    end
+
+
+    describe ".build" do
+      specify "(no args) raise ArgumentError" do
+        expect { User.build }.to raise_error(ArgumentError)
       end
 
-      specify "not member" do
-        lambda { User.build(:foo => "!") }.should raise_error(Typed::NotDefined)
+      specify "(non hash args) raise ArgumentError" do
+        expect { User.build([]) }.to raise_error(ArgumentError)
       end
 
-      specify "type error" do
-        lambda { User.build(:age => "!") }.should raise_error(TypeError)
+      context "(hash)" do
+        before  { @hash = {:key=>"turi", :name=>"aya", :age=>12 } }
+        subject { User.build(@hash) }
+
+        its(:key ) { should == "turi" }
+        its(:name) { should == "aya" }
+        its(:age ) { should == 12 }
+
+        specify "when less args, raise Typed::SizeMismatch" do
+          @hash.delete(:age)
+          expect { subject }.to raise_error(Typed::SizeMismatch)
+          expect { subject }.to raise_error(/age/)
+        end
+
+        specify "when more args, raise Typed::SizeMismatch" do
+          @hash[:extra] = 10
+          expect { subject }.to raise_error(Typed::SizeMismatch)
+          expect { subject }.to raise_error(/extra/)
+        end
+
+        specify "when unknown field, raise Typed::NotDefined" do
+          @hash.delete(:age)
+          @hash[:xxx] = 100
+          expect { subject }.to raise_error(Typed::NotDefined)
+        end
+
+        specify "when type mismatch, raise TypeError" do
+          @hash[:age] = "!"
+          expect { subject }.to raise_error(TypeError)
+        end
       end
     end
   end

data/typed.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "activesupport"
-  s.add_dependency "must", ">= 0.2.7"
+  s.add_dependency "must", ">= 0.3.2"
 
   s.add_development_dependency "rspec"
 end

metadata

@@ -1,76 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: typed
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 0.2.9
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 8
-  version: 0.2.8
 platform: ruby
-authors: 
+authors:
 - maiha
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-09-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-10-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: must
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 2
-        - 7
-        version: 0.2.7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: must
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Typed::Hash
-email: 
+email:
 - maiha@wota.jp
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.rdoc
@@ -109,36 +104,26 @@ files:
 - typed.gemspec
 homepage: https://github.com/maiha/typed
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: typed
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Ruby library for Typed variables
 test_files: []
-