gds-api-adapters 10.13.0 → 10.14.0

data/lib/gds_api/test_helpers/business_support_helper.rb

@@ -7,13 +7,13 @@ module GdsApi
   module TestHelpers
     module BusinessSupportHelper
       def setup_business_support_stubs(endpoint, path)
-        @stubbed_business_supports = {}
+        @stubbed_business_supports = []
         stub_request(:get, %r{\A#{endpoint}/#{path}\.json}).to_return do |request|
           if request.uri.query_values
-            key = facet_key(request.uri.query_values)
-            results = @stubbed_business_supports[key] || []
+            facets = sanitise_facets(request.uri.query_values)
+            results = stubs_for_facets(facets) || []
           else
-            results = @stubbed_business_supports['default']
+            results = @stubbed_business_supports
           end
           {:body => plural_response_base.merge("results" => results, "total" => results.size).to_json}
         end
@@ -21,19 +21,34 @@ module GdsApi
       end
 
       def api_has_business_support(business_support, facets={})
-        key = facet_key(facets)
-        unless @stubbed_business_supports.has_key?(key)
-          @stubbed_business_supports[key] = []
+        facets = sanitise_facets(facets)
+        if business_support.is_a?(Symbol)
+          bs_with_facets = facets.merge(:title => business_support)
+        else
+          bs_with_facets = facets.merge(business_support)
         end
-        @stubbed_business_supports[key] << business_support
+        @stubbed_business_supports << bs_with_facets unless @stubbed_business_supports.include?(bs_with_facets)
       end
 
       private
 
-      def facet_key(facets)
-        key = 'default'
-        key = facets.values.flatten.sort.hash.to_s if facets and !facets.empty?
-        key
+      def stubs_for_facets(facets)
+        @stubbed_business_supports.select do |bs|
+          facet_matches = 0
+          facets.each do |k,v|
+            if bs[k] and (v & bs[k]).any?
+              facet_matches += 1
+            end
+          end
+          facet_matches == facets.keys.size
+        end
+      end
+
+      def sanitise_facets(facets)
+        Hash[facets.map{ |k, v|
+          v = v.split(',') if v.is_a?(String)
+          [k.to_sym, v]
+        }]
       end
     end
   end

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '10.13.0'
+  VERSION = '10.14.0'
 end

data/test/business_support_api_test.rb

@@ -15,12 +15,13 @@ describe GdsApi::BusinessSupportApi do
     it "should return all schemes when called with no facets" do
       business_support_api_has_schemes([:scheme1, :scheme2, :scheme3])
       response = @api.schemes
-      assert_equal ["scheme1", "scheme2", "scheme3"], response['results']
+      assert_equal [{"title" => "scheme1"}, {"title" => "scheme2"}, {"title" => "scheme3"}], response['results']
     end
     it "should return schemes for applicable facets"  do
       business_support_api_has_scheme(:scottish_manufacturing, {locations: 'scotland', sectors: 'manufacturing', support_types: 'grant,loan'})
       response = @api.schemes({locations: 'scotland', sectors: 'manufacturing', support_types: 'grant,loan'})
-      assert_equal ["scottish_manufacturing"], response["results"]
+      assert_equal 1, response["results"].size
+      assert_equal "scottish_manufacturing", response["results"].first["title"]
     end
     it "should return an empty result when facets are not applicable" do
       business_support_api_has_scheme(:super_secret, {locations: 'the moon', sectors: 'espionage'})

data/test/content_api_test.rb

@@ -620,7 +620,8 @@ describe GdsApi::ContentApi do
         response = @api.business_support_schemes(:locations => "england", :sectors => "farming").to_hash
 
         assert_equal 2, response["total"]
-        assert_equal [s1, s3], response["results"]
+        assert_equal s1["title"], response["results"].first["title"]
+        assert_equal s3["title"], response["results"].last["title"]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 10.13.0
+  version: 10.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
@@ -382,7 +382,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4445085740245273405
+      hash: -4129704915142926265
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -391,7 +391,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4445085740245273405
+      hash: -4129704915142926265
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23