oop 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b1bc5413988e59c81e35971a4009fcee97823f4
-  data.tar.gz: 02f74b58e4a55041fe1bd7054717dc31612e51d7
+  metadata.gz: 1e0d5bf847d6a7863bd8b327808ff4b9524393c1
+  data.tar.gz: 073dd1e1db6b5d6f85879720324e9f06ad8b838c
 SHA512:
-  metadata.gz: 2ee55376633dee2764e593b8ccfecc417d4cd6e34e26e35be9f0ddfe2f98107324abae844aeb8b25b949c0c6ffb06a73f33bfbde1780458ad0a54a8a65d22d5c
-  data.tar.gz: 8eb3b1929b4121af4b74c1a52dd2dce36a30c3af31f96c14f7dfcda94e67cce836bed7c68efb2e57a16f43b7a5cb95d19ff9c588be665605a8eedf9109fcbcae
+  metadata.gz: aa5f6e7b129cc16c6962144dab3ce79194cf63d6de205c30682e72e1ae238d155fe12403d1f94e8a30f3843bddc35554a632fa308989ab4ba029eb6178b6cc07
+  data.tar.gz: 7a53ce080511e3fb5eaf369ae128d1d4cd45606449f17575823243234d90d494b1433c92f2643acb97e5c92063eebf606cfe3b2ec2d0f2019409e3827b11ddf5

data/lib/oop/tools.rb

@@ -10,13 +10,30 @@ module OOP
         end
       end
       def konstructor(*parts, &block)
-        parts = parts.first if parts.first.is_a?(Hash)
+        parts_hsh = if parts.last.is_a?(Hash)
+          *parts, hsh = parts
+          parts += hsh.keys
+          parts.reduce({}){|m,e| m[e] = nil; m}.merge(hsh)
+        else
+          parts.reduce({}){|m,e| m[e] = nil; m}
+        end
         define_method(:initialize) do |opts|
           if block
             opts = block.call(opts) || raise("#{self} invalid with #{opts}")
           end
 
+          opts = opts.map{|k,v| [k.to_sym, v] }.to_h
           @opts = {}
+          extra_args = (opts.keys - parts)
+          missing_args = parts.select do |k|
+            !opts.has_key?(k) && !parts_hsh.has_key?(k)
+          end
+          if extra_args.any?
+            raise "extra args: #{extra_args}"
+          elsif missing_args.any?
+            raise "missing args: #{missing_args}"
+          end
+
           opts.each do |k, v|
             k = k.to_sym
             if self.is_a? Value
@@ -27,7 +44,7 @@ module OOP
           end
           @opts
         end
-        parts.each do |part, defaultt|
+        parts_hsh.each do |part, defaultt|
           part = part.to_sym
           define_method(part) do
             @opts[part] ||= defaultt

data/lib/oop/version.rb

@@ -1,3 +1,3 @@
 module OOP
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oop
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Serguei Filimonov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler