marcspec 1.6.1 → 1.6.3

data/CHANGES

@@ -1,6 +1,10 @@
+1.6.3
+  * Fixed bad calls to logback::simple "log" object in class methods, where it wasn't available
+  
+1.6.2
+  * When declaring a function using the DSL, make sure it is defined in the given module
 1.6.1
   * Change VariableField#asDSLString to reflect compact declaration of spec with subs
-  
 1.6.0
   * Allow specs like spec('245ac'), with or without a block as well.
   

data/VERSION

@@ -1 +1 @@
-1.6.1
+1.6.3

data/lib/marcspec/dsl.rb

@@ -138,6 +138,17 @@ module MARCSpec
     end
     
     def mod(constant)
+      # Is the module loaded?
+      
+      unless defined? constant
+        raise ArgumentError, "Module #{constant} unknown; do you need to make sure it gets loaded?"
+      end
+      
+      # Check to see if the functionSymbol exists
+      unless constant.singleton_methods.include? self.functionSymbol.to_s
+        raise ArgumentError, "Function #{self.functionSymbol} not defined in module #{constant}"
+      end
+      
       self.module = constant
     end
     

data/lib/marcspec/map.rb

@@ -35,14 +35,14 @@ module MARCSpec
       begin
         str = File.open(filename).read
       rescue Exception => e
-        log.fatal "Problem opening #{filename}: #{e.message}"
+        Logback::Simple::Logger.fatal "Problem opening #{filename}: #{e.message}"
         raise e
       end
       
       begin 
         rawmap = eval(str)
       rescue Exception => e
-        log.fatal "Problem evaluating (with 'eval') file #{filename}: #{e.message}"
+        Logback::Simple::Logger.fatal "Problem evaluating (with 'eval') file #{filename}: #{e.message}"
         raise e
       end
       
@@ -59,7 +59,7 @@ module MARCSpec
       when :multi
         return MultiValueMap.new(rawmap[:mapname], rawmap[:map])
       else
-        log.fatal "Map file #{filename} doesn't seem to be either a KV map or a MuliValueMap according to :maptype (#{rawmap[:maptype]})"
+        Logback::Simple::Logger.fatal "Map file #{filename} doesn't seem to be either a KV map or a MuliValueMap according to :maptype (#{rawmap[:maptype]})"
         raise ArgumentError, "File #{filename} doesn't evaluate to a valid map"
       end
       

data/lib/marcspec/multivaluemap.rb

@@ -24,12 +24,11 @@ module MARCSpec
     
     def initialize *args
       super(*args)
-      self.optimize
+      self.optimize if @map and @mapname
     end
     
     def map= map
       @map = map
-      self.optimize
     end
     
     
@@ -98,7 +97,10 @@ module MARCSpec
           kvlist << [Regexp.new(match[1]), match[2]]
         end
       end        
-      return self.new(mapname, kvlist)
+      rv = self.new(nil,nil) # empty; avoid the optimize
+      rv.mapname = mapname
+      rv.map = kvlist
+      return rv
     end
         
     # Produce a string suitable for pretty-printing. Unfortunately, we need to just plain

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 6
-    - 1
-  version: 1.6.1
+    - 3
+  version: 1.6.3
 platform: ruby
 authors: 
   - BillDueber
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -04:00
+date: 2010-10-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency