seis_ruby 0.2.3 → 0.2.4

data/lib/seis_ruby/application.rb

@@ -3,6 +3,7 @@ require 'thor'
 class ::SeisRuby::Application < Thor
   require 'yaml'
   require 'fileutils'
+  require 'ruby_patch'
 
   COMMAND = 'seis_ruby'
   COMPLETION_FILE = File.join(ENV['HOME'], ".config", COMMAND, "completion.bash")
@@ -12,10 +13,10 @@ class ::SeisRuby::Application < Thor
     repl_hook()
 
     Pry.start(
-        ::TOPLEVEL_BINDING,
+        ::SeisRuby,
         prompt: [
-                lambda{|obj, nest_level, pry| "[#{pry.input_array.size}] SeisRuby(#{obj}):#{nest_level}> "},
-                lambda{|obj, nest_level, pry| "[#{pry.input_array.size}] SeisRuby(#{obj}):#{nest_level}* "}])
+                lambda{|obj, nest_level, pry| "[#{pry.input_array.size}] #{obj}:#{nest_level}> "},
+                lambda{|obj, nest_level, pry| "[#{pry.input_array.size}] #{obj}:#{nest_level}* "}])
   end
 
   desc "yamlize URI", "Read data from URI, parse it and output to STDOUT in YAML format."

data/lib/seis_ruby/data/sac/binary/head.rb

@@ -1,5 +1,5 @@
 module ::SeisRuby::Data::Sac::Binary::Head
-  HEAD_FORMAT_STRING = "f70i40A8A16" + "A8"*21
+  HEAD_FORMAT_STRING = "f70l40A8A16" + "A8"*21
   BODY_FORMAT_STRING = "f*"
   FORMAT_STRING = HEAD_FORMAT_STRING + BODY_FORMAT_STRING
 end

data/lib/seis_ruby/data/sac/head.rb

@@ -61,80 +61,94 @@ module ::SeisRuby::Data::Sac::Head
   ].map.with_index.with_object({}){|(v, i), h| h[i + 1] = v}
 
   # Float
-  CONVERTER_FROM_HEAD_FLOAT = lambda{|x|
-    x_f = x.to_f
-    return nil if x_f == -12345.0
-    x_f
-  }
-  CONVERTER_TO_HEAD_FLOAT = lambda{|x|
-    return -12345.0 if x.nil?
-    x.to_f
-  }
-
-  # Integer
-  CONVERTER_FROM_HEAD_INTEGER = lambda{|n|
-    n_i = n.to_f.round
-    return nil if n_i == -12345
-    n_i
-  }
-  CONVERTER_TO_HEAD_INTEGER = lambda{|n|
-    return -12345 if n.nil?
-    n.to_f.round
-  }
-
-  # Enumerated value
-  CONVERTER_FROM_HEAD_ENUMERATED_VALUE = lambda{|n|
-    n_i = n.to_f.round
-    return nil if n_i == -12345
-    raise ArgumentError, "Enumerated value out of range: #{n.inspect}.to_f.round" unless ENUMERATED_VALUES.has_key?(n_i)
-    ENUMERATED_VALUES.fetch(n_i)
-  }
-  CONVERTER_TO_HEAD_ENUMERATED_VALUE = lambda{|sym|
-    return -12345 if sym.nil?
-    sym_sym = sym.to_sym
-    raise ArgumentError, "Unknown enumerated value: #{sym.inspect}.to_sym" unless ENUMERATED_VALUES.has_value?(sym_sym)
-    ENUMERATED_VALUES.key(sym_sym)
-  }
-
-  # Logical
-  CONVERTER_FROM_HEAD_LOGICAL = lambda{|n| n.to_f.round == 1}
-  CONVERTER_TO_HEAD_LOGICAL = lambda{|v|
-    if v
-      1
-    else
-      0
+  module FloatConverter
+    UNDEFINED = -12345.0
+
+    def self.from_head(x)
+      x_f = x.to_f
+      return nil if x_f == UNDEFINED
+      x_f
+    end
+
+    def self.to_head(x)
+      return UNDEFINED if x.nil?
+      x.to_f
+    end
+  end
+
+  module IntegerConverter
+    UNDEFINED = -12345
+
+    def self.from_head(n)
+      n_i = n.to_f.round
+      return nil if n_i == UNDEFINED
+      n_i
+    end
+
+    def self.to_head(n)
+      return UNDEFINED if n.nil?
+      n.to_f.round
+    end
+  end
+
+  module EnumeratedValueConverter
+    UNDEFINED = -12345
+
+    def self.from_head(n)
+      n_i = n.to_f.round
+      return nil if n_i == UNDEFINED
+      raise ArgumentError, "Enumerated value out of range: #{n.inspect}.to_f.round" unless ENUMERATED_VALUES.has_key?(n_i)
+      ENUMERATED_VALUES.fetch(n_i)
+    end
+
+    def self.to_head(sym)
+      return UNDEFINED if sym.nil?
+      sym_sym = sym.to_sym
+      raise ArgumentError, "Unknown enumerated value: #{sym.inspect}.to_sym" unless ENUMERATED_VALUES.has_value?(sym_sym)
+      ENUMERATED_VALUES.key(sym_sym)
     end
-  }
-
-  # String
-  CONVERTER_FROM_HEAD_STRING = lambda{|str|
-    stripped_str = str.to_s.strip
-    return nil if stripped_str == "-12345"
-    stripped_str
-  }
-  CONVERTER_TO_HEAD_STRING = lambda{|str|
-    return "-12345" if str.nil?
-    str.to_s.strip
-  }
-
-  CONVERTERS_FROM_HEAD\
-  = [CONVERTER_FROM_HEAD_FLOAT]*70\
-  + [CONVERTER_FROM_HEAD_INTEGER]*15\
-  + [CONVERTER_FROM_HEAD_ENUMERATED_VALUE]*20\
-  + [CONVERTER_FROM_HEAD_LOGICAL]*5\
-  + [CONVERTER_FROM_HEAD_STRING]*23
-
-  CONVERTERS_TO_HEAD\
-  = [CONVERTER_TO_HEAD_FLOAT]*70\
-  + [CONVERTER_TO_HEAD_INTEGER]*15\
-  + [CONVERTER_TO_HEAD_ENUMERATED_VALUE]*20\
-  + [CONVERTER_TO_HEAD_LOGICAL]*5\
-  + [CONVERTER_TO_HEAD_STRING]*23
-
-  Field = Struct.new(:name, :converter_from_head, :converter_to_head)
+  end
+
+  module LogicalConverter
+    def self.from_head(n)
+      n.to_f.round == 1
+    end
+
+    def self.to_head(v)
+      if v
+        1
+      else
+        0
+      end
+    end
+  end
+
+  module StringConverter
+    UNDEFINED = '-12345'
+
+    def self.from_head(str)
+      stripped_str = str.to_s.strip
+      return nil if stripped_str == UNDEFINED
+      stripped_str
+    end
+
+    def self.to_head(str)
+      return UNDEFINED if str.nil?
+      str.to_s.strip
+    end
+  end
+
+  CONVERTERS\
+  = [FloatConverter]*70\
+  + [IntegerConverter]*15\
+  + [EnumeratedValueConverter]*20\
+  + [LogicalConverter]*5\
+  + [StringConverter]*23
+
+  Field = Struct.new(:name, :converter)
   FIELDS = NAMES\
-    .zip(CONVERTERS_FROM_HEAD, CONVERTERS_TO_HEAD)\
-    .map{|name, from, to| Field.new(name, from, to)}
+    .zip(CONVERTERS)\
+    .map{|name, converter| Field.new(name, converter)}
 
   class << self
     # @param [Array] array
@@ -144,7 +158,7 @@ module ::SeisRuby::Data::Sac::Head
         .zip(array)\
         .map{|field, val|
         begin
-          [field.name, field.converter_from_head.call(val)]
+          [field.name, field.converter.from_head(val)]
         rescue ArgumentError => e
           $stderr.puts "Field name: #{field.name.inspect}"
           raise e
@@ -156,7 +170,7 @@ module ::SeisRuby::Data::Sac::Head
     # @param [Hash] hash
     # @return [Array]
     def convert_to_head(hash)
-      FIELDS.map{|field| field.converter_to_head.call(hash[field.name])}
+      FIELDS.map{|field| field.converter.to_head(hash[field.name])}
     end
   end
 end

data/lib/seis_ruby/version.rb

@@ -1,3 +1,3 @@
 module SeisRuby
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/test/seis_ruby/data/sac/head_test.rb

@@ -12,67 +12,61 @@ class HeadTest < ::MiniTest::Unit::TestCase
 
   T = ::SeisRuby::Data::Sac::Head
 
-  F_FROM = T::CONVERTER_FROM_HEAD_FLOAT
-  N_FROM = T::CONVERTER_FROM_HEAD_INTEGER
-  I_FROM = T::CONVERTER_FROM_HEAD_ENUMERATED_VALUE
-  L_FROM = T::CONVERTER_FROM_HEAD_LOGICAL
-  K_FROM = T::CONVERTER_FROM_HEAD_STRING
+  F = T::FloatConverter
+  N = T::IntegerConverter
+  I = T::EnumeratedValueConverter
+  L = T::LogicalConverter
+  K = T::StringConverter
 
   def test_convert_from_head_undefined
-    assert_nil(F_FROM.call(-12345.0))
-    assert_nil(N_FROM.call(-12345))
-    assert_nil(I_FROM.call(-12345))
-    assert_nil(K_FROM.call("-12345"))
+    assert_nil(F.from_head(-12345.0))
+    assert_nil(N.from_head(-12345))
+    assert_nil(I.from_head(-12345))
+    assert_nil(K.from_head("-12345"))
   end
 
   def test_convert_from_head_valid
-    assert_equal(42.0, F_FROM.call(42.0))
-    assert_equal(42, N_FROM.call(42))
-    assert_equal(:itime, I_FROM.call(1))
-    assert_equal(:ipostq, I_FROM.call(42))
-    assert_equal(:iu, I_FROM.call(86))
-    assert_equal(true, L_FROM.call(1))
-    assert_equal(false, L_FROM.call(0))
-    assert_equal("42", K_FROM.call("42"))
+    assert_equal(42.0, F.from_head(42.0))
+    assert_equal(42, N.from_head(42))
+    assert_equal(:itime, I.from_head(1))
+    assert_equal(:ipostq, I.from_head(42))
+    assert_equal(:iu, I.from_head(86))
+    assert_equal(true, L.from_head(1))
+    assert_equal(false, L.from_head(0))
+    assert_equal("42", K.from_head("42"))
   end
 
   def test_convert_from_head_invalid
-    assert_raises(ArgumentError, NoMethodError){F_FROM.call(:'1.0')}
-    assert_raises(ArgumentError, NoMethodError){N_FROM.call(:'1')}
-    assert_raises(ArgumentError, NoMethodError){I_FROM.call(-1)}
-    assert_raises(ArgumentError, NoMethodError){I_FROM.call(0)}
-    assert_raises(ArgumentError, NoMethodError){I_FROM.call(87)}
-    assert_raises(ArgumentError, NoMethodError){I_FROM.call(88)}
+    assert_raises(ArgumentError, NoMethodError){F.from_head(:'1.0')}
+    assert_raises(ArgumentError, NoMethodError){N.from_head(:'1')}
+    assert_raises(ArgumentError, NoMethodError){I.from_head(-1)}
+    assert_raises(ArgumentError, NoMethodError){I.from_head(0)}
+    assert_raises(ArgumentError, NoMethodError){I.from_head(87)}
+    assert_raises(ArgumentError, NoMethodError){I.from_head(88)}
   end
 
-  F_TO = T::CONVERTER_TO_HEAD_FLOAT
-  N_TO = T::CONVERTER_TO_HEAD_INTEGER
-  I_TO = T::CONVERTER_TO_HEAD_ENUMERATED_VALUE
-  L_TO = T::CONVERTER_TO_HEAD_LOGICAL
-  K_TO = T::CONVERTER_TO_HEAD_STRING
-
   def test_convert_to_head_undefined
-    assert_equal(-12345.0, F_TO.call(nil))
-    assert_equal(-12345, N_TO.call(nil))
-    assert_equal(-12345, I_TO.call(nil))
-    assert_equal(0, L_TO.call(nil))
-    assert_equal("-12345", K_TO.call(nil))
+    assert_equal(-12345.0, F.to_head(nil))
+    assert_equal(-12345, N.to_head(nil))
+    assert_equal(-12345, I.to_head(nil))
+    assert_equal(0, L.to_head(nil))
+    assert_equal("-12345", K.to_head(nil))
   end
 
   def test_convert_to_head_valid
-    assert_equal(42.0, F_TO.call(42.0))
-    assert_equal(42, N_TO.call(42))
-    assert_equal(1, I_TO.call(:itime))
-    assert_equal(42, I_TO.call(:ipostq))
-    assert_equal(86, I_TO.call(:iu))
-    assert_equal(1, L_TO.call(true))
-    assert_equal(0, L_TO.call(false))
-    assert_equal("42", K_TO.call("42"))
+    assert_equal(42.0, F.to_head(42.0))
+    assert_equal(42, N.to_head(42))
+    assert_equal(1, I.to_head(:itime))
+    assert_equal(42, I.to_head(:ipostq))
+    assert_equal(86, I.to_head(:iu))
+    assert_equal(1, L.to_head(true))
+    assert_equal(0, L.to_head(false))
+    assert_equal("42", K.to_head("42"))
   end
 
   def test_convert_to_head_invalid
-    assert_raises(ArgumentError, NoMethodError){F_TO.call(:"42.0")}
-    assert_raises(ArgumentError, NoMethodError){N_TO.call(:"42")}
-    assert_raises(ArgumentError, NoMethodError){I_TO.call(:this_is_not_exist)}
+    assert_raises(ArgumentError, NoMethodError){F.to_head(:"42.0")}
+    assert_raises(ArgumentError, NoMethodError){N.to_head(:"42")}
+    assert_raises(ArgumentError, NoMethodError){I.to_head(:this_is_not_exist)}
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seis_ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-15 00:00:00.000000000 Z
+date: 2012-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2154938040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
+  version_requirements: *2154938040
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2154937560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: '0.15'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.15'
+  version_requirements: *2154937560
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2154937100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: '2.5'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
+  version_requirements: *2154937100
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2154936640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: 0.9.10
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.10
+  version_requirements: *2154936640
 - !ruby/object:Gem::Dependency
   name: ruby_patch
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2154936180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,12 +65,7 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+  version_requirements: *2154936180
 description: Ruby library for earthquake science.
 email: 
 executables:
@@ -166,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby library for earthquake science.