hieraviz 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4eaf9279a8b9ffdd555aa1d48fcf395a648b5e2
-  data.tar.gz: 3325be3798ce496aea8ce0f99e1c58348ef72805
+  metadata.gz: c92243305adbd29684586595b9756031dbab5890
+  data.tar.gz: 92149f89aebee317256c51b143613111431730ab
 SHA512:
-  metadata.gz: 1365f4a1804d57eae53a2ea56fa47a8a0be87eb605a98e575ba075dc76a68ca398c5e33125a5dcc73e9a9f95fa8dc6c30b1a38fb98270cc6e248c66f67941f77
-  data.tar.gz: f46e79ebd53ade534fad598bf09ce5584b41e6ff943ff65fca029fffc9089e1ea9a9d0598994a87f4c6bad2b87f7a5a2f00878757d6b361c0ec25507200e8907
+  metadata.gz: 2910ecf14f76df96f33f1b211bcfe315a6ba2acec195a2375c7cc95a6f3a7a02230e8703256e79d673069178cfaaa7cd19190a86660a9a23420136984bca0852
+  data.tar.gz: 868f5226fc033dc439515f4b3f81182f6a40068ae17da91fec87a67296384d0789d29b4e70b23176581578069e34abd6a44f71750599640ed829488ed173ad26

data/CHANGELOG.md

@@ -1,7 +1,10 @@
 Hieraviz Changelog
 ========================
 
-### v0.2.0 - 2014-03-03
+### v0.2.1 - 2016-04-04
+- replaced sinatra-flash (weird license, no debian package) with rack-flash3
+
+### v0.2.0 - 2016-03-03
 - fix button display on firefox
 - fixes on http simple auth
 - various refactoring

data/README.md

@@ -23,7 +23,25 @@ Install it from Rubygens:
 
 Development
 --------------
-Launch it with `shotgun` or `rackup`.
+
+Make sure you have ruby installed (version 2.1.5 from jessie works fine, or use rvm).
+
+    gem install bundler
+    git clone https://github.com/Gandi/hieraviz.git
+    cd hieraviz
+    bundle install --path vendor
+    cp config/hieraviz.default.yml config/hieraviz.yml
+    # edit the config file
+    bundle exec shotgun
+    # or
+    bundle exec rackup
+
+
+Production
+----------------
+
+    gem install thin
+    thin -s 1 -C config.yml -R config.ru start
 
 Contributing
 ----------------

data/app/apiv1.rb

@@ -14,6 +14,7 @@ module HieravizApp
 
     configure do
       set :session_secret, settings.configdata['session_seed']
+      set :protection, :origin_whitelist => ['http://web.example.com']
       enable :sessions
     end
 
@@ -52,6 +53,11 @@ module HieravizApp
       def get_facts(base, node)
         Hieraviz::Facts.new(settings.configdata['tmpdir'], base, node, username)
       end
+      def cors_headers()
+        headers 'Access-Control-Allow-Origin' => '*'
+        headers 'Access-Control-Allow-Headers' => 'Authorization,Accepts,Content-Type,X-CSRF-Token,X-Requested-With,X-AUTH'
+        headers 'Access-Control-Allow-Methods' => 'GET,POST,PUT,DELETE,OPTIONS'
+      end
     end
 
     get %r{^/?([-_\.a-zA-Z0-9]+)?/nodes} do |base|
@@ -109,6 +115,7 @@ module HieravizApp
 
     get %r{^/?([-_\.a-zA-Z0-9]+)?/farms} do |base|
       check_authorization
+      cors_headers
       hieracles_config = prepare_config(base)
       json Hieracles::Registry.farms_counted(hieracles_config, base)
     end
@@ -137,8 +144,14 @@ module HieravizApp
       json res
     end
 
+    options %r{^/.*/$} do
+      cors_headers
+      halt 200
+    end
+
     get %r{^/?([-_\.a-zA-Z0-9]+)?/farm/([-_\.a-zA-Z0-9]+)$} do |base, farm|
-      check_authorization
+      # check_authorization
+      cors_headers
       hieracles_config = prepare_config(base)
       nodes =  Hieracles::Registry.nodes_data(hieracles_config, base).each_with_object({}) do |(key, val), acc|
         acc[key] = val if val['farm'] == farm

data/app/public/css/main.css

@@ -452,10 +452,6 @@ input {
   background-color: #4d4;
   color: #000;
 }
-.flash.warning {
-  background-color: #d63;
-  color: #fff;
-}
 .flash.fatal {
   background-color: #a20;
   color: #fff;

data/app/public/js/farms.js

@@ -51,19 +51,19 @@ ready( () => {
   var Farm = {
     show: function(el) {
       addClass(meat, 'wait');
-      farm = el.dataset.item;
-      fetch('/v1/' + base + '/farm/' + farm, auth_header()).
+      focused = el.dataset.item;
+      fetch('/v1/' + base + '/farm/' + focused, auth_header()).
         then(res => res.json()).
         then(j => {
           if (j.error !== undefined) {
             show_error(meat, j['error']);
           } else {
-            build_list(meat, farm, j);
+            build_list(meat, focused, j);
             Array.prototype.forEach.call(farms, (item, i) => {
               removeClass(item, 'focus');
             });
             addClass(el, 'focus');
-            update_footer('/v1/' + base + '/farm/' + farm);
+            update_footer('/v1/' + base + '/farm/' + focused);
           }
           removeClass(meat, 'wait');
         });

data/app/views/_flash.erb

@@ -0,0 +1,5 @@
+<% if flash.has?(:fatal) %>
+<div class="flash fatal"><%= flash[:fatal] %></div>
+<% elsif flash.has?(:info) %>
+<div class="flash info"><%= flash[:info] %></div>
+<% end %>

data/app/views/_layout.erb

@@ -23,7 +23,7 @@
         <%= erb :_head, :layout => false %>
       </div>
       <div class="content">
-        <%= styled_flash %>
+        <%= erb :_flash, :layout => false %>
         <%= yield %>
       </div>
       <div class="foot">

data/app/web.rb

@@ -1,7 +1,7 @@
 require 'sinatra/content_for'
-require 'sinatra/flash'
 
 require 'better_errors'
+require 'rack-flash'
 require 'dotenv'
 require 'oauth2'
 
@@ -14,7 +14,7 @@ module HieravizApp
   # the unique web endpoints management
   class Web < Common
     helpers Sinatra::ContentFor
-    register Sinatra::Flash
+    use Rack::Flash
 
     configure do
       set :session_secret, settings.configdata['session_seed']
@@ -113,7 +113,7 @@ module HieravizApp
         access_token = settings.oauth.access_token(request, params[:code])
         session[:access_token] = access_token.token
         settings.store.set access_token.token, settings.oauth.user_info(access_token.token)
-        flash['info'] = 'Successfully authenticated with the server'
+        flash[:info] = 'Successfully authenticated with the server'
         redirect '/'
       end
 

data/config.ru

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'sinatra'
+
 require File.expand_path '../app/main.rb', __FILE__
 
 run Rack::URLMap.new('/' => HieravizApp::Web,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hieraviz
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra-flash
+  name: rack-flash3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -276,6 +276,7 @@ files:
 - app/public/js/modules.js
 - app/public/js/nodes.js
 - app/public/js/resources.js
+- app/views/_flash.erb
 - app/views/_foot.erb
 - app/views/_head.erb
 - app/views/_layout.erb