apitools-middleware 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e96c4cfd9aeb2cae572d5df9879309971f594a12
-  data.tar.gz: 9cd9ee6b6618e0d3e415fc8cf5c9e2c7ba02c94a
+  metadata.gz: 98fca66c7e5d7143c74e114003256d121e876bc4
+  data.tar.gz: 4b200fbe2463c067dcb67cc6895a64efb5985c2f
 SHA512:
-  metadata.gz: 23d9f0fbe3b2e846b16d977dae035ea4e1e0f2c4862527d4589e9bd7f4f65a57087a678effd71500b34913bd7bfa77e9f8e681eb058728a134859b43587696fc
-  data.tar.gz: c60111fdf6d7ca2a58fd30520b08357c4a0f993cce0da3e426830c3dcc86ca305885ba9af82504da9f28ee85511af39b8298b4f651de6fab6bf96a61cff3f53a
+  metadata.gz: 4ec6095cdd19ac4a64f58b802b809c50bb55eee7a2de0ebf862c49b57b78779b078cd87d565e73e262ff962f758763766fc7ecf3d098a62dc3b03f746afbe5c8
+  data.tar.gz: 1858a0c45590a24ec7e9d2ee22ebe645a09202c5d998db493d8dfe6b75a32e8e611bb4655de79d23fbb558e91e570694b6a03882243d13bb226d75928ba8ca18

data/lib/apitools/middleware/spec.rb

@@ -6,18 +6,16 @@ require 'apitools/middleware/manifest'
 module Apitools
   module Middleware
     class Spec
-      MANIFEST_FILE = 'apitools.json' # should be apitools.json
+      MANIFEST_FILE = Pathname('apitools.json') # should be apitools.json
 
-      attr_reader :repo, :manifest_path
+      attr_reader :repo
 
       extend Forwardable
-      def_delegators :manifest, :name, :description, :author, :endpoints, :files
+      def_delegators :manifest, :name, :description, :author, :endpoints
 
       def initialize(repo, path)
         @repo = repo
-        pathname = Pathname(path)
-        @path = pathname.dirname
-        @manifest_path = pathname.basename || MANIFEST_FILE
+        @path, @manifest_file = extract_path_and_manifest(path)
       end
 
       def manifest=(json)
@@ -36,6 +34,10 @@ module Apitools
         @path.to_s
       end
 
+      def manifest_file
+        @manifest_file.to_s
+      end
+
       def endpoint
         Array(endpoints).first
       end
@@ -58,6 +60,16 @@ module Apitools
         lua_files.none?{ |file| !file || file.nil? || file.empty? }
       end
 
+      def extract_path_and_manifest(path)
+        pathname = Pathname(path)
+
+        if pathname.extname.empty? # no manifest at the end
+          [pathname, MANIFEST_FILE]
+        else
+          [pathname.dirname, pathname.basename]
+        end
+      end
+
       protected
 
       def content(path)
@@ -65,7 +77,7 @@ module Apitools
       end
 
       def load_manifest
-        content @manifest_path
+        content @manifest_file
       end
 
       def load_code

data/lib/apitools/middleware/version.rb

@@ -1,5 +1,5 @@
 module Apitools
   module Middleware
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/spec/spec_spec.rb

@@ -5,11 +5,11 @@ describe Apitools::Middleware::Spec do
   subject(:spec) { described_class.new(repo, path.to_s) }
 
   it 'trims path to just folder' do
-    expect(spec.path).to eq(path.dirname.to_s)
+    expect(spec.path).to eq('some')
   end
 
   it 'remembers manifest from path' do
-    expect(spec.manifest_path).to eq(path.basename)
+    expect(spec.manifest_file).to eq('path.json')
   end
 
   it 'allows setting manifest as json' do
@@ -17,6 +17,18 @@ describe Apitools::Middleware::Spec do
     expect(spec.manifest).to eq(name: 'manifest')
   end
 
+  context 'path without manifest' do
+    let(:path) { Pathname('middleware/some-middleware') }
+
+    it 'uses default manifest name' do
+      expect(spec.manifest_file).to eq('apitools.json')
+    end
+
+    it 'uses path as a path' do
+      expect(spec.path).to eq('middleware/some-middleware')
+    end
+  end
+
   context 'with valid manifest' do
     let(:manifest) do
       {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apitools-middleware
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Michal Cichra