keystone 0.0.31 → 0.0.32

data/.gitignore

@@ -0,0 +1,3 @@
+*.log
+.DS_Store
+*.gem

data/README.ore

@@ -0,0 +1,4 @@
+- updating gem
+
+rake build
+gem push pkg/keystone*******

data/Rakefile

@@ -11,19 +11,32 @@ $:.unshift "lib"
 #   sh "gem install kanamei-keystone-#{Keystone::VERSION}.gem"
 # end
 
-task :build do
-  begin
-    require 'jeweler'
-    Jeweler::Tasks.new do |gemspec|
+#task :build do
+  #begin
+    #require 'jeweler'
+    #Jeweler::Tasks.new do |gemspec|
+      #gemspec.name = "keystone"
+      #gemspec.summary = "oreore library"
+      #gemspec.email = "paco.jp@gmail.com"
+      #gemspec.homepage = "http://github.com/kanamei/keystone"
+      #gemspec.description = "oreore library"
+      #gemspec.authors = ["paco"]
+    #end
+  #rescue LoadError
+    #puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  #end  
+#end
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
       gemspec.name = "keystone"
       gemspec.summary = "oreore library"
       gemspec.email = "paco.jp@gmail.com"
       gemspec.homepage = "http://github.com/kanamei/keystone"
       gemspec.description = "oreore library"
       gemspec.authors = ["paco"]
-    end
-  rescue LoadError
-    puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-  end  
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
-

data/VERSION

@@ -1 +1 @@
-0.0.31
+0.0.32

data/keystone.gemspec

@@ -1,23 +1,25 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{keystone}
-  s.version = "0.0.29"
+  s.name = "keystone"
+  s.version = "0.0.32"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["paco"]
-  s.date = %q{2010-09-02}
-  s.description = %q{oreore library}
-  s.email = %q{paco.jp@gmail.com}
+  s.date = "2011-12-07"
+  s.description = "oreore library"
+  s.email = "paco.jp@gmail.com"
   s.extra_rdoc_files = [
-    "README"
+    "README",
+     "README.ore"
   ]
   s.files = [
     ".gitignore",
      "README",
+     "README.ore",
      "Rakefile",
      "VERSION",
      "doc/classes/Dir.html",
@@ -160,14 +162,15 @@ Gem::Specification.new do |s|
      "lib/keystone/core_ext/tempfile.rb",
      "lib/keystone/core_ext/uri.rb",
      "lib/keystone/mail.rb",
-     "lib/keystone/mail/address.rb",
-     "lib/keystone/mail/content_type.rb",
-     "lib/keystone/mail/message.rb",
-     "lib/keystone/mail/message_factory.rb",
-     "lib/keystone/mail/message_iso2022jp.rb",
-     "lib/keystone/mail/message_sjis.rb",
-     "lib/keystone/mail/receive.rb",
      "lib/keystone/mail/send.rb",
+     "lib/keystone/mail__old/address.rb",
+     "lib/keystone/mail__old/content_type.rb",
+     "lib/keystone/mail__old/message.rb",
+     "lib/keystone/mail__old/message_factory.rb",
+     "lib/keystone/mail__old/message_iso2022jp.rb",
+     "lib/keystone/mail__old/message_sjis.rb",
+     "lib/keystone/mail__old/receive.rb",
+     "lib/keystone/mail__old/send.rb",
      "lib/keystone/os.rb",
      "lib/keystone/os/abstract_os.rb",
      "lib/keystone/os/centos.rb",
@@ -178,6 +181,7 @@ Gem::Specification.new do |s|
      "lib/keystone/string_util.rb",
      "test/test_core_ext.rb",
      "test/test_string_util.rb",
+     "test_local/batch.rb",
      "util/README",
      "util/bin/command_broadcast.rb",
      "util/bin/disk_size_check.rb",
@@ -186,18 +190,17 @@ Gem::Specification.new do |s|
      "vendor/flag_set_maker.rb",
      "vendor/moji.rb"
   ]
-  s.homepage = %q{http://github.com/kanamei/keystone}
+  s.homepage = "http://github.com/kanamei/keystone"
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{oreore library}
+  s.rubygems_version = "1.8.11"
+  s.summary = "oreore library"
   s.test_files = [
     "test/test_core_ext.rb",
      "test/test_string_util.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -206,4 +209,3 @@ Gem::Specification.new do |s|
   else
   end
 end
-

data/lib/keystone.rb

@@ -3,8 +3,10 @@
 #$KCODE = 'u'
 
 
-# version check
-raise 'this version only for 1.9.2' unless RUBY_VERSION == '1.9.2'
+unless RUBY_VERSION == '1.9.2' || RUBY_VERSION == '1.9.3'
+  # version check
+  raise 'this version only for 1.9.2 or 1.9.3' 
+end
 
 require 'keystone/core_ext'
 require 'keystone/base'
@@ -16,7 +18,7 @@ autoload :Moji          , 'vendor/moji'
 
 module Keystone
 
-  VERSION = '0.0.31'
+  VERSION = '0.0.32'
 
   autoload :StringUtil , 'keystone/string_util'
   autoload :Batch      , 'keystone/batch'

data/lib/keystone/core_ext/array.rb

@@ -15,7 +15,7 @@ class Array
     end
     return ret
   end
-  
+
   if RUBY_VERSION < '1.8.7'
     def sample(count=1)
       if count == 1
@@ -27,4 +27,33 @@ class Array
       end
     end
   end
-end
+
+  #
+  # 候補が実は複数あるときはエラーを出したいが、、、今のところ無しで
+  #
+  def left_join!(name,ar,index1,index2)
+
+    key_hits = []
+    has = {}
+    ar.each do |o|
+      if o.has_key?(index2)
+        val = o[index2]
+        if key_hits.include?(val)
+          raise "right side data is multiple(#{val})"
+        end
+        h = o.clone
+        h.delete(index2)
+        has[val] = h
+      end
+    end
+
+    self.each do |i|
+      if has.has_key?(i[index1])
+        has[i[index1]].each do |key,value|
+          i["#{name.to_s}_#{key}"] = value
+        end
+      end
+    end
+    self
+  end
+end

data/test/test_core_ext.rb

@@ -1,15 +1,63 @@
-require 'rubygems'
-require 'redgreen'
-require 'lib/keystone/core_ext'
+#require 'redgreen'
+
+gem 'term-ansicolor'
+gem 'turn'
+require 'test/unit'
+require './lib/keystone/core_ext'
+require './lib/keystone/core_ext/array'
 
 class TestCoreExt < Test::Unit::TestCase
   def setup
-  end  
-  
+  end
+
   def test_array_split_by
     assert_equal([1,2,3,4,5,6,7,8,9].split_by(3),[[1, 2, 3], [4, 5, 6], [7, 8, 9]])
     assert_equal([1,2,3,4,5,6,7,8,9,10].split_by(2),[[1,2],[3,4],[5,6],[7,8],[9,10]])
     assert_equal([].split_by(3),[])
     assert_equal([[1,2,3,4],[1,23],[2,33],[[4]]].split_by(3),[[[1, 2, 3, 4], [1, 23], [2, 33]], [[[4]]]])
   end
-end
+
+  def test_array_left_join
+    test1 = [{:a=>1,:b=>2}]
+    test2 = [{:a=>2,:c=>3}]
+    test3 = [{:a=>1,:c=>4},{:a=>2,:c=>6}]
+    test4 = [{:a=>1,:b=>2,'test3_c'=>4}]
+    test5 = [{:a=>1,:b=>2},{:a=>1,:b=>2}]
+    test6 = [{:a=>1,:b=>2,'test3_c'=>4},{:a=>1,:b=>2,'test3_c'=>4}]
+    test7 = [{:a=>1,:b=>2},{:a=>2,:b=>'test'}]
+    test8 = [{:a=>1,:b=>2,'test3_c'=>4},{:a=>2,:b=>'test','test3_c'=>6}]
+
+    ans = test1.left_join!(:test2,test2,:a,:a)
+    assert_equal(ans,test1)
+    ans = test1.left_join!(:test3,test3,:a,:a)
+    assert_equal(ans,test4)
+    ans = test7.left_join!(:test3,test3,:a,:a)
+    assert_equal(ans,test8)
+
+    test1 = []
+    (0..300000).each do |i|
+      has = {}
+      [:a,:b,:c,:d,:e,:f,:g,:h].each do |k|
+        has[k] = "#{k}#{i}"
+      end
+      has[:st] = '1' * 80
+      test1 << has
+    end
+
+    test2 = []
+    (0..300000).each do |i|
+      has = {}
+      [:a,:b,:c,:d,:e,:f,:g,:h].each do |k|
+        has[k] = "#{k}#{i}"
+      end
+      has[:st] = '1' * 80
+      test2 << has
+    end
+
+    puts Time.now
+    puts test1.left_join!(:test2,test2,:a,:a)
+    puts Time.now
+
+
+  end
+end

metadata

@@ -1,29 +1,27 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: keystone
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.32
   prerelease: 
-  version: 0.0.31
 platform: ruby
-authors: 
+authors:
 - paco
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-07 00:00:00 +09:00
-default_executable: 
+date: 2011-12-07 00:00:00.000000000 Z
 dependencies: []
-
 description: oreore library
 email: paco.jp@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+- README.ore
+files:
+- .gitignore
 - README
+- README.ore
 - Rakefile
 - VERSION
 - doc/classes/Dir.html
@@ -193,34 +191,31 @@ files:
 - util/bin/ve2tar.rb
 - vendor/flag_set_maker.rb
 - vendor/moji.rb
-has_rdoc: true
 homepage: http://github.com/kanamei/keystone
 licenses: []
-
 post_install_message: 
-rdoc_options: []
-
-require_paths: 
+rdoc_options:
+- --charset=UTF-8
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: oreore library
-test_files: 
+test_files:
 - test/test_core_ext.rb
 - test/test_string_util.rb