seis_ruby 0.2.2 → 0.2.3

data/README.rdoc

@@ -2,13 +2,13 @@
 == What is this?
 Ruby library and command line tools for earthquake science.
 
-== Command line tool
+== Command Line Tool
   seis_ruby help
 
 == Library
 Please check {SeisRuby::Command} which provides handy methods via {::SeisRuby}.
 
-== Quick start
+== Quick Start
   require 'seis_ruby'
   sac = SeisRuby.load_file('test_read.SAC') # Read a SAC file
   sac.head[:a] += 3.0                       # Shift Tp 3.0 seconds

data/lib/seis_ruby/application.rb

@@ -2,7 +2,6 @@ require 'thor'
 
 class ::SeisRuby::Application < Thor
   require 'yaml'
-  require 'pry'
   require 'fileutils'
 
   COMMAND = 'seis_ruby'
@@ -10,6 +9,8 @@ class ::SeisRuby::Application < Thor
 
   desc "repl", "Start interactive mode."
   def repl
+    repl_hook()
+
     Pry.start(
         ::TOPLEVEL_BINDING,
         prompt: [
@@ -26,7 +27,7 @@ class ::SeisRuby::Application < Thor
   def generate_completion
     FileUtils.mkdir_p(File.dirname(COMPLETION_FILE))
     FileUtils.mv(COMPLETION_FILE, "#{COMPLETION_FILE}.#{Time.now.ymdhms}.bak") if File.exist?(COMPLETION_FILE)
-    File.write(COMPLETION_FILE, completion_function_str)
+    File.write(COMPLETION_FILE, completion_function_str())
 
     puts <<-EOS
 Please add following code to your ~/.bashrc if necessary.
@@ -45,6 +46,10 @@ fi
 
   private
 
+  def repl_hook
+    require 'pry'
+  end
+
   def completion_function_str
     <<-EOS
 _#{COMMAND}()

data/lib/seis_ruby/data/cmtsolution.rb

@@ -1,34 +1,6 @@
 class ::SeisRuby::Data::Cmtsolution < ::SeisRuby::Data
   require 'ostruct'
 
-  def self.load_file(file)
-    load(File.read_uri(file), file: file)
-  end
-
-  def self.load(raw_data, meta_data)
-    new(raw_data, meta_data)
-  end
-
-  def initialize(raw_data, meta_data)
-    @raw_data = raw_data
-    @meta_data = meta_data
-    parse!
-  end
-  attr_accessor :hypocenter
-  attr_accessor :centroid
-
-  private
-
-  def parse!
-    lines\
-    = @raw_data\
-      .split("\n")\
-      .map(&:strip)\
-      .delete_if(&:empty?)
-    @hypocenter = Hypocenter.new(lines[0])
-    @centroid = Centroid.new(lines[1..-1])
-  end
-
   class Hypocenter < OpenStruct
     FIELDS = [
       # name,        column,    converter
@@ -94,4 +66,32 @@ class ::SeisRuby::Data::Cmtsolution < ::SeisRuby::Data
     end
     attr_accessor :table
   end
+
+  def self.load_file(file)
+    load(File.read_uri(file), file: file)
+  end
+
+  def self.load(raw_data, meta_data)
+    new(raw_data, meta_data)
+  end
+
+  def initialize(raw_data, meta_data)
+    @raw_data = raw_data
+    @meta_data = meta_data
+    parse!
+  end
+  attr_accessor :hypocenter
+  attr_accessor :centroid
+
+  private
+
+  def parse!
+    lines\
+    = @raw_data\
+      .split("\n")\
+      .map(&:strip)\
+      .delete_if(&:empty?)
+    @hypocenter = Hypocenter.new(lines[0])
+    @centroid = Centroid.new(lines[1..-1])
+  end
 end

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

@@ -146,7 +146,7 @@ module ::SeisRuby::Data::Sac::Head
         begin
           [field.name, field.converter_from_head.call(val)]
         rescue ArgumentError => e
-          $stderr.puts "#{field.name.inspect}"
+          $stderr.puts "Field name: #{field.name.inspect}"
           raise e
         end
       }

data/lib/seis_ruby/database/global_cmt_catalog_search/cmtsolution_format/custom_html_parser.rb

@@ -0,0 +1,7 @@
+require 'mechanize'
+
+class ::SeisRuby::Database::GlobalCmtCatalogSearch::CmtsolutionFormat::CustomHtmlParser < ::Mechanize::Page
+  def initialize(uri = nil, response = nil, body = nil, code = nil, mech = nil)
+    super(uri, response, body.gsub(/<=/, '&lt;='), code, mech)
+  end
+end

data/lib/seis_ruby/database/global_cmt_catalog_search/cmtsolution_format.rb

@@ -1,10 +1,10 @@
 module ::SeisRuby::Database::GlobalCmtCatalogSearch::CmtsolutionFormat
-  require 'mechanize'
-
   class << self
     def load_file(uri)
+      load_file_hook()
+
       agent = Mechanize.new{|a|
-        a.pluggable_parser.html = CustomHtmlParser
+        a.pluggable_parser.html = ::SeisRuby::Database::GlobalCmtCatalogSearch::CmtsolutionFormat::CustomHtmlParser
       }
       agent.get(uri)
 
@@ -20,11 +20,12 @@ module ::SeisRuby::Database::GlobalCmtCatalogSearch::CmtsolutionFormat
       end
       events.concat(load_file(next_link.uri))
     end
-  end
 
-  class CustomHtmlParser < ::Mechanize::Page
-    def initialize(uri = nil, response = nil, body = nil, code = nil, mech = nil)
-      super(uri, response, body.gsub(/<=/, '&lt;='), code, mech)
+    private
+
+    def load_file_hook
+      require 'mechanize'
+      require 'seis_ruby/database/global_cmt_catalog_search/cmtsolution_format/custom_html_parser'
     end
   end
 end

data/lib/seis_ruby/database/global_cmt_catalog_search.rb

@@ -16,12 +16,16 @@ module ::SeisRuby::Database::GlobalCmtCatalogSearch
     # @param [String] uri URI of a first page of Global CMT Catalog Search result.
     # @return [Array<Hash>] {::SeisRuby::Data::Cmtsolution#parse}
     def load_file(uri)
-      raise ArgumentError, "Not a URI of #{self}: #{uri}" unless uri =~ URI_FOR_SELF_REG
-      module_from_list_number(Regexp.last_match(1).to_i).load_file(uri)
+      raise ArgumentError, "Not a URI of #{self}: #{uri}" unless uri_for_self?(uri)
+      module_from_uri(uri).load_file(uri)
     end
 
     private
 
+    def module_from_uri(uri)
+      module_from_list_number(list_number_from_uri(uri))
+    end
+
     def module_from_list_number(list_number)
       case list_number
       when 0
@@ -40,5 +44,10 @@ module ::SeisRuby::Database::GlobalCmtCatalogSearch
         raise ArgumentError, "Unsupported list number: #{list_number}"
       end
     end
+
+    def list_number_from_uri(uri)
+      uri =~ URI_FOR_SELF_REG
+      Regexp.last_match(1).to_i
+    end
   end
 end

data/lib/seis_ruby/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seis_ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2012-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &2169113040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2169113040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2169112060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '0.15'
   type: :runtime
   prerelease: false
-  version_requirements: *2169112060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &2169111540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '2.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2169111540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2169110540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 0.9.10
   type: :runtime
   prerelease: false
-  version_requirements: *2169110540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.10
 - !ruby/object:Gem::Dependency
   name: ruby_patch
-  requirement: &2169109360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2169109360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: Ruby library for earthquake science.
 email: 
 executables:
@@ -93,6 +118,7 @@ files:
 - lib/seis_ruby/database.rb
 - lib/seis_ruby/database/global_cmt_catalog_search.rb
 - lib/seis_ruby/database/global_cmt_catalog_search/cmtsolution_format.rb
+- lib/seis_ruby/database/global_cmt_catalog_search/cmtsolution_format/custom_html_parser.rb
 - lib/seis_ruby/version.rb
 - seis_ruby.gemspec
 - test.watchr
@@ -140,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby library for earthquake science.