rubyang 0.1.1 → 0.1.2

data/lib/rubyang/xpath.rb

@@ -1,12 +1,220 @@
 # coding utf-8
 
 require_relative 'xpath/parser'
+require_relative 'database/data_tree'
 
 module Rubyang
 	module Xpath
-		class LocationSteps < Array
-			def initialize *location_steps
-				self.push *location_steps
+		module BasicType
+			class NodeSet
+				include Enumerable
+
+				attr_reader :value
+				def initialize value=[]
+					raise "#{self.class} argument must be Array but #{value.class}" unless Array === value
+					value.each{ |v|
+						unless Rubyang::Database::DataTree::Node === v
+							raise "#{self.class} argument must be Rubyang::Database::DataTree::Node but #{v.class}"
+						end
+					}
+					@value = value
+				end
+
+				def each
+					@value.each do |v|
+						yield v
+					end
+				end
+
+				def to_boolean
+					value = if @value == [] then false else true end
+					Boolean.new value
+				end
+
+				def == right
+					@value.each{ |v|
+						unless Rubyang::Database::DataTree::Leaf === v
+							raise "#{self.class} argument must be Rubyang::Database::DataTree::Leaf but #{v.class}"
+						end
+					}
+					case right
+					when NodeSet
+						right.value.each{ |v|
+							unless Rubyang::Database::DataTree::Leaf === v
+								raise "#{right.class} argument must be Rubyang::Database::DataTree::Leaf but #{v.class}"
+							end
+						}
+						value = if (@value.map{ |v| v.value } & right.value.map{ |v| v.value }).size > 0 then true else false end
+						Boolean.new value
+					when Boolean
+						value = if @value.size > 0
+								if right.value then true else false end
+							else
+								if right.value then false else true end
+							end
+						Boolean.new value
+					when Number
+						value = @value.any?{ |v| Float(v.value) == right.value rescue false }
+						Boolean.new value
+					when String
+						value = @value.any?{ |v| v.value == right.value }
+						Boolean.new value
+					end
+				end
+
+				def != right
+					value = ! (self == right).value
+					Boolean.new value
+				end
+			end
+
+			class Boolean
+				attr_reader :value
+				def initialize value
+					raise "#{self.class} argument must be true or false but #{value.class}" unless [true, false].include?( value )
+					@value = value
+				end
+
+				def to_boolean
+					self
+				end
+
+				def and right
+					value = (@value and right.to_boolean.value)
+					Boolean.new value
+				end
+
+				def or right
+					value = (@value or right.to_boolean.value)
+					Boolean.new value
+				end
+			end
+
+			class Number
+				attr_reader :value
+				def initialize value
+					@value = Float(value)
+				end
+
+				def to_boolean
+					value = if @value == Float(0) then false else true end
+					Boolean.new value
+				end
+
+				def -@
+					value = (- @value)
+					Number.new value
+				end
+
+				def + right
+					case right
+					when Number
+						value = (@value + right.value)
+						Number.new value
+					else
+						raise
+					end
+				end
+
+				def - right
+					case right
+					when Number
+						value = (@value - right.value)
+						Number.new value
+					else
+						raise
+					end
+				end
+
+				def * right
+					case right
+					when Number
+						value = (@value * right.value)
+						Number.new value
+					else
+						raise
+					end
+				end
+
+				def / right
+					case right
+					when Number
+						value = (@value / right.value)
+						Number.new value
+					else
+						raise
+					end
+				end
+
+				def == right
+					case right
+					when Number
+						value = (@value == right.value)
+						Boolean.new value
+					else
+						raise
+					end
+				end
+
+				def != right
+					case right
+					when Number
+						value = (@value != right.value)
+						Boolean.new value
+					else
+						raise
+					end
+				end
+			end
+
+			class String
+				attr_reader :value
+				def initialize value
+					@value = value
+				end
+
+				def to_boolean
+					value = if @value == '' then false else true end
+					Boolean.new value
+				end
+
+				def == right
+					case right
+					when String
+						value = (@value == right.value)
+						Boolean.new value
+					else
+						raise
+					end
+				end
+
+				def != right
+					case right
+					when String
+						value = (@value != right.value)
+						Boolean.new value
+					else
+						raise
+					end
+				end
+			end
+		end
+
+		class Expr
+			attr_reader :op
+			def initialize op
+				@op = op
+			end
+		end
+
+		class LocationPath
+			attr_reader :location_step_sequence
+			def initialize *location_step_sequence
+				@location_step_sequence = location_step_sequence
+			end
+			def add *location_step_sequence
+				@location_step_sequence.push *location_step_sequence
+				self
 			end
 		end
 
@@ -86,139 +294,168 @@ module Rubyang
 		end
 
 		class Predicate
-			class Expr
+			attr_reader :expr
+			def initialize expr
+				@expr = expr
 			end
+		end
 
-			class OrExpr < Expr
-				attr_reader :op1, :op2
-				def initialize op1, op2=nil
-					@op1 = op1
-					@op2 = op2
-				end
+		class OrExpr
+			attr_reader :op1, :op2
+			def initialize op1, op2=nil
+				@op1 = op1
+				@op2 = op2
 			end
+		end
 
-			class AndExpr < Expr
-				attr_reader :op1, :op2
-				def initialize op1, op2=nil
-					@op1 = op1
-					@op2 = op2
-				end
+		class AndExpr
+			attr_reader :op1, :op2
+			def initialize op1, op2=nil
+				@op1 = op1
+				@op2 = op2
 			end
+		end
 
-			class EqualityExpr < Expr
-				attr_reader :op1, :operator, :op2
-				def initialize op1, operator=nil, op2=nil
-					@op1 = op1
-					@operator = operator
-					@op2 = op2
-				end
+		class EqualityExpr
+			attr_reader :op1, :operator, :op2
+			def initialize op1, operator=nil, op2=nil
+				@op1 = op1
+				@operator = operator
+				@op2 = op2
 			end
+		end
 
-			class RelationalExpr < Expr
-				attr_reader :op1, :operator, :op2
-				def initialize op1, operator=nil, op2=nil
-					@op1 = op1
-					@operator = operator
-					@op2 = op2
-				end
+		class RelationalExpr
+			attr_reader :op1, :operator, :op2
+			def initialize op1, operator=nil, op2=nil
+				@op1 = op1
+				@operator = operator
+				@op2 = op2
 			end
+		end
 
-			class AdditiveExpr < Expr
-				attr_reader :op1, :operator, :op2
-				def initialize op1, operator=nil, op2=nil
-					@op1 = op1
-					@operator = operator
-					@op2 = op2
-				end
+		class AdditiveExpr
+			attr_reader :op1, :operator, :op2
+			def initialize op1, operator=nil, op2=nil
+				@op1 = op1
+				@operator = operator
+				@op2 = op2
 			end
+		end
 
-			class MultiplicativeExpr < Expr
-				attr_reader :op1, :operator, :op2
-				def initialize op1, operator=nil, op2=nil
-					@op1 = op1
-					@operator = operator
-					@op2 = op2
-				end
+		class MultiplicativeExpr
+			attr_reader :op1, :operator, :op2
+			def initialize op1, operator=nil, op2=nil
+				@op1 = op1
+				@operator = operator
+				@op2 = op2
 			end
+		end
 
-			class UnaryExpr < Expr
-				attr_reader :op1, :operator
-				def initialize op1, operator=nil
-					@op1 = op1
-					@operator = operator
-				end
+		class UnaryExpr
+			attr_reader :op1, :operator
+			def initialize op1, operator=nil
+				@op1 = op1
+				@operator = operator
 			end
+		end
 
-			class UnionExpr < Expr
-				attr_reader :op1, :operator, :op2
-				def initialize op1, operator=nil, op2=nil
-					@op1 = op1
-					@operator = operator
-					@op2 = op2
-				end
+		class UnionExpr
+			attr_reader :op1, :operator, :op2
+			def initialize op1, operator=nil, op2=nil
+				@op1 = op1
+				@operator = operator
+				@op2 = op2
 			end
+		end
 
-			class PathExpr < Expr
-				attr_reader :op1, :operator, :op2
-				def initialize op1, operator=nil, op2=nil
-					@op1 = op1
-					@operator = operator
-					@op2 = op2
-				end
+		class PathExpr
+			attr_reader :op1, :operator, :op2
+			def initialize op1, operator=nil, op2=nil
+				@op1 = op1
+				@operator = operator
+				@op2 = op2
 			end
+		end
 
-			class FilterExpr < Expr
-				attr_reader :op1, :op2
-				def initialize op1, op2=nil
-					@op1 = op1
-					@op2 = op2
-				end
+		class FilterExpr
+			attr_reader :op1, :op2
+			def initialize op1, op2=nil
+				@op1 = op1
+				@op2 = op2
 			end
+		end
 
-			class PrimaryExpr < Expr
-				attr_reader :op1
-				def initialize op1
-					@op1 = op1
-				end
+		class PrimaryExpr
+			attr_reader :op1
+			def initialize op1
+				@op1 = op1
 			end
+		end
 
-			class Literal
-				attr_reader :value
-				def initialize value
-					@value = case value
-						 when /^"(?:[^"])*"/
-							 value.gsub(/^"/,'').gsub(/"$/,'').gsub(/\\n/,"\n").gsub(/\\t/,"\t").gsub(/\\"/,"\"").gsub(/\\\\/,"\\")
-						 when /^'(?:[^'])*'/
-							 value.gsub(/^'/,'').gsub(/'$/,'')
-						 else
-							 value
-						 end
-				end
+		class VariableReference
+			attr_reader :name
+			def initialize name
+				@name = name
 			end
+		end
 
-			class Number
-				attr_reader :value
-				def initialize value
-					@value = value.to_f.to_s
-				end
+		class Literal
+			attr_reader :value
+			def initialize value
+				@value = case value
+					 when /^"(?:[^"])*"/
+						 value.gsub(/^"/,'').gsub(/"$/,'').gsub(/\\n/,"\n").gsub(/\\t/,"\t").gsub(/\\"/,"\"").gsub(/\\\\/,"\\")
+					 when /^'(?:[^'])*'/
+						 value.gsub(/^'/,'').gsub(/'$/,'')
+					 else
+						 value
+					 end
 			end
+		end
 
-			class FunctionCall
-				CURRENT ||= 'current'
-
-				attr_reader :name, :args
-				def initialize name, args=[]
-					@name = name
-					@args = args
-				end
+		class Number
+			attr_reader :value
+			def initialize value
+				@value = value.to_f.to_s
 			end
+		end
 
-			attr_reader :expr
-
-			def initialize expr
-				@expr = expr
+		class FunctionCall
+			CURRENT          ||= :current
+			LAST             ||= :last
+			POSITION         ||= 'position'
+			COUNT            ||= 'count'
+			ID               ||= 'id'
+			LOCAL_NAME       ||= 'local-name'
+			NAMESPACE_URI    ||= 'namespace-uri'
+			NAME             ||= 'name'
+			STRING           ||= 'string'
+			CONCAT           ||= 'concat'
+			STARTS_WITH      ||= 'starts-with'
+			CONTAINS         ||= 'contains'
+			SUBSTRING_BEFORE ||= 'substring-before'
+			SUBSTRING_AFTER  ||= 'substring-after'
+			SUBSTRING        ||= 'substring'
+			STRING_LENGTH    ||= 'string-length'
+			NORMALIZE_SPACE  ||= 'normalize-space'
+			TRANSLATE        ||= 'translate'
+			BOOLEAN          ||= 'boolean'
+			NOT              ||= 'not'
+			TRUE             ||= 'true'
+			FALSE            ||= 'false'
+			LANG             ||= 'lang'
+			NUMBER           ||= 'number'
+			SUM              ||= 'sum'
+			FLOOR            ||= 'floor'
+			CEILING          ||= 'ceiling'
+			ROUND            ||= 'round'
+
+			attr_reader :name, :args
+			def initialize name, args=[]
+				@name = name
+				@args = args
 			end
 		end
-
 	end
 end

data/lib/rubyang.rb

@@ -2,6 +2,7 @@
 
 require_relative 'rubyang/version'
 
+require_relative 'rubyang/logger'
 require_relative 'rubyang/model'
 require_relative 'rubyang/xpath'
 require_relative 'rubyang/database'

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 "bundler",                   '~> 1.16'
   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'
+  spec.add_development_dependency "codeclimate-test-reporter", '~> 1.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyang
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - hirura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-02 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 1.0.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 1.0.8
 description: YANG parser and tree structure data store
 email:
 - hirura@gmail.com
@@ -138,6 +138,7 @@ files:
 - lib/rubyang/database/data_tree.rb
 - lib/rubyang/database/helper.rb
 - lib/rubyang/database/schema_tree.rb
+- lib/rubyang/logger.rb
 - lib/rubyang/model.rb
 - lib/rubyang/model/parser.rb
 - lib/rubyang/model/parser/parser.tab.rb
@@ -180,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: YANG parser and tree structure data store