tagen 1.1.4 → 1.1.5

data/.gitignore

@@ -1,3 +1,3 @@
-*~
+/*.gem
 /.yardoc
 /tags

data/Gemfile

@@ -1,10 +1,11 @@
-source 'http://rubygems.org'
+source "http://rubygems.org"
 
-gem 'activesupport', '~>3.1.0'
+gem "activesupport", "~>3.1.0"
+gem "i18n"
 
 group :development do
-	gem 'rspec'
-  gem 'watchr'
+	gem "rspec"
+  gem "watchr"
 end
 
 #gemspec

data/Gemfile.lock

@@ -4,6 +4,7 @@ GEM
     activesupport (3.1.3)
       multi_json (~> 1.0)
     diff-lcs (1.1.3)
+    i18n (0.6.0)
     multi_json (1.0.3)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
@@ -20,5 +21,6 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 3.1.0)
+  i18n
   rspec
   watchr

data/Rakefile

@@ -1,32 +1,43 @@
+sudo = Process.pid==0 ? "" : "sudo"
+
 desc "build a gem file"
 task :release do
-	`rm *.gem &>/dev/null`
-	sh "gem build tagen.gemspec"
-	sh "gem push *.gem"
-	sh "rm *.gem"
+	run "gem build tagen.gemspec"
+	run "gem push *.gem"
+  run "#{sudo} gem install *.gem"
+	run "rm *.gem"
 end
 
-desc "install a gem"
+desc "install a gem file"
 task :install do
-	`rm *.gem &>/dev/null`
-	sh "gem build tagen.gemspec"
-	sh "gem install *.gem"
-	sh "rm *.gem"
+	run "gem build tagen.gemspec"
+	run "#{sudo} gem install *.gem"
+	run "rm *.gem"
 end
 
 desc "autotest with watchr"
 task :test do
-	sh "watchr tagen.watchr"
+	run "watchr tagen.watchr"
 end
 
+desc "testing the libraray"
 namespace :test do
-	desc "testing the whole library"
 	task :all do
-		sh "rspec --color spec"
+		run "rspec spec"
 	end
 end
 
-def sh cmd
+desc "run yard server --reload"
+task :doc do
+	run "yard server --reload"
+end
+
+desc "clean up"
+task :clean do
+	run "rm *.gem"
+end
+
+def run cmd
 	puts cmd
 	system cmd
 end

data/lib/tagen/core.rb

@@ -8,7 +8,6 @@
 	core/enumerator
 	core/numeric
 	core/string
-	core/symbol
 	core/array
 	core/hash
 	core/extend_hash
@@ -20,3 +19,6 @@
 
 	core/open_option
 ).each {|n| require_relative n }
+
+# from active_support
+require "active_support/core_ext"

data/lib/tagen/core/kernel.rb

@@ -50,7 +50,7 @@ private
 	#   RUBY_PLATFORM is "i686-linux" "i386-migw32"
 	#
 	# @return [Boolean]
-	def linux?() 
+	def linux?
     RUBY_PLATFORM =~ /linux/ 
   end  
 
@@ -58,7 +58,7 @@ private
 	#
 	# @return [Boolean]
 	# @see {#linux?}
-	def win32?() 
+	def win32?
     RUBY_PLATFORM =~ /mingw32|mswin/ 
   end 
 end # module Kernel

data/lib/tagen/core/symbol.rb

@@ -1,9 +1,8 @@
 class Symbol
-
+  # confict with active_support/core
 	# goes to String, return Symbol
-	def method_missing name, *args
-		ret = to_s.send name, *args
-		String===ret ? ret.to_sym : ret
-	end
-
+	#def method_missing name, *args
+		#ret = to_s.send name, *args
+		#String===ret ? ret.to_sym : ret
+	#end
 end

data/lib/tagen/core/time.rb

@@ -1,8 +1,50 @@
 class Time 
-	# return a float of current time
+	# return a float of time since linux epoch
 	#
 	#   #=> 1295953427.0005338
 	#
 	# @return [Float] 
-	def self.time; now.to_f end
-end # class Time
+	def self.time 
+    now.to_f 
+  end
+
+  class Deta
+    class <<self
+      # @param [Time] from
+      # @param [Time] to
+      # @return [Time::Deta] deta
+      def deta(from, to)
+        seconds = (from-to).to_i
+        self.new(seconds)
+      end
+    end
+
+    attr_reader :years, :months, :days, :hours, :minutes, :seconds
+
+    def initialize(seconds)
+      deta = seconds
+      deta, @seconds = deta.divmod(60)
+      deta, @minutes = deta.divmod(60)
+      deta, @hours = deta.divmod(24)
+      deta, @days = deta.divmod(30)
+      @years, @months = deta.divmod(12)
+    end
+
+    def display(include_seconds=true)
+      ret = ""
+      ret << "#{years} years " unless years == 0
+      ret << "#{months} months " unless months == 0
+      ret << "#{days} days " unless days==0
+      ret << "#{hours} hours " unless hours == 0
+      ret << "#{minutes} minutes " unless minutes == 0
+      ret << "#{seconds} seconds" if include_seconds
+
+      ret
+    end
+
+    # to [years, months, days, hours minutes seconds]
+    def to_a
+      [ years, months, days, hours, minutes, seconds ]
+    end
+  end
+end

data/lib/tagen/date.rb

@@ -0,0 +1,80 @@
+require "date"
+
+class Date # ::Deta
+  class Deta
+    class <<self
+      # @param [Date] from
+      # @param [Date] to
+      # @return [Date::Deta] deta
+      def deta(from, to)
+        days = (from-to).to_i
+        self.new(days)
+      end
+    end
+
+    attr_reader :years, :months, :days
+
+    def initialize(days)
+      deta = days
+      deta, @days = deta.divmod(30)
+      @years, @months = deta.divmod(12)
+    end
+
+    def display(include_days=true)
+      ret = ""
+      ret << "#{years} years " unless years == 0
+      ret << "#{months} months " unless months == 0
+      ret << "#{days} days" unless (!include_days && days==0)
+
+      ret
+    end
+
+    # to [years months days]
+    def to_a
+      [ years, months, days ]
+    end
+  end
+end
+
+
+class DateTime # ::Deta
+  class Deta
+    class <<self
+      # @param [DateTime] from
+      # @param [DateTime] to
+      # @return [DateTime::Deta] deta
+      def deta(from, to)
+        seconds = (from-to)*24*3600.to_i
+        self.new(seconds)
+      end
+    end
+
+    attr_reader :years, :months, :days, :hours, :minutes, :seconds
+
+    def initialize(seconds)
+      deta = seconds
+      deta, @seconds = deta.divmod(60)
+      deta, @minutes = deta.divmod(60)
+      deta, @hours = deta.divmod(24)
+      deta, @days = deta.divmod(30)
+      @years, @months = deta.divmod(12)
+    end
+
+    def display(include_seconds=true)
+      ret = ""
+      ret << "#{years} years " unless years == 0
+      ret << "#{months} months " unless months == 0
+      ret << "#{days} days " unless days==0
+      ret << "#{hours} hours " unless hours == 0
+      ret << "#{minutes} minutes " unless minutes == 0
+      ret << "#{seconds} seconds" if include_seconds
+
+      ret
+    end
+
+    # to [years, months, days, hours, minutes, seconds]
+    def to_a
+      [ years, months, days, hours, minutes, seconds ]
+    end
+  end
+end

data/lib/tagen/socket.rb

@@ -1,22 +1,80 @@
 require "socket"
 
-class Socket
-class <<self
-	# pack human-readable address to Socket address
-	#
-	# @example
-	# 	addr("192.168.1.1") #=> "\xC0\xA8\x01\x01"
-	#
-	# @return [String] address used by Socket
-	# @see unaddr
-	def addr(str) str.split(".").map{|v|v.to_i}.pack("CCCC") end
-
-	# unpack to humna-readable address from  Socket address 
-	#
-	# @example
-	# 	unaddr("\xC0\xA8\x01\x01") #=> "192.168.1.1"
-	#
-	# @return [String] human readable address
-	def unaddr(str) str.unpack("CCCC").join(".") end
+class BasicSocket
+  MessageLengthError = Class.new(StandardError)
+  MessageUnderflow = Class.new(StandardError)
+
+  MAXLEN  = 65535
+  LEN_LEN = [0].pack("N").size
+
+  # Send a message over the socket. The message is like a datagram rather
+  # than a stream of data.
+  def send2(message)
+    len = message.length
+    if len > MAXLEN
+      raise MessageLengthError, "MAXLEN exceeded: #{len} > #{MAXLEN}"
+    end
+    send([len].pack("N"), 0)
+    send(message, 0)
+  end
+
+  # Receive a message from the socket. Returns +""+ when there are no
+  # more messages (the writer has closed its end of the socket).
+  # Yields each time more data is received, even if partial. This can
+  # be used for a progress indicator.
+  def recv2
+    if (data = recv(LEN_LEN))
+      if data.empty?
+        ""
+      else
+        len = data.unpack("N")[0]
+        if len > MAXLEN
+          raise MessageLengthError, "MAXLEN exceeded: #{len} > #{MAXLEN}"
+        end
+
+        msg = ""
+        part = nil
+        while (delta = len - msg.length) > 0 and (part = recv(delta))
+          if part.length == 0
+            raise MessageUnderflow,
+              "Peer closed socket before finishing message --" +
+              " received #{msg.length} of #{len} bytes:\n" +
+              msg[0..99].unpack("H*")[0] + "..."
+          end
+          yield part if block_given?
+          msg << part
+        end
+        msg.empty? ? nil : msg
+      end
+    end
+  end
+
+  def send_obj(obj)
+    send2 Marshal.dump(obj)
+  end
+
+  def recv_obj
+    Marshal.load recv2
+  end
 end
+
+class Socket
+  class <<self
+    # pack human-readable address to Socket address
+    #
+    # @example
+    # 	addr("192.168.1.1") #=> "\xC0\xA8\x01\x01"
+    #
+    # @return [String] address used by Socket
+    # @see unaddr
+    def addr(str) str.split(".").map{|v|v.to_i}.pack("CCCC") end
+
+    # unpack to humna-readable address from  Socket address 
+    #
+    # @example
+    # 	unaddr("\xC0\xA8\x01\x01") #=> "192.168.1.1"
+    #
+    # @return [String] human readable address
+    def unaddr(str) str.unpack("CCCC").join(".") end
+  end
 end

data/lib/tagen/version.rb

@@ -1,3 +1,3 @@
 module Tagen 
-  VERSION="1.1.4"
+  VERSION = "1.1.5"
 end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require "tagen/core"
 
-
 class Dir
 	class << self
 		def empty? path
@@ -8,3 +7,42 @@ class Dir
 		end
 	end
 end
+
+RSpec.configure do |config|
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+
+    result
+  end
+
+  alias :silence :capture
+end
+
+module Kernel 
+private
+
+  def xdescribe(*args, &blk)
+    describe *args do
+      pending "xxxxxxxxx"
+    end
+  end
+
+  def xcontext(*args, &blk)
+    context *args do
+      pending "xxxxxxxxx"
+    end
+  end
+
+  def xit(*args, &blk)
+    it *args do
+      pending "xxxxxxxx"
+    end
+  end
+end

data/spec/tagen/core/symbol_spec.rb

@@ -1,5 +1,6 @@
 require "spec_helper"
 
+=begin
 describe Symbol do
 	describe "#method_missing" do
 		it "#sub. returns a symbol" do
@@ -9,6 +10,6 @@ describe Symbol do
 		it "#chars. return a enumerator" do
 			:_foo.chars.should be_an_instance_of Enumerator
 		end
-		
 	end
 end
+=end

data/spec/tagen/core/time_spec.rb

@@ -0,0 +1,64 @@
+require "spec_helper"
+
+describe Time do
+  describe ".time" do
+    it "works" do
+      Time.stub_chain("now.to_f") { 1 }
+      Time.time.should == 1
+    end
+  end
+end
+
+Deta = Time::Deta
+describe Deta do
+  describe "#initialize" do
+    it "works for 36561906 seconds" do
+      d = Deta.new(36561906)
+
+      d.years.should == 1
+      d.months.should == 2
+      d.days.should == 3
+      d.hours.should == 4
+      d.minutes.should == 5
+      d.seconds.should == 6
+    end
+  end
+
+  describe "#display" do
+    it "works for 1 years 2 months 3 days 4 hours 5 minutes 6 seconds" do 
+      d = Deta.new(36561906)
+
+      d.display.should == "1 years 2 months 3 days 4 hours 5 minutes 6 seconds"
+    end
+
+    it "works for 0 second" do
+      d = Deta.new(0)
+
+      d.display.should == "0 seconds"
+    end
+  end
+
+  describe "#to_a" do
+    it "works" do
+      d = Deta.new(1)
+      d.stub(:years) { 1 }
+      d.stub(:months) { 2 }
+      d.stub(:days) { 3 }
+      d.stub(:hours) { 4 }
+      d.stub(:minutes) { 5 }
+      d.stub(:seconds) { 6 }
+
+
+      d.to_a.should == [ 1, 2, 3, 4, 5, 6 ]
+    end
+  end
+
+  describe ".deta" do
+    it "works" do
+      a = Deta.deta(Time.new(2011, 1, 1, 1, 1, 2), Time.new(2011, 1, 1, 1, 1, 1)).to_a
+      b = [ 0, 0, 0, 0, 0, 1 ]
+
+      a.should == b
+    end
+  end
+end

data/spec/tagen/core_spec.rb

@@ -0,0 +1,6 @@
+require "spec_helper"
+
+describe "core" do
+
+end
+

data/spec/tagen/date_spec.rb

@@ -0,0 +1,146 @@
+require "spec_helper"
+require "tagen/date"
+
+describe Date::Deta do
+  before :all do
+    Deta = Date::Deta
+  end
+
+  describe "#initialize" do
+    it "works for 423 days" do
+      d = Deta.new(423)
+      d.years.should == 1
+      d.months.should == 2
+      d.days.should == 3
+    end
+
+    it "works for 32 days" do
+      d = Deta.new(32)
+      d.years.should == 0
+      d.months.should == 1
+      d.days.should == 2
+    end
+
+    it "works for 1 day" do
+      d = Deta.new(1)
+      d.years.should == 0
+      d.months.should == 0
+      d.days.should == 1
+    end
+  end
+
+  describe "#display" do
+    it "works for 1 years 2 months 3 days" do 
+      d = Deta.new(1)
+      d.stub(:years) { 1 }
+      d.stub(:months) { 2 }
+      d.stub(:days) { 3 }
+
+      d.display.should == "1 years 2 months 3 days"
+    end
+
+    it "works for 2 months 3 days" do 
+      d = Deta.new(1)
+      d.stub(:years) { 0 }
+      d.stub(:months) { 2 }
+      d.stub(:days) { 3 }
+
+      d.display.should == "2 months 3 days"
+    end
+
+    it "works for 0 days" do 
+      d = Deta.new(1)
+      d.stub(:years) { 0 }
+      d.stub(:months) { 0 }
+      d.stub(:days) { 0 }
+
+      d.display.should == "0 days"
+    end
+
+    it "works for 0 days with :include_days => false" do 
+      d = Deta.new(1)
+      d.stub(:years) { 0 }
+      d.stub(:months) { 0 }
+      d.stub(:days) { 0 }
+
+      d.display(false).should == ""
+    end
+  end
+
+  describe "#to_a" do
+    it "works" do
+      d = Deta.new(1)
+      d.stub(:years) { 1 }
+      d.stub(:months) { 2 }
+      d.stub(:days) { 3 }
+
+      d.to_a.should == [ 1, 2, 3 ]
+    end
+  end
+
+  describe ".deta" do
+    it "works" do
+      a = Deta.deta(Date.new(2011, 1, 2), Date.new(2011, 1, 1)).to_a
+      b = [ 0, 0, 1 ]
+
+      a.should == b
+    end
+  end
+end
+
+describe DateTime::Deta do
+  before :all do
+    Deta = DateTime::Deta
+  end
+
+  describe "#initialize" do
+    it "works for 36561906 seconds" do
+      d = Deta.new(36561906)
+
+      d.years.should == 1
+      d.months.should == 2
+      d.days.should == 3
+      d.hours.should == 4
+      d.minutes.should == 5
+      d.seconds.should == 6
+    end
+  end
+
+  describe "#display" do
+    it "works for 1 years 2 months 3 days 4 hours 5 minutes 6 seconds" do 
+      d = Deta.new(36561906)
+
+      d.display.should == "1 years 2 months 3 days 4 hours 5 minutes 6 seconds"
+    end
+
+    it "works for 0 second" do
+      d = Deta.new(0)
+
+      d.display.should == "0 seconds"
+    end
+  end
+
+  describe "#to_a" do
+    it "works" do
+      d = Deta.new(1)
+      d.stub(:years) { 1 }
+      d.stub(:months) { 2 }
+      d.stub(:days) { 3 }
+      d.stub(:hours) { 4 }
+      d.stub(:minutes) { 5 }
+      d.stub(:seconds) { 6 }
+
+
+      d.to_a.should == [ 1, 2, 3, 4, 5, 6 ]
+    end
+  end
+
+  describe ".deta" do
+    it "works" do
+      a = Deta.deta(DateTime.new(2011, 1, 1, 1, 1, 2), DateTime.new(2011, 1, 1, 1, 1, 1)).to_a
+      b = [ 0, 0, 0, 0, 0, 1 ]
+
+      a.should == b
+    end
+  end
+end

data/spec/tagen/socket_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+require "tagen/socket"
+
+describe BasicSocket do
+  describe "#send2 and #recv2" do
+    it "works" do
+      s = TCPServer.open("127.0.0.1", 0)
+      af, port, host, addr = s.addr
+      c = TCPSocket.open(host, port)
+      s = s.accept
+      c.send2("guten")
+      c.send2("tag")
+      s.recv2.should == "guten"
+      s.recv2.should == "tag"
+    end
+  end
+
+  describe "#send_obj and #recv_obj" do
+    it "works" do
+      s = TCPServer.open("127.0.0.1", 0)
+      af, port, host, addr = s.addr
+      c = TCPSocket.open(host, port)
+      s = s.accept
+      c.send_obj([1,2])
+      s.recv_obj.should == [1,2]
+    end
+  end
+end

data/tagen.gemspec

@@ -1,20 +1,21 @@
-$: << File.expand_path('../lib', __FILE__)
-require 'tagen/version'
+$: << File.expand_path("../lib", __FILE__)
+require "tagen/version"
 
 Gem::Specification.new do |s|
-	s.name = 'tagen'
+	s.name = "tagen"
 	s.version = Tagen::VERSION
-	s.summary = 'a core and extra extension to ruby library'
+	s.summary = "a core and extra extension to ruby library"
 	s.description = <<-EOF
 a core and extra extension to ruby library. 
 	EOF
 
-	s.author = 'Guten'
-	s.email = 'ywzhaifei@gmail.com'
-	s.homepage = 'http://github.com/GutenYe/tagen'
-	s.rubyforge_project = 'xx'
+	s.author = "Guten"
+	s.email = "ywzhaifei@gmail.com"
+	s.homepage = "http://github.com/GutenYe/tagen"
+	s.rubyforge_project = "xx"
 
 	s.files = `git ls-files`.split("\n")
 
-  s.add_dependency 'activesupport', '~>3.1.0'
+  s.add_dependency "activesupport", "~>3.1.0"
+  s.add_dependency "i18n"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagen
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000 Z
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &17287020 !ruby/object:Gem::Requirement
+  requirement: &19935160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,18 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *17287020
+  version_requirements: *19935160
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &19934120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *19934120
 description: ! "a core and extra extension to ruby library. \n"
 email: ywzhaifei@gmail.com
 executables: []
@@ -62,6 +73,7 @@ files:
 - lib/tagen/core/string/pyformat.rb
 - lib/tagen/core/symbol.rb
 - lib/tagen/core/time.rb
+- lib/tagen/date.rb
 - lib/tagen/erb.rb
 - lib/tagen/gdk_pixbuf2.rb
 - lib/tagen/gtk2.rb
@@ -88,7 +100,11 @@ files:
 - spec/tagen/core/open_option_spec.rb
 - spec/tagen/core/string/pyformat_spec.rb
 - spec/tagen/core/symbol_spec.rb
+- spec/tagen/core/time_spec.rb
+- spec/tagen/core_spec.rb
+- spec/tagen/date_spec.rb
 - spec/tagen/erb_spec.rb
+- spec/tagen/socket_spec.rb
 - tagen.gemspec
 - tagen.watchr
 homepage: http://github.com/GutenYe/tagen