started modifying rdfmodeler

.gitignore

@@ -3,5 +3,7 @@ config/settings.json
 config/repository.yml
 config/harvesting.yml
 oai_updates/*
+coverage
+spec/reports
 # keep empty directories with .gitignore in them
 #!.gitignore

Gemfile

@@ -38,4 +38,5 @@ group :test do
   gem "minitest"
   gem "guard"
   gem "guard-rspec"
+  gem 'simplecov', '~> 0.7.1'
 end

Gemfile.lock

@@ -125,6 +125,10 @@ GEM
     safe_yaml (0.9.7)
     shotgun (0.9)
       rack (>= 1.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     sinatra (1.4.3)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -188,6 +192,7 @@ DEPENDENCIES
   rspec
   rufus-scheduler
   shotgun
+  simplecov (~> 0.7.1)
   sinatra
   sinatra-contrib
   sinatra-reloader

Rakefile

@@ -18,6 +18,11 @@ task :spec do
   end
 end
 
+task :coverage do
+    ENV['COVERAGE'] = 'true'
+    Rake::Task["spec"].execute
+end
+
 desc "Run CI rspec"
 task "ci_rspec" => ["ci:setup:rspec", "^spec"]
 

api/conversion.rb

@@ -73,6 +73,8 @@ class Conversion < Grape::API
         requires :uri, type: String, desc: "URI of resource"
       end
     get "/marcxml" do
+      #format :xml
+      #content_type :xml, 'text/xml'
       content_type 'text/xml'
       library = Library.find(:id => params[:id])
       marc = MARCModeler.new(library)

lib/rdfmodeler.rb

@@ -2,21 +2,27 @@
 # Struct for RDFModeler
 require 'rdf/ntriples'
 
-RDFModeler = Struct.new(:library_id, :record, :uri, :tags, :statements, :rdf)
+RDFModeler = Struct.new(:library_id, :record, :uri, :map, :statements, :rdf)
 class RDFModeler
 
   ## Instance Methods
   def initialize(library, record, params={})
     # lookup library by id unless given as param
-    library = Library.find(:id => library) unless library.is_a? Library
+    library = Library.find(:id => library) unless library.is_a?(Library)
 
     self.library_id = library.id
     self.record  = record
     id           = self.record[library.config["resource"]["identifier_tag"]]
     self.uri     = RDF::URI(library.config["resource"]["base"] + library.config["resource"]["prefix"] + "#{id.value}")
-    # choose library's selected mapping if not given as parameter
-    params[:mapping] ? mapping = Mapping.find(:id => params[:mapping]) : mapping = Mapping.find(:id => library.mapping)
-    self.tags    = mapping.mapping["tags"] if mapping
+    # mapping is either passed as param (full mapping or id) or selected from library
+    if params[:mapping]
+      params[:mapping].is_a?(Mapping) ? self.map = params[:mapping] :
+        self.map = Mapping.find(:id => params[:mapping]) 
+    else
+      self.map = Mapping.find(:id => library.mapping)
+    end
+    return nil unless self.map
+    #self.tags    = mapping.mapping["tags"] if mapping
     self.statements = []
   end
 
@@ -143,8 +149,8 @@ def convert
     self.record.tags.each do | marctag | 
       # put all marc tag fields into array object 'marcfields' for later use
       marcfields = self.record.find_all { |field| field.tag == marctag }
-      # start matching MARC tags against @tags from mapping, put results in match array
-      match = self.tags.select { |k,v| marctag  =~ /#{k}/ }
+      # start matching MARC tags against tags from mapping, put results in match array
+      match = self.map.mapping["tags"].select { |k,v| marctag  =~ /#{k}/ }
       match.each do |yamlkey,yamlvalue|
       # iterate each marc tag array object to catch multiple marc fields 
         marcfields.each do | marcfield |