cim 1.3 → 1.4

data/lib/cim.rb

@@ -41,7 +41,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 #
 
 module CIM
-  VERSION = '1.3'
+  VERSION = '1.4'
   require 'cim/type'
   require 'cim/variant'
   require 'cim/qualifier_flavors'

data/lib/cim/class_feature.rb

@@ -19,18 +19,6 @@ module CIM
   class ClassFeature < NamedElement
     attr_reader :type
     #
-    # if has key qualifier
-    #
-    def key?
-      @qualifiers && @qualifiers.include?(:key,:boolean)
-    end
-    #
-    # if static (class-level) feature
-    #
-    def static?
-      false
-    end
-    #
     # if Property
     #
     def property?

data/lib/cim/method.rb

@@ -45,5 +45,21 @@ module CIM
       p = parameters.join(", ")
       "#{super}(#{p})"
     end
+    #
+    # Check for qualifiers
+    #
+    #  # check for existance
+    #  method.qualifier? -> true or false
+    #
+    #  # check value
+    #  method.description -> String or nil
+    #
+    def method_missing name, *args
+      if name.to_s[-1,1] == "?"
+        @qualifiers && @qualifiers.include?(name.to_s[0...-1])
+      else
+        (@qualifiers[name].value || @qualifiers[name].declaration.default.value) rescue nil
+      end
+    end
   end
 end

data/lib/cim/property.rb

@@ -33,6 +33,22 @@ module CIM
     def property?
       true
     end
+    #
+    # Check for qualifiers
+    #
+    #  # check for existance
+    #  element.qualifier? -> true or false
+    #
+    #  # check value
+    #  element.description -> String or nil
+    #
+    def method_missing name, *args
+      if name.to_s[-1,1] == "?"
+        @qualifiers && @qualifiers.include?(name.to_s[0...-1])
+      else
+        (@qualifiers[name].value || @qualifiers[name].declaration.default.value) rescue nil
+      end
+    end
   end
 end
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cim
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  version: "1.3"
+  - 4
+  version: "1.4"
 platform: ruby
 authors: 
 - "Klaus K\xC3\xA4mpf"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-13 00:00:00 +01:00
+date: 2012-06-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,39 +60,23 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
-- Gemfile
-- History.txt
-- LICENSE
-- README.rdoc
-- Rakefile
-- cim.gemspec
 - lib/cim.rb
-- lib/cim/class.rb
-- lib/cim/class_feature.rb
-- lib/cim/instance.rb
-- lib/cim/method.rb
-- lib/cim/named_element.rb
 - lib/cim/property.rb
-- lib/cim/qualifier.rb
-- lib/cim/qualifier_declaration.rb
-- lib/cim/qualifier_flavors.rb
+- lib/cim/type.rb
+- lib/cim/method.rb
 - lib/cim/qualifier_scopes.rb
+- lib/cim/instance.rb
 - lib/cim/qualifier_set.rb
 - lib/cim/reference.rb
-- lib/cim/type.rb
+- lib/cim/qualifier_flavors.rb
 - lib/cim/variant.rb
-- tasks/clean.rake
-- tasks/doc.rake
-- tasks/test.rake
-- test/test_loading.rb
-- test/test_method.rb
-- test/test_property.rb
-- test/test_qualifier.rb
-- test/test_qualifier_flavors.rb
-- test/test_qualifier_scopes.rb
-- test/test_qualifier_set.rb
-- test/test_reference.rb
-- test/test_type.rb
+- lib/cim/class_feature.rb
+- lib/cim/class.rb
+- lib/cim/named_element.rb
+- lib/cim/qualifier_declaration.rb
+- lib/cim/qualifier.rb
+- README.rdoc
+- LICENSE
 has_rdoc: true
 homepage: https://github.com/kkaempf/cim
 licenses: []
@@ -127,13 +111,5 @@ rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A pure-Ruby implementation of the CIM meta model
-test_files: 
-- test/test_loading.rb
-- test/test_method.rb
-- test/test_property.rb
-- test/test_qualifier.rb
-- test/test_qualifier_flavors.rb
-- test/test_qualifier_scopes.rb
-- test/test_qualifier_set.rb
-- test/test_reference.rb
-- test/test_type.rb
+test_files: []
+

data/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in cim.gemspec
-gemspec

data/History.txt

@@ -1,35 +0,0 @@
-=== 1.3 2011-11-16
-
-* Make QualifierScope and QualifierFlavor Array
-  (remove :elements and :flavors accessors)
-
-* Rename CIM::QualifierScopesError to CIM::QualifierScopeError
-
-=== 1.2.1 2011-11-08
-
-* Ruby 1.9 support
-
-=== 1.2.0
-
-=== 0.5.0 2011-09-29
-
-* Clean up Rakefile, support Bundler
-* Add QualifierSet[] access function
-* Make check functions like key?, etc. public
-
-=== 0.4.1 2010-10-14
-
-* More tests
-* Refactor Qualifiers to QualifierSet, QualifierSet includes Qualifiers
-
-=== 0.3.1 2010-10-05
-
-* Extend API for mof
-
-=== 0.3.0 2010-10-04
-
-* Refactoring for mof
-
-=== 0.2.7 2010-10-03
-
-* Initial release

data/Rakefile

@@ -1,6 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-task :default => [:test]
-
-Dir['tasks/**/*.rake'].each { |t| load t }

data/cim.gemspec

@@ -1,30 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "cim"
-
-Gem::Specification.new do |s|
-  s.name        = "cim"
-  s.version     = CIM::VERSION
-
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Klaus Kämpf"]
-  s.email       = ["kkaempf@suse.de"]
-  s.homepage    = "https://github.com/kkaempf/cim"
-  s.summary     = %q{A pure-Ruby implementation of the CIM meta model}
-  s.description = %q{Instances of Cim classes are used to define a CIM
-schema, often represented as a .mof file. See
-http://www.dmtf.org/standards/cim and
-http://www.dmtf.org/education/mof for details}
-  
-  s.rubyforge_project = "cim"
-
-  s.add_development_dependency('rake')
-  s.add_development_dependency('bundler')
-
-  s.files         = `git ls-files`.split("\n")
-  s.files.reject! { |fn| fn == '.gitignore' }
-  s.extra_rdoc_files    = Dir['README*', 'TODO*', 'CHANGELOG*', 'LICENSE']
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-end

data/tasks/clean.rake

@@ -1,9 +0,0 @@
-task :clean do
-  `rm -rf *~`
-  `rm -rf */*~`
-  `rm -rf */*/*~`
-  `rm -f Gemfile.lock`
-  `rm -rf doc`
-  `rm -rf .yardoc`
-  `rm -rf pkg`
-end

data/tasks/doc.rake

@@ -1,14 +0,0 @@
-begin
- require 'yard'
-  YARD::Rake::YardocTask.new(:doc) do |t|
-    t.files   = ['lib/**/*.rb']
-    t.options = ['--no-private']
-  end
-rescue LoadError
-  STDERR.puts "Install yard if you want prettier docs"
-  require 'rdoc/task'
-  Rake::RDocTask.new(:doc) do |rdoc|
-    rdoc.rdoc_dir = "doc"
-    rdoc.title = "dm-keeper-adapter #{CIM::VERSION}"
-  end
-end

data/tasks/test.rake

@@ -1,6 +0,0 @@
-Rake::TestTask.new do |t|
-  t.libs << File.expand_path('../test', __FILE__)
-  t.libs << File.expand_path('../', __FILE__)
-  t.test_files = FileList['test/test*.rb']
-  t.verbose = true
-end

data/test/test_loading.rb

@@ -1,2 +0,0 @@
-$: << File.join(File.dirname(__FILE__),"..","lib")
-require "cim"

data/test/test_method.rb

@@ -1,29 +0,0 @@
-$: << File.join(File.dirname(__FILE__),"..","lib")
-
-require "test/unit"
-require "cim"
-
-class MethodTest < Test::Unit::TestCase
-  def test_init
-    m = CIM::Method.new :real32, "Foo", CIM::QualifierDeclaration.new(:description, :string, "This is a foo method", :class)
-    assert m
-    assert_equal "Foo", m.name
-    assert m.qualifiers.size > 0
-    assert m.qualifiers.include?( :description )
-    assert m.qualifiers.include?( :description, :string )
-#    assert_equal "This is a foo method", m.description
-    assert_equal false, m.to_s.empty?
-  end
-  def test_nodesc
-    m = CIM::Method.new :boolean, "Foo"
-    assert m
-    assert_equal "Foo", m.name
-    assert_equal m.type, :boolean
-#    assert_equal nil, m.description
-  end
-  def test_raise
-    assert_raise TypeError do
-      m = CIM::Method.new :foo, "Foo"
-    end
-  end
-end

data/test/test_property.rb

@@ -1,23 +0,0 @@
-$: << File.join(File.dirname(__FILE__),"..","lib")
-
-require "test/unit"
-require "cim"
-
-class PropertyTest < Test::Unit::TestCase
-  def test_init
-    p = CIM::Property.new :string, "String", CIM::QualifierDeclaration.new(:key, :boolean), CIM::QualifierDeclaration.new(:description, :string, "This is a string", :class)
-    assert p
-    assert p.is_a? CIM::Property
-    assert_equal "String", p.name
-#    assert p.key?
-  end
-  def test_name
-    p = CIM::Property.new :uint32, "foo"
-    assert_equal "foo", p.name
-  end
-  def test_raise
-    assert_raise TypeError do
-      p = CIM::Property.new :foo, "foo"
-    end
-  end
-end

data/test/test_qualifier.rb

@@ -1,16 +0,0 @@
-$: << File.join(File.dirname(__FILE__),"..","lib")
-
-require "test/unit"
-require "cim"
-
-class QualifierTest < Test::Unit::TestCase
-  def test_key
-    q = CIM::QualifierDeclaration.new :key, :boolean
-    assert q
-  end
-  def test_raise
-    assert_raise RuntimeError do
-      CIM::Qualifier.new(:unknown)
-    end  
-  end
-end

data/test/test_qualifier_flavors.rb

@@ -1,19 +0,0 @@
-$: << File.join(File.dirname(__FILE__),"..","lib")
-
-require "test/unit"
-require "cim"
-
-class QualifierFlavorsTest < Test::Unit::TestCase
-  def test_new
-    assert CIM::QualifierFlavors.new
-    f = CIM::QualifierFlavors.new(:enableoverride)
-    assert f
-    assert_equal 1,f.size
-    assert f.include? :enableoverride
-  end
-  def test_raise
-    assert_raise CIM::QualifierFlavorError do
-      CIM::QualifierFlavors.new(:unknown)
-    end
-  end
-end

data/test/test_qualifier_scopes.rb

@@ -1,19 +0,0 @@
-$: << File.join(File.dirname(__FILE__),"..","lib")
-
-require "test/unit"
-require "cim"
-
-class QualifierScopesTest < Test::Unit::TestCase
-  def test_new
-    assert CIM::QualifierScopes.new
-    s = CIM::QualifierScopes.new(:association)
-    assert s
-    assert_equal 1,s.size
-    assert s.include? :association
-  end
-  def test_raise
-    assert_raise CIM::QualifierScopeError do
-      CIM::QualifierScopes.new(:unknown)
-    end
-  end
-end

data/test/test_qualifier_set.rb

@@ -1,39 +0,0 @@
-$: << File.join(File.dirname(__FILE__),"..","lib")
-
-require "test/unit"
-require "cim"
-
-class QualifierSetTest < Test::Unit::TestCase
-  def setup
-    qboolean = CIM::QualifierDeclaration.new("flag")
-    qint     = CIM::QualifierDeclaration.new("value", :uint32)
-    qstring  = CIM::QualifierDeclaration.new("description", :string, "This is a description")
-    @qualifiers = CIM::QualifierSet.new
-    @qualifiers << CIM::Qualifier.new(qboolean)
-    @qualifiers << CIM::Qualifier.new(qint)
-    @qualifiers << CIM::Qualifier.new(qstring)
-  end
-  def test_key
-    assert_equal 3, @qualifiers.size
-  end
-  def test_prefill
-    q = CIM::QualifierSet.new "a", :b
-    assert_equal 2, q.size
-    assert q.include?( "a" )
-    assert q.include?( "b", :boolean )
-  end
-  def test_include
-    assert @qualifiers.include?( :flag )
-    assert @qualifiers.include?( "flag" )
-    assert @qualifiers.include?( "flag", :boolean )
-    assert @qualifiers.include?( "flag", "boolean" )
-    assert !@qualifiers.include?( "flag", :string )
-  end
-  def test_access
-    assert @qualifiers[:flag]
-    assert @qualifiers["flag"]
-    assert @qualifiers["flag", :boolean]
-    assert @qualifiers["flag", "boolean"]
-    assert !@qualifiers["flag", :string]
-  end
-end

data/test/test_reference.rb

@@ -1,13 +0,0 @@
-$: << File.join(File.dirname(__FILE__),"..","lib")
-
-require "test/unit"
-require "cim"
-
-class ReferenceTest < Test::Unit::TestCase
-  def test_init
-    r = CIM::Reference.new :string, "String"
-    assert r
-    assert r.is_a? CIM::Reference
-    assert r.kind_of? CIM::ClassFeature
-  end
-end

data/test/test_type.rb

@@ -1,33 +0,0 @@
-$: << File.join(File.dirname(__FILE__),"..","lib")
-
-require "test/unit"
-require "cim"
-
-class TypeTest < Test::Unit::TestCase
-  def test_init
-    t = CIM::Type.new :null
-    assert t
-    assert_equal "null", t.to_s
-    assert !t.array?
-  end
-  def test_raise
-    assert_raise TypeError do
-      t = CIM::Type.new :foo
-    end
-  end
-  def test_alias
-    assert_equal CIM::Type.new(:bool), CIM::Type.new(:boolean)
-    assert_equal CIM::Type.new(:datetime), CIM::Type.new(:dateTime)
-  end
-  def test_normalize
-    assert_equal CIM::Type.new(:null), CIM::Type.normalize(:null)
-    assert_equal CIM::Type.normalize(:null), CIM::Type.normalize(CIM::Type.new(:null))
-  end
-  def test_matches
-    assert CIM::Type.new(:null).matches? nil
-    assert CIM::Type.new(:uint64).matches? 1
-    assert CIM::Type.new(:uint64).matches? Integer
-    assert CIM::Type.new(:real32).matches? 3.1415
-    assert CIM::Type.new(:string).matches? String
-  end
-end