striuct 0.4.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 746edaaaf527160fde69fb136722ff8861375af7
-  data.tar.gz: 17062017c2bec73985602a5c4069ffec47acc3f6
+  metadata.gz: a30f4e23f85f0d1dfe93361680098c4392fa5310
+  data.tar.gz: eebe3b499e546f79818ff526a526dfd254b79412
 SHA512:
-  metadata.gz: 7c3897a36c553fcc2f760581e7b844cb81256e08b774efc4d81ca7ae6d24a811fbb2431a842acd24cd69bafdc045c58ba3ea46674b089eaf639f5acef7a89482
-  data.tar.gz: 57a64de8a4faa2a740856f770f121f9ade2d924d3a2f99625d2ed3dd369b4f7ddf4a23d8d3e00f2485c9fc82e12dae8038cd37a6df453627c383486a1bd6c6af
+  metadata.gz: b79df0bcae7d599d530193891fafed7831507b09c4b77b4841eb1fdb79c7454928cadcd5585b58582b378e72c7a944cfb0ca8a6b47ee436bf5ff3535e4413a02
+  data.tar.gz: 8b40078d94fe1c120e98885a1861359fdc1d0fd948f2ec528e27fcc8c4a602b73987af3bb6da8232e325b1519401371472bfeaa9598282dd4d73549474abd4ef

data/.travis.yml

@@ -5,7 +5,6 @@ rvm:
   - 2.2
   - 2.1
   - 2.0
-  - 1.9.3
   - ruby-head
   - rbx-2
   - jruby-head

data/README.md

@@ -3,6 +3,7 @@ striuct
 
 [![Build Status](https://secure.travis-ci.org/kachick/striuct.png)](http://travis-ci.org/kachick/striuct)
 [![Gem Version](https://badge.fury.io/rb/striuct.png)](http://badge.fury.io/rb/striuct)
+[![Dependency Status](https://gemnasium.com/kachick/striuct.svg)](https://gemnasium.com/kachick/striuct)
 
 Description
 -----------
@@ -113,7 +114,7 @@ UseMustOption.new #=> InvalidOperationError "`foo` require a value under `must`
 Requirements
 -------------
 
-* Ruby - [1.9.2 or later](http://travis-ci.org/#!/kachick/striuct)
+* Ruby - [2.0 or later](http://travis-ci.org/#!/kachick/striuct)
 
 Install
 -------
@@ -125,10 +126,10 @@ gem install striuct
 Link
 ----
 
-* [code](https://github.com/kachick/striuct)
-* [wiki](https://github.com/kachick/striuct/wiki)
-* [API](http://kachick.github.com/striuct/yard/frames.html)
-* [issues](https://github.com/kachick/striuct/issues)
+* [Code](https://github.com/kachick/striuct)
+* [Wiki](https://github.com/kachick/striuct/wiki)
+* [API](http://www.rubydoc.info/github/kachick/striuct)
+* [Issues](https://github.com/kachick/striuct/issues)
 * [CI](http://travis-ci.org/#!/kachick/striuct)
 * [gem](https://rubygems.org/gems/striuct)
 
@@ -137,4 +138,4 @@ License
 
 The MIT X11 License  
 Copyright (c) 2011 Kenichi Kamiya  
-See MIT-LICENSE for further details.
+See MIT-LICENSE for further details.

data/lib/striuct/classmethods/enum.rb

@@ -7,7 +7,7 @@ class Striuct; module ClassMethods
   # @yieldreturn [Class] self
   # @return [Enumerator]
   def each_autonym
-    return to_enum(__callee__) unless block_given?
+    return to_enum(__callee__) { size } unless block_given?
 
     @autonyms.each{|autonym|yield autonym}
     self
@@ -20,7 +20,7 @@ class Striuct; module ClassMethods
   # @yieldreturn [Class] self
   # @return [Enumerator]
   def each_index
-    return to_enum(__callee__) unless block_given?
+    return to_enum(__callee__) { size }  unless block_given?
 
     @autonyms.each_index{|index|yield index}
     self
@@ -32,7 +32,7 @@ class Striuct; module ClassMethods
   # @yieldreturn [Class] self
   # @return [Enumerator]
   def each_autonym_with_index
-    return to_enum(__callee__) unless block_given?
+    return to_enum(__callee__) { size }  unless block_given?
 
     @autonyms.each_with_index{|autonym, index|yield autonym, index}
     self
@@ -42,4 +42,4 @@ class Striuct; module ClassMethods
 
   # @endgroup
 
-end; end
+end; end

data/lib/striuct/instancemethods/enum.rb

@@ -7,7 +7,7 @@ class Striuct; module InstanceMethods
   # @yieldreturn [self]
   # @return [Enumerator]
   def each_autonym(&block)
-    return to_enum(__callee__) unless block_given?
+    return to_enum(__callee__) { self.class.size } unless block_given?
 
     self.class.each_autonym(&block)
     self
@@ -21,7 +21,7 @@ class Striuct; module InstanceMethods
   # @yieldreturn [self]
   # @return [Enumerator]
   def each_value
-    return to_enum(__callee__) unless block_given?
+    return to_enum(__callee__) { self.class.size } unless block_given?
   
     each_autonym{|autonym|yield _get(autonym)}
   end
@@ -36,7 +36,7 @@ class Striuct; module InstanceMethods
   # @see #each_autonym
   # @see #each_value 
   def each_pair
-    return to_enum(__callee__) unless block_given?
+    return to_enum(__callee__) { self.class.size } unless block_given?
 
     each_autonym{|autonym|yield autonym, _get(autonym)}
   end
@@ -46,7 +46,7 @@ class Striuct; module InstanceMethods
   # @yieldreturn [self]
   # @return [Enumerator]
   def each_index
-    return to_enum(__callee__) unless block_given?
+    return to_enum(__callee__) { self.class.size } unless block_given?
 
     self.class.each_index{|index|yield index}
     self
@@ -58,7 +58,7 @@ class Striuct; module InstanceMethods
   # @yieldreturn [self]
   # @return [Enumerator]
   def each_autonym_with_index
-    return to_enum(__callee__) unless block_given?
+    return to_enum(__callee__) { self.class.size } unless block_given?
 
     self.class.each_autonym_with_index{|autonym, index|yield autonym, index}
     self
@@ -71,7 +71,7 @@ class Striuct; module InstanceMethods
   # @yieldreturn [self]
   # @return [Enumerator]
   def each_value_with_index
-    return to_enum(__callee__) unless block_given?
+    return to_enum(__callee__) { self.class.size } unless block_given?
 
     each_value.with_index{|value, index|yield value, index}
   end
@@ -84,7 +84,7 @@ class Striuct; module InstanceMethods
   # @yieldreturn [self]
   # @return [Enumerator]
   def each_pair_with_index
-    return to_enum(__callee__) unless block_given?
+    return to_enum(__callee__) { self.class.size } unless block_given?
 
     index = 0
     each_pair do |autonym, value|
@@ -95,4 +95,4 @@ class Striuct; module InstanceMethods
 
   # @endgroup
 
-end; end
+end; end

data/lib/striuct/instancemethods/values.rb

@@ -23,6 +23,23 @@ class Striuct; module InstanceMethods
     }
   end
 
+  # @return [Array]
+  # @raise [ArgumentError] if the keys contains an unmacthed
+  #     key and no block is given
+  def fetch_values(*_keys, &block)
+    _keys.map {|key|
+      if has_key? key
+        fetch_by_key(key)
+      else
+        if block_given?
+          block.call
+        else
+          raise ArgumentError, "`#{key}' is not matched"
+        end
+      end
+    }
+  end
+
   # @return [self]
   def replace_values(*values)
     unless values.size <= size
@@ -38,4 +55,4 @@ class Striuct; module InstanceMethods
 
   # @endgroup
 
-end; end
+end; end

data/striuct.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/kachick/#{lib_name}"
   gem.license       = 'MIT'
   gem.name          = lib_name.dup
-  gem.version       = '0.4.4.1'
+  gem.version       = '0.5.0'
 
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 2.0'
 
   gem.add_runtime_dependency 'validation', '~> 0.0.7'
   gem.add_runtime_dependency 'optionalargument', '~> 0.1'

data/test/test_subc-f-enum.rb

@@ -25,6 +25,7 @@ class Test_Striuct_Subclass_Enum < Test::Unit::TestCase
         
         enum = reciever.public_send(callee)
         assert_instance_of Enumerator, enum
+        assert_equal 2, enum.size
         assert_same :foo, enum.next
         assert_same :bar, enum.next
         assert_raises StopIteration do
@@ -41,6 +42,7 @@ class Test_Striuct_Subclass_Enum < Test::Unit::TestCase
         
         enum = reciever.public_send(callee)
         assert_instance_of Enumerator, enum
+        assert_equal 2, enum.size
         assert_same 0, enum.next
         assert_same 1, enum.next
         assert_raises StopIteration do
@@ -57,6 +59,7 @@ class Test_Striuct_Subclass_Enum < Test::Unit::TestCase
         
         enum = reciever.public_send(callee)
         assert_instance_of Enumerator, enum
+        assert_equal 2, enum.size
         assert_equal [:foo, 0], enum.next
         assert_equal [:bar, 1], enum.next
         assert_raises StopIteration do
@@ -73,6 +76,7 @@ class Test_Striuct_Subclass_Enum < Test::Unit::TestCase
         
         enum = reciever.public_send(callee)
         assert_instance_of Enumerator, enum
+        assert_equal 2, enum.size
         assert_same FOO, enum.next
         assert_same BAR, enum.next
         assert_raises StopIteration do
@@ -89,6 +93,7 @@ class Test_Striuct_Subclass_Enum < Test::Unit::TestCase
         
         enum = reciever.public_send(callee)
         assert_instance_of Enumerator, enum
+        assert_equal 2, enum.size
         assert_equal [FOO, 0], ret = enum.next
         assert_same FOO, ret.first
         assert_equal [BAR, 1], ret = enum.next
@@ -107,6 +112,7 @@ class Test_Striuct_Subclass_Enum < Test::Unit::TestCase
         
         enum = reciever.public_send(callee)
         assert_instance_of Enumerator, enum
+        assert_equal 2, enum.size
         assert_equal [:foo, FOO], ret = enum.next
         assert_same FOO, ret.last
         assert_equal [:bar, BAR], ret = enum.next
@@ -125,6 +131,7 @@ class Test_Striuct_Subclass_Enum < Test::Unit::TestCase
         
         enum = reciever.public_send(callee)
         assert_instance_of Enumerator, enum
+        assert_equal 2, enum.size
         assert_equal [:foo, FOO, 0], ret = enum.next
         assert_same FOO, ret[1]
         assert_equal [:bar, BAR, 1], ret = enum.next
@@ -134,6 +141,19 @@ class Test_Striuct_Subclass_Enum < Test::Unit::TestCase
         end
       end
     end
+    
+    def test_modified_members_enum_size
+      klass = Striuct.new do
+        member :foo
+      end
+      cenum = klass.each_autonym
+      ienum = klass.new.each_autonym
+      assert_equal 1, cenum.size
+      assert_equal 1, ienum.size
+      klass.send :member, :bar
+      assert_equal 2, cenum.size
+      assert_equal 2, ienum.size
+    end
   end
 
-end
+end

data/test/test_subc-i-basic.rb

@@ -29,4 +29,15 @@ class Test_Striuct_Subclass_Instance_Basic < Test::Unit::TestCase
     assert_equal(@user.values_at(4, 0, (2..4)), [30, 9999, 'yamada', 'Tokyo Japan', 30])
   end
 
+  def test_fetch_values
+    assert_equal(@user.fetch_values(:id, 4, :id), [9999, 30, 9999])
+    assert_equal(@user.fetch_values, [])
+
+    assert_raise ArgumentError do
+      @user.fetch_values :id, 5, :id
+    end
+    
+    assert_equal(@user.fetch_values(:id, 5, :id) { :substitute }, [9999, :substitute, 9999])
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: striuct
 version: !ruby/object:Gem::Version
-  version: 0.4.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Kenichi Kamiya
@@ -246,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Struct++ library.  ---  Validatable, Inheritable, Member Aliasing, Conflict