model_log 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f69aea8ea5dbb704c20fe58297b8729514c23d5d
-  data.tar.gz: 4929d7be0bb1904632b7c85c11110b0d110742cf
+  metadata.gz: 69789c8a7e6466dc191b8b44b7b02a9ffe79c30f
+  data.tar.gz: 6a47a7eaa1d12566fc4d6b4e26a452adb2180d6a
 SHA512:
-  metadata.gz: 836b92018bbd10ac6fc56479ba00c894d49441a0f386d5f6e791ab68f2457e65ee3f3506317788558153f605ab2fdc3da31f3d55af70eb51d8807a6a4a32de86
-  data.tar.gz: 48686a6ae25abdf61a14eb81e105dd282f6eef79d881014c7deb236c1d875516bd6323c7b721b74563b090652ff950d2a9014e37fb6048e96d674ea1c50ee085
+  metadata.gz: ad2c48215043ddac1e1247b1ea3af09a69845047dbd513f903c157dbeea11c9cbb52e28f65e6d1b99f4f0dd5316c02cff54e28ad325a755030b93009fb03aedd
+  data.tar.gz: c5c5fd4a84abc00ea8f0becaf4b25552bbf19c450d93626ec3784c5a33410a7ec979e6ba9dd843570de8e1b80565c86a64561b3f8acc186794df245d4a610c69

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    model_log (1.0.1)
+    model_log (1.0.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/model_log/class_methods/models.rb

@@ -46,52 +46,50 @@ module ModelLog
         end
 
         def write_log(resource, type)
-          begin
-            passport = ModelLog::Passport.current_passport
-            request = ModelLog::Request.current_request
-            type = type.to_s
-            can_write = true
-            content_text = {}
+          passport = ModelLog::Passport.current_passport
+          request = ModelLog::Request.current_request
+          type = type.to_s
+          can_write = true
+          content_text = {}
 
-            if type == "update"
-              changes = resource.changes
-              changes.each do |key, values|
-                value_arr = []
-                values.each_with_index do |value, i|
-                  value_arr << data_processing(key, value, :index => i)
-                end
-                content_text.merge!(Hash[key, value_arr])
+          if type == "update"
+            changes = resource.changes
+            changes.each do |key, values|
+              value_arr = []
+              values.each_with_index do |value, i|
+                value_arr << data_processing(key, value, :index => i)
               end
+              content_text.merge!(Hash[key, value_arr])
+            end
 
-              can_write = false if content_text.empty?
-            else
-              resource.class.content_columns.each do |column|
-                column_name = column.name
-                column_val = data_processing(column_name, resource.send(column_name))
-                content_text.merge!(Hash[column_name, column_val])
-              end
+            can_write = false if content_text.empty?
+          else
+            resource.class.content_columns.each do |column|
+              column_name = column.name
+              column_val = data_processing(column_name, resource.send(column_name))
+              content_text.merge!(Hash[column_name, column_val])
             end
+          end
 
-            file_content = <<-EFO.strip_heredoc.gsub("\n", "\t")
-              #{request.try(:request_method)}
-              #{request.try(:url)}
-              #{request.try(:referer)}
-              #{request.try(:remote_ip)}
-              #{request.try(:user_agent)}
-              #{ModelLog.platform}
-              #{passport.try(:id)}
-              #{passport.try(ModelLog.user_name_field)}
-              #{type.to_s}
-              #{resource.class}
-              #{resource.id}
-              #{Time.now}
-              #{content_text}
-            EFO
+          file_content = <<-EFO.strip_heredoc.gsub("\n", "\t")
+            #{Time.now.strftime("%Y-%m-%d %H:%M:%S")}
+            #{request.try(:request_method)}
+            #{request.try(:url)}
+            #{request.try(:referer)}
+            #{request.try(:remote_ip)}
+            #{request.try(:user_agent)}
+            #{ModelLog.platform}
+            #{passport.try(:id)}
+            #{passport.try(ModelLog.user_name_field)}
+            #{type}
+            #{resource.class}
+            #{resource.id}
+            #{content_text}
+          EFO
 
-            ModelLog.info file_content if can_write
-          rescue => e
-            ModelLog.info e.message
-          end
+          ModelLog.info file_content if can_write
+        rescue => e
+          ModelLog.info e.message
         end
     end
   end

data/lib/model_log/version.rb

@@ -1,3 +1,3 @@
 module ModelLog
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/model_log.rb

@@ -10,13 +10,13 @@ module ModelLog
 
     def info(content)
       content = content.chomp + "\n"
-      File.open("#{Rails.root.to_s}/log/model_log_#{Rails.env}.log", "a+") do |output|
+      File.open("#{Rails.root}/log/model_log_#{Rails.env}.log", "a+") do |output|
         output.write(content)
       end
     end
   end
 
-  @current_user_method = @current_user_method || :current_passport
-  @user_name_field = @user_name_field || :username
+  @current_user_method ||= :current_passport
+  @user_name_field ||= :username
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_log
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - sunyudong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler