simpex 0.0.4 → 0.0.5

data/lib/simpex/type.rb

@@ -23,8 +23,11 @@ class Type
       else
         @attributes << attribute
         if attribute =~ /^\$/
-          if @macros.empty? || @macros.none?{|m| m.split("=").first == attribute.split("[").first}
-            raise ArgumentError.new "You are using a macro that is not defined: #{attribute}, declared macros are #{@macros}" 
+          if @macros.empty?
+            raise ArgumentError.new "In the type '#{name}', you are using a macro but no macros are given at all, pass the macros as an array to the type constructor." 
+          end
+          if @macros.none?{|m| m.split("=").first == attribute.split("[").first}
+            raise ArgumentError.new "In the type #{name}, you are using a macro that is not defined: #{attribute}, declared macros are #{@macros.inspect}" 
           end
         end
       end

data/lib/simpex/version.rb

@@ -1,4 +1,4 @@
 module Simpex
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end
 

data/test/test_type.rb

@@ -43,10 +43,23 @@ class TestType < Test::Unit::TestCase
       Type.new("Product", %w{code[unique=true] name[lang=en] name[lang=de] unit(code) $catalogVersion supercategories(code)})
     end
 
-    macros = ["$catalogVersion=adsfasdfasdf"]
+    macros = ["$catalogVersion=adsfasdfasdf", "$contentCV=someValue"]
+    Type.new("MediaReference", %w{uid[unique=true] name referencedDamMedia(code,$contentCV)[lang=$lang] altText[lang=$lang] $contentCV[unique=true]}, macros)
     Type.new("Product", %w{code[unique=true] name[lang=en] name[lang=de] unit(code) $catalogVersion[unique=true] supercategories(code)}, macros)
   end
 
+  def test_type_should_validate_the_presence_of_macros_if_no_macros_are_given
+    assert_raises ArgumentError do
+      Type.new("Product", %w{code[unique=true] name[lang=en] name[lang=de] unit(code) $catalogVersion supercategories(code)})
+    end
+    assert_raises ArgumentError do
+        macros = ["$catalogVersion=adsfasdfasdf"]
+        Type.new("Product", %w{code[unique=true] name[lang=en] name[lang=de] unit(code) $catalogVe[unique=true] supercategories(code)}, macros)
+    end
+    macros = ["$catalogVe=adsfasdfasdf"]
+    Type.new("Product", %w{code[unique=true] name[lang=en] name[lang=de] unit(code) $catalogVe[unique=true] supercategories(code)}, macros)
+  end
+
   def test_shoud_add_an_after_each_statement
     bash_script = "#%afterEach: "
     after_each = "impex.getLastImportedItem().setApprovalStatus(impex.getLastImportedItem().getBaseProduct().getApprovalStatus());" 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simpex
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000Z
+date: 2012-09-10 00:00:00.000000000Z
 dependencies: []
 description: Read more details at the homepage https://github.com/denislutz/simpex
 email: