simpex 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simpex (0.0.5)
+    simpex (0.1.0)
 
 GEM
   remote: http://rubygems.org/

data/lib/simpex/impex_result.rb

@@ -3,7 +3,8 @@ class ImpexResult
   attr_writer :memory_safe, :max_type_entries_in_tree
 
   def initialize(dest_folder)
-    raise "Given dest folder #{dest_folder} is either nil or does not exist!" if dest_folder.nil? || !Dir.exist?(dest_folder)
+    raise "Given dest folder #{dest_folder} is either nil or does not exist!" if dest_folder.nil? || 
+                                                                                  !Dir.exist?(dest_folder)
     @dest_folder = dest_folder
     @types = []
     @max_type_entries_in_tree = 2000 
@@ -49,7 +50,6 @@ class ImpexResult
 
   private
   def validate_macros
-    
     #collect all macros from all types
     @macros = @types.inject([]) do |result, type|
       type.macros.each do |macro|
@@ -57,11 +57,13 @@ class ImpexResult
       end
       result
     end
-
     #make sure each macro is used in at least one type
     @macros.each do |macro|
-      if @types.none? {|type| type.attributes.include?(macro)}
-        raise ArgumentError.new "the macro #{macro} is never used in all declared types"
+      macro_key = macro.split("=").first
+      not_used_in_types = @types.none? {|type| type.attributes.include?(macro_key)}
+      not_used_in_macros = @macros.none? {|m| !m.eql?(macro) && m.include?(macro_key)}
+      if not_used_in_types && not_used_in_macros  
+        raise ArgumentError.new "the macro #{macro} is never used in all declared types and macros"
       end
     end
   end
@@ -75,7 +77,7 @@ class ImpexResult
       end
       puts "writing complete result to the file #{file_name}"
       result_file_name = File.basename(result_file_name)
-      raise "You gave the directory #{result_file_name} instead of a single file" if File.directory?(result_file_name)
+      raise "You directory '#{result_file_name}' instead of a single file" if File.directory?(result_file_name)
       File.open(file_name, "w") do |f|
         all_macros = []
         @types.each do |type|
@@ -118,7 +120,8 @@ class ImpexResult
     def check_for_impexify
       if @memory_safe
         if  @global_enties_number > @max_type_entries_in_tree
-          puts "impexifying all entries since global entries #{@global_enties_number} is bigger then max #{@max_type_entries_in_tree}"
+          puts "impexifying all entries since global entries #{@global_enties_number} is bigger 
+                    then max #{@max_type_entries_in_tree}"
           self.impexify 
         end
       end

data/lib/simpex/type.rb

@@ -27,7 +27,7 @@ class Type
             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}" 
+            raise ArgumentError.new "In the type '#{name}', you are using the macro '#{attribute}' that is not defined, defined macros are #{@macros.inspect}" 
           end
         end
       end

data/lib/simpex/version.rb

@@ -1,4 +1,4 @@
 module Simpex
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end
 

data/test/test_result.rb

@@ -28,20 +28,17 @@ class TestResult < Test::Unit::TestCase
 
   def test_should_recognize_not_used_macros
     macros = []
-    macros << "$firstmacro"
-    macros << "$secondmacro"
+    macros << "$variableUsedByMacros=someThing()"
+    macros << "$firstmacro=catalogversion[unique=true,default=$variableUsedByMacros:Staged]"
+    macros << "$secondmacro=something"
 
     @category_type = Type.new("Category", %w{code[unique=true] name[lang=de]}, macros)
     @product_type = Type.new("Product", %w{code[unique=true] name[lang=en]}, macros)
-
     result = ImpexResult.new(@impex_dest_dir)
     result << @category_type 
     result << @product_type
-
-
     entry = TypeEntry.new(@product_type, %w{555 myproduct555})
     entry = TypeEntry.new(@category_type, %w{555 mycategory})
-
     assert_raises ArgumentError do
       result.impexify("result.csv", false)
     end 
@@ -55,12 +52,15 @@ class TestResult < Test::Unit::TestCase
       result.impexify("result.csv", false)
     end
 
+    macros << "$neverUsed=someThing()"
     @product_type = Type.new("Product", %w{code[unique=true] name[lang=en] $firstmacro}, macros)
     @category_type = Type.new("Category", %w{code[unique=true] name[lang=de] $secondmacro}, macros)
     result = ImpexResult.new(@impex_dest_dir)
     result << @category_type 
     result << @product_type
-    result.impexify("result.csv", false)
+    assert_raises ArgumentError do
+        result.impexify("result.csv", false)
+    end
   end
 
   def test_should_write_the_impex_resupt_to_the_given_folder
@@ -96,7 +96,8 @@ class TestResult < Test::Unit::TestCase
     catalog_type = Type.new("Catalog", %w{id[unique=true] name[lang=de] name[lang=en] defaultCatalog})
     catalog = TypeEntry.new(catalog_type, %w{simpex_catalog SimpexCatalog SimpexCatalog true})
 
-    catalog_version_type = Type.new("CatalogVersion", %w{catalog(id)[unique=true] version[unique=true] active defaultCurrency(isocode)})
+    catalog_version_type = Type.new("CatalogVersion", %w{catalog(id)[unique=true] version[unique=true] 
+                                                                    active defaultCurrency(isocode)})
     TypeEntry.new(catalog_version_type, [catalog.id, "online", "true", "EUR"])
 
     result = ImpexResult.new(impex_dest_dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simpex
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: