libciel 0.0.0.2 → 0.0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc7e2c339c060855b8d8d5ff00c7ae2bd868a9bb
-  data.tar.gz: 217d0b4d4f3b05e83eeba0ec0b0b006369bb4e76
+  metadata.gz: 4fa58b86ead83f8e76fad4c6c059365dcee1c1c2
+  data.tar.gz: 6554e526034c197a4ede4383e89326891f2b0d04
 SHA512:
-  metadata.gz: 6d102875526fbcd3d656214c1a407e3ff943a048eaf1ef380d28cdf950a7e383a4bc739b47d7f3ba0baed6ff688a9465ada839ca027909a5e9cfb4e76d115d58
-  data.tar.gz: 2180c8d14545ec9aeaa7cb2badd0c3c902608870dc85b8f75f244a71ddde8bc33459dad6c12cbf43b232346e2dc0e7d45d5e3976aba26f290e4fa04d4d8caf00
+  metadata.gz: a65062be26d7329516af9e9da16b041e130e68bbd2573fb5f6c433b1284e47e99e1d402f58973f3cb58b6f15a7a2af5b31350a4e7d00d5fe9f1a08c1db4a1c35
+  data.tar.gz: c0a1048afdc5b940e230ce6204c74970e7e580145df124bc19da37784a7bf596c1365c9e5372ddd2c0c9e4f6f1adfb13caaf6a2f08b2f481f29fb5e3532853d1

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 # ChangeLog
 
+## 0.0.0.3 (2014 Jan 24)
+- Refined source structure.
+- Kernel::zip doesn't modify original Array anymore.
+- Removed Hash#patch, which is actually the same as Hash#merge. Thank you smackesey.
+- Dropped Hash#exists_rec? and introduced Hash#fetch_nested.
+
 ## 0.0.0.2 (2014 Jan 22)
 - Initial release

data/LICENSE.txt

@@ -1,4 +1,4 @@
-- Copyright (c) 2013, T. Yamada
+- Copyright (c) 2013, @cielavenir
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met: 

data/README.md

@@ -9,6 +9,10 @@
   * 2.2.1 and 2.2.2 are not working.
 * (Possibly) ironruby / macruby / topaz etc
 
-## Notice
+## Note
 * **Ruby 2.0+ cannot handle dbd-sqlite3.**
 * jruby cannot handle dbi.
+
+## Warning
+* This library is experimental. Incompatible API change might happen. You might want to include the source directly.
+* None of my projects (cTouch (builder) / yomebrowser / picrawler) don't depend on this gem.

data/lib/array/permutation2.rb

@@ -0,0 +1,20 @@
+class Array
+	#Enumerates permutation of Array.
+	#Unlike Array#permutation, there are no duplicates in generated permutations.
+	#Instead, elements must be comparable.
+	def permutation2(n=self.size)
+		return to_enum(:permutation2,n) unless block_given?
+		return if n<0||self.size<n
+		a=self.sort
+		yield a.dup[0,n]
+		loop{
+			a=a[0,n]+a[n..-1].reverse
+			k=(a.size-2).downto(0).find{|i|a[i]<a[i+1]}
+			break if !k
+			l=(a.size-1).downto(k+1).find{|i|a[k]<a[i]}
+			a[k],a[l]=a[l],a[k]
+			a=a[0,k+1]+a[k+1..-1].reverse
+			yield a.dup[0,n]
+		}
+	end
+end

data/lib/dbi/connect_transaction.rb

@@ -0,0 +1,27 @@
+module DBI
+	#connect-transaction-disconnect triplet.
+	# To use this method, you need to require dbi before requiring libciel.
+	def self.connect_transaction(driver_url, user=nil, auth=nil, params=nil, &block)
+		x=connect(driver_url, user, auth, params)
+		begin
+			x.transaction(&block)
+		ensure
+			x.disconnect
+		end
+	end
+
+	class DatabaseHandle
+		#execute-map,count-finish triplet.
+		# To use this method, you need to require dbi before requiring libciel.
+		def execute_immediate(stmt,*bindvars,&block)
+			sth=execute(stmt,*bindvars)
+			ret=0
+			begin
+				if block then ret=sth.map(&block).count end
+			ensure
+				sth.finish
+			end
+			ret
+		end
+	end
+end

data/lib/enumerable/squeeze.rb

@@ -0,0 +1,16 @@
+module Enumerable
+	#Squeezes the same element. This behaves like C++ unique().
+	#To get the similar result to Array#uniq, you need to sort it prior.
+	# Calculation order is O(n).
+	def squeeze
+		r=[]
+		cur=nil
+		self.each{|e|
+			if r.empty?||cur!=e
+				r<<e
+				cur=e
+			end
+		}
+		r
+	end
+end

data/lib/enumerator/lazy/squeeze.rb

@@ -0,0 +1,20 @@
+class Enumerator
+	begin
+	Lazy.class_eval{
+		#Enumerator.Lazy version of Enumerable#squeeze.
+		#Enumerator.Lazy is evaluated as Enumerable::Lazy on Ruby 1.9 + enumerable/lazy, otherwise Enumerator::Lazy.
+		# To use this method, on Ruby <2.0, you need to require enumerable/lazy or backports before requiring libciel.
+		def squeeze
+			first=true
+			cur=nil
+			self.class.new(self){|y,v|
+				if first||cur!=v
+					y<<v
+					first=false
+					cur=v
+				end
+			}
+		end
+	}
+	rescue NameError=>e; end
+end

data/lib/hash/fetch_nested.rb

@@ -0,0 +1,11 @@
+class Hash
+	#nil safe version of Hash#[].
+	# h.fetch_nested(*['hello','world']) is basically the same as h['hello'].try.send(:[],'world').
+	def fetch_nested(*keys)
+		begin
+			keys.reduce(self){|accum, k| accum.fetch(k)}
+		rescue (RUBY_VERSION<'1.9' ? IndexError : KeyError)
+			block_given? ? yield(*keys) : nil
+		end
+	end
+end

data/lib/kernel/zip.rb

@@ -0,0 +1,7 @@
+module Kernel
+	#Pythonic zip. The same as a.shift.zip(*a).
+	def zip(_a)
+		a=_a.dup
+		a.shift.zip(*a)
+	end
+end

data/lib/libciel.rb

@@ -1,136 +1,15 @@
-module LibCiel
-	#Version string
-	VERSION='0.0.0.2'
-end
-
-class Object
-	#PHPic extract(). Hash will be injected into self as instance variables (@var).
-	def extract(h,overwrite=false)
-		h.each{|k,v|
-			if overwrite || !self.instance_variable_defined?('@'+k) then
-				self.instance_variable_set('@'+k,v) #k should always be String
-			end
-		}
-	end
-end
+require File.expand_path(File.dirname(__FILE__)+'/array/permutation2')
+require File.expand_path(File.dirname(__FILE__)+'/enumerable/squeeze')
+require File.expand_path(File.dirname(__FILE__)+'/enumerator/lazy/squeeze')
+require File.expand_path(File.dirname(__FILE__)+'/hash/fetch_nested')
+require File.expand_path(File.dirname(__FILE__)+'/kernel/zip')
+require File.expand_path(File.dirname(__FILE__)+'/object/extract')
+require File.expand_path(File.dirname(__FILE__)+'/string/rotate')
 
-module Kernel
-	#Pythonic zip. The same as a.shift.zip(*a).
-	def zip(a) a.shift.zip(*a) end
-end
-
-module Enumerable
-	#Squeezes the same element. This behaves like C++ unique().
-	#To get the similar result to Array#uniq, you need to sort it prior.
-	# Calculation order is O(n).
-	def squeeze
-		r=[]
-		cur=nil
-		self.each{|e|
-			if r.empty?||cur!=e
-				r<<e
-				cur=e
-			end
-		}
-		r
-	end
-end
-
-class Enumerator
-	begin
-	Lazy.class_eval{
-		#Enumerator.Lazy version of Enumerable#squeeze.
-		#Enumerator.Lazy is evaluated as Enumerable::Lazy on Ruby 1.9 + enumerable/lazy, otherwise Enumerator::Lazy.
-		# To use this method, on Ruby <2.0, you need to require enumerable/lazy or backports before requiring libciel.
-		def squeeze
-			first=true
-			cur=nil
-			self.class.new(self){|y,v|
-				if first||cur!=v
-					y<<v
-					first=false
-					cur=v
-				end
-			}
-		end
-	}
-	rescue NameError=>e; end
-end
+#DBI stuff will be dropped in the future (maybe)
+require File.expand_path(File.dirname(__FILE__)+'/dbi/connect_transaction')
 
-class Array
-	#Enumerates permutation of Array.
-	#Unlike Array#permutation, there are no duplicates in generated permutations.
-	#Instead, elements must be comparable.
-	def permutation2(n=self.size)
-		return to_enum(:permutation2,n) unless block_given?
-		return if n<0||self.size<n
-		a=self.sort
-		yield a.dup[0,n]
-		loop{
-			a=a[0,n]+a[n..-1].reverse
-			k=(a.size-2).downto(0).find{|i|a[i]<a[i+1]}
-			break if !k
-			l=(a.size-1).downto(k+1).find{|i|a[k]<a[i]}
-			a[k],a[l]=a[l],a[k]
-			a=a[0,k+1]+a[k+1..-1].reverse
-			yield a.dup[0,n]
-		}
-	end
-end
-
-class String
-	#Rotate string to the left with count.
-	#Specifying negative number indicates rotation to the right.
-	def rotate(count=1)
-		count+=self.length if count<0
-		self.slice(count,self.length-count)+self.slice(0,count)
-	end
-	#Destructive version of String#rotate
-	def rotate!(count=1) self.replace(self.rotate(count)) end
-end
-
-class Hash
-	#nil safe version of Hash#[].
-	# h.exists_rec?(['hello','world']) is the same as h['hello'].try.send(:[],'world').
-	def exists_rec?(a)
-		#if a.length<1 then return false
-		if !self.include?(a[0]) then return nil end           #if not found
-		if a.length==1 then return self[a[0]] end             #if found and last
-		if !self[a[0]].is_a?(Hash) then return nil end #if not last and child not hash
-		return self[a[0]].exists_rec?(a[1..-1])               #check child
-	end
-	#Returns self.dup with overwriting par.
-	def patch(par)
-		h=self.dup
-		par.each{|k,v|h[k]=v}
-		return h
-	end
-end
-
-module DBI
-	#connect-transaction-disconnect triplet.
-	# To use this method, you need to require dbi before requiring libciel.
-	def self.connect_transaction(driver_url, user=nil, auth=nil, params=nil, &block)
-		x=connect(driver_url, user, auth, params)
-		begin
-			x.transaction(&block)
-		ensure
-			x.disconnect
-		end
-	end
-
-	class DatabaseHandle
-		#execute-map,count-finish triplet.
-		# To use this method, you need to require dbi before requiring libciel.
-		def execute_immediate(stmt,*bindvars,&block)
-			sth=execute(stmt,*bindvars)
-			ret=0
-			begin
-				if block then ret=sth.map(&block).count end
-			ensure
-				sth.finish
-			end
-			ret
-		end
-	end
+module LibCiel
+	#Version string
+	VERSION='0.0.0.3'
 end

data/lib/object/extract.rb

@@ -0,0 +1,10 @@
+class Object
+	#PHPic extract(). Hash will be injected into self as instance variables (@var).
+	def extract(h,overwrite=false)
+		h.each{|k,v|
+			if overwrite || !self.instance_variable_defined?('@'+k) then
+				self.instance_variable_set('@'+k,v) #k should always be String
+			end
+		}
+	end
+end

data/lib/string/rotate.rb

@@ -0,0 +1,10 @@
+class String
+	#Rotate string to the left with count.
+	#Specifying negative number indicates rotation to the right.
+	def rotate(count=1)
+		count+=self.length if count<0
+		self.slice(count,self.length-count)+self.slice(0,count)
+	end
+	#Destructive version of String#rotate
+	def rotate!(count=1) self.replace(self.rotate(count)) end
+end

data/spec/libciel_spec.rb

@@ -11,27 +11,50 @@ describe Object do
 end
 
 describe Kernel do
-	specify 'zip' do
-		zip([[1,2],[3,4]]).should eq [[1,3],[2,4]]
+	context 'zip' do
+		specify 'basic case' do
+			a=[[1,2],[3,4]]
+			zip(a).should eq [[1,3],[2,4]]
+			a.transpose.should eq [[1,3],[2,4]]
+		end
+		specify 'awkward case' do
+			a=[[1,2,3],[4,5]]
+			zip(a).should eq [[1, 4],[2, 5],[3, nil]]
+			lambda{a.transpose}.should raise_error
+		end
 	end
 end
 
 describe Enumerable do
-	specify 'squeeze' do
-		[1,2,2,3,3,2,1].squeeze.should eq [1,2,3,2,1]
+	context 'squeeze' do
+		specify 'example' do
+			[1,2,2,3,3,2,1].squeeze.should eq [1,2,3,2,1]
+		end
+		specify 'sort.squeeze is eq uniq' do
+			[1,2,2,3,3,2,1].sort.squeeze.should eq [1,2,3]
+		end
 	end
 end
 
 describe Enumerator::Lazy do
-	specify 'squeeze' do
+	specify 'squeeze enum' do
 		[1,2,2,3,3,2,1].lazy.squeeze.select(&:odd?).to_a.should eq [1,3,1]
 	end
 end
 
 describe Array do
-	specify 'permutation2' do
-		[1,1,2,3].permutation2.to_a.should_not eq [1,1,2,3].permutation.to_a
-		[1,1,2,3].permutation2.to_a.should eq [1,1,2,3].permutation.to_a.uniq
+	context 'permutation2' do
+		specify 'example' do
+			[1,1,2,2,3].permutation2(2).to_a.should eq [
+				[1, 1], [1, 2], [1, 3], [2, 1], [2, 2], [2, 3], [3, 1], [3, 2]
+			]
+		end
+		it 'is not eq permutation.to_a' do
+			[1,1,2,3].permutation2.to_a.should_not eq [1,1,2,3].permutation.to_a
+		end
+		it 'is eq permutation.to_a.uniq' do
+			[1,1,2,3].permutation2.to_a.should eq [1,1,2,3].permutation.to_a.uniq
+		end
 	end
 end
 
@@ -64,8 +87,8 @@ describe Hash do
 		specify 'usual search' do
 			h['hello']['world'].should eq 42
 		end
-		specify 'exists_rec?' do
-			h.exists_rec?(['hello','world']).should eq 42
+		specify 'fetch_nested' do
+			h.fetch_nested(*['hello','world']).should eq 42
 		end
 	end
 	context 'dangerous case' do
@@ -73,24 +96,17 @@ describe Hash do
 		specify 'usual search' do
 			lambda{h['hello']['world']}.should raise_error
 		end
-		specify 'exists_rec?' do
-			h.exists_rec?(['hello','world']).should eq nil
+		specify 'fetch_nested' do
+			h.fetch_nested(*['hello','world']).should eq nil
 		end
 	end
-	specify 'patch' do
-		h={'hello'=>1,'world'=>2}
-		h_dup=h.dup
-		answer={'hello'=>1,'world'=>42}
-		h.patch({'world'=>42}).should eq answer
-		h_dup.should eq h
-	end
 end
 
 describe DBI do
 	specify 'connect and execute' do
 		pending 'dbd-sqlite3 seems stopped working from Ruby 2.0' if RUBY_VERSION>='2.0'
 		pending 'dbd-sqlite3 is not supported by jruby' if defined?(RUBY_ENGINE)&&RUBY_ENGINE=='jruby'
-		DBI.connect('DBI:SQLite3:'+File.dirname(__FILE__)+'/test.sqlite',nil,nil,'AutoCommit'=>false){|dbi|
+		DBI.connect_transaction('DBI:SQLite3:'+File.dirname(__FILE__)+'/test.sqlite',nil,nil,'AutoCommit'=>false){|dbi|
 			#dbi.execute_immediate("create table test ( message varchar )")
 			dbi.execute_immediate("select * from test"){|e|
 				e.should eq ['hello']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libciel
 version: !ruby/object:Gem::Version
-  version: 0.0.0.2
+  version: 0.0.0.3
 platform: ruby
 authors:
 - cielavenir
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,15 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/array/permutation2.rb
+- lib/dbi/connect_transaction.rb
+- lib/enumerable/squeeze.rb
+- lib/enumerator/lazy/squeeze.rb
+- lib/hash/fetch_nested.rb
+- lib/kernel/zip.rb
 - lib/libciel.rb
+- lib/object/extract.rb
+- lib/string/rotate.rb
 - libciel.gemspec
 - spec/libciel_spec.rb
 - spec/spec_helper.rb