pact_broker 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e750616e35159ab4915a82899463fb4726c3f1a0
-  data.tar.gz: 194233d951cfa4bc3b4039efbaac97f19ecf88f7
+  metadata.gz: 9d2bef5e5437959448b15a75ea7b521c759230ea
+  data.tar.gz: b160d8c66c450e5fd20d0a9c629c819249967191
 SHA512:
-  metadata.gz: fe4b4e81c2224d8ef238c3ddc8f5539b435dcadf5c87add833e9992d4e5ca79ad8463aff7a337601826be1fccd148cc709a6ca9b43c922a618ddf259b0b35eeb
-  data.tar.gz: 3a3b9df99e3e07546c2088297e6baf3b15d6928d0190642de12ed86bcd627b56412c40f486793954600f1c1aa368cd178fbea307f85d9f04e1db65be669b016e
+  metadata.gz: fe2da2b3ccd031e076334878f8e23fc543d17147e1a2ebf3bd209d20a55d2693826febadd760962514c20ee42bb5ed89f862128308fa541320a40479c900ef4a
+  data.tar.gz: 31f2080bbed54f778972966987629973738ed2e4e9f0a6808f1a184b7bbb6d1bb7c525e38febc9bdc486702cc19c53f65d3b86b30e2e9eb008796473e5cd332c

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Do this to generate your change history
 
     $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+#### 1.7.0 (2015-03-20)
+
+* a26402c - Allow configuration of version parsing. (Beth Skurrie, Tue Apr 14 09:39:05 2015 +1000)
+
 #### 1.6.0 (2015-03-20)
 
 * e20e657 - Added support for JSON contracts that are not in the Pact format (e.g. top level is an array) (Beth Skurrie, Fri Mar 20 19:12:46 2015 +1100)

data/lib/pact_broker/api/contracts/consumer_version_number_validation.rb

@@ -18,14 +18,9 @@ module PactBroker
         end
 
         def invalid_consumer_version_number?
-          begin
-            Versionomy.parse(consumer_version_number)
-            false
-          rescue Versionomy::Errors::ParseError => e
-            true
-          end
+          parsed_version_number = PactBroker.configuration.version_parser.call consumer_version_number
+          parsed_version_number.nil?
         end
-
       end
     end
   end

data/lib/pact_broker/api/contracts/put_pact_params_contract.rb

@@ -1,6 +1,5 @@
 require 'reform'
 require 'reform/contract'
-require 'versionomy'
 require 'pact_broker/messages'
 require 'pact_broker/constants'
 require 'pact_broker/api/contracts/pacticipant_name_contract'

data/lib/pact_broker/app.rb

@@ -11,7 +11,7 @@ module PactBroker
     attr_accessor :configuration
 
     def initialize &block
-      @configuration = Configuration.default_configuration
+      @configuration = PactBroker.configuration
       yield configuration
       post_configure
       build_app

data/lib/pact_broker/configuration.rb

@@ -7,7 +7,7 @@ module PactBroker
   class Configuration
 
     attr_accessor :log_dir, :database_connection, :auto_migrate_db, :use_hal_browser, :html_pact_renderer
-    attr_accessor :validate_database_connection_config, :enable_diagnostic_endpoints
+    attr_accessor :validate_database_connection_config, :enable_diagnostic_endpoints, :version_parser
     attr_writer :logger
 
     def logger
@@ -15,6 +15,7 @@ module PactBroker
     end
 
     def self.default_configuration
+      require 'pact_broker/versions/parse_semantic_version'
       config = Configuration.new
       config.log_dir = File.expand_path("./log")
       config.auto_migrate_db = true
@@ -22,6 +23,7 @@ module PactBroker
       config.html_pact_renderer = default_html_pact_render
       config.validate_database_connection_config = true
       config.enable_diagnostic_endpoints = true
+      config.version_parser = PactBroker::Versions::ParseSemanticVersion
       config
     end
 
@@ -47,4 +49,4 @@ module PactBroker
 
   end
 
-end
+end

data/lib/pact_broker/domain/group.rb

@@ -1,5 +1,3 @@
-require 'versionomy'
-
 module PactBroker
   module Domain
     class Group < Array
@@ -18,4 +16,4 @@ module PactBroker
 
     end
   end
-end
+end

data/lib/pact_broker/domain/order_versions.rb

@@ -1,4 +1,4 @@
-require 'versionomy'
+require 'pact_broker/configuration'
 
 module PactBroker
   module Domain
@@ -15,7 +15,7 @@ module PactBroker
 
         def initialize version_model
           @version_model = version_model
-          @sortable_number = Versionomy.parse(version_model.number)
+          @sortable_number = PactBroker.configuration.version_parser.call version_model.number
         end
 
         def <=> other
@@ -30,4 +30,4 @@ module PactBroker
       end
     end
   end
-end
+end

data/lib/pact_broker/locale/en.yml

@@ -8,8 +8,8 @@ en:
         invalid_url: "Invalid URL '%{url}'. Expected format: http://example.org"
         pact_missing_pacticipant_name: "was not found at expected path $.%{pacticipant}.name in the submitted pact file."
         consumer_version_number_missing: "Please specify the consumer version number by setting the X-Pact-Consumer-Version header."
-        consumer_version_number_header_invalid: "X-Pact-Consumer-Version '%{consumer_version_number}' is not recognised as a standard semantic version. eg. 1.3.0 or 2.0.4.rc1"
-        consumer_version_number_invalid: "Consumer version number '%{consumer_version_number}' is not recognised as a standard semantic version. eg. 1.3.0 or 2.0.4.rc1"
+        consumer_version_number_header_invalid: "X-Pact-Consumer-Version '%{consumer_version_number}' cannot be parsed to a version number. The expected format (unless this configuration has been overridden) is a semantic version. eg. 1.3.0 or 2.0.4.rc1"
+        consumer_version_number_invalid: "Consumer version number '%{consumer_version_number}' cannot be parsed to a version number. The expected format (unless this configuration has been overridden) is a semantic version. eg. 1.3.0 or 2.0.4.rc1"
         pacticipant_name_mismatch: "in pact ('%{name_in_pact}') does not match %{pacticipant} name in path ('%{name}')."
         connection_encoding_not_utf8: "The Sequel connection encoding (%{encoding}) is strongly recommended to be \"utf8\". If you need to set it to %{encoding} for some particular reason, then disable this check by setting config.validate_database_connection_config = false"
       duplicate_pacticipant: |

data/lib/pact_broker/version.rb

@@ -1,3 +1,3 @@
 module PactBroker
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 end

data/lib/pact_broker/versions/parse_semantic_version.rb

@@ -0,0 +1,17 @@
+require 'versionomy'
+
+module PactBroker
+  module Versions
+    class ParseSemanticVersion
+
+      def self.call string_version
+        begin
+          ::Versionomy.parse(string_version)
+        rescue ::Versionomy::Errors::ParseError => e
+          nil
+        end
+      end
+
+    end
+  end
+end

data/spec/lib/pact_broker/api/contracts/put_pact_params_contract_spec.rb

@@ -62,7 +62,7 @@ module PactBroker
             let(:attributes) { {consumer_version_number: 'blah'} }
 
             it "returns an error" do
-              expect(subject.errors[:base]).to include "Consumer version number 'blah' is not recognised as a standard semantic version. eg. 1.3.0 or 2.0.4.rc1"
+              expect(subject.errors[:base].first).to include "Consumer version number 'blah' cannot be parsed to a version number."
             end
           end
 

data/spec/lib/pact_broker/domain/order_versions_spec.rb

@@ -20,4 +20,4 @@ describe PactBroker::Domain::OrderVersions do
     expect(ordered_versions).to eq(['1.3.0','1.4.0', '1.5.0'])
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -522,6 +522,7 @@ files:
 - lib/pact_broker/ui/views/layouts/main.haml
 - lib/pact_broker/ui/views/relationships/show.haml
 - lib/pact_broker/version.rb
+- lib/pact_broker/versions/parse_semantic_version.rb
 - lib/rack/hal_browser.rb
 - lib/rack/hal_browser/redirect.rb
 - lib/rack/pact_broker/convert_file_extension_to_accept_header.rb