redmine-reporting 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac501589d0737e31a91a96268028b61dbc16e021
-  data.tar.gz: a14f692beba30c48642f1dbf5a81142cfaa2ed5d
+  metadata.gz: f59676859d1dd31152d7b49246ce7b0d86cae104
+  data.tar.gz: 802fff1d7124b72fcd2486902204807f803bc6bc
 SHA512:
-  metadata.gz: 17643533787ea69e2f4fb34752b312eef4ad187c3f9af8d2d0826274987bcd852c3cba13927e1dfc333b74dd8ca20ac13e33828853dd52381389ec14b82da260
-  data.tar.gz: d970eba7db83d58045d09840b81f2ef498ce901fcbadead4b8e82406165456b75fd84bb6ddd0a483f58efdbb02378467bfa05c5d9d670cd912ccff9776eafbd8
+  metadata.gz: a1af6b987a35f7cc93a03cdcbce7677cc6b4ff0b188116d04bb3afcd64e58d6a9b727b6b47b377bc89d739fd3aac95683cb5421c245f7cca8c5e122960d03042
+  data.tar.gz: 91e782b6b0f44629ad8e4f63661aef46a72678c522d9de2203c43f185035936774912e4dc928d4bad0919223162215c387e47b13eabf9d79d8e8d9a8d05cc48b

data/lib/redmine/reporting/configuration.rb

@@ -19,6 +19,19 @@ module Redmine
         @http_options[:http_proxyuser] = username
         @http_options[:http_proxypass] = password
       end
+
+      def to_hash
+        {
+          base_url: self.base_url,
+          api_key: self.api_key,
+          project: self.project,
+          tracker: self.tracker,
+          category: self.category,
+          http_options: self.http_options
+        }
+      end
+
+      alias :to_h :to_hash
     end
   end
 end

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

@@ -23,36 +23,26 @@ module Redmine
 
         # This method should be used for sending manual notifications while you are still
         # inside the controller. Otherwise it works like Redmine::Reporting.report.
-        def redmine_report(subject_or_exception, &block)
-          #unless redmine_reporting_local_request?
-            env['redmine_reporting.reference_id'] = Redmine::Reporting.report(subject_or_exception, &block)
-          #end
+        def redmine_report(subject_or_exception, options={}, &block)
+          unless redmine_reporting_local_request?
+            @redmine_reporting_reference_id = env['redmine_reporting.reference_id'] = Redmine::Reporting.report(subject_or_exception, options, &block)
+          end
         end
 
         def redmine_report_reference_id
-          env['redmine_reporting.reference_id']
+          @redmine_reporting_reference_id || env['redmine_reporting.reference_id']
         end
 
         private
 
         def redmine_reporting_local_request?
-          if defined?(::Rails.application.config)
-            ::Rails.application.config.consider_all_requests_local || (request.local? && (!request.env["HTTP_X_FORWARDED_FOR"]))
-          else
-            consider_all_requests_local || (local_request? && (!request.env["HTTP_X_FORWARDED_FOR"]))
-          end
+          ::Rails.application.config.consider_all_requests_local || (request.local? && (!request.env["HTTP_X_FORWARDED_FOR"]))
         end
 
         def redmine_reporting_filter_hash(hash)
           return hash if ! hash.is_a?(Hash)
 
-          if respond_to?(:filter_parameters) # Rails 2
-            filter_parameters(hash)
-          elsif defined?(ActionDispatch::Http::ParameterFilter) # Rails 3
-            ActionDispatch::Http::ParameterFilter.new(::Rails.application.config.filter_parameters).filter(hash)
-          else
-            hash
-          end rescue hash
+          ActionDispatch::Http::ParameterFilter.new(::Rails.application.config.filter_parameters).filter(hash)
         end
 
         def redmine_reporting_request_url

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

@@ -28,13 +28,9 @@ module Redmine
         def redmine_report(env, exception)
           return unless desc = env["action_controller.instance"].try(:redmine_reporting_request_data)
 
-          Redmine::Reporting.report(exception.message) do
-            description do
-              section(exception.message) do
-                output("<pre>#{exception.backtrace.join("\n")}</pre>")
-              end unless exception.nil?
-            end
+          Redmine::Reporting.report(exception) do
             notes do
+              section("URL: #{desc[:url]}", '')
               section('Parameters') do
                 output(desc[:params].collect{|k,v| "* #{k}: #{v}"}.join("\n"))
               end

data/lib/redmine/reporting/report.rb

@@ -7,6 +7,10 @@ module Redmine
   module Reporting
     class Report
 
+      def initialize(options)
+        @options = options.dup.freeze
+      end
+
       def subject(s)
         @subject = s
       end
@@ -24,40 +28,36 @@ module Redmine
       end
 
       def commit
-        config = Redmine::Reporting.configuration
-
-        options = (config.http_options || {}).merge({
+        options = (config[:http_options] || {}).merge({
           headers: {
             'Content-type' => 'application/json',
-            'X-Redmine-API-Key' => config.api_key
+            'X-Redmine-API-Key' => config[:api_key]
           }
         })
 
         if issue_id.nil?
-          resp = HTTParty.post("#{config.base_url}/issues.json", options.merge({
+          resp = HTTParty.post("#{config[:base_url]}/issues.json", options.merge({
               body: {
                 issue: {
                   subject: @subject.strip,
-                  project_id: config.project,
+                  project_id: config[:project],
                   description: @description.strip,
-                  tracker_id: config.tracker,
-                  category_id: config.category
+                  tracker_id: config[:tracker],
+                  category_id: config[:category]
                 }
               }.to_json
             }))
 
-          issue_id = resp['issue']['id'] rescue nil
+          iid = resp['issue']['id'] rescue nil
 
-          unless issue_id.nil?
-            File.open(issue_id_file, File::CREAT|File::TRUNC|File::RDWR, 0600) {|f| f.write(issue_id.to_s)}
-          end
+          File.open(issue_id_file, File::CREAT|File::TRUNC|File::RDWR, 0600) {|f| f.write(iid.to_s)} unless iid.nil?
         end
 
         return false if 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)}"
 
-        resp = HTTParty.put("#{config.base_url}/issues/#{issue_id}.json", options.merge({
+        resp = HTTParty.put("#{config[:base_url]}/issues/#{issue_id}.json", options.merge({
             body: {
               issue: {
                 notes: "h1. #{reference_id}\n\n#{@notes}".strip
@@ -104,10 +104,12 @@ module Redmine
         nil
       end
 
-      def issue_hash
-        config = Redmine::Reporting.configuration
+      def config
+        @c ||= Redmine::Reporting.configuration.to_h.merge(@options)
+      end
 
-        Digest::SHA1.hexdigest([config.base_url, config.project, @subject.strip, @description.strip].join('//'))
+      def issue_hash
+        Digest::SHA1.hexdigest([config[:base_url], config[:project], @subject.strip, @description.strip].join('//'))
       end
 
       def issue_id_file

data/lib/redmine/reporting/version.rb

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

data/lib/redmine/reporting.rb

@@ -15,13 +15,13 @@ module Redmine
         @configuration ||= Configuration.new
       end
 
-      def report(subject_or_exception=nil, &block)
-        r = Report.new
+      def report(subject_or_exception=nil, options={}, &block)
+        r = Report.new(options)
 
         if subject_or_exception.is_a?(Exception)
           r.subject(subject_or_exception.message)
           r.description do
-            section(subject_or_exception.message) do
+            section("#{subject_or_exception.class}: #{subject_or_exception.message}") do
               output("<pre>#{subject_or_exception.backtrace.join("\n")}</pre>")
             end
           end

metadata

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