typed 0.2.9 → 0.3.0

data/lib/typed/scala/accessors.rb

@@ -29,6 +29,15 @@ module Typed
           raise Typed::NotDefined, "#{key} is not a member of #{self.class}"
         end
       end
+
+      def ==(other)
+        return false unless other.is_a?(self.class)
+        return __attrs__ == other.__attrs__
+      end
+
+      def to_s
+        __attrs__.inspect
+      end
     end
   end
 end

data/lib/typed/scala/builder.rb

@@ -1,16 +1,33 @@
 module Typed
   module Scala
 
-    ######################################################################
-    ### Builder
     module Builder
+      ######################################################################
+      ### Build instances
+
+      # check hash except arg size. (valid: return hash, invalid: raised)
       def check(hash)
         build(hash)
         return hash
       end
 
-      # Build instance from hash
+      # check hash strictly. (valid: return hash, invalid: raised)
+      def check!(hash)
+        build!(hash)
+        return hash
+      end
+
+      # Build instance from hash (check only types)
       def build(hash)
+        obj = new
+        hash.each_pair do |k,v|
+          obj[k] = v if variables[k]
+        end
+        return obj
+      end
+
+      # Build instance from hash strictly. (check both arg size and types)
+      def build!(hash)
         hash.must(::Hash) { raise ArgumentError, "#{self} expects Hash, but got #{hash.class}" }
 
         if hash.size != variables.size
@@ -23,6 +40,7 @@ module Typed
           raise Typed::SizeMismatch, msg
         end
 
+        # 'build' just ignore unknown fields, but 'build!' raise errors
         obj = new
         hash.each_pair do |k,v|
           obj[k] = v
@@ -30,12 +48,8 @@ module Typed
         return obj
       end
 
-      # Build instance from array
+      # Build instance from array. (check only types)
       def apply(*args)
-        if args.size > variables.size
-          raise Typed::SizeMismatch, "#{self}.apply expects #{variables.size} args, but got #{args.size}"
-        end
-
         obj = new
         variables.each_key do |name|
           val = args.shift or next
@@ -44,7 +58,7 @@ module Typed
         return obj
       end
 
-      # Build instance from array strictly. Raised when args size is differ.
+      # Build instance from array strictly. (check both arg size and types)
       def apply!(*args)
         if args.size != variables.size
           raise Typed::SizeMismatch, "#{self} expects #{variables.size} args, but got #{args.size}"
@@ -56,6 +70,29 @@ module Typed
         end
         return obj
       end
+
+      ######################################################################
+      ### Extract attrs
+
+      def attrs(obj)
+        obj.must(self).__attrs__
+      end
+
+      def unbuild(obj)
+        raise NotImplementedError
+      end
+
+      def unbuild!(obj)
+        raise NotImplementedError
+      end
+
+      def unapply(obj)
+        raise NotImplementedError
+      end
+
+      def unapply!(obj)
+        raise NotImplementedError
+      end
     end
 
   end

data/lib/typed/version.rb

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

data/spec/scala/attrs_spec.rb

@@ -26,9 +26,9 @@ describe Typed::Scala do
       end
     end
 
-    describe ".build" do
+    describe ".build!" do
       context '(:key=>"x", :attrs=>{:a=>1})' do
-        subject { A.build(:key=>"x", :attrs=>{:a=>1}) }
+        subject { A.build!(:key=>"x", :attrs=>{:a=>1}) }
         its(:key)   { should == "x" }
         its(:attrs) { should == {:a=>1} }
       end

data/spec/scala/build_spec.rb

@@ -25,97 +25,132 @@ describe Typed::Scala do
     its(:vars) { should be_kind_of ActiveSupport::OrderedHash }
     its(:vars) { should == { "name" => String, "age" => Fixnum } }
 
-    describe ".apply" do
-      specify "less args" do
-        user = User.apply("001", "aya")
-        user.key .should == "001"
-        user.name.should == "aya"
-        lambda { user.age}.should raise_error(Typed::NotDefined)
+    def check  ; User.check(input)   ; end
+    def check! ; User.check!(input)  ; end
+    def build  ; User.build(input)   ; end
+    def build! ; User.build!(input)  ; end
+    def apply  ; User.apply(*input)  ; end
+    def apply! ; User.apply!(*input) ; end
+
+    ######################################################################
+    ### apply(array)
+
+    describe "from array" do
+      let(:input) { ["001", "aya", 12] }
+      subject { apply }
+
+      its(:key ) { should == "001" }
+      its(:name) { should == "aya" }
+      its(:age ) { should == 12    }
+
+      context "(complete)" do
+        specify do
+          expect( apply  ).to be_a_kind_of(User)
+          expect( apply! ).to be_a_kind_of(User)
+        end
       end
 
-      specify "exact args" do
-        user = User.apply("001", "aya", 12)
-        user.key .should == "001"
-        user.name.should == "aya"
-        user.age .should == 12
+      context "(less)" do
+        before { input.pop }
+        specify do
+          expect( apply  ).to be_a_kind_of(User)
+          expect{ apply! }.to raise_error(Typed::SizeMismatch)
+        end
       end
 
-      specify "more args" do
-        lambda { User.apply("001", "aya", 12, "!") }.should raise_error(/expects 3 args/)
+      context "(more)" do
+        before { input << "!!!" }
+        specify do
+          expect( apply  ).to be_a_kind_of(User)
+          expect{ apply! }.to raise_error(Typed::SizeMismatch)
+        end
       end
     end
 
+    # use case
     describe ".apply!" do
-      specify "less args" do
-        lambda { User.apply!("001", "aya") }.should raise_error(/expects 3 args/)
-      end
-
-      specify "exact args" do
-        user = User.apply!("001", "aya", 12)
-        user.key .should == "001"
-        user.name.should == "aya"
-        user.age .should == 12
-      end
+      subject { User.apply!("turi", "aya", 12) }
 
-      specify "more args" do
-          lambda { User.apply!("001", "aya", 12, "!") }.should raise_error(/expects 3 args/)
-      end
+      its(:key ) { should == "turi" }
+      its(:name) { should == "aya" }
+      its(:age ) { should == 12 }
     end
 
-    describe ".check" do
-      before  { @hash = {:key=>"turi", :name=>"aya", :age=>12 } }
-      subject { User.check(@hash) }
+    ######################################################################
+    ### build(hash)
+
+    context "(complete hash)" do
+      let(:input) { {:key=>"turi", :name=>"aya", :age=>12 } }
 
-      specify "(valid hash) return given hash itself" do
-        expect( subject ).to eq @hash
+      specify do
+        expect( check  ).to eq(input)
+        expect( check! ).to eq(input)
+        expect( build  ).to be_a_kind_of(User)
+        expect( build! ).to be_a_kind_of(User)
       end
+    end
 
-      specify "(invalid hash) raise errors" do
-        @hash.clear
-        expect { subject }.to raise_error(Typed::SizeMismatch)
+    context "(less hash)" do
+      let(:input) { {:name => "aya"} }
+
+      specify do
+        expect( check  ).to eq(input)
+        expect{ check! }.to raise_error(Typed::SizeMismatch)
+        expect( build  ).to be_a_kind_of(User)
+        expect{ build! }.to raise_error(Typed::SizeMismatch)
       end
     end
 
+    context "(more hash)" do
+      let(:input) { {:key=>"turi", :name=>"aya", :age=>12, :state=>true } }
 
-    describe ".build" do
-      specify "(no args) raise ArgumentError" do
-        expect { User.build }.to raise_error(ArgumentError)
+      specify do
+        expect( check  ).to eq(input)
+        expect{ check! }.to raise_error(Typed::SizeMismatch)
+        expect( build  ).to be_a_kind_of(User)
+        expect{ build! }.to raise_error(Typed::SizeMismatch)
       end
+    end
 
-      specify "(non hash args) raise ArgumentError" do
-        expect { User.build([]) }.to raise_error(ArgumentError)
+    context "(no args)" do
+      specify do
+        expect{ User.check  }.to raise_error(ArgumentError)
+        expect{ User.check! }.to raise_error(ArgumentError)
+        expect{ User.build  }.to raise_error(ArgumentError)
+        expect{ User.build! }.to raise_error(ArgumentError)
       end
+    end
 
-      context "(hash)" do
-        before  { @hash = {:key=>"turi", :name=>"aya", :age=>12 } }
-        subject { User.build(@hash) }
+    # use case
+    describe ".build!" 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 }
+      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 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 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 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
+      specify "when type mismatch, raise TypeError" do
+        @hash[:age] = "!"
+        expect { subject }.to raise_error(TypeError)
       end
     end
   end

data/spec/scala/core_spec.rb

@@ -65,9 +65,10 @@ describe Typed::Scala do
       it { should respond_to(:map) }
     end
 
-    describe "#__attrs__" do
-      subject { User.apply!("001", "aya", 12).__attrs__ }
+    describe "attributes" do
+      subject { User.attrs(User.apply!("001", "aya", 12)) }
 
+      its(:class ) { should == Hash }
       its(:size  ) { should == 3 }
       its(:keys  ) { should == %w( key name age ) }
       its(:values) { should == ["001", "aya", 12] }

data/spec/scala/equal_spec.rb

@@ -0,0 +1,50 @@
+require "spec_helper"
+
+describe Typed::Scala do
+  include_context "scala_source"
+
+  ######################################################################
+  ### Basic usage
+
+  describe "Kvs" do
+    before { scala_source("Kvs", <<-EOF)
+      class Kvs
+        include Typed::Scala
+
+        val key = String
+        var val = String
+      end
+      EOF
+    }
+
+    describe "#==" do
+      context "(different class)" do
+        specify do
+          Kvs.new.should_not == Kvs
+          Kvs.new.should_not == {}
+          Kvs.new.should_not == []
+        end
+      end
+
+      context "(blank)" do
+        specify do
+          Kvs.new.should == Kvs.new
+        end
+      end
+      
+      context "(full data)" do
+        specify do
+          Kvs.apply("x", "1").should     == Kvs.apply("x", "1")
+          Kvs.apply("x", "1").should_not == Kvs.apply("x", "2")
+        end
+      end
+
+      context "less data" do
+        specify do
+          Kvs.apply("x", "1").should_not == Kvs.apply("x")
+          Kvs.apply("x", "1").should_not == Kvs.new
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typed
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -93,6 +93,7 @@ files:
 - spec/scala/attrs_spec.rb
 - spec/scala/build_spec.rb
 - spec/scala/core_spec.rb
+- spec/scala/equal_spec.rb
 - spec/scala/inherit_spec.rb
 - spec/scala/modifier_spec.rb
 - spec/scala/todo_spec.rb