apiture 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43c92cdbf01d3a08d09f7c9f142326e68d571933
-  data.tar.gz: 64c58f798e154f7508efc272ee60cf9095f18b3c
+  metadata.gz: 987570957cf2e6c779b9c3ccb5fa06a52f008ef8
+  data.tar.gz: 058c845cfc7ae48422c7f1122c0eacc485099032
 SHA512:
-  metadata.gz: c7e72e4e47a2b83fc42324f71b21c363257cac465cac965330888d7310cc3a82a9e01a75c407cb7290f97e059c00570ed13b5cbbdedad00ec393d097a46d5109
-  data.tar.gz: 4e26f7d33a5d0ed70b12c77017d2eb4574c52a3622bf5da0c0dcbcceb3fd4819b1194c9721695d330cf838f3ab30c673ed6bfbd6a7e46d6f8e296591b18bcba9
+  metadata.gz: 3efce36770c2060e613adf6c5491015ac85dcdf420b6a00a99c0dc76c7f4419c594b10c1d1b8acb5cd677c21a744d193c68776090f8e80b29c24294dac8cc72e
+  data.tar.gz: b5fdd0338d28917d4c55982822386ad251f852a1cb1e7697b8313503bdf9515fa04d9b6bf544fe874970f83e9e3b2f523451520a725503bb7f148d4fcad6f487

data/lib/apiture/api_builder.rb

@@ -80,8 +80,6 @@ module Apiture
                     (operation.produces && operation.produces.first) ||
                     (spec.produces && spec.produces.first) 
 
-                security = operation.security || spec.security
-
                 use Apiture::Middleware::Debug
                 use Apiture::Middleware::SetHeader, 'User-Agent' => "apiture-rb/#{Apiture::VERSION}"
 
@@ -93,8 +91,9 @@ module Apiture
                   use Apiture::Middleware::SetHeader, 'Accept' => produces
                 end
 
+                security = operation.security || spec.security
                 security_ids = if security
-                                 security.keys
+                                 security.map(&:id)
                                else
                                  if operation.security_definitions && !operation.security_definitions.empty?
                                    [operation.security_definitions.keys.first]

data/lib/apiture/swagger/operation.rb

@@ -19,9 +19,9 @@ module Apiture
       list :parameters, validate: true
       list :responses, validate: true
       list :schemes
+      list :security, validate: true
 
       hash :security_definitions, validate: true
-      hash :security, validate: true
 
       def initialize(id)
         super()

data/lib/apiture/swagger/parser.rb

@@ -29,7 +29,7 @@ module Apiture
         specification.produces = json['produces'] || []
         specification.consumes = json['consumes'] || []
         build_security_definition_hash(specification, json)
-        build_security_hash(specification, json)
+        build_security_node_list(specification, json)
         specification.paths = build_node_hash(Path, json, 'paths') do |path, path_json|
           trace = [path.id]
           [:get, :put, :post, :delete, :options, :head, :patch].each do |method|
@@ -49,7 +49,7 @@ module Apiture
                 trace.shift
               end
               build_security_definition_hash(op, json)
-              build_security_hash(op, op_json)
+              build_security_node_list(op, op_json)
               path.send("#{method}=".to_sym, op)
               trace.shift
             end
@@ -71,14 +71,15 @@ module Apiture
           end
         end
 
-        def build_security_hash(parent_node, json)
+        def build_security_node_list(parent_node, json)
           # leave security nil to defer security to parent. An empty hash means
           # no security.
           if sec_json = json['security']
-            parent_node.security = sec_json.reduce({}) do |memo, (k,v)|
-              memo[k] = security = Security.new(k)
-              security.scopes = v
-              memo
+            parent_node.security = sec_json.map do |h|
+              security_id = h.keys.first
+              security = Security.new(security_id)
+              security.scopes = h[security_id]
+              security
             end
           end
         end

data/lib/apiture/swagger/security.rb

@@ -13,7 +13,7 @@ module Apiture
       end
 
       def serializable_hash
-        scopes || []
+        { id => scopes || [] }
       end
 
     end

data/lib/apiture/swagger/specification.rb

@@ -19,13 +19,13 @@ module Apiture
       list :consumes
       list :produces
       list :tags, validate: true
+      list :security, validate: true
 
       hash :paths, validate: true
       hash :definitions, validate: true
       hash :parameters, validate: true
       hash :responses, validate: true
       hash :security_definitions, validate: true
-      hash :security, validate: true
     end
   end
 end

data/lib/apiture/version.rb

@@ -1,3 +1,3 @@
 module Apiture
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/apiture/swagger/parser_spec.rb

@@ -26,7 +26,7 @@ describe Apiture::Swagger::Parser do
     expect(api_token.in).to eq :header
     expect(api_token.name).to eq "X-TrackerToken"
 
-    security = specification.security['apiToken']
+    security = specification.security.detect { |sec| sec.id == 'apiToken' }
     expect(security).to_not be_nil
 
     expect(specification.produces).to include "application/json"
@@ -94,7 +94,7 @@ describe Apiture::Swagger::Parser do
   it "should parse a swagger specification with operation specific security" do
     specification = Apiture::Swagger::Parser.new.parse(load_spec('github'))
     op = specification.paths["/applications/{clientId}/tokens/{accessToken}"].get
-    expect(op.security["basic"]).to_not be_nil
+    expect(op.security.detect { |sec| sec.id == 'basic' }).to_not be_nil
   end
 
   it "should parse nested schema objects" do

data/spec/apiture/swagger/specification_spec.rb

@@ -8,12 +8,13 @@ describe Apiture::Swagger::Specification do
 
     security = Apiture::Swagger::Security.new('oauth')
     security.scopes = ['email']
-    spec.security = { 'oauth' => security }
+    spec.security = [security]
 
-    hash = spec.serializable_hash
-    security_hash = hash['security'] 
-    expect(security_hash).to_not be_nil
-    scopes = security_hash['oauth']
-    expect(scopes).to eq ['email']
+    h = spec.serializable_hash
+    security_list = h['security'] 
+    expect(security_list).to_not be_nil
+    security = security_list.detect { |sec| sec.keys.first == 'oauth' }
+    expect(security).to_not be_nil
+    expect(security['oauth']).to eq ['email']
   end
 end

data/spec/files/github.json

@@ -48,9 +48,11 @@
     }
   },
 
-  "security": {
-    "oauth2": []
-  },
+  "security": [
+    {
+      "oauth2": []
+    }
+  ],
 
   "paths": {
     "/user": {
@@ -63,9 +65,11 @@
       "get": {
         "summary": "List email addresses for a user",
         "operationId": "getUserEmails",
-        "security": {
-          "basic": ["user:email"]
-        }
+        "security": [
+          {
+            "basic": ["user:email"]
+          }
+        ]
       }
     },
     "/user/repos": {
@@ -116,12 +120,14 @@
       "get": {
         "summary": "List organizations for the authenticated user",
         "operationId": "getUserOrgs",
-        "security": {
-          "oauth2": [
-            "user",
-            "read:org"
-          ]
-        }
+        "security": [
+          {
+            "oauth2": [
+              "user",
+              "read:org"
+            ]
+          }
+        ]
       }
     },
     "/orgs/{org}/repos": {
@@ -177,9 +183,11 @@
           "in": "path",
           "required": true
         }],
-        "security": {
-          "basic": []
-        }
+        "security": [
+          {
+            "basic": []
+          }
+        ]
       }
     }
   }

data/spec/files/harvest.json

@@ -24,9 +24,11 @@
     }
   },
 
-  "security": {
-    "oauth2": []
-  },
+  "security": [
+    {
+      "oauth2": []
+    }
+  ],
 
   "paths": {
     "/invoices": {

data/spec/files/honeybadger.json

@@ -74,7 +74,9 @@
     }
   },
 
-  "security": {
-    "authToken": []
-  }
+  "security": [
+    {
+      "authToken": []
+    } 
+  ]
 }

data/spec/files/mandrill.json

@@ -23,9 +23,11 @@
     }
   },
 
-  "security": {
-    "key": []
-  },
+  "security": [
+    {
+      "key": []
+    }
+  ],
 
   "paths": {
     "/users/info.json": {

data/spec/files/pivotal_tracker.json

@@ -88,7 +88,9 @@
     }
   },
 
-  "security": {
-    "apiToken": []
-  }
+  "security": [
+    {
+      "apiToken": []
+    } 
+  ]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiture
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Calvin Yu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-11 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler