libciel 0.0.0.3 → 0.0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fa58b86ead83f8e76fad4c6c059365dcee1c1c2
-  data.tar.gz: 6554e526034c197a4ede4383e89326891f2b0d04
+  metadata.gz: a1beff7563007f659cbd895f09df00ded56a3a77
+  data.tar.gz: ef5bd575643618ae8a7012bb6645b95143882fa8
 SHA512:
-  metadata.gz: a65062be26d7329516af9e9da16b041e130e68bbd2573fb5f6c433b1284e47e99e1d402f58973f3cb58b6f15a7a2af5b31350a4e7d00d5fe9f1a08c1db4a1c35
-  data.tar.gz: c0a1048afdc5b940e230ce6204c74970e7e580145df124bc19da37784a7bf596c1365c9e5372ddd2c0c9e4f6f1adfb13caaf6a2f08b2f481f29fb5e3532853d1
+  metadata.gz: 5637c324ddffd0fa76440d564a2b09af6b2c095a7de02ef8af3bb5e7517f73923cea49080cea959f2d3ca86875b8ea95ce22d6b441eb9783d2daba856711717b
+  data.tar.gz: 5e0a91f5910eebe5ff34806149c8239699fdffd27082fa6b978da62c435da79e8937fccc0689feb9c2286b1ac5db58f3f6bd9545014936971741e1089d6e54b5

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Gemfile.lock

data/.travis.yml

@@ -1,7 +1,4 @@
 language: ruby
-before_install:
-  - gem update --system 2.1.11
-  - gem --version
 rvm:
   - 1.8.7
   - ree
@@ -9,15 +6,22 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.1.7
+  - 2.2.0
+  - 2.2.3
   - ruby-head
   - jruby-18mode
   - jruby-19mode
   - jruby-20mode
   - jruby-21mode
   - jruby-head
-  - rbx-2.1.1
-  - rbx-2.2.3
+  - rbx-2
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
+    - rvm: jruby-20mode
+    - rvm: jruby-21mode
+    - rvm: rbx-2

data/Gemfile

@@ -13,8 +13,13 @@ group :test do
 end
 
 group :development, :test do
+	if RUBY_VERSION<'1.9'
+		gem 'mime-types', '~> 1.0'
+		gem 'rest-client', '~> 1.6.0'
+	end
 	gem 'bundler', '>= 1.0'
 	gem 'rake'
 	gem 'rspec'
 	gem 'simplecov'
+	gem 'coveralls', :require => false
 end

data/lib/array/fetch_nested.rb

@@ -0,0 +1,19 @@
+#Note: this file is exactly the same as Hash#fetch_nested except the class name.
+
+class Array
+	#nil safe version of Hash#[].
+	# a.fetch_nested(*[0,1]) is basically the same as a[0].try.send(:[],1).
+	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
+
+	# Ruby 2.3 feature
+	# note: block yielding is libciel extention.
+	unless Hash.method_defined? :dig
+		alias :dig :fetch_nested
+	end
+end

data/lib/array/squeeze.rb

@@ -0,0 +1,7 @@
+class Array
+	#Destructive version of Enumerable#squeeze
+	def squeeze!
+		replace(squeeze)
+	end
+end
+

data/lib/hash/fetch_nested.rb

@@ -8,4 +8,10 @@ class Hash
 			block_given? ? yield(*keys) : nil
 		end
 	end
+
+	# Ruby 2.3 feature
+	# note: block yielding is libciel extention.
+	unless Hash.method_defined? :dig
+		alias :dig :fetch_nested
+	end
 end

data/lib/libciel.rb

@@ -1,9 +1,12 @@
+require File.expand_path(File.dirname(__FILE__)+'/array/fetch_nested')
 require File.expand_path(File.dirname(__FILE__)+'/array/permutation2')
+require File.expand_path(File.dirname(__FILE__)+'/array/squeeze')
 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/phpass')
 require File.expand_path(File.dirname(__FILE__)+'/string/rotate')
 
 #DBI stuff will be dropped in the future (maybe)
@@ -11,5 +14,5 @@ require File.expand_path(File.dirname(__FILE__)+'/dbi/connect_transaction')
 
 module LibCiel
 	#Version string
-	VERSION='0.0.0.3'
+	VERSION='0.0.0.5'
 end

data/lib/string/phpass.rb

@@ -0,0 +1,43 @@
+require 'digest/md5'
+
+class String
+	def phpass(encpass)
+		return "*" if !encpass || encpass.size < 12
+		table = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
+		cnt = table.index(encpass[3..3])
+		return "*" if cnt > 31
+		pass = self
+		cnt = 1 << cnt
+		salt = encpass[4, 8]
+		hash = Digest::MD5.digest(salt + pass)
+		cnt.times{
+			hash = Digest::MD5.digest(hash + pass)
+		}
+
+		result = encpass[0, 12]
+		i = 0
+		cnt = 16
+		while i < cnt
+			val = hash[i].ord; i += 1
+			result += table[val & 0x3f, 1]
+
+			val |= hash[i].ord << 8 if i < cnt
+			result += table[(val >> 6) & 0x3f, 1]
+			i += 1
+			break if i >= cnt
+
+			val |= hash[i].ord << 16 if i < cnt
+			result += table[(val >> 12) & 0x3f, 1]
+			i += 1
+			break if i >= cnt
+
+			result += table[(val >> 18) & 0x3f, 1]
+		end
+		return result
+	end
+
+	def gen_phpass
+		# todo: better random generation?
+		self.phpass('$P$B' + ([*'0'..'9'] + [*'a'..'z'] + [*'A'..'Z']).sample(8).join)
+	end
+end

data/spec/libciel_spec.rb

@@ -30,7 +30,7 @@ describe Enumerable 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
+		specify 'sort.squeeze eq uniq' do
 			[1,2,2,3,3,2,1].sort.squeeze.should eq [1,2,3]
 		end
 	end
@@ -49,13 +49,21 @@ describe Array do
 				[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
+		it '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
+		it '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
+	specify 'squeeze!' do
+		a=[1,2,2,3,3,2,1]
+		a.squeeze!
+		a.should eq [1,2,3,2,1]
+	end	
+	specify 'fetch_nested' do
+		[[1,2,3]].fetch_nested(0,1).should eq 2
+	end
 end
 
 describe String do
@@ -79,6 +87,11 @@ describe String do
 			s.should eq 'ghabcdef'
 		end
 	end
+	specify 'phpass' do
+		s='hello'
+		encpass=s.gen_phpass
+		s.phpass(encpass).should eq encpass
+	end
 end
 
 describe Hash do

data/spec/spec_helper.rb

@@ -5,6 +5,11 @@ RSpec.configure{|config|
 
 if !defined?(RUBY_ENGINE)||RUBY_ENGINE=='ruby'
 	require 'simplecov'
+	require 'coveralls'
+	SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+		SimpleCov::Formatter::HTMLFormatter,
+		Coveralls::SimpleCov::Formatter
+	]
 	SimpleCov.start do
 		add_filter 'spec'
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libciel
 version: !ruby/object:Gem::Version
-  version: 0.0.0.3
+  version: 0.0.0.5
 platform: ruby
 authors:
 - cielavenir
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,15 +59,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/array/fetch_nested.rb
 - lib/array/permutation2.rb
+- lib/array/squeeze.rb
 - lib/dbi/connect_transaction.rb
 - lib/enumerable/squeeze.rb
 - lib/enumerator/lazy/squeeze.rb
@@ -75,6 +77,7 @@ files:
 - lib/kernel/zip.rb
 - lib/libciel.rb
 - lib/object/extract.rb
+- lib/string/phpass.rb
 - lib/string/rotate.rb
 - libciel.gemspec
 - spec/libciel_spec.rb
@@ -100,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: ciel's useful libraries of Ruby

data/Gemfile.lock

@@ -1,246 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    backports (3.4.0)
-    dbd-sqlite3 (1.2.5)
-      dbi (>= 0.4.0)
-      sqlite3-ruby
-    dbi (0.4.5)
-      deprecated (= 2.0.1)
-    deprecated (2.0.1)
-    diff-lcs (1.2.5)
-    docile (1.1.1)
-    ffi2-generators (0.1.1)
-    multi_json (1.8.2)
-    rake (10.1.1)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    rubysl (2.0.15)
-      rubysl-abbrev (~> 2.0)
-      rubysl-base64 (~> 2.0)
-      rubysl-benchmark (~> 2.0)
-      rubysl-bigdecimal (~> 2.0)
-      rubysl-cgi (~> 2.0)
-      rubysl-cgi-session (~> 2.0)
-      rubysl-cmath (~> 2.0)
-      rubysl-complex (~> 2.0)
-      rubysl-continuation (~> 2.0)
-      rubysl-coverage (~> 2.0)
-      rubysl-csv (~> 2.0)
-      rubysl-curses (~> 2.0)
-      rubysl-date (~> 2.0)
-      rubysl-delegate (~> 2.0)
-      rubysl-digest (~> 2.0)
-      rubysl-drb (~> 2.0)
-      rubysl-e2mmap (~> 2.0)
-      rubysl-english (~> 2.0)
-      rubysl-enumerator (~> 2.0)
-      rubysl-erb (~> 2.0)
-      rubysl-etc (~> 2.0)
-      rubysl-expect (~> 2.0)
-      rubysl-fcntl (~> 2.0)
-      rubysl-fiber (~> 2.0)
-      rubysl-fileutils (~> 2.0)
-      rubysl-find (~> 2.0)
-      rubysl-forwardable (~> 2.0)
-      rubysl-getoptlong (~> 2.0)
-      rubysl-gserver (~> 2.0)
-      rubysl-io-console (~> 2.0)
-      rubysl-io-nonblock (~> 2.0)
-      rubysl-io-wait (~> 2.0)
-      rubysl-ipaddr (~> 2.0)
-      rubysl-irb (~> 2.0)
-      rubysl-logger (~> 2.0)
-      rubysl-mathn (~> 2.0)
-      rubysl-matrix (~> 2.0)
-      rubysl-mkmf (~> 2.0)
-      rubysl-monitor (~> 2.0)
-      rubysl-mutex_m (~> 2.0)
-      rubysl-net-ftp (~> 2.0)
-      rubysl-net-http (~> 2.0)
-      rubysl-net-imap (~> 2.0)
-      rubysl-net-pop (~> 2.0)
-      rubysl-net-protocol (~> 2.0)
-      rubysl-net-smtp (~> 2.0)
-      rubysl-net-telnet (~> 2.0)
-      rubysl-nkf (~> 2.0)
-      rubysl-observer (~> 2.0)
-      rubysl-open-uri (~> 2.0)
-      rubysl-open3 (~> 2.0)
-      rubysl-openssl (~> 2.0)
-      rubysl-optparse (~> 2.0)
-      rubysl-ostruct (~> 2.0)
-      rubysl-pathname (~> 2.0)
-      rubysl-prettyprint (~> 2.0)
-      rubysl-prime (~> 2.0)
-      rubysl-profile (~> 2.0)
-      rubysl-profiler (~> 2.0)
-      rubysl-pstore (~> 2.0)
-      rubysl-pty (~> 2.0)
-      rubysl-rational (~> 2.0)
-      rubysl-readline (~> 2.0)
-      rubysl-resolv (~> 2.0)
-      rubysl-rexml (~> 2.0)
-      rubysl-rinda (~> 2.0)
-      rubysl-rss (~> 2.0)
-      rubysl-scanf (~> 2.0)
-      rubysl-securerandom (~> 2.0)
-      rubysl-set (~> 2.0)
-      rubysl-shellwords (~> 2.0)
-      rubysl-singleton (~> 2.0)
-      rubysl-socket (~> 2.0)
-      rubysl-stringio (~> 2.0)
-      rubysl-strscan (~> 2.0)
-      rubysl-sync (~> 2.0)
-      rubysl-syslog (~> 2.0)
-      rubysl-tempfile (~> 2.0)
-      rubysl-thread (~> 2.0)
-      rubysl-thwait (~> 2.0)
-      rubysl-time (~> 2.0)
-      rubysl-timeout (~> 2.0)
-      rubysl-tmpdir (~> 2.0)
-      rubysl-tsort (~> 2.0)
-      rubysl-un (~> 2.0)
-      rubysl-uri (~> 2.0)
-      rubysl-weakref (~> 2.0)
-      rubysl-webrick (~> 2.0)
-      rubysl-xmlrpc (~> 2.0)
-      rubysl-yaml (~> 2.0)
-      rubysl-zlib (~> 2.0)
-    rubysl-abbrev (2.0.4)
-    rubysl-base64 (2.0.0)
-    rubysl-benchmark (2.0.1)
-    rubysl-bigdecimal (2.0.2)
-    rubysl-cgi (2.0.1)
-    rubysl-cgi-session (2.0.1)
-    rubysl-cmath (2.0.0)
-    rubysl-complex (2.0.0)
-    rubysl-continuation (2.0.0)
-    rubysl-coverage (2.0.3)
-    rubysl-csv (2.0.2)
-      rubysl-english (~> 2.0)
-    rubysl-curses (2.0.1)
-    rubysl-date (2.0.6)
-    rubysl-delegate (2.0.1)
-    rubysl-digest (2.0.3)
-    rubysl-drb (2.0.1)
-    rubysl-e2mmap (2.0.0)
-    rubysl-english (2.0.0)
-    rubysl-enumerator (2.0.0)
-    rubysl-erb (2.0.1)
-    rubysl-etc (2.0.3)
-      ffi2-generators (~> 0.1)
-    rubysl-expect (2.0.0)
-    rubysl-fcntl (2.0.4)
-      ffi2-generators (~> 0.1)
-    rubysl-fiber (2.0.0)
-    rubysl-fileutils (2.0.3)
-    rubysl-find (2.0.1)
-    rubysl-forwardable (2.0.1)
-    rubysl-getoptlong (2.0.0)
-    rubysl-gserver (2.0.0)
-      rubysl-socket (~> 2.0)
-      rubysl-thread (~> 2.0)
-    rubysl-io-console (2.0.0)
-    rubysl-io-nonblock (2.0.0)
-    rubysl-io-wait (2.0.0)
-    rubysl-ipaddr (2.0.0)
-    rubysl-irb (2.0.4)
-      rubysl-e2mmap (~> 2.0)
-      rubysl-mathn (~> 2.0)
-      rubysl-readline (~> 2.0)
-      rubysl-thread (~> 2.0)
-    rubysl-logger (2.0.0)
-    rubysl-mathn (2.0.0)
-    rubysl-matrix (2.1.0)
-      rubysl-e2mmap (~> 2.0)
-    rubysl-mkmf (2.0.1)
-      rubysl-fileutils (~> 2.0)
-      rubysl-shellwords (~> 2.0)
-    rubysl-monitor (2.0.0)
-    rubysl-mutex_m (2.0.0)
-    rubysl-net-ftp (2.0.1)
-    rubysl-net-http (2.0.4)
-      rubysl-cgi (~> 2.0)
-      rubysl-erb (~> 2.0)
-      rubysl-singleton (~> 2.0)
-    rubysl-net-imap (2.0.1)
-    rubysl-net-pop (2.0.1)
-    rubysl-net-protocol (2.0.1)
-    rubysl-net-smtp (2.0.1)
-    rubysl-net-telnet (2.0.0)
-    rubysl-nkf (2.0.1)
-    rubysl-observer (2.0.0)
-    rubysl-open-uri (2.0.0)
-    rubysl-open3 (2.0.0)
-    rubysl-openssl (2.0.5)
-    rubysl-optparse (2.0.1)
-      rubysl-shellwords (~> 2.0)
-    rubysl-ostruct (2.0.4)
-    rubysl-pathname (2.0.0)
-    rubysl-prettyprint (2.0.2)
-    rubysl-prime (2.0.1)
-    rubysl-profile (2.0.0)
-    rubysl-profiler (2.0.1)
-    rubysl-pstore (2.0.0)
-    rubysl-pty (2.0.2)
-    rubysl-rational (2.0.1)
-    rubysl-readline (2.0.2)
-    rubysl-resolv (2.0.0)
-    rubysl-rexml (2.0.2)
-    rubysl-rinda (2.0.0)
-    rubysl-rss (2.0.0)
-    rubysl-scanf (2.0.0)
-    rubysl-securerandom (2.0.0)
-    rubysl-set (2.0.1)
-    rubysl-shellwords (2.0.0)
-    rubysl-singleton (2.0.0)
-    rubysl-socket (2.0.1)
-    rubysl-stringio (2.0.0)
-    rubysl-strscan (2.0.0)
-    rubysl-sync (2.0.0)
-    rubysl-syslog (2.0.1)
-      ffi2-generators (~> 0.1)
-    rubysl-tempfile (2.0.1)
-    rubysl-thread (2.0.2)
-    rubysl-thwait (2.0.0)
-    rubysl-time (2.0.3)
-    rubysl-timeout (2.0.0)
-    rubysl-tmpdir (2.0.0)
-    rubysl-tsort (2.0.1)
-    rubysl-un (2.0.0)
-      rubysl-fileutils (~> 2.0)
-      rubysl-optparse (~> 2.0)
-    rubysl-uri (2.0.0)
-    rubysl-weakref (2.0.0)
-    rubysl-webrick (2.0.0)
-    rubysl-xmlrpc (2.0.0)
-    rubysl-yaml (2.0.4)
-    rubysl-zlib (2.0.1)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    sqlite3 (1.3.8)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  backports
-  bundler (>= 1.0)
-  dbd-sqlite3
-  dbi
-  rake
-  rspec
-  rubysl
-  simplecov