httpd_log_parser 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11ce3801979dd626841b135990505a1b23dfa035
-  data.tar.gz: f2dcb4f3d48a43dc83e9fddc2807c051d6a6ed68
+  metadata.gz: fc88575c2ff0173d9e64cbb0ed1a91fc982d398f
+  data.tar.gz: 95dbdb562c486a37410fa793b90f881cc44d335a
 SHA512:
-  metadata.gz: 269b6f5cab0350fbbba8dc92494472759824db58038f58a9adca75ac839e91b29f1c419770d78fafe29789975abd2757c3e0d26d17e6fcfc4698dd1c00065405
-  data.tar.gz: 9265c3179d6d00d54973fc1b4ad3045441321c68e963e800747f6f0ca0e52dfe1331df364476c7ac6b54568b94e5c7c468dc9a918b7a7b7ff9e91dfee119d5fc
+  metadata.gz: 354237063d6066599e2fbb17f4d62ec6a5497e052d00086c58ae874bac23eb90e86b01cb88d6d2cab9a162b8933d4ce03d914dab31170367c5c0bd3cca06ee2a
+  data.tar.gz: 6c38bd911cf1b68bb3fd4fa6a505cc39a21865612d8adcf6078fd4cbcd2a16fbe955eb2d1d5936fa30558b98162cccac3c4bb7fc5e7c2e5e509e9a20224692ac

data/Guardfile

@@ -0,0 +1,38 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+guard :test do
+  watch(%r{^test/.+_test\.rb$})
+  watch(%r{^test/test_.+\.rb$}) {'test' }
+
+  # Non-rails
+  watch(%r{^lib/(.+)\.rb$}) { |m| "test/#{m[1]}_test.rb" }
+
+  # Rails 4
+  # watch(%r{^app/(.+)\.rb})                               { |m| "test/#{m[1]}_test.rb" }
+  # watch(%r{^app/controllers/application_controller\.rb}) { 'test/controllers' }
+  # watch(%r{^app/controllers/(.+)_controller\.rb})        { |m| "test/integration/#{m[1]}_test.rb" }
+  # watch(%r{^app/views/(.+)_mailer/.+})                   { |m| "test/mailers/#{m[1]}_mailer_test.rb" }
+  # watch(%r{^lib/(.+)\.rb})                               { |m| "test/lib/#{m[1]}_test.rb" }
+
+  # Rails < 4
+  # watch(%r{^app/models/(.+)\.rb$})                   { |m| "test/unit/#{m[1]}_test.rb" }
+  # watch(%r{^app/controllers/(.+)\.rb$})              { |m| "test/functional/#{m[1]}_test.rb" }
+  # watch(%r{^app/views/(.+)/.+\.erb$})                { |m| "test/functional/#{m[1]}_controller_test.rb" }
+  # watch(%r{^app/views/.+$})                          { 'test/integration' }
+  # watch('app/controllers/application_controller.rb') { ['test/functional', 'test/integration'] }
+end

data/httpd_log_parser.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "guard-test"
 end

data/lib/httpd_log_parser.rb

@@ -1,3 +1,17 @@
 require 'httpd_log_parser/base'
 require 'httpd_log_parser/common'
 require 'httpd_log_parser/combined'
+
+class String
+  def to_unicage_str
+    return self.gsub(/_/, "\\_").gsub(/ /, "_")
+  end
+
+  def to_unicage_nullchk
+    if self == "-"
+      return "_"
+    end
+
+    return self
+  end
+end

data/lib/httpd_log_parser/base.rb

@@ -1,8 +1,10 @@
 
 module HttpdLogParser
   class Base
-    attr_accessor :remote_host, :client_type, :user_name, :access_time, :request_code, :response_status, :object_bytes, :referer_uri, :user_agent, :request_method, :uri, :url, :query, :filters, :ignore_extentions
+    attr_accessor :remote_host, :client_type, :user_name, :access_time, :request_code, :response_status, :object_bytes, :referer_uri, :user_agent, :request_method, :uri, :url, :query, :filters, :ignore_extentions, :call_version, :other_data
     @@format = '%d/%b/%Y:%H:%M:%S %Z'
+    @@format_unicage = '%Y-%m-%dT%H:%M:%S-%Z'
+
     def initializer()
       @ignore_extentions = []
       @filters = []
@@ -39,5 +41,8 @@ module HttpdLogParser
 
       self
     end
+
+
   end
+
 end

data/lib/httpd_log_parser/combined.rb

@@ -24,10 +24,26 @@ module HttpdLogParser
           self.user_agent = line[8]
           request_datum = self.request_code.split(" ")
           self.request_method = request_datum[0]
-          self.uri = request_datum[1]
+          if ! request_datum[1].nil?
+            self.uri = request_datum[1]
+          else
+            self.uri = ""
+          end
+          if ! request_datum[2].nil?
+            self.call_version = request_datum[2]
+          else
+            self.call_version = ""
+          end
+
           if ! self.uri.nil?
             self.url, self.query = self.uri.split('?')
           end
+          if ! line[9].nil?
+            self.other_data = line[9]
+          else 
+            self.other_data = ""
+          end
+
         rescue => e
           $stderr.puts e
           $stderr.puts line
@@ -45,8 +61,14 @@ module HttpdLogParser
       Digest::MD5.hexdigest(self.referer_uri)
     end
 
+    # get combined logformat  data
     def log
       "#{self.remote_host} #{self.client_type} #{self.user_name} [#{self.access_time.strftime(@@format)}] \"#{self.request_code}\" #{self.response_status} #{self.object_bytes} \"#{self.referer_uri}\" \"#{self.user_agent}\""
     end
+
+    # get unicage string data
+    def to_unicage
+      "#{self.remote_host} #{self.client_type.to_unicage_nullchk} #{self.access_time.strftime(@@format_unicage)} #{self.request_method} #{self.uri.to_unicage_str} #{self.call_version.to_unicage_str} #{self.object_bytes} #{self.referer_uri.to_unicage_str.to_unicage_nullchk} #{self.user_agent.to_unicage_str} #{self.other_data.to_unicage_str}"
+    end
   end
 end

data/lib/httpd_log_parser/common.rb

@@ -18,7 +18,16 @@ module HttpdLogParser
           self.object_bytes = line[6]
           request_datum = self.request_code.split(" ")
           self.request_method = request_datum[0]
-          self.uri = request_datum[1]
+          if ! request_datum[1].nil?
+            self.uri = request_datum[1]
+          else
+            self.uri = ""
+          end
+          if ! request_datum[2].nil?
+            self.call_version = request_datum[2]
+          else
+            self.call_version = ""
+          end
           if ! self.uri.nil?
             self.url, self.query = self.uri.split('?')
           end
@@ -38,5 +47,10 @@ module HttpdLogParser
     def log
       "#{self.remote_host} #{self.client_type} #{self.user_name} [#{self.access_time.strftime(@@format)}] \"#{self.request_code}\" #{self.response_status} #{self.object_bytes}"
     end
+
+    # get unicage string data
+    def to_unicage
+      "#{self.remote_host} #{self.client_type.to_unicage_nullchk} #{self.access_time.strftime(@@format_unicage)} #{self.request_method} #{self.uri.to_unicage_str} #{self.call_version.to_unicage_str} #{self.object_bytes}"
+    end
   end
 end

data/lib/httpd_log_parser/version.rb

@@ -1,3 +1,3 @@
 module HttpdLogParser
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpd_log_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - inpwjp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This library is, convert ruby object from Apache log(common, combined).
 email:
 - inpw@mua.biglobe.ne.jp
@@ -63,6 +77,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile