dashing_api 0.0.2 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 266ad32555334fd28c654bb7b416e2652eba4a6f
+  data.tar.gz: 92fa93ac2e3170ba9a0baacec6d9d8b8a7953e8c
+SHA512:
+  metadata.gz: 97456f63c940cdc0526551ff1cb8455c9c5b183bc252c2317384c175f9511a649734c52dec42d91d768fdb0c7d370858ef6a6125f75d1416726b779ad369a762
+  data.tar.gz: 89880e61c14bbfdc9b871966f727e1b5c0165126a8e0e8d1e3e8e80e7968c8f8cf5ddf38f9ad67a54aedda6645d6d49b93d34175aaa070ce7859097399dab3c1

data/README.md

@@ -2,14 +2,22 @@
 
 ## Test it locally
 
+Install bundler if you don't already have it (`gem install bundler`), then run `bundle install` to pull
+in dependencies. Then you can:
+
 Build a gem:
 ```sh
-rake build
+bundle exec rake build
 ```
 
 Install:
 ```sh
-rake install
+bundle exec rake install
+```
+
+Run unit tests:
+```sh
+bundle exec rake test
 ```
 
 ## Installation

data/lib/dashing_api/api.rb

@@ -19,7 +19,7 @@ end
 get '/tiles/:id.json' do
     content_type :json
     if data = settings.history[params[:id]]
-    	data.split[1]
+    	data.sub("data: ", "")
     else
     	@message = "Host " + params[:id] + "does not exist"
     	404
@@ -46,14 +46,13 @@ get '/dashboards/' do
     dashboards = Array.new()
 
     # Get the name of the dashboard only. Strip the path
-    Dir.entries(settings.root+'/dashboards/').each do |dashboard|
+    Dir.entries(settings.root+'/dashboards/').sort.each do |dashboard|
     	dashArray = dashboard.split("/")
-	dashboard = dashArray[dashArray.length-1]
-	if dashboard.include? ".erb"
-            dashboards.push dashboard.chomp(".erb")
-	end
+      dashboard = dashArray[dashArray.length-1]
+	    if dashboard.include? ".erb"
+        dashboards.push dashboard.chomp(".erb")
+	    end
     end
-
     { :dashboards => dashboards }.to_json
 end
 
@@ -61,7 +60,7 @@ end
 get '/dashboards/:dashboard' do
     dashboard = params[:dashboard]    
     if functions.dashboardExists(dashboard, settings.root)
-    	{ :dashboard => dashboard, :message => 'Dashboard ' +dashboard+  ' exists' }.to_json
+    	{ :dashboard => dashboard, :message => "Dashboard #{dashboard} exists" }.to_json
     else
     	@message = "Dashboard " + dashboard + " does not exist"
 	404
@@ -74,12 +73,12 @@ put '/dashboards/' do
     body = JSON.parse(request.body.read)
     from = body["from"]
     to = body["to"]
-    
+
     if functions.checkAuthToken(body, settings.auth_token)
     	if functions.dashboardExists(from, settings.root)
     		if from != settings.default_dashboard
       	            File.rename(settings.root+'/dashboards/'+from+'.erb', settings.root+'/dashboards/'+to+'.erb')
-                    { :message => 'Dashboard Renamed from ' + from +' to ' + to }.to_json
+                    { :message => "Dashboard Renamed from #{from} to #{to}" }.to_json
                 else
                     { :message => 'Cannot rename the default dashboard ' + from }.to_json
                 end
@@ -98,13 +97,13 @@ delete '/dashboards/:dashboard' do
     request.body.rewind
     body = JSON.parse(request.body.read)
     dashboard = params[:dashboard]
-   
+
     if functions.checkAuthToken(body, settings.auth_token)
         if functions.dashboardExists(dashboard, settings.root)
             if dashboard != settings.default_dashboard
                 File.delete(settings.root+'/dashboards/'+dashboard+'.erb')
-                { :dashboard => dashboard, :message => 'Dashboard ' +dashboard+ ' deleted' }.to_json
-		status 202
+                body({ :dashboard => dashboard, :message => "Dashboard #{dashboard} deleted" }.to_json)
+		            202
             else
             	@message = "Cannot delete the default dashboard"
 		404
@@ -125,7 +124,7 @@ get '/jobs/:id' do
     content_type :json
     hostName = params[:id]
     if settings.history[hostName]
-        { :tile => hostName, :message => 'Host' +hostName+ ' has a job script' }.to_json
+        { :tile => hostName, :message => 'Host' + hostName + ' has a job script' }.to_json
     else
     	@message = "Host " + hostName + " does not have a job script"
 	404
@@ -141,7 +140,7 @@ get '/tiles/:dashboard/:hosts'  do
         if output.empty?
             { :dashboard => dashboard, :tiles => hosts, :message => 'Tiles exists on the dashboard' }.to_json
         else
-            @message = "Tiles " +output.join(',')+ "does not exist on the dashboard " +dashboard
+            @message = "Tiles " + output.join(',') + " does not exist on the dashboard #{dashboard}"
 	    404
         end
     else
@@ -222,7 +221,7 @@ delete '/tiles/:dashboard' do
                 output = functions.tileExists(dashboard, tiles, settings.root)
                 if output.empty?
                     functions.deleteTile(dashboard, tiles, settings.root)
-                    { :message => 'Tiles '+tiles.join(',')+ ' removed from the dashboard ' +dashboard  }.to_json
+                    body({ :message => 'Tiles '+tiles.join(',')+ " removed from the dashboard #{dashboard}"  }.to_json)
 		    status 202
                 else
                     @message = "Hosts "+output.join(',')+" are not on the dashboard " + dashboard
@@ -254,7 +253,7 @@ put '/tiles/:dashboard' do
             if functions.dashboardExists(dashboard, settings.root)
                 output = functions.tileExists(dashboard, tiles, settings.root)
                 if output.empty?
-                    { :message => 'Tiles '+tiles.join(',')+ ' already on the dashboard ' +dashboard }.to_json
+                    { :message => 'Tiles '+tiles.join(',')+ " already on the dashboard #{dashboard}" }.to_json
                 else
                     if functions.addTile(dashboard, body, settings.root)
                         { :message => 'Tiles '+tiles.join(',')+ ' added to the dashboard '+ dashboard  }.to_json
@@ -304,5 +303,5 @@ put '/ping/:dashboard' do
     else
         @message = "Invalid API Key!"
        403
-   end
+    end
 end

data/lib/dashing_api/helperFunctions.rb

@@ -205,8 +205,6 @@ class HelperFunctions
     end
 
     def pingHosts(dashboard, body, directory)
-        notFound = Array.new
-
         upArr = Array.new
         downArr = Array.new
 

data/lib/dashing_api/version.rb

@@ -1,3 +1,3 @@
 module DashingApi
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,62 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: dashing_api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - FT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dashing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: net-ping
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.8.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: API for interaction with dashing
@@ -68,32 +131,31 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/dashing_api.rb
-- lib/dashing_api/version.rb
 - lib/dashing_api/api.rb
 - lib/dashing_api/helperFunctions.rb
+- lib/dashing_api/version.rb
 homepage: https://github.com/Financial-Times/dashing_api.git
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: API for interaction with dashing
 test_files: []