gds-api-adapters 0.0.31 → 0.0.32

data/lib/gds_api/panopticon/registerer.rb

@@ -8,6 +8,7 @@ module GdsApi
         @owning_app = options[:owning_app]
         @kind = options[:kind] || 'custom-application'
         @panopticon = options[:panopticon]
+        @platform = options[:platform] || ENV['FACTER_govuk_platform'] || 'development'
       end
   
       def record_to_artefact(record)
@@ -29,7 +30,7 @@ module GdsApi
           panopticon.create_artefact(artefact)
         elsif existing.owning_app == artefact[:owning_app]
           logger.info "Updating #{artefact[:slug]}"
-          panopticon.update_artefact(artefact)
+          panopticon.update_artefact(artefact[:slug], artefact)
         else
           raise "Slug #{artefact[:slug]} already registered to application '#{existing.owning_app}'"
         end
@@ -39,8 +40,7 @@ module GdsApi
         options = {
           timeout: 5
         }
-        platform = ENV['FACTER_govuk_platform'] || 'development'
-        @panopticon ||= GdsApi::Panopticon.new(platform, options.merge(panopticon_api_credentials))
+        @panopticon ||= GdsApi::Panopticon.new(@platform, options.merge(panopticon_api_credentials))
       end
   
       def panopticon_api_credentials

data/lib/gds_api/test_helpers/panopticon.rb

@@ -23,6 +23,12 @@ module GdsApi
 
         return urls.first
       end
+
+      def panopticon_has_no_metadata_for(slug)
+        url = "#{PANOPTICON_ENDPOINT}/artefacts/#{slug}.json"
+        stub_request(:get, url).to_return(:status => 404, :body => "", :headers => {})
+      end
+
     end
   end
 end

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '0.0.31'
+  VERSION = '0.0.32'
 end

data/test/panopticon_api_test.rb

@@ -94,14 +94,32 @@ class PanopticonApiTest < MiniTest::Unit::TestCase
     api.update_artefact(1, basic_artefact)
   end
   
-  def test_can_register_artefacts_en_masse
-    panopticon = stub_everything('Panopticon api client')
-    r = GdsApi::Panopticon::Registerer.new(owning_app: 'my-app', panopticon: panopticon)
-    record = OpenStruct.new(slug: '/foo', title: 'MyFoo')
-    
-    panopticon.stubs(:artefact_for_slug).returns(nil)
-    panopticon.expects(:create_artefact).with({slug: '/foo', owning_app: 'my-app', kind: 'custom-application', name: 'MyFoo'})
-    
+  def test_can_register_new_artefacts_en_masse
+    artefact = {slug: 'foo', owning_app: 'my-app', kind: 'custom-application', name: 'MyFoo'}
+    r = GdsApi::Panopticon::Registerer.new(platform: "test", owning_app: 'my-app')
+    panopticon_has_no_metadata_for('foo')
+
+    url = "#{PANOPTICON_ENDPOINT}/artefacts.json"
+    stub_request(:post, url)
+      .with(body: artefact.to_json)
+      .to_return(body: artefact.merge(id: 1).to_json)
+
+    record = OpenStruct.new(artefact.merge(title: artefact[:name]))
+    r.register(record)
+  end
+
+  def test_can_register_existing_artefacts_en_masse
+    artefact = {slug: 'foo', owning_app: 'my-app', kind: 'custom-application', name: 'MyFoo'}
+    r = GdsApi::Panopticon::Registerer.new(platform: "test", owning_app: 'my-app')
+
+    panopticon_has_metadata(artefact)
+    url = "#{PANOPTICON_ENDPOINT}/artefacts/foo.json"
+    stub_request(:put, url)
+      .with(body: artefact.to_json)
+      .to_return(status: 200, body: '{}')
+
+    record = OpenStruct.new(artefact.merge(title: artefact[:name]))
     r.register(record)
   end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: gds-api-adapters
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors: 
 - James Stewart
@@ -14,7 +14,6 @@ date: 2012-01-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: plek
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -22,10 +21,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: null_logger
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,10 +32,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,10 +43,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.2.2
   type: :development
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: webmock
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -55,10 +54,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.7"
   type: :development
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mocha
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,10 +65,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.10.0
   type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: minitest
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,10 +76,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.10.0
   type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rack
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,10 +87,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: simplecov
-  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -99,10 +98,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.4
   type: :development
+  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: simplecov-rcov
-  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,6 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id009
 description: A set of adapters providing easy access to the GDS gov.uk APIs
 email: 
@@ -161,17 +161,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 4128390024308242266
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 4128390024308242266
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: Adapters to work with GDS APIs