mof 1.2.2 → 1.2.4

data/lib/mof/parser.y

@@ -477,6 +477,7 @@ rule
 	: IDENTIFIER
 	| ASSOCIATION /* meta qualifier */
 	| INDICATION /* meta qualifier */
+	| REFERENCE /* Added in DSP0004 2.7.0 */
 	| SCHEMA
         ;
 

data/lib/mof/scanner.rb

@@ -19,14 +19,17 @@
 # @q: Queue of [token,value] pairs, [false,false] denotes EOF
 #
 
-require 'iconv'
-
 module MOF
 module Scanner
+
+  require 'iconv' unless String.method_defined? :encode
+
   def fill_queue
-    if @file.eof?
+    if @file.closed? || @file.eof?
 #      $stderr.puts "eof ! #{@fstack.size}"
-      @file.close unless @file == $stdin
+      unless @file.closed?
+        @file.close unless @file == $stdin
+      end
       unless @fstack.empty?
 	@file, @name, @lineno, @iconv, $/, @result = @fstack.pop
 #	$stderr.puts "fill! #{@fstack.size}, #{@name}@#{@lineno}"
@@ -41,7 +44,13 @@ module Scanner
 
 #    $stderr.puts "fill_queue(#{@line.split('').inspect})"
     @line.chomp!  # remove $/
-    @line = Iconv.conv( "ISO-8859-1", @iconv, @line ) if @iconv
+    if @iconv
+      if String.method_defined? encode
+        @line = @line.encode( "ISO-8859-1", @iconv )
+      else
+        @line = Iconv.conv( "ISO-8859-1", @iconv, @line )
+      end
+    end
 #    $stderr.puts "scan(#{@line})" unless @quiet
     scanner = StringScanner.new(@line)
 

data/lib/mof/version.rb

@@ -1,3 +1,3 @@
 module MOF
-  VERSION = '1.2.2'
+  VERSION = '1.2.4'
 end

data/test/mof/qualifier.mof

@@ -1,3 +1,6 @@
 // simple qualifier declaration
 qualifier Description : string,
   Scope(class, property);
+
+Qualifier Reference : string = null,
+    Scope(property);

data/test/test_qualifier.rb

@@ -21,13 +21,24 @@ class TestQualifiers < Test::Unit::TestCase
     name,res = result.shift
     assert !res.qualifiers.empty?
     # parsed one qualifier
-    assert_equal 1, res.qualifiers.size
-    q = res.qualifiers.shift
-    assert q.is_a? CIM::QualifierDeclaration
-    assert q.type == :string
-    # has two qualifier scopes
-    assert_equal 2, q.scopes.size
-    assert q.scopes.include? :class
-    assert q.scopes.include? :property
+    assert_equal 2, res.qualifiers.size
+    res.qualifiers.each do |q|
+      assert q.is_a? CIM::QualifierDeclaration
+      case q.name
+      when "Description"
+        assert q.type == :string
+        # has two qualifier scopes
+        assert_equal 2, q.scopes.size
+        assert q.scopes.include? :class
+        assert q.scopes.include? :property
+      when "Reference"
+        assert q.type == :string
+        assert_equal 1, q.scopes.size
+        assert q.scopes.include? :property
+      else
+        STDERR.puts "Unhandled QualifierDeclaration for '#{q.name}'"
+        assert false
+      end
+    end
   end
 end

metadata

@@ -1,80 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mof
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 2
-  version: 1.2.2
+version: !ruby/object:Gem::Version
+  version: 1.2.4
 platform: ruby
-authors: 
-- "Klaus K\xC3\xA4mpf"
+authors:
+- Klaus Kämpf
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-27 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-04-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cim
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   The Managed Object Format (MOF) language used to
   describe classes and instances of the Common Information Model (CIM).
   See http://www.dmtf.org/education/mof
-email: 
+email:
 - kkaempf@suse.de
-executables: 
+executables:
 - moflint
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - LICENSE
-files: 
+files:
 - Gemfile
 - History.txt
 - LICENSE
@@ -85,6 +75,7 @@ files:
 - lib/include/wmi-qualifiers.mof
 - lib/mof.rb
 - lib/mof/helper.rb
+- lib/mof/parser.rb
 - lib/mof/parser.y
 - lib/mof/result.rb
 - lib/mof/scanner.rb
@@ -108,42 +99,30 @@ files:
 - test/test_class_qualifiers.rb
 - test/test_loading.rb
 - test/test_qualifier.rb
-- lib/mof/parser.rb
-has_rdoc: true
 homepage: https://github.com/kkaempf/mof
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: mof
-rubygems_version: 1.5.0
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A pure Ruby parser for MOF (Managed Object Format) files
-test_files: 
+test_files:
 - test/mof/array_initializer.mof
 - test/mof/association_qualifier.mof
 - test/mof/class_qualifier_fail.mof