apiaryio 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d7b421e749c1bd1307e63b1bc23ebb2caaceed4
-  data.tar.gz: aa8f2ae6ed17b14d1988b60239c1bc4c78c875d9
+  metadata.gz: 5756528c3736e0906c6b0548508705fb4b43c601
+  data.tar.gz: 9910234e8ac83f76eca23712bccc01be7c9e28c1
 SHA512:
-  metadata.gz: 8e1246cca1c28cc2593f74dcc9acd81e7bc0a9158b54ebbf452ae590d66ed7fa9cd015e9c80f34e57b1d0f527d150c98a531435e4fa5b9e7e32c9084fa2efa86
-  data.tar.gz: 853bf679a6b669b389d4b8eeafb726cb0ae6025e3ce03f4ab2056b15a337e04d3a44f1b22a26feac19c9b01152d08b4e3c14d80d74bc06ae2177cdb9aff299f4
+  metadata.gz: edfda0ff24e9ee17001f1ebf3365908e95b76e5308d6af714db4b80de06e97f2dd8b29377a4bdb147882be82f4e46106b5c76143d489ff071cd32ff98d8deee6
+  data.tar.gz: 8460c8eea49d4ef58681e7c1c5d4d52a3265b8353c43eeca82200f6afca7e4000d7fbb636e57c4fa103edf31d54d6e6a282c5e050b82780119c53f889cab1b11

data/.rubocop_todo.yml

@@ -10,10 +10,10 @@ Metrics/AbcSize:
   Max: 33
 
 Metrics/BlockLength:
-  Max: 150
+  Max: 200
 
 Metrics/ClassLength:
-  Max: 190 # or whatever ends up being appropriate
+  Max: 250 # or whatever ends up being appropriate
 
 Metrics/PerceivedComplexity:
   Max: 12

data/README.md

@@ -132,6 +132,7 @@ Usage:
 
 Options:
   [--fetch], [--no-fetch]              # Fetch styleguide rules and functions from apiary.io
+  [--push], [--no-push]                # Push styleguide rules and functions to apiary.io
   [--add=ADD]                          # Path to API Description Document. When given a directory, it will look for `apiary.apib` and `swagger.yaml` file
   [--functions=FUNCTIONS]              # Path to to the file with functions definitions
   [--rules=RULES]                      # Path to to the file with rules definitions - `functions.js` and `rules.json` are loaded if not specified

data/lib/apiary/cli.rb

@@ -49,6 +49,7 @@ module Apiary
 
     desc 'styleguide', 'Check API Description Document against styleguide rules (Apiary.io pro plan is required - https://apiary.io/plans )'
     method_option :fetch, type: :boolean, desc: 'Fetch styleguide rules and functions from apiary.io'
+    method_option :push, type: :boolean, desc: 'Push styleguide rules and functions to apiary.io'
     method_option :add, type: :string, desc: 'Path to API Description Document. When given a directory, it will look for `apiary.apib` and `swagger.yaml` file'
     method_option :functions, type: :string, desc: 'Path to to the file with functions definitions'
     method_option :rules, type: :string, desc: 'Path to to the file with rules definitions - `functions.js` and `rules.json` are loaded if not specified'

data/lib/apiary/command/preview.rb

@@ -49,7 +49,7 @@ module Apiary::Command
     end
 
     def execute
-      if @options.server
+      if @options.server || @options.watch
         watch
         server
       else
@@ -70,15 +70,15 @@ module Apiary::Command
     end
 
     def server
-      generate_app = get_app('/') do
+      generate_app = get_app(path: '/') do
         generate
       end
 
-      change_app = get_app('/changed') do
+      change_app = get_app(path: '/changed', options: { 'Content-Type' => 'text/plain' }) do
         @changed
       end
 
-      source_app = get_app('/source') do
+      source_app = get_app(path: '/source', options: { 'Content-Type' => 'text/plain' }) do
         api_description_source(@source_path)
       end
 
@@ -99,10 +99,10 @@ module Apiary::Command
       end
     end
 
-    def get_app(path)
+    def get_app(path: '/', options: {})
       Rack::Builder.new do
         map path do
-          run ->(env) { [200, {}, [yield]] }
+          run ->(env) { [200, options, [yield]] }
         end
       end
     end

data/lib/apiary/command/styleguide.rb

@@ -36,11 +36,37 @@ module Apiary::Command
       check_api_key
       if @options.fetch
         fetch
+      elsif @options.push
+        push
       else
         validate
       end
     end
 
+    def push
+      begin
+        load(add: false)
+      rescue StandardError => e
+        abort "Error: #{e.message}"
+      end
+
+      path = 'styleguide-cli/set-assertions/'
+      headers = @options.headers.clone
+      headers[:authentication] = "Token #{@options.api_key}"
+
+      data = {
+        functions: @functions,
+        rules: @rules
+      }.to_json
+
+      begin
+        call_apiary(path, data, headers, :post)
+      rescue => e
+        puts e
+        abort "Error: Can not write into the rules/functions file: #{e}"
+      end
+    end
+
     def fetch
       begin
         assertions = fetch_from_apiary
@@ -82,6 +108,7 @@ module Apiary::Command
 
       headers = @options.headers.clone
       headers[:Authorization] = "Bearer #{token}"
+      headers['Accept-Encoding'] = 'identity'
 
       output call_resource(@options.vk_url, data, headers, :post)
     end
@@ -195,11 +222,13 @@ module Apiary::Command
       abort 'Error: API key must be provided through environment variable APIARY_API_KEY. \Please go to https://login.apiary.io/tokens to obtain it.'
     end
 
-    def load
-      @add_path = api_description_source_path(@options.add)
-      @add = api_description_source(@add_path)
-      @functions = get_functions(@options.functions)
-      @rules = get_rules(@options.rules)
+    def load(add: true, functions: true, rules: true)
+      if add
+        @add_path = api_description_source_path(@options.add)
+        @add = api_description_source(@add_path)
+      end
+      @functions = get_functions(@options.functions) if functions
+      @rules = get_rules(@options.rules) if rules
     end
 
     def fetch_from_apiary

data/lib/apiary/file_templates/preview.erb

@@ -12,7 +12,7 @@
     });
 
     if (<%= data[:watch] %>) {
-        var changed = null
+        var changed = null;
         var xhrChanged = new XMLHttpRequest();
         var xhrData = new XMLHttpRequest();
         setInterval(function() {
@@ -20,18 +20,18 @@
             xhrChanged.send();
 
             xhrChanged.onreadystatechange = function() {
-                if (xhrChanged.readyState == 4 && xhrChanged.status == 200) {
+                if (xhrChanged.readyState === 4 && xhrChanged.status === 200) {
                     if (!changed) {
-                        changed = xhrChanged.responseText
+                        changed = xhrChanged.responseText;
                     }
                     if (changed != xhrChanged.responseText) {
-                        changed = xhrChanged.responseText
+                        changed = xhrChanged.responseText;
                         xhrData.open('GET', window.location.href + "/source", true);
                         xhrData.send();
 
                         xhrData.onreadystatechange = function() {
-                            if (xhrData.readyState == 4 && xhrData.status == 200) {
-                                embed.iframeElement.contentWindow.postMessage({"origin": embed.ORIGIN, "eventType": "anonymousPreview", "data": {"code": xhrData.responseText}}, '*');
+                            if (xhrData.readyState === 4 && xhrData.status === 200) {
+                                window[embed.adaptee.id].contentWindow.postMessage({"origin": "Apiary.Embed", "eventType": "anonymousPreview", "data": {"code": xhrData.responseText}}, '*');
                             }
                         }
                     }

data/lib/apiary/version.rb

@@ -1,3 +1,3 @@
 module Apiary
-  VERSION = '0.10.2'.freeze
+  VERSION = '0.11.0'.freeze
 end

data/spec/apiary/command/styleguide_spec.rb

@@ -172,4 +172,48 @@ describe Apiary::Command::Styleguide do
       end.to output("[\n\n]\n").to_stdout
     end
   end
+
+  describe 'push' do
+    it 'call command without APIARY_API_KEY set' do
+      opts = {
+        push: true,
+        api_key: '',
+        functions: 'features/support',
+        rules: 'features/support'
+      }
+      command = Apiary::Command::Styleguide.new(opts)
+      test_abort(command, 'Error: API key must be provided through environment variable APIARY_API_KEY.')
+    end
+
+    it 'call command with incorrect APIARY_API_KEY' do
+      opts = {
+        push: true,
+        api_key: 'xxx'
+      }
+
+      command = Apiary::Command::Styleguide.new(opts)
+      stub_request(:post, "https://#{command.options.api_host}/styleguide-cli/set-assertions/").to_return(status: [403, 'This resource requires authenticated API call.'])
+
+      test_abort(command, 'Error: Apiary service responded with: 403')
+    end
+
+    it 'call command with correct APIARY_API_KEY' do
+      opts = {
+        push: true,
+        api_key: 'xxx',
+        functions: 'function testFunction(data) { return "failed"; }',
+        rules: '[{"ruleName": "testName","functionName": "testFunction","target": "Request_Body","intent": "testIntent"}]'
+      }
+
+      command = Apiary::Command::Styleguide.new(opts)
+      stub_request(:post, "https://#{command.options.api_host}/styleguide-cli/set-assertions/").to_return(status: 200, body: '')
+
+      expect do
+        begin
+          command.execute
+        rescue SystemExit
+        end
+      end.to output('').to_stdout
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiaryio
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Apiary Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client