vault-test-tools 0.3.0 → 0.3.1

data/lib/vault-test-tools/spec_helpers.rb

@@ -6,34 +6,40 @@ module Vault::Test
     extend self
 
     def usage_json
-      @usage_json ||= read_spec('usage')
+      vault_spec('usage.json')
     end
 
     def statement_json
-      @statement_json ||= read_spec('statement')
+      vault_spec('statement.json')
+    end
+
+    # memoizes return value so we don't keep making a request
+    def vault_spec(filename)
+      var_name = "@#{filename.gsub(".",'_')}".to_sym
+      spec_value = instance_variable_get(var_name)
+      return spec_value if spec_value
+      instance_variable_set(var_name, read_spec(filename))
     end
 
     protected
-    def json_url(name)
-      "http://vault-specs.herokuapp.com/#{name}.json"
+    def url(name)
+      "http://vault-specs.herokuapp.com/#{name}"
     end
 
-    def json_file(name)
-      "./test/support/#{name}.json"
+    def file(name)
+      "./test/support/#{name}"
     end
 
     # Uses JSON at URL when it can, but will use
     # the cached statement when it can't
     def read_spec(name)
-      @statement_json ||= begin
-         data = Net::HTTP.get(URI.parse(json_url(name)))
-         FileUtils.mkdir_p(File.dirname(json_file(name)))
-         File.open(json_file(name), 'w') { |f| f << data }
-         data
-       rescue => e
-         $stderr.puts "Using cached #{name}.json"
-         File.read(json_file(name))
-       end
+      data = Net::HTTP.get(URI.parse(url(name)))
+      FileUtils.mkdir_p(File.dirname(file(name)))
+      File.open(file(name), 'w') { |f| f << data }
+      data
+    rescue => e
+      $stderr.puts "Using cached #{name}"
+      File.read(file(name))
     end
   end
 end

data/lib/vault-test-tools/version.rb

@@ -1,5 +1,5 @@
 module Vault
   module Test
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/test/spec_helpers_test.rb

@@ -4,6 +4,7 @@ class SpecHelpersTest < Vault::TestCase
   include Vault::Test::SpecHelpers
   include RR::Adapters::MiniTest
   STATEMENT_FILE = './test/support/statement.json'
+  USAGE_FILE     = './test/support/usage.json'
 
   def setup
     super
@@ -18,15 +19,34 @@ class SpecHelpersTest < Vault::TestCase
     FakeWeb.allow_net_connect = true
     # Using the filesystem - dirrrty
     File.unlink(STATEMENT_FILE) if File.exists?(STATEMENT_FILE)
+    File.unlink(USAGE_FILE)     if File.exists?(USAGE_FILE)
     reset #for RR
   end
 
+  # These are for canonical endpoints
+  def test_named_methods
+    FakeWeb.register_uri(:get, "#{@url}/statement.json", body: "STATEMENT")
+    FakeWeb.register_uri(:get, "#{@url}/usage.json",     body: "USAGE")
+    assert_equal("STATEMENT", statement_json)
+    assert_equal("USAGE",     usage_json)
+  end
+
   # Happy path is to use the request from the service
   def test_requests_spec_from_service
     url = "#{@url}/statement.json"
     FakeWeb.register_uri(:get, url, body: "USAGE JSON")
     stub(File).open(STATEMENT_FILE, 'w')
-    assert_equal("USAGE JSON", statement_json)
+    assert_equal("USAGE JSON", vault_spec('statement.json'))
+  end
+
+  # The statement_json wrapper
+  def test_generic_spec_method
+    stub(File).open
+    url = "#{@url}/usage2v2.json"
+    FakeWeb.register_uri(:get, url, body: "USAGE JSON")
+    capture_io do
+      assert_equal("USAGE JSON", vault_spec('usage2v2.json'))
+    end
   end
 
   # Call both methods with stubbed HTTP endpoints
@@ -62,17 +82,17 @@ class SpecHelpersTest < Vault::TestCase
     # now no network
     stub(URI).parse { raise RuntimeError }
     capture_io do
-      assert_equal("USAGE JSON", statement_json)
+      assert_equal("USAGE JSON", vault_spec('statement.json'))
     end
   end
 
   # This is the real error scenario
   def test_bombs_if_no_cached_json
     stub(URI).parse { raise RuntimeError }
-    stub(File).read { raise RuntimeError }
+    stub(File).read { raise RuntimeError, 'boom' }
     capture_io do
-      assert_raises RuntimeError do
-        statement_json
+      assert_raises RuntimeError, 'boom' do
+        vault_spec('usage.json')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vault-test-tools
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turn
@@ -204,7 +204,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2085097193621949794
+      hash: 1618270359711124284
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2085097193621949794
+      hash: 1618270359711124284
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23