govuk-dummy_content_store 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5dd9fe111f1c3b117d99660b2fcfb5ae872cb49
-  data.tar.gz: 6aa1452e17bcb73f2c81143d7aa18e1ace7bc265
+  metadata.gz: 3df0103431cbcbe787a7f8f0b1809fbd6e8ff281
+  data.tar.gz: 067f997fbe692d9cab432cf0cb710b6517ac75aa
 SHA512:
-  metadata.gz: 6208026404355eed070957cbb6846cb1a5917cbbf3549e3517226297133349edf4fde0d1ae95fcd74fa71b9709dd2fd3eafcdb79f005288efc7a71cae3cffcb9
-  data.tar.gz: c2762aaf2d7f7b4e5ba9b93bc78d087ad30f86d3147a2a1b657bbe096303ab18e253866f293673cb2eced1e4e09172e5e1732e416a1cca14ba43b1152c71a669
+  metadata.gz: 4f66a5d0e1a5f07de603ddd8310b8b479a41e5d5bfc9228c982871ef2e8bad6d6559431389817211d7eb34d10e4e01777c56cd28b8e3f574022c0d026bed6b6e
+  data.tar.gz: 19f5ff83592c91e7901f2271da16ebf454208d8d6bb496ad8be492dccf67d4a2ad77967f7575d842e8823947925ffff13ab28ff9721b3fd466dca1121d603a10

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.0.5
+
+* Add the fall back to live feature
+
 # 0.0.4
 
 * Only include frontend examples in dummy content store

data/README.md

@@ -22,6 +22,16 @@ It will look for the schema files in the following locations:
   2. in the current directory
   3. at the path specified in the first argument
 
+If a fallback url is specified on startup:
+
+    $ dummy_content_store -u https://www.gov.uk/api/content
+
+  or 
+
+    $ DUMMY_CONTENT_STORE_FALLBACK_URL=https://www.gov.uk/api/content dummy_content_store
+
+it will look also for live contents at the specified url, if the example content is not found.
+
 ## Configuration
 
 By default the dummy content store runs on port 3068 which is the same port as

data/bin/dummy_content_store

@@ -10,6 +10,13 @@ OptionParser.new do |opts|
     puts opts
     exit
   end
+
+  opts.on('-u', '--url URL', "Fallback URL for non available examples") do |url|
+    # e.g. https://www.gov.uk/api/content
+    ENV["DUMMY_CONTENT_STORE_FALLBACK_URL"] = url
+    puts "fallback URL = #{url}"
+  end
+
 end.parse!
 
 if ARGV.size == 1

data/config.ru

@@ -2,7 +2,10 @@ $LOAD_PATH << File.dirname(__FILE__) + "/lib"
 require 'govuk/dummy_content_store'
 
 govuk_content_schemas_path = ENV.fetch('GOVUK_CONTENT_SCHEMAS_PATH', ".")
+govuk_live_content_path = ENV['DUMMY_CONTENT_STORE_FALLBACK_URL']
+
 repository = Govuk::DummyContentStore::ExampleRepository.new(govuk_content_schemas_path)
+live_repository = Govuk::DummyContentStore::LiveRepository.new(govuk_live_content_path) if govuk_live_content_path
 
 map '/' do
   run Govuk::DummyContentStore::Index.new(repository)
@@ -18,10 +21,10 @@ end
 
 # Serve examples
 map '/content' do
-  run Govuk::DummyContentStore::Content.new(repository)
+  run Govuk::DummyContentStore::Content.new(repository, live_repository)
 end
 map '/api/content' do
-  run Govuk::DummyContentStore::Content.new(repository)
+  run Govuk::DummyContentStore::Content.new(repository, live_repository)
 end
 
 

data/govuk-dummy_content_store.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "gem_publisher"
   spec.add_development_dependency "nokogiri"
+  spec.add_development_dependency "webmock"
 end

data/lib/govuk/dummy_content_store.rb

@@ -5,6 +5,7 @@ module Govuk
     autoload :Content, "govuk/dummy_content_store/content"
     autoload :ExampleContentItem, "govuk/dummy_content_store/example_content_item"
     autoload :ExampleRepository, "govuk/dummy_content_store/example_repository"
+    autoload :LiveRepository, "govuk/dummy_content_store/live_repository"
     autoload :Index, "govuk/dummy_content_store/index"
   end
 end

data/lib/govuk/dummy_content_store/content.rb

@@ -1,20 +1,25 @@
 require 'pathname'
 require 'json'
 require 'govuk/dummy_content_store'
+require 'net/http'
 
 module Govuk
   module DummyContentStore
     class Content
       attr_reader :repository
+      attr_reader :live_repository
 
-      def initialize(repository)
+      def initialize(repository, live_repository = nil)
         @repository = repository
+        @live_repository = live_repository
       end
 
       def call(env)
         example = repository.find_by_base_path(env["PATH_INFO"])
         if example
           present_example(example)
+        elsif live_repository && res = live_repository.find_by_base_path(env["PATH_INFO"])
+          present_live(res.body)
         else
           present_not_found
         end
@@ -31,6 +36,16 @@ module Govuk
         [200, headers, [example.raw_data]]
       end
 
+      def present_live(body)
+        headers = {
+          'Content-Type' => 'application/json; charset=utf-8',
+          'Content-Length' => body.size.to_s,
+          'Cache-control' => 'no-cache'
+        }
+
+        [200, headers, [body]]
+      end
+
       def present_not_found
         body = 'Not found'
         headers = {

data/lib/govuk/dummy_content_store/live_repository.rb

@@ -0,0 +1,25 @@
+module Govuk
+  module DummyContentStore
+    class LiveRepository
+      attr_reader :live_content_path
+
+      def initialize(live_content_path)
+        @live_content_path = live_content_path
+      end
+
+      def find_by_base_path(base_path)
+        res = http_get(base_path)
+        res.code == "404" ? nil : res
+      end
+
+    private
+      def http_get(base_path)
+        url = URI.parse(live_content_path + base_path)
+        req = Net::HTTP::Get.new(url.to_s)
+        http = Net::HTTP.new(url.host, url.port)
+        http.use_ssl = true if url.scheme == "https"
+        http.request(req)
+      end
+    end
+  end
+end

data/lib/govuk/dummy_content_store/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module DummyContentStore
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/spec/integration/dummy_content_store_spec.rb

@@ -65,4 +65,28 @@ RSpec.describe "Dummy content store rack application" do
       expect(last_response).to be_ok
     end
   end
+
+  
+  context "a fallback url is set" do
+    before(:each) { ENV['DUMMY_CONTENT_STORE_FALLBACK_URL'] = "https://www.gov.uk/api/content" }
+    
+    it "serves the live content if the example is not available" do
+      live_file_base_path = "/available"
+      live_content_body = "stubbed response"
+    
+      get "/api/content#{live_file_base_path}"
+      expect(last_response).to be_ok
+      expect(last_response.body).to eq(live_content_body)
+    end
+
+    it "responds not found if both live and example are not available" do
+      live_file_base_path = "/not-available"
+      not_found_body = "Not found"
+      
+      get "/api/content#{live_file_base_path}"
+      expect(last_response).not_to be_ok
+      expect(last_response.status).to eq(404)
+      expect(last_response.body).to eq(not_found_body)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'webmock/rspec'
+
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
@@ -18,4 +20,14 @@ RSpec.configure do |config|
   config.order = :random
 
   Kernel.srand config.seed
+
+  config.before(:each) do
+    stub_request(:get, "https://www.gov.uk/api/content/available").
+      with(headers: {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+      to_return(status: 200, body: "stubbed response", headers: {})
+
+    stub_request(:get, "https://www.gov.uk/api/content/not-available").
+      with(headers: {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
+      to_return(status: 404, body: "not found", headers: {})
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-dummy_content_store
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - David Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - david.heath@digital.cabinet-office.gov.uk
@@ -147,6 +161,7 @@ files:
 - lib/govuk/dummy_content_store/example_content_item.rb
 - lib/govuk/dummy_content_store/example_repository.rb
 - lib/govuk/dummy_content_store/index.rb
+- lib/govuk/dummy_content_store/live_repository.rb
 - lib/govuk/dummy_content_store/templates/index.html.erb
 - lib/govuk/dummy_content_store/version.rb
 - public/styles.css