striuct 0.4.0 → 0.4.1

data/README.md

@@ -101,7 +101,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.1
+* [optionalargument](https://github.com/kachick/optionalargument) - 0.0.3
 * [keyvalidatable](https://github.com/kachick/keyvalidatable) - 0.0.3
 
 Install

data/lib/striuct/classmethods/copy.rb

@@ -2,52 +2,49 @@ class Striuct; module ClassMethods
 
   # @group Basic Methods for Ruby's Object
 
-  # @return [Module]
-  def dup
-    autonyms = @autonyms.dup
-    aliases  = @aliases.dup
-    attributes = @attributes.deep_dup
-
-    super.tap {|ret|
-      ret.instance_eval do
-        @autonyms = autonyms
-        @aliases = aliases
-        @attributes = attributes
-      end
-    }
-  end
-
-  # @return [Module]
+  # @return [Class]
   def clone
     ret = super
-    ret.__send__ :close if closed?
+    ret.__send__ :close_member if closed?
     ret
   end
 
+  # @return [Class]
+  def dup
+    copy_variables! super
+  end
+
   private
   
   def inherited(subclass)
+    ret = super subclass
+    copy_variables! subclass
+    ret
+  end
+     
+  def initialize_copy(original)
+    ret = super original
+    @autonyms = @autonyms.dup
+    @aliases = @aliases.dup
+    @attributes = @attributes.deep_dup
+    ret
+  end
+
+  # @return [familar_class]
+  def copy_variables!(familar_class)
     autonyms = @autonyms.dup
     aliases  = @aliases.dup
     attributes = @attributes.deep_dup
     conflict_management = @conflict_management_level
-    
-    subclass.class_eval do
-      original_inherited subclass
-      
+
+    familar_class.class_eval do      
       @autonyms = autonyms
       @aliases = aliases
       @attributes = attributes
       @conflict_management_level = conflict_management
     end
-  end
-     
-  def initialize_copy(original)
-    ret = super original
-    @autonyms = @autonyms.dup
-    @aliases = @aliases.dup
-    @attributes = @attributes.deep_dup
-    ret
+
+    familar_class
   end
 
   # @endgroup

data/lib/striuct/{singleton_class → classmethods}/hashdeepdupulicatable.rb

@@ -1,4 +1,4 @@
-class Striuct; class << self
+class Striuct; module ClassMethods
 
   module HashDeepDupulicatable
 

data/lib/striuct/classmethods/inner.rb

@@ -4,6 +4,13 @@ class Striuct; module ClassMethods
 
   private
 
+  def _init
+    @autonyms      = []
+    @attributes    = {}.extend HashDeepDupulicatable # autonym => Attributes
+    @aliases       = {} # aliased => autonym
+    @conflict_management_level = DEFAULT_CONFLICT_MANAGEMENT_LEVEL
+  end
+
   def _add_autonym(autonym)
     autonym = autonym.to_sym
     raise NameError, 'already defined' if member? autonym

data/lib/striuct/classmethods/requirements.rb

@@ -1,5 +1,6 @@
 require 'optionalargument'
 
+require_relative 'hashdeepdupulicatable'
 require_relative 'attributes'
 require_relative 'inner'
 require_relative 'names'

data/lib/striuct/requirements.rb

@@ -1,3 +1,4 @@
+require 'validation'
 require_relative 'structs'
 require_relative 'classmethods/requirements'
 require_relative 'instancemethods/requirements'

data/lib/striuct/singleton_class.rb

@@ -1,14 +1,14 @@
-require_relative 'singleton_class/hashdeepdupulicatable'
+require 'validation'
 
 class Striuct
 
   class << self
-
-    # @group Constructor
     
     alias_method :new_instance, :new
     private :new_instance
     
+    # @group Constructors for Subclassies 
+
     # @param [Symbol, String] autonyms
     # @yieldreturn [Class]
     # @return [Class]
@@ -19,25 +19,25 @@ class Striuct
         warn "no define constant first-arg(#{first}), the Struct behavior is not supported in Striuct"
       end
 
-      Class.new self do
+      Class.new(self) {
         autonyms.each do |autonym|
           add_member autonym
         end
 
         class_eval(&block) if block_given?
-      end
+      }
     end
 
     # @yieldreturn [Class] (see Striuct.new) - reject floating class
     # @return [void]
     def define(&block)
-      raise ArgumentError, 'must with block' unless block_given?
+      raise ArgumentError, 'block not supplied' unless block_given?
 
       new(&block).tap {|subclass|
-        subclass.class_eval do
+        subclass.class_eval {
           raise 'not yet finished' if @autonyms.empty?
           close
-        end
+        }
       }
     end
 
@@ -45,22 +45,19 @@ class Striuct
 
     private
     
-    alias_method :original_inherited, :inherited
-
     def inherited(subclass)
-      subclass.class_eval do
-        original_inherited subclass
+      ret = super subclass
 
+      subclass.class_eval {
         extend ClassMethods
         include Enumerable
+        include Validation
         include InstanceMethods
         
-        @autonyms      = []
-        @attributes    = {}.extend HashDeepDupulicatable # autonym => Attributes
-        @aliases       = {} # aliased => autonym
-        @conflict_management_level = 
-          ClassMethods::DEFAULT_CONFLICT_MANAGEMENT_LEVEL
-      end
+        _init
+      }
+
+      ret
     end
 
   end

data/lib/striuct.rb

@@ -1,13 +1,8 @@
-# striuct - Provides a Struct++ class.
-# Copyright (c) 2011 Kenichi Kamiya
-
-require 'validation'
+# striuct - Struct++
+# Copyright (c) 2011-2012 Kenichi Kamiya
 
 # @abstract
 class Striuct
-
-  include Validation
-
 end
 
 require_relative 'striuct/requirements'

data/striuct.gemspec

@@ -12,7 +12,7 @@ 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.0'
+  gem.version       = '0.4.1'
 
   gem.required_ruby_version = '>= 1.9.2'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: striuct
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-30 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: validation
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9580980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.3
+  version_requirements: *9580980
 - !ruby/object:Gem::Dependency
   name: optionalargument
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9579740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.3
+  version_requirements: *9579740
 - !ruby/object:Gem::Dependency
   name: keyvalidatable
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9578620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.3
+  version_requirements: *9578620
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9169460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
+  version_requirements: *9169460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9169020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *9169020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9168420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,12 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *9168420
 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 :)"
@@ -139,6 +109,7 @@ files:
 - lib/striuct/classmethods/default.rb
 - lib/striuct/classmethods/enum.rb
 - lib/striuct/classmethods/fix.rb
+- lib/striuct/classmethods/hashdeepdupulicatable.rb
 - lib/striuct/classmethods/inner.rb
 - lib/striuct/classmethods/length.rb
 - lib/striuct/classmethods/macro.rb
@@ -167,7 +138,6 @@ files:
 - lib/striuct/instancemethods/values.rb
 - lib/striuct/requirements.rb
 - lib/striuct/singleton_class.rb
-- lib/striuct/singleton_class/hashdeepdupulicatable.rb
 - lib/striuct/structs.rb
 - striuct.gemspec
 - test/helper.rb
@@ -222,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Struct++