lib/rfm.rb in ginjo-rfm-1.4.2 vs lib/rfm.rb in ginjo-rfm-1.4.3

@@ -1,16 +1,25 @@
-path = File.expand_path(File.dirname(__FILE__))
-$:.unshift(path) unless $:.include?(path)
+# path = File.expand_path(File.dirname(__FILE__))
+# $:.unshift(path) unless $:.include?(path)
+# 
+# require path + '/rfm/utilities/case_insensitive_hash'
+# require path + '/rfm/utilities/factory'
+# require path + '/rfm/version.rb'
 
-require path + '/rfm/utilities/case_insensitive_hash'
-require path + '/rfm/utilities/factory'
-require path + '/rfm/version.rb'
+Rfm = Module.new unless defined? Rfm
+Rfm::PATH = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift(Rfm::PATH) unless $LOAD_PATH.include?(Rfm::PATH)
 
+require 'rfm/utilities/case_insensitive_hash'
+require 'rfm/utilities/factory'
+require 'rfm/version.rb'
+
+
 module Rfm
 
 	if $0.to_s.match(/irb|rails|bundle/) # was ENV['_']
-  	puts "Using gem ginjo-rfm version: #{VERSION}"
+  	puts "Using gem ginjo-rfm version: #{::Rfm::VERSION}"
   end
   
   class CommunicationError  < StandardError; end
   class ParameterError      < StandardError; end
   class AuthenticationError < StandardError; end
@@ -27,6 +36,7 @@
 		autoload :Field, 'rfm/metadata/field'
 		autoload :FieldControl, 'rfm/metadata/field_control'
 		autoload :ValueListItem, 'rfm/metadata/value_list_item'
 	end
 	  
-end
\ No newline at end of file
+end
+