striuct 0.4.1 → 0.4.2

data/.travis.yml

@@ -5,13 +5,11 @@ rvm:
   - 1.9.2
   - rbx-19mode
   - jruby-head
-  - jruby-19mode
 
 matrix:
   allow_failures:
     - rvm: rbx-19mode
     - rvm: jruby-head
-    - rvm: jruby-19mode
 
 before_install:
   - gem install bundler

data/.yardopts

@@ -1 +1 @@
---readme README.md --private lib/**/*.rb --exclude attributes|hashdeepdupulicatable - LICENSE
+--readme README.md --private lib/**/*.rb --exclude attributes|hashdeepdupulicatable - MIT-LICENSE

data/README.md

@@ -102,7 +102,7 @@ Requirements
 * Ruby - [1.9.2 or later](http://travis-ci.org/#!/kachick/striuct)
 * [validation](https://github.com/kachick/validation) - 0.0.3
 * [optionalargument](https://github.com/kachick/optionalargument) - 0.0.3
-* [keyvalidatable](https://github.com/kachick/keyvalidatable) - 0.0.3
+* [keyvalidatable](https://github.com/kachick/keyvalidatable) - 0.0.5
 
 Install
 -------
@@ -131,5 +131,5 @@ License
 
 The MIT X11 License  
 Copyright (c) 2011 Kenichi Kamiya  
-See the file LICENSE for further details.
+See MIT-LICENSE for further details.
 

data/lib/striuct/classmethods/constructor.rb

@@ -1,4 +1,5 @@
 require 'keyvalidatable'
+require 'optionalargument'
 
 class Striuct; module ClassMethods
 
@@ -15,8 +16,8 @@ class Striuct; module ClassMethods
   # @return [Striuct]
   def for_pairs(pairs)
     raise TypeError, 'no pairs object' unless pairs.respond_to?(:each_pair)
-
-    pairs.dup.extend(KeyValidatable).validate_keys let: all_members
+    KeyValidatable.validate_array KeyValidatable.keys_for(pairs).map(&:to_sym),
+                                       let: all_members
 
     new.tap {|instance|
       pairs.each_pair do |name, value|
@@ -27,6 +28,12 @@ class Striuct; module ClassMethods
 
   alias_method :[], :for_pairs
 
+  # @return [Class]
+  DEFINE_OptArg = OptionalArgument.define {
+    opt :lock, default: true, condition: BOOLEAN?
+    opt :strict, default: true, condition: BOOLEAN?
+  }
+
   # for build the fixed object
   # @param [Hash] options
   # @option options [Boolean] :lock
@@ -34,26 +41,25 @@ class Striuct; module ClassMethods
   # @yieldparam [Striuct] instance
   # @yieldreturn [Striuct] instance
   # @return [void]
-  def define(options={lock: true, strict: true})
+  def define(options={})
     raise ArgumentError, 'must with block' unless block_given?
-    options.dup.extend(KeyValidatable).validate_keys let: [:lock, :strict]
-    
-    lock, strict = options[:lock], options[:strict]
+    opts = DEFINE_OptArg.parse options
     
     new.tap {|instance|
       yield instance
   
-      unless (yets = autonyms.select{|autonym|! instance.assign?(autonym)}).empty?
+      yets = autonyms.select{|autonym|! instance.assign?(autonym)}
+      unless yets.empty?
         raise "not assigned members are, yet '#{yets.inspect} in #{self}'"
       end
       
-      if strict &&
-        ! (invalids = autonyms.select{|autonym|! instance.valid?(autonym)}).empty?
-
-        raise Validation::InvalidWritingError, "invalids members are, yet '#{invalids.inspect} in #{self}'"
+      invalids = autonyms.select{|autonym|! instance.valid?(autonym)}
+      if opts.strict && !invalids.empty?
+        raise Validation::InvalidWritingError,
+               "invalids members are, yet '#{invalids.inspect} in #{self}'"
       end
 
-      instance.lock_all if lock
+      instance.lock_all if opts.lock
     }
   end
 

data/lib/striuct/classmethods/macro.rb

@@ -4,7 +4,8 @@ class Striuct; module ClassMethods
 
   ANYTHING = ::Validation::Condition::ANYTHING
   
-  ADD_MEMBER_OPTIONS = OptionalArgument.define {
+  # @return [Class]
+  ADD_MEMBER_OptArg = OptionalArgument.define {
     opt :default_value, aliases: [:default]
     opt :default_proc, aliases: [:lazy_default]
     conflict :default_value, :default_proc
@@ -30,7 +31,7 @@ class Striuct; module ClassMethods
     raise "can't modify frozen Class" if frozen?
     raise "already closed to add member in #{self}" if closed?
     
-    options = ADD_MEMBER_OPTIONS.parse options
+    options = ADD_MEMBER_OptArg.parse options
     autonym = autonym.to_sym # First difinition for an autonym
 
     raise ArgumentError, %Q!already exist name "#{autonym}"! if member? autonym

data/striuct.gemspec

@@ -12,13 +12,13 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = 'striuct'
   gem.require_paths = ['lib']
-  gem.version       = '0.4.1'
+  gem.version       = '0.4.2'
 
   gem.required_ruby_version = '>= 1.9.2'
 
   gem.add_runtime_dependency 'validation', '~> 0.0.3'
   gem.add_runtime_dependency 'optionalargument', '~> 0.0.3'
-  gem.add_runtime_dependency 'keyvalidatable', '~> 0.0.3'
+  gem.add_runtime_dependency 'keyvalidatable', '~> 0.0.5'
 
   gem.add_development_dependency 'yard', '~> 0.8'
   gem.add_development_dependency 'rake'

data/test/test_subc-c-constructor.rb

@@ -77,6 +77,10 @@ class Test_Striuct_Subclass_Class_Constructor < Test::Unit::TestCase
     sth = Sth[hoge: 7, foo: 8]
    
     assert_equal [8, nil, 7], sth.values
+
+    sth = Sth['hoge' => 7, 'foo' => 8]
+   
+    assert_equal [8, nil, 7], sth.values
   end
 
   def test_for_pairs_from_struct

data/test/test_version.rb

@@ -6,9 +6,8 @@ class Test_Striuct_Version < Test::Unit::TestCase
     assert_same false, Striuct.const_defined?(:VERSION, false)
   end
 
-  # I want to be this behavior
-  #def test_const_version_of_dependencies
-  #  assert_same false, Striuct.const_defined?(:VERSION, true)
-  #end
+  def test_const_version_of_dependencies
+    assert_same false, Striuct.const_defined?(:VERSION, true)
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: striuct
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: validation
-  requirement: &9580980 !ruby/object:Gem::Requirement
+  requirement: &11390460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *9580980
+  version_requirements: *11390460
 - !ruby/object:Gem::Dependency
   name: optionalargument
-  requirement: &9579740 !ruby/object:Gem::Requirement
+  requirement: &11389980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *9579740
+  version_requirements: *11389980
 - !ruby/object:Gem::Dependency
   name: keyvalidatable
-  requirement: &9578620 !ruby/object:Gem::Requirement
+  requirement: &11389500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *9578620
+  version_requirements: *11389500
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &9169460 !ruby/object:Gem::Requirement
+  requirement: &11389040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *9169460
+  version_requirements: *11389040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9169020 !ruby/object:Gem::Requirement
+  requirement: &11388640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9169020
+  version_requirements: *11388640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9168420 !ruby/object:Gem::Requirement
+  requirement: &11388180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9168420
+  version_requirements: *11388180
 description: ! "Validatable, Inheritable, Member Aliasing,\n  Conflict Management,
   Default Value, Divide nil with unassign,\n  Lock setter of each member, Hash flendly
   API, ... And more Struct++ features :)"
@@ -91,7 +91,7 @@ files:
 - .yardopts
 - Gemfile
 - History.old(~0.3.n).rdoc
-- LICENSE
+- MIT-LICENSE
 - README.md
 - Rakefile
 - benchmark/basics.rb