rubyang 0.1.2.1 → 0.1.3

data/lib/rubyang/restapi.rb

@@ -1,10 +1,11 @@
 # coding: utf-8
+# vim: et ts=2 sw=2
 
-require_relative 'restapi/app'
+require 'rubyang/restapi/app'
 
 module Rubyang
-	module RestAPI
-	end
+  module RestAPI
+  end
 end
 
 Rubyang::RestAPI::App.run!

data/lib/rubyang/restapi/app.rb

@@ -1,72 +1,71 @@
 # coding: utf-8
+# vim: et ts=2 sw=2
 
 require 'bundler/setup'
-
 require 'sinatra/base'
 require 'sinatra/reloader'
 require 'sinatra/respond_with'
-
-require_relative '../../rubyang'
+require 'rubyang'
 
 module Rubyang
-	module RestAPI
-		class App < Sinatra::Base
-			set :environment, :development
-			set :bind, '0.0.0.0'
+  module RestAPI
+    class App < Sinatra::Base
+      set :environment, :development
+      set :bind, '0.0.0.0'
 
-			configure :development do
-				register Sinatra::Reloader
-			end
+      configure :development do
+        register Sinatra::Reloader
+      end
 
-			register Sinatra::RespondWith
+      register Sinatra::RespondWith
 
 
-			target_yang = File.expand_path( File.dirname( __FILE__ ) ) + '/target.yang'
-			model = Rubyang::Model::Parser.parse( File.open( target_yang, 'r' ).read )
-			db = Rubyang::Database.new
-			db.load_model model
-			db.configure.edit('container1').edit('container2').edit('leaf1').set('value')
+      target_yang = File.expand_path( File.dirname( __FILE__ ) ) + '/target.yang'
+      model = Rubyang::Model::Parser.parse( File.open( target_yang, 'r' ).read )
+      db = Rubyang::Database.new
+      db.load_model model
+      db.configure.edit('container1').edit('container2').edit('leaf1').set('value')
 
 
-			get '/' do
-				respond_to do |f|
-					f.on( 'application/xml' ){
-						config = db.configure
-						config.to_xml( pretty: true )
-					}
-				end
-			end
+      get '/' do
+        respond_to do |f|
+          f.on( 'application/xml' ){
+            config = db.configure
+            config.to_xml( pretty: true )
+          }
+        end
+      end
 
-			get %r{/api(?:/(.+)[/]?)} do
-				respond_to do |f|
-					f.on( 'application/xml' ){
-						#{ params: ' '+params[:captures][0] }.to_json
-						config = db.configure
-						paths = params[:captures][0].split( '/' )
-						element = paths.inject( config ){ |parent, child| parent.edit( child ) }
-						element.to_xml( pretty: true )
-					}
-				end
-			end
+      get %r{/api(?:/(.+)[/]?)} do
+        respond_to do |f|
+          f.on( 'application/xml' ){
+            #{ params: ' '+params[:captures][0] }.to_json
+            config = db.configure
+            paths = params[:captures][0].split( '/' )
+            element = paths.inject( config ){ |parent, child| parent.edit( child ) }
+            element.to_xml( pretty: true )
+          }
+        end
+      end
 
-			post %r{/api(?:/(.+)[/]?)} do
-				body = request.body.read
-				respond_to do |f|
-					f.on( 'application/xml' ){
-						config = db.configure
-						paths = params[:captures][0].split( '/' )
-						element = paths.inject( config ){ |parent, child| parent.edit( child ) }
-					}
-				end
-			end
+      post %r{/api(?:/(.+)[/]?)} do
+        body = request.body.read
+        respond_to do |f|
+          f.on( 'application/xml' ){
+            config = db.configure
+            paths = params[:captures][0].split( '/' )
+            element = paths.inject( config ){ |parent, child| parent.edit( child ) }
+          }
+        end
+      end
 
-			get %r{/api[/]?} do
-				respond_to do |f|
-					f.on( 'application/xml' ){ db.configure.to_xml( pretty: true ) }
-				end
-			end
+      get %r{/api[/]?} do
+        respond_to do |f|
+          f.on( 'application/xml' ){ db.configure.to_xml( pretty: true ) }
+        end
+      end
 
-			run! if app_file == $0
-		end
-	end
+      run! if app_file == $0
+    end
+  end
 end

data/lib/rubyang/server.rb

@@ -1,8 +1,9 @@
 # coding: utf-8
+# vim: et ts=2 sw=2
 
-require_relative '../rubyang'
+require 'rubyang'
 
 module Rubyang
-	module Server
-	end
+  module Server
+  end
 end

data/lib/rubyang/server/base.rb

@@ -1,30 +1,30 @@
 # coding: utf-8
-
-require_relative '../../rubyang'
+# vim: et ts=2 sw=2
 
 require 'fileutils'
 require 'drb/drb'
+require 'rubyang'
 
 module Rubyang
-	module Server
-		class Base
-			def initialize
-				@pid = Process.pid
-				@sock_dir = "/tmp/rubyang/server"
-				#@sock_file = "#{@sock_dir}/#{self.class.to_s}.#{@pid}.sock"
-				@sock_file = "#{@sock_dir}/#{self.class.to_s}.sock"
+  module Server
+    class Base
+      def initialize
+        @pid = Process.pid
+        @sock_dir = "/tmp/rubyang/server"
+        #@sock_file = "#{@sock_dir}/#{self.class.to_s}.#{@pid}.sock"
+        @sock_file = "#{@sock_dir}/#{self.class.to_s}.sock"
 
-				FileUtils.mkdir_p @sock_dir
+        FileUtils.mkdir_p @sock_dir
 
-				@db = Rubyang::Database.new
-				@db.load_model Rubyang::Model::Parser.parse File.open( "#{File.dirname(__FILE__)}/../yang/rubyang.yang", 'r' ).read
-			end
+        @db = Rubyang::Database.new
+        @db.load_model Rubyang::Model::Parser.parse File.open( "#{File.dirname(__FILE__)}/../yang/rubyang.yang", 'r' ).read
+      end
 
-			def run
-				#DRb.start_service( "drbunix:#{@sock_file}", @db, safe_level: 1 )
-				DRb.start_service( "drbunix:#{@sock_file}", @db )
-				DRb.thread.join
-			end
-		end
-	end
+      def run
+        #DRb.start_service( "drbunix:#{@sock_file}", @db, safe_level: 1 )
+        DRb.start_service( "drbunix:#{@sock_file}", @db )
+        DRb.thread.join
+      end
+    end
+  end
 end

data/lib/rubyang/server/example.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
+# vim: et ts=2 sw=2
 
-require_relative 'base'
+require 'rubyang/server/base'
 
 class Example < Rubyang::Server::Base
 end

data/lib/rubyang/version.rb

@@ -1,3 +1,6 @@
+# coding: utf-8
+# vim: et ts=2 sw=2
+
 module Rubyang
-  VERSION = "0.1.2.1"
+  VERSION = "0.1.3"
 end

data/lib/rubyang/webui.rb

@@ -1,10 +1,11 @@
 # coding: utf-8
+# vim: et ts=2 sw=2
 
-require_relative 'webui/app'
+require 'rubyang/webui/app'
 
 module Rubyang
-	module WebUI
-	end
+  module WebUI
+  end
 end
 
 Rubyang::WebUI::App.run!

data/lib/rubyang/webui/app.rb

@@ -1,74 +1,73 @@
 # coding: utf-8
+# vim: et ts=2 sw=2
 
 require 'bundler/setup'
-
 require 'sinatra/base'
 require 'sinatra/reloader'
 require 'sinatra/content_for'
-
-require_relative '../../rubyang'
-require_relative 'make_json_schema'
+require 'rubyang'
+require 'rubyang/webui/make_json_schema'
 
 module Rubyang
-	module WebUI
-		class App < Sinatra::Base
-			set :environment, :development
-			set :bind, '0.0.0.0'
-
-			helpers Sinatra::ContentFor
-
-			configure :development do
-				register Sinatra::Reloader
-			end
-
-
-			target_yang = File.expand_path( File.dirname( __FILE__ ) ) + '/target.yang'
-			model = Rubyang::Model::Parser.parse( File.open( target_yang, 'r' ).read )
-			db = Rubyang::Database.new
-			db.load_model model
-
-
-			get '/' do
-				locals = Hash.new
-				erb :index, locals: locals
-			end
-
-			get '/api/reload_model' do
-				target_yang = File.expand_path( File.dirname( __FILE__ ) ) + '/target.yang'
-				model = Rubyang::Model::Parser.parse( File.open( target_yang, 'r' ).read )
-				db = Rubyang::Database.new
-				db.load_model @model
-				'{}'
-			end
-
-			get '/api/schema' do
-				schema_tree = db.configure.schema
-				data = make_json_schema( schema_tree )
-				puts data
-				sleep 0
-				data
-			end
-
-			get '/api/data' do
-				config = db.configure
-				data = config.to_json( pretty: true )
-				puts data
-				sleep 0
-				data
-			end
-
-			post '/api/data' do
-				request.body.rewind
-				data = request.body.read
-				puts data
-				db.configure.load_override_json( data )
-				sleep 1
-				'{}'
-			end
-
-			run! if app_file == $0
-		end
-	end
+  module WebUI
+    class App < Sinatra::Base
+      set :environment, :development
+      set :bind, '0.0.0.0'
+
+      helpers Sinatra::ContentFor
+
+      configure :development do
+        register Sinatra::Reloader
+      end
+
+
+      target_yang = File.expand_path( File.dirname( __FILE__ ) ) + '/target.yang'
+      model = Rubyang::Model::Parser.parse( File.open( target_yang, 'r' ).read )
+      db = Rubyang::Database.new
+      db.load_model model
+
+
+      get '/' do
+        locals = Hash.new
+        erb :index, locals: locals
+      end
+
+      get '/api/reload_model' do
+        target_yang = File.expand_path( File.dirname( __FILE__ ) ) + '/target.yang'
+        model = Rubyang::Model::Parser.parse( File.open( target_yang, 'r' ).read )
+        db = Rubyang::Database.new
+        db.load_model @model
+        '{}'
+      end
+
+      get '/api/schema' do
+        schema_tree = db.configure.schema
+        data = make_json_schema( schema_tree )
+        puts data
+        sleep 0
+        data
+      end
+
+      get '/api/data' do
+        config = db.configure
+        data = config.to_json( pretty: true )
+        puts data
+        sleep 0
+        data
+      end
+
+      post '/api/data' do
+        request.body.rewind
+        data = request.body.read
+        puts data
+        db.configure.load_override_json( data )
+        sleep 1
+        '{}'
+      end
+
+      run! if app_file == $0
+    end
+  end
 end
 
 

data/lib/rubyang/webui/make_json_schema.rb

@@ -1,63 +1,64 @@
 # coding: utf-8
+# vim: et ts=2 sw=2
 
 def make_json_schema schema_tree
-	json_schema_tree = Array.new
-	make_json_schema_recursive json_schema_tree, schema_tree
-	return JSON.pretty_generate(json_schema_tree)
+  json_schema_tree = Array.new
+  make_json_schema_recursive json_schema_tree, schema_tree
+  return JSON.pretty_generate(json_schema_tree)
 end
 
 def make_json_schema_recursive json_schema_tree, schema_tree
-	case schema_tree.model
-	when nil
-		json_schema_tree.push Hash.new
-		json_schema_tree.last[:root] = Hash.new
-		json_schema_tree.last[:root][:name] = "root"
-		json_schema_tree.last[:root][:description] = "root"
-		json_schema_tree.last[:root][:children] = Array.new
-		schema_tree.children.each{ |child_schema_tree|
-			make_json_schema_recursive json_schema_tree.last[:root][:children], child_schema_tree
-		}
-	when Rubyang::Model::Container
-		json_schema_tree.push Hash.new
-		json_schema_tree.last[:container] = Hash.new
-		json_schema_tree.last[:container][:name] = schema_tree.model.arg
-		json_schema_tree.last[:container][:description] = schema_tree.model.substmt('description').first.arg
-		json_schema_tree.last[:container][:children] = Array.new
-		schema_tree.children.each{ |child_schema_tree|
-			make_json_schema_recursive json_schema_tree.last[:container][:children], child_schema_tree
-		}
-	when Rubyang::Model::List
-		json_schema_tree.push Hash.new
-		json_schema_tree.last[:list] = Hash.new
-		json_schema_tree.last[:list][:key] = schema_tree.model.substmt('key')[0].arg
-		json_schema_tree.last[:list][:name] = schema_tree.model.arg
-		json_schema_tree.last[:list][:description] = schema_tree.model.substmt('description').first.arg
-		json_schema_tree.last[:list][:children] = Array.new
-		schema_tree.children.each{ |child_schema_tree|
-			make_json_schema_recursive json_schema_tree.last[:list][:children], child_schema_tree
-		}
-	when Rubyang::Model::Leaf
-		json_schema_tree.push Hash.new
-		json_schema_tree.last[:leaf] = Hash.new
-		json_schema_tree.last[:leaf][:name] = schema_tree.model.arg
-		json_schema_tree.last[:leaf][:description] = schema_tree.model.substmt('description').first.arg
-		json_schema_tree.last[:leaf][:type] = schema_tree.type.arg
-	end
+  case schema_tree.model
+  when nil
+    json_schema_tree.push Hash.new
+    json_schema_tree.last[:root] = Hash.new
+    json_schema_tree.last[:root][:name] = "root"
+    json_schema_tree.last[:root][:description] = "root"
+    json_schema_tree.last[:root][:children] = Array.new
+    schema_tree.children.each{ |child_schema_tree|
+      make_json_schema_recursive json_schema_tree.last[:root][:children], child_schema_tree
+    }
+  when Rubyang::Model::Container
+    json_schema_tree.push Hash.new
+    json_schema_tree.last[:container] = Hash.new
+    json_schema_tree.last[:container][:name] = schema_tree.model.arg
+    json_schema_tree.last[:container][:description] = schema_tree.model.substmt('description').first.arg
+    json_schema_tree.last[:container][:children] = Array.new
+    schema_tree.children.each{ |child_schema_tree|
+      make_json_schema_recursive json_schema_tree.last[:container][:children], child_schema_tree
+    }
+  when Rubyang::Model::List
+    json_schema_tree.push Hash.new
+    json_schema_tree.last[:list] = Hash.new
+    json_schema_tree.last[:list][:key] = schema_tree.model.substmt('key')[0].arg
+    json_schema_tree.last[:list][:name] = schema_tree.model.arg
+    json_schema_tree.last[:list][:description] = schema_tree.model.substmt('description').first.arg
+    json_schema_tree.last[:list][:children] = Array.new
+    schema_tree.children.each{ |child_schema_tree|
+      make_json_schema_recursive json_schema_tree.last[:list][:children], child_schema_tree
+    }
+  when Rubyang::Model::Leaf
+    json_schema_tree.push Hash.new
+    json_schema_tree.last[:leaf] = Hash.new
+    json_schema_tree.last[:leaf][:name] = schema_tree.model.arg
+    json_schema_tree.last[:leaf][:description] = schema_tree.model.substmt('description').first.arg
+    json_schema_tree.last[:leaf][:type] = schema_tree.type.arg
+  end
 end
 
 
 if __FILE__ == $0
-	require 'yaml'
-	require_relative '../../rubyang'
+  require 'yaml'
+  require_relative '../../rubyang'
 
-	target_yang = File.expand_path( File.dirname( __FILE__ ) ) + '/target.yang'
+  target_yang = File.expand_path( File.dirname( __FILE__ ) ) + '/target.yang'
 
-	model = Rubyang::Model::Parser.parse( File.open( target_yang, 'r' ).read )
-	db = Rubyang::Database.new
-	db.load_model model
+  model = Rubyang::Model::Parser.parse( File.open( target_yang, 'r' ).read )
+  db = Rubyang::Database.new
+  db.load_model model
 
-	schema_tree = db.configure.schema
+  schema_tree = db.configure.schema
 
-	json = make_json_schema schema_tree
-	puts json
+  json = make_json_schema schema_tree
+  puts json
 end