redmine-reporting 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f59676859d1dd31152d7b49246ce7b0d86cae104
-  data.tar.gz: 802fff1d7124b72fcd2486902204807f803bc6bc
+  metadata.gz: c3b87630b0f4b777429f6c3ff4de4586eee52909
+  data.tar.gz: 7a86c92b6a44c5d88e2bdfb43d2ebdd2d389e360
 SHA512:
-  metadata.gz: a1af6b987a35f7cc93a03cdcbce7677cc6b4ff0b188116d04bb3afcd64e58d6a9b727b6b47b377bc89d739fd3aac95683cb5421c245f7cca8c5e122960d03042
-  data.tar.gz: 91e782b6b0f44629ad8e4f63661aef46a72678c522d9de2203c43f185035936774912e4dc928d4bad0919223162215c387e47b13eabf9d79d8e8d9a8d05cc48b
+  metadata.gz: 258104f8eab4e65d97e8df80fc6cf278d17baca7fcbf1afee9d75f6c5f34077f353764e2d6d791b4d61dcec09804ebba61e3b41e4ec3a401c78cee5dd9309c24
+  data.tar.gz: 7b12cc3281fc0698042d343962af12f21e8ae0f6d441152009357f77725173e6b469544e2b8d465ca4fdb44dd575c584d10009d217d986ea0e475892aedd2c2d

data/lib/redmine/reporting/configuration.rb

@@ -30,8 +30,8 @@ module Redmine
           http_options: self.http_options
         }
       end
-
       alias :to_h :to_hash
+
     end
   end
 end

data/lib/redmine/reporting/rails/middleware.rb

@@ -30,12 +30,12 @@ module Redmine
 
           Redmine::Reporting.report(exception) do
             notes do
-              section("URL: #{desc[:url]}", '')
+              section("URL: #{desc[:url]} (#{desc[:params][:controller]}##{desc[:params][:action]})", '')
               section('Parameters') do
-                output(desc[:params].collect{|k,v| "* #{k}: #{v}"}.join("\n"))
+                output(desc[:params].select{|k,v| ![:controller, :action].include?(k)}.collect{|k,v| "* *#{k}:* #{v}"}.join("\n"))
               end
               section('Session') do
-                output(desc[:session].collect{|k,v| "* #{k}: #{v}"}.join("\n"))
+                output(desc[:session].collect{|k,v| "* *#{k}:* #{v}"}.join("\n"))
               end
             end
           end

data/lib/redmine/reporting/report.rb

@@ -28,6 +28,8 @@ module Redmine
       end
 
       def commit
+        reference_id = "#{Zlib.crc32(Time.now.to_f.to_s).to_s(16)}#{Zlib.crc32(@subject).to_s(16)}#{Zlib.crc32(@description).to_s(16)}"
+
         options = (config[:http_options] || {}).merge({
           headers: {
             'Content-type' => 'application/json',
@@ -35,7 +37,10 @@ module Redmine
           }
         })
 
-        if issue_id.nil?
+        # add reference_id to description if updates are disabled
+        @description = "h1. #{reference_id}\n\n#{@description}" if config[:no_update]
+
+        if saved_issue_id.nil?
           resp = HTTParty.post("#{config[:base_url]}/issues.json", options.merge({
               body: {
                 issue: {
@@ -50,12 +55,12 @@ module Redmine
 
           iid = resp['issue']['id'] rescue nil
 
-          File.open(issue_id_file, File::CREAT|File::TRUNC|File::RDWR, 0600) {|f| f.write(iid.to_s)} unless iid.nil?
+          save_issue_data(iid, reference_id) unless iid.nil?
         end
 
-        return false if issue_id.nil?
+        return false if (issue_id = saved_issue_id).nil?
 
-        reference_id = "#{Zlib.crc32(Time.now.to_f.to_s).to_s(16)}#{Zlib.crc32(@subject).to_s(16)}#{Zlib.crc32(@description).to_s(16)}"
+        return saved_reference_id if config[:no_update]
 
         resp = HTTParty.put("#{config[:base_url]}/issues/#{issue_id}.json", options.merge({
             body: {
@@ -65,6 +70,8 @@ module Redmine
             }.to_json
           }))
 
+        save_issue_data(issue_id, reference_id)
+
         reference_id
       rescue => e
         # TODO ignore
@@ -81,6 +88,10 @@ module Redmine
         nil
       end
 
+      def chapter(title, content=nil, &block)
+        syntax_section('h1', title, content, &block)
+      end
+
       def section(title, content=nil, &block)
         syntax_section('h2', title, content, &block)
       end
@@ -116,13 +127,26 @@ module Redmine
         File.join(Dir.tmpdir, "redmine_reporting_#{issue_hash}")
       end
 
-      def issue_id
+      def save_issue_data(issue_id, reference_id)
+        File.open(issue_id_file, File::CREAT|File::TRUNC|File::RDWR, 0600) {|f| f.write("#{issue_id.to_s};#{reference_id}")}
+      end
+
+      def read_issue_data
+        data = [nil, nil]
+
         if File.exists?(issue_id_file)
-          id = File.open(issue_id_file, 'r').read.strip.to_i
-          return id if id > 0
+          data = File.open(issue_id_file, 'r').read.split(';').collect{|d| d.strip} rescue [nil, nil]
         end
 
-        nil
+        data
+      end
+
+      def saved_issue_id
+        read_issue_data.first
+      end
+
+      def saved_reference_id
+        read_issue_data.last
       end
 
     end

data/lib/redmine/reporting/version.rb

@@ -1,5 +1,5 @@
 module Redmine
   module Reporting
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine-reporting
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler