oval 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,4 +1,9 @@
+2014-02-03 Pawel Tomulik <ptomulik@meil.pw.edu.pl>
+  * release 0.0.4
 2014-02-02 Pawel Tomulik <ptomulik@meil.pw.edu.pl>
+  * corrections to README.md
+  * small refactoring
+  * removed dead code from class_decl_base.rb
   * release 0.0.3
   * fixed dependencies in oval.gemspec
   * release 0.0.2

data/Modulefile

@@ -1,5 +1,5 @@
 name    'ptomulik-oval'
-version '0.0.3'
+version '0.0.4'
 source 'git://github.com/ptomulik/rubygems-oval.git'
 author 'ptomulik'
 license 'Apache License, Version 2.0'

data/README.md

@@ -126,11 +126,17 @@ end
 A declaration of options consists entirely of what we call here
 **declarators**. The [ov_options](#ov_options) should be used as a root of
 every declaration (starting symbol in grammar terms). It accepts a Hash of the
-form **{optname => optdecl, ...}** as an argument. The **optname** is an option
-name, and **optdecl** is a declarator restricting the option's value. Each
-option name (key) must be convertible to a `String`. Option value declarators
-are non-terminal declarators (defined later in this section) or terminals (any
-other ruby values). The simple declaration
+form 
+
+```
+{optname1 => optdecl1, optname2 => optdecl2, ... }
+```
+
+as an argument. The **optname#** is an option name, and **optdecl#** is a
+declarator restricting the option's value. Each option name (key) must be
+convertible to a `String`. Option value declarators are non-terminal
+declarators (defined later in this section) or terminals (any other ruby
+values). The simple declaration
 
 ```ruby
 ov_options[ :foo => :bar ]

data/lib/oval/class_decl_base.rb

@@ -1,6 +1,5 @@
 require 'oval/base'
 class Oval::ClassDeclBase < Oval::Base
-  attr_reader :klass
   def self.[](klass)
     new(klass)
   end
@@ -9,18 +8,18 @@ class Oval::ClassDeclBase < Oval::Base
     self.klass = klass
   end
 
+  attr_reader :klass
+
   private
 
-  def klass=(k)
-    validate_class(k)
-    @klass = k
+  def klass=(klass)
+    self.class.validate_class(klass, self.class)
+    @klass = klass
   end
 
-  def self.myname; 'ClassDeclBase'; end
-
-  def validate_class(klass)
+  def self.validate_class(klass,receiver)
     unless klass.is_a?(Class)
-      subject = self.class.name.sub(/^.*::/,'')
+      subject = receiver.name.sub(/^.*::/,'')
       raise Oval::DeclError,
         "Invalid class #{klass.inspect}#{for_subject(subject)}"
     end

data/oval.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'oval'
-  gem.version       = '0.0.3'
+  gem.version       = '0.0.4'
   gem.authors       = ["Pawel Tomulik"]
   gem.email         = ["ptomulik@meil.pw.edu.pl"]
   gem.description   = %q{Validate options when passed to methods}

data/spec/unit/oval/class_decl_base_spec.rb

@@ -12,7 +12,7 @@ describe Oval::ClassDeclBase do
 
   context "an instance" do
     let(:subject) { described_class[:klass0] }
-    before { described_class.any_instance.stubs(:validate_class) }
+    before { described_class.stubs(:validate_class) }
     it { should be_kind_of Oval::Base }
     [
       :klass,
@@ -22,26 +22,26 @@ describe Oval::ClassDeclBase do
   end
 
   describe "#validate_class" do
-    let(:subject) { described_class.new(:klass0) }
-    before do
-      described_class.any_instance.stubs(:validate_class)
-      subject
-      described_class.any_instance.unstub(:validate_class)
-    end
+##    let(:subject) { described_class.new(:klass0) }
+##    before do
+##      described_class.stubs(:validate_class)
+##      subject
+##      described_class.unstub(:validate_class)
+##    end
     context "validate_class(:symbol1)" do
       let(:msg) { "Invalid class :symbol1 for ClassDeclBase" }
-      it { expect { subject.send(:validate_class,:symbol1) }.to raise_error Oval::DeclError, msg }
+      it { expect { described_class.send(:validate_class,:symbol1,Oval::ClassDeclBase) }.to raise_error Oval::DeclError, msg }
     end
     [ Array, String, NilClass ].each do |klass|
       context "validate_class(#{klass.name})" do
         let(:klass) { klass }
-        it { expect { subject.send(:validate_class,klass) }.to_not raise_error }
+        it { expect { described_class.send(:validate_class,klass,Oval::ClassDeclBase) }.to_not raise_error }
       end
     end
   end
 
   describe "klass" do
-    before { described_class.any_instance.stubs(:validate_class) }
+    before { described_class.stubs(:validate_class) }
     context "new(:klass0).klass" do
       it { described_class.new(:klass0).klass.should be :klass0 }
     end
@@ -53,13 +53,13 @@ describe Oval::ClassDeclBase do
   end
 
   describe "#klass=" do
-    before { described_class.any_instance.stubs(:validate_class) }
+    before { described_class.stubs(:validate_class) }
     let(:subject) { described_class.new(:klass0) }
     context "#klass = :klass1" do
-      it "should call self.class.validate_class(:klass1) once" do
+      it "should call self.class.validate_class(:klass1,Oval::ClassDeclBase) once" do
         subject # reference before re-stubbing validate_class
-        subject.stubs(:validate_class).never
-        subject.stubs(:validate_class).once.with(:klass1)
+        described_class.stubs(:validate_class).never
+        described_class.stubs(:validate_class).once.with(:klass1,Oval::ClassDeclBase)
         expect { subject.send(:klass=,:klass1) }.to_not raise_error
       end
       it "should assign @klass = :klass1" do

data/spec/unit/oval/instance_of_spec.rb

@@ -4,7 +4,7 @@ require 'oval/instance_of'
 describe Oval::InstanceOf do
   describe 'an instance' do
     let(:subject)  { described_class[:klass] }
-    before { described_class.any_instance.stubs(:validate_class) }
+    before { described_class.stubs(:validate_class) }
     it { should respond_to :validate }
   end
 

data/spec/unit/oval/kind_of_spec.rb

@@ -4,7 +4,7 @@ require 'oval/kind_of'
 describe Oval::KindOf do
   describe 'an instance' do
     let(:subject)  { described_class[:klass] }
-    before { described_class.any_instance.stubs(:validate_class) }
+    before { described_class.stubs(:validate_class) }
     it { should respond_to :validate }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oval
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2913996889033551152
+      hash: 1914845513131623040
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2913996889033551152
+      hash: 1914845513131623040
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23