rubyang 0.1.0 → 0.1.1

data/lib/rubyang/model/parser/parser.y

@@ -1442,7 +1442,7 @@ rule
 	"string"			:	STRING
 					|	"string" "+" STRING
 							{
-								result = val[0] + val[1]
+								result = val[0] + val[2]
 							}
 
 	"stmtend"			:	";"

data/lib/rubyang/restapi.rb

@@ -1,4 +1,11 @@
 # coding: utf-8
 
-require_relative 'restapi/httpd.rb'
+require_relative 'restapi/app'
+
+module Rubyang
+	module RestAPI
+	end
+end
+
+Rubyang::RestAPI::App.run!
 

data/lib/rubyang/restapi/app.rb

@@ -0,0 +1,72 @@
+# coding: utf-8
+
+require 'bundler/setup'
+
+require 'sinatra/base'
+require 'sinatra/reloader'
+require 'sinatra/respond_with'
+
+require_relative '../../rubyang'
+
+module Rubyang
+	module RestAPI
+		class App < Sinatra::Base
+			set :environment, :development
+			set :bind, '0.0.0.0'
+
+			configure :development do
+				register Sinatra::Reloader
+			end
+
+			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')
+
+
+			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
+
+			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
+
+			run! if app_file == $0
+		end
+	end
+end

data/lib/rubyang/server.rb

@@ -0,0 +1,8 @@
+# coding: utf-8
+
+require_relative '../rubyang'
+
+module Rubyang
+	module Server
+	end
+end

data/lib/rubyang/server/base.rb

@@ -0,0 +1,30 @@
+# coding: utf-8
+
+require_relative '../../rubyang'
+
+require 'fileutils'
+require 'drb/drb'
+
+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"
+
+				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
+
+			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

@@ -0,0 +1,9 @@
+# coding: utf-8
+
+require_relative 'base'
+
+class Example < Rubyang::Server::Base
+end
+
+example = Example.new
+example.run

data/lib/rubyang/version.rb

@@ -1,3 +1,3 @@
 module Rubyang
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/rubyang/webui/public/js/webui.js

@@ -30,7 +30,7 @@ function make_form(trees, parent_id){
 		}else if(stmt == "leaf"){
 			var child_schema_path = parent_id + '/' + tree["name"];
 			var child_id = next_id();
-			addleaf(parent_id, child_id, child_schema_path, tree["name"], tree["description"], 'string', '');
+			addleaf(parent_id, child_id, child_schema_path, tree["name"], tree["description"], tree["type"], '');
 		}
 	}
 }
@@ -204,7 +204,27 @@ function addleaf(parent_id, id, schemapath, schemaname, description, datatype, o
 	label.attr('for', id_form);
 	label.html(description);
 
-	if(datatype == "string"){
+	if(datatype == "binary"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
+	}else if(datatype == "bits"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
+	}else if(datatype == "boolean"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
+	}else if(datatype == "decimal64"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
+	}else if(datatype == "empty"){
 		input = $('<input>');
 		input.attr('id',id_form);
 		input.addClass('form-control');
@@ -221,7 +241,79 @@ function addleaf(parent_id, id, schemapath, schemaname, description, datatype, o
 		input.append(option0);
 		input.append(option1);
 		input.append(option2);
-	}else{
+	}else if(datatype == "identityref"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
+	}else if(datatype == "instance-identifier"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
+	}else if(datatype == "int8"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
+	}else if(datatype == "int16"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
+	}else if(datatype == "int32"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
+	}else if(datatype == "int64"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
+	}else if(datatype == "leafref"){
+		input = $('<select>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		var option0 = $('<option>');
+		var option1 = $('<option>');
+		var option2 = $('<option>');
+		option0.html('0');
+		option1.html('1');
+		option2.html('2');
+		input.append(option0);
+		input.append(option1);
+		input.append(option2);
+	}else if(datatype == "string"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
+	}else if(datatype == "uint8"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
+	}else if(datatype == "uint16"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
+	}else if(datatype == "uint32"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
+	}else if(datatype == "uint64"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
+	}else if(datatype == "union"){
+		input = $('<input>');
+		input.attr('id',id_form);
+		input.addClass('form-control');
+		input.attr('type', 'text');
 	}
 
 	$('#'+parent_id).append(panel);

data/lib/rubyang/yang/rubyang.yang

@@ -0,0 +1,33 @@
+module rubyang {
+	namespace "http://github.com/hirura/rubyang";
+	prefix rubyang;
+
+	organization "rubyang";
+	contact "http://github.com/hirura/";
+	description "The module to support some basic features";
+
+	revision 2016-07-02 {
+		description "Initial revision. Just for testing.";
+	}
+
+	container rubyang {
+		list component {
+			key name;
+			leaf name {
+				type string;
+			}
+			leaf hook {
+				type enumeration {
+					//enum start;
+					enum commit;
+					//enum finish;
+				}
+			}
+			leaf file-path {
+				type string {
+					pattern '/.+\.rb';
+				}
+			}
+		}
+	}
+}

data/rubyang.gemspec

@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sinatra",         '~> 1.0'
   spec.add_dependency "sinatra-contrib", '~> 1.0'
 
-  spec.add_development_dependency "bundler",   '~> 1.0'
-  spec.add_development_dependency "rake",      '~> 11.0'
-  spec.add_development_dependency "rspec",     '~> 3.0'
-  spec.add_development_dependency "racc",      '~> 1.0'
-  spec.add_development_dependency "coveralls", '~> 0.0'
+  spec.add_development_dependency "bundler",                   '~> 1.0'
+  spec.add_development_dependency "rake",                      '~> 11.0'
+  spec.add_development_dependency "rspec",                     '~> 3.0'
+  spec.add_development_dependency "racc",                      '~> 1.0'
+  spec.add_development_dependency "codeclimate-test-reporter", '~> 0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyang
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - hirura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -131,7 +131,10 @@ files:
 - lib/rubyang.rb
 - lib/rubyang/cli.rb
 - lib/rubyang/cli/parser.rb
+- lib/rubyang/component/base.rb
+- lib/rubyang/component/example.rb
 - lib/rubyang/database.rb
+- lib/rubyang/database/component_manager.rb
 - lib/rubyang/database/data_tree.rb
 - lib/rubyang/database/helper.rb
 - lib/rubyang/database/schema_tree.rb
@@ -140,7 +143,10 @@ files:
 - lib/rubyang/model/parser/parser.tab.rb
 - lib/rubyang/model/parser/parser.y
 - lib/rubyang/restapi.rb
-- lib/rubyang/restapi/httpd.rb
+- lib/rubyang/restapi/app.rb
+- lib/rubyang/server.rb
+- lib/rubyang/server/base.rb
+- lib/rubyang/server/example.rb
 - lib/rubyang/version.rb
 - lib/rubyang/webui.rb
 - lib/rubyang/webui/app.rb
@@ -152,6 +158,7 @@ files:
 - lib/rubyang/xpath/parser.rb
 - lib/rubyang/xpath/parser/parser.tab.rb
 - lib/rubyang/xpath/parser/parser.y
+- lib/rubyang/yang/rubyang.yang
 - rubyang.gemspec
 homepage: https://github.com/hirura/rubyang
 licenses:

data/lib/rubyang/restapi/httpd.rb

@@ -1,62 +0,0 @@
-# coding: utf-8
-
-require 'sinatra'
-require 'sinatra/contrib'
-require 'sinatra/reloader'
-require 'json'
-
-require_relative '../../rubyang'
-db = Rubyang::Database.new
-yang_str = <<-EOB
-	module module1 {
-		namespace "http://module1/";
-		prefix module1;
-		container container1 {
-			container container2 {
-				leaf leaf1 { type string; }
-			}
-		}
-	}
-EOB
-db.load_model Rubyang::Model::Parser.parse( yang_str )
-config = db.configure
-config.edit( 'container1' ).edit( 'container2' ).edit( 'leaf1' ).set( 'aaa' )
-
-
-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
-
-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