pact_broker 1.3.2.rc1 → 1.4.0

data/lib/pact_broker/api/decorators/pact_pacticipant_decorator.rb

@@ -1,5 +1,5 @@
 require 'pact_broker/api/pact_broker_urls'
-require_relative 'version_decorator'
+require_relative 'embedded_version_decorator'
 require_relative 'base_decorator'
 
 
@@ -13,7 +13,7 @@ module PactBroker
 
         property :name
         property :repository_url
-        property :version, :class => "PactBroker::Domain::Version", :extend => PactBroker::Api::Decorators::VersionRepresenter, :embedded => true
+        property :version, :class => "PactBroker::Domain::Version", :extend => PactBroker::Api::Decorators::EmbeddedVersionDecorator, :embedded => true
 
         link :self do | options |
           pacticipant_url(options[:base_url], represented)

data/lib/pact_broker/api/decorators/pacticipant_collection_decorator.rb

@@ -1,26 +1,6 @@
-require 'roar/representer/json/hal'
+require 'roar/json/hal'
 require 'pact_broker/api/pact_broker_urls'
-require_relative 'version_decorator'
-
-module Roar
-  module Representer
-    module Feature
-
-      module Hypermedia
-
-        #Monkey patch alert! Get "no method rel for Nil" when there is an empty array
-        #in links. Cannot reproduce this in the roar tests :(
-        alias_method :original_compile_links_for, :compile_links_for
-
-        def compile_links_for configs, *args
-          original_compile_links_for(configs, *args).select(&:any?)
-        end
-
-      end
-    end
-  end
-end
-
+require_relative 'embedded_version_decorator'
 
 module PactBroker
 
@@ -30,11 +10,7 @@ module PactBroker
 
       class PacticipantCollectionRepresenter < BaseDecorator
 
-        collection :pacticipants, exec_context: :decorator, :class => PactBroker::Domain::Pacticipant, :extend => PactBroker::Api::Decorators::PacticipantRepresenter
-
-        def pacticipants
-          represented
-        end
+        collection :entries, :as => :pacticipants, :class => PactBroker::Domain::Pacticipant, :extend => PactBroker::Api::Decorators::PacticipantRepresenter
 
         link :self do | options |
           pacticipants_url options[:base_url]
@@ -47,4 +23,4 @@ module PactBroker
       end
     end
   end
-end
+end

data/lib/pact_broker/api/decorators/pacticipant_decorator.rb

@@ -1,5 +1,5 @@
 require_relative 'base_decorator'
-require_relative 'version_decorator'
+require_relative 'embedded_version_decorator'
 require 'pact_broker/api/decorators/timestamps'
 
 module PactBroker
@@ -13,7 +13,7 @@ module PactBroker
         property :name
         property :repository_url, as: :repositoryUrl
 
-        property :latest_version, as: :'latest-version', :class => PactBroker::Domain::Version, :extend => PactBroker::Api::Decorators::VersionRepresenter, :embedded => true, writeable: false
+        property :latest_version, as: :'latest-version', :class => PactBroker::Domain::Version, :extend => PactBroker::Api::Decorators::EmbeddedVersionDecorator, :embedded => true, writeable: false
 
         include Timestamps
 

data/lib/pact_broker/api/decorators/representable_pact.rb

@@ -1,14 +1,17 @@
 require 'ostruct'
 
+# TODO remove this class
+
 module PactBroker
   module Api
     module Decorators
       class RepresentablePact
 
-        attr_reader :consumer, :provider, :consumer_version, :created_at, :updated_at
+        attr_reader :consumer, :provider, :consumer_version, :consumer_version_number, :created_at, :updated_at
 
         def initialize pact
           @consumer_version = pact.consumer_version
+          @consumer_version_number = pact.consumer_version.number
           @consumer = OpenStruct.new(:version => @consumer_version, :name => pact.consumer.name)
           @provider = OpenStruct.new(:version => nil, :name => pact.provider.name)
           @created_at = pact.created_at

data/lib/pact_broker/api/decorators/tag_decorator.rb

@@ -10,10 +10,33 @@ module PactBroker
 
       class TagDecorator < BaseDecorator
 
+        property :name
+
         include Timestamps
 
+
         link :self do | options |
-          tag_url(options[:base_url], represented)
+          {
+            title: 'Tag',
+            name: represented.name,
+            href: tag_url(options[:base_url], represented)
+          }
+        end
+
+        link :version do | options |
+          {
+            title: 'Version',
+            name: represented.version.number,
+            href: version_url(options.fetch(:base_url), represented.version)
+          }
+        end
+
+        link :pacticipant do | options |
+          {
+            title: 'Pacticipant',
+            name: represented.version.pacticipant.name,
+            href: pacticipant_url(options.fetch(:base_url), represented.version.pacticipant)
+          }
         end
 
       end

data/lib/pact_broker/api/decorators/timestamps.rb

@@ -1,4 +1,4 @@
-require 'roar/representer/json'
+require 'roar/json'
 
 module PactBroker
 
@@ -8,7 +8,7 @@ module PactBroker
 
       module Timestamps
 
-        include Roar::Representer::JSON
+        include Roar::JSON
 
         property :optional_updated_at, as: :updatedAt, exec_context: :decorator, writeable: false
         property :createdAt, getter: lambda { |_|  created_at.xmlschema }, writeable: false

data/lib/pact_broker/api/decorators/version_decorator.rb

@@ -1,16 +1,40 @@
 require_relative 'base_decorator'
+require_relative 'embedded_tag_decorator'
 
 module PactBroker
   module Api
     module Decorators
-      class VersionRepresenter < BaseDecorator
+      class VersionDecorator < BaseDecorator
 
         property :number
 
+        collection :tags, embedded: true, :extend => PactBroker::Api::Decorators::EmbeddedTagDecorator
+
+        link :self do | options |
+          {
+            title: 'Version',
+            name: represented.number,
+            href: version_url(options.fetch(:base_url), represented)
+          }
+        end
+
         link :self do | options |
-          version_url(options[:base_url], represented)
+          {
+            title: 'Version',
+            name: represented.number,
+            href: version_url(options.fetch(:base_url), represented)
+          }
         end
+
+        link :pacticipant do | options |
+          {
+            title: 'Pacticipant',
+            name: represented.pacticipant.name,
+            href: pacticipant_url(options.fetch(:base_url), represented.pacticipant)
+          }
+        end
+
       end
     end
   end
-end
+end

data/lib/pact_broker/api/decorators/webhooks_decorator.rb

@@ -7,7 +7,7 @@ module PactBroker
       class WebhooksDecorator < BaseDecorator
 
 
-        link :'pb:self' do | context |
+        link :self do | context |
           {
             title: context[:resource_title],
             href: context[:resource_url]

data/lib/pact_broker/api/pact_broker_urls.rb

@@ -25,8 +25,7 @@ module PactBroker
       end
 
       def pact_url base_url, pact
-        representable_pact = representable_pact(pact)
-        "#{pactigration_base_url(base_url, representable_pact)}/version/#{representable_pact.consumer.version.number}"
+        "#{pactigration_base_url(base_url, pact)}/version/#{pact.consumer_version_number}"
       end
 
       def pact_url_from_params base_url, params
@@ -48,6 +47,14 @@ module PactBroker
         "#{base_url}/pacts/provider/#{url_encode(provider_name)}/consumer/#{url_encode(consumer_name)}/versions"
       end
 
+      def previous_distinct_diff_url pact, base_url
+        pact_url(base_url, pact) + "/diff/previous-distinct"
+      end
+
+      def previous_distinct_pact_version_url pact, base_url
+        pact_url(base_url, pact) + "/previous-distinct"
+      end
+
       def tags_url base_url, version
         "#{version_url(base_url, version)}/tags"
       end
@@ -69,7 +76,7 @@ module PactBroker
       end
 
       def webhooks_for_pact_url consumer, provider, base_url
-        "#{base_url}/webhooks/provider/#{provider.name}/consumer/#{consumer.name}"
+        "#{base_url}/webhooks/provider/#{url_encode(provider.name)}/consumer/#{url_encode(consumer.name)}"
       end
 
       def hal_browser_url target_url

data/lib/pact_broker/api/resources/index.rb

@@ -18,22 +18,22 @@ module PactBroker
         def to_json
           {
             _links: {
-              'pb:self' =>
+              'self' =>
               {
                 href: base_url,
-                title: 'The Pact Broker index page',
+                title: 'Index',
                 templated: false
               },
-              'pb:latest-pacts' =>
+              'pb:latest-pact-versions' =>
               {
                 href: base_url + '/pacts/latest',
-                title: 'Retrieve latest pacts',
+                title: 'Latest pact versions',
                 templated: false
               },
               'pb:pacticipants' =>
               {
                 href: base_url + '/pacticipants',
-                title: 'Retrieve pacticipants',
+                title: 'Pacticipants',
                 templated: false
               },
               'pb:webhooks' =>

data/lib/pact_broker/api/resources/pact_content_diff.rb

@@ -0,0 +1,40 @@
+require 'pact_broker/api/resources/base_resource'
+require 'pact_broker/pacts/pact_params'
+require 'pact_broker/pacts/diff'
+
+module PactBroker
+  module Api
+    module Resources
+
+      class PactContentDiff < BaseResource
+
+        def content_types_provided
+          [["text/plain", :to_text]]
+        end
+
+        def allowed_methods
+          ["GET"]
+        end
+
+        def resource_exists?
+          pacticipant_service.find_pacticipant_by_name(consumer_name) &&
+            pacticipant_service.find_pacticipant_by_name(provider_name)
+        end
+
+        def to_text
+          _, body = PactBroker::Pacts::Diff.run pact_params, base_url: base_url
+          response.body = body
+        end
+
+        def pact
+          @pact ||= pact_service.find_pact(pact_params)
+        end
+
+        def pact_params
+          @pact_params ||= PactBroker::Pacts::PactParams.from_request request, path_info
+        end
+
+      end
+    end
+  end
+end

data/lib/pact_broker/api/resources/previous_distinct_pact_version.rb

@@ -0,0 +1,39 @@
+require 'pact_broker/api/resources/base_resource'
+require 'pact_broker/pacts/pact_params'
+require 'pact_broker/pacts/diff'
+require 'pact_broker/api/decorators/pact_decorator'
+
+module PactBroker
+  module Api
+    module Resources
+
+      class PreviousDistinctPactVersion < BaseResource
+
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
+
+        def allowed_methods
+          ["GET"]
+        end
+
+        def resource_exists?
+          pact
+        end
+
+        def to_json
+          PactBroker::Api::Decorators::PactDecorator.new(pact).to_json(base_url: base_url)
+        end
+
+        def pact
+          @pact ||= pact_service.find_previous_distinct_pact_version(pact_params)
+        end
+
+        def pact_params
+          @pact_params ||= PactBroker::Pacts::PactParams.from_request request, path_info
+        end
+
+      end
+    end
+  end
+end

data/lib/pact_broker/api/resources/version.rb

@@ -0,0 +1,36 @@
+require 'pact_broker/services'
+require 'pact_broker/api/decorators/version_decorator'
+
+module PactBroker
+  module Api
+    module Resources
+
+      class Version < BaseResource
+
+        def content_types_provided
+          [["application/hal+json", :to_json]]
+        end
+
+        def allowed_methods
+          ["GET"]
+        end
+
+        def resource_exists?
+          version
+        end
+
+        def to_json
+          Decorators::VersionDecorator.new(version).to_json(base_url: base_url)
+        end
+
+        private
+
+        def version
+          @version ||= version_service.find_by_pacticipant_name_and_number path_info
+        end
+
+      end
+    end
+
+  end
+end

data/lib/pact_broker/app.rb

@@ -43,7 +43,7 @@ module PactBroker
     def build_app
       @app = Rack::Builder.new
 
-      @app.use Rack::Static, :urls => ["/stylesheets", "/css", "/fonts", "/js", "/javascripts"], :root => PactBroker.project_root.join("public")
+      @app.use Rack::Static, :urls => ["/stylesheets", "/css", "/fonts", "/js", "/javascripts", "/images"], :root => PactBroker.project_root.join("public")
       @app.use Rack::PactBroker::ConvertFileExtensionToAcceptHeader
 
       if configuration.use_hal_browser
@@ -54,7 +54,7 @@ module PactBroker
       end
 
       logger.info "Mounting UI"
-      require 'pact_broker/ui/app'
+      require 'pact_broker/ui'
 
       logger.info "Mounting PactBroker::API"
       require 'pact_broker/api'

data/lib/pact_broker/date_helper.rb

@@ -0,0 +1,93 @@
+module PactBroker
+  module DateHelper
+
+    extend self
+
+    #Ripped from actionview/lib/action_view/helpers/date_helper.rb
+
+    def local_date_in_words datetime
+      datetime.to_time.localtime.to_datetime.strftime("%a %d %b %Y, %l:%M%P %:z").gsub('  ', ' ')
+    end
+
+    class Locale
+      def initialize options
+        @options = options
+      end
+
+      def t path, options
+        I18n.t path, @options.merge(options)
+      end
+    end
+
+    def distance_of_time_in_words(from_time, to_time = 0, options = {})
+      options = {
+        scope: :'datetime.distance_in_words'
+      }.merge!(options)
+
+      from_time = from_time.to_time if from_time.respond_to?(:to_time)
+      to_time = to_time.to_time if to_time.respond_to?(:to_time)
+      from_time, to_time = to_time, from_time if from_time > to_time
+      distance_in_minutes = ((to_time - from_time)/60.0).round
+      distance_in_seconds = (to_time - from_time).round
+
+      # require 'pry'; pry(binding);
+
+      # locale = I18n.with_options :locale => options[:locale], :scope => options[:scope]
+      locale = Locale.new(:locale => options[:locale], :scope => options[:scope])
+      case distance_in_minutes
+        when 0..1
+          return distance_in_minutes == 0 ?
+                 locale.t(:less_than_x_minutes, :count => 1) :
+                 locale.t(:x_minutes, :count => distance_in_minutes) unless options[:include_seconds]
+
+          case distance_in_seconds
+            when 0..4   then locale.t :less_than_x_seconds, :count => 5
+            when 5..9   then locale.t :less_than_x_seconds, :count => 10
+            when 10..19 then locale.t :less_than_x_seconds, :count => 20
+            when 20..39 then locale.t :half_a_minute
+            when 40..59 then locale.t :less_than_x_minutes, :count => 1
+            else             locale.t :x_minutes,           :count => 1
+          end
+
+        when 2...45           then locale.t :x_minutes,      :count => distance_in_minutes
+        when 45...90          then locale.t :about_x_hours,  :count => 1
+        # 90 mins up to 24 hours
+        when 90...1440        then locale.t :about_x_hours,  :count => (distance_in_minutes.to_f / 60.0).round
+        # 24 hours up to 42 hours
+        when 1440...2520      then locale.t :x_days,         :count => 1
+        # 42 hours up to 30 days
+        when 2520...43200     then locale.t :x_days,         :count => (distance_in_minutes.to_f / 1440.0).round
+        # 30 days up to 60 days
+        when 43200...86400    then locale.t :about_x_months, :count => (distance_in_minutes.to_f / 43200.0).round
+        # 60 days up to 365 days
+        when 86400...525600   then locale.t :x_months,       :count => (distance_in_minutes.to_f / 43200.0).round
+        else
+          if from_time.acts_like?(:time) && to_time.acts_like?(:time)
+            fyear = from_time.year
+            fyear += 1 if from_time.month >= 3
+            tyear = to_time.year
+            tyear -= 1 if to_time.month < 3
+            leap_years = (fyear > tyear) ? 0 : (fyear..tyear).count{|x| Date.leap?(x)}
+            minute_offset_for_leap_year = leap_years * 1440
+            # Discount the leap year days when calculating year distance.
+            # e.g. if there are 20 leap year days between 2 dates having the same day
+            # and month then the based on 365 days calculation
+            # the distance in years will come out to over 80 years when in written
+            # English it would read better as about 80 years.
+            minutes_with_offset = distance_in_minutes - minute_offset_for_leap_year
+          else
+            minutes_with_offset = distance_in_minutes
+          end
+          remainder                   = (minutes_with_offset % 525600)
+          distance_in_years           = (minutes_with_offset.div 525600)
+          if remainder < 131400
+            locale.t(:about_x_years,  :count => distance_in_years)
+          elsif remainder < 394200
+            locale.t(:over_x_years,   :count => distance_in_years)
+          else
+            locale.t(:almost_x_years, :count => distance_in_years + 1)
+          end
+        end
+      end
+  end
+end