sentofu 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b7dc29a9728152c3aa6e84c7112e37743b19e5261ede35083a8937e92763376
-  data.tar.gz: '009438a0d7a8d47de159407759b396632292bd77457381cf52826bab414236c5'
+  metadata.gz: 438abd6ab431bafd2d9f9cd6ff66202cc311de0d16081b9bcbf62f040ab2dde7
+  data.tar.gz: b357331c8ffca74c00130a8965b95be86afbbd8e9300fd3db485b9a2ba5e5200
 SHA512:
-  metadata.gz: aeab8b37e947bd378312f9d6505501884b299e68600d314632729804d58c1fee6da15ebdfe0e9890b82ad21be15906faaa99bd2f173e16c0e037d3c8ed6d0784
-  data.tar.gz: 887c2f98f8b238157cef6fc711cced2634c51a26d096d34e5c4e645e10631719dcfbc19a488b5223c19263d7cd19322078c5b4452e402f2e91a507db7238942e
+  metadata.gz: 7d9b1b89c83523e5f8ffdf956f6f7339fa6e42ced07be392609503300ebbe50ac9e68e380edd5125210f07f85488420296efd28c62160ad7d50f0543c20b5779
+  data.tar.gz: 39b988baecc334abec4fa15cd52b78a04feb92b1f34f9e5b1f11ecaeaeb0b42a3a0155cfcf3715fb3baca8865eba82637739fc9a5cd33468daeb6cc41d448abc

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## sentofu 0.2.1  released 2019-05-30
+
+* Fix version/modified when loading from local yaml
+
+
 ## sentofu 0.2.0  released 2019-05-29
 
 * Accept a directory for Sentofu.init(x)

data/lib/sentofu/api.rb

@@ -186,15 +186,12 @@ module Sentofu
 
     def modified
 
-      Time.parse(
-        @spec[:meta]['properties']
-          .find { |pr| pr['type'] == 'X-Modified' }['value'])
+      Time.parse(@spec[:meta][:modified])
     end
 
     def version
 
-      @spec[:meta]['properties']
-        .find { |pr| pr['type'] == 'X-Version' }['value']
+      @spec[:meta][:version]
     end
 
     protected

data/lib/sentofu.rb

@@ -14,7 +14,7 @@ require 'sentofu/explo'
 
 module Sentofu
 
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 
   USER_AGENT =
     "Sentofu #{Sentofu::VERSION} - " +
@@ -55,9 +55,20 @@ module Sentofu
 
       paths.each do |path|
 
-        api_name = path.match(/api_([^_]+)_\d/)[1]
+        m = path.match(/api_([^_]+)_(\d+(?:\.\d+)*)\.yaml\z/)
+        next unless m
+
+        api_name = m[1]
+        api_version = m[2]
+
         api_spec = YAML.load(File.read(path))
 
+        api_spec[:meta] = {
+          name: api_name,
+          version: api_version,
+          path: path,
+          modified: File.mtime(path).utc.strftime('%FT%RZ') }
+
         init_api(api_name, api_spec)
       end
     end
@@ -78,20 +89,26 @@ module Sentofu
 
         metas = Sentofu::Http.get_and_parse(doc_uri)
 
-        v, u, meta = metas['apis']
+        ver, mod, url, meta = metas['apis']
           .collect { |m|
             prs = m['properties']
             [ prs.find { |pr| pr['type'] == 'X-Version' }['value'],
+              prs.find { |pr| pr['type'] == 'X-Modified' }['value'],
               prs.find { |pr| pr['type'] == 'Swagger' }['url'],
               m ] }
-          .select { |v, _, _| version_match(v, ver_pattern) }
+          .select { |v, _, _, _| version_match(v, ver_pattern) }
           .sort_by(&:first)
           .first
 
-        spec = Sentofu::Http.get_and_parse(u)
-        spec[:meta] = meta
+        meta[:name] = api_name
+        meta[:version] = ver
+        meta[:url] = url
+        meta[:modified] = mod
 
-        init_api(api_name, spec)
+        api_spec = Sentofu::Http.get_and_parse(url)
+        api_spec[:meta] = meta
+
+        init_api(api_name, api_spec)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentofu
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec