institutions 0.0.3 → 0.0.4

data/lib/institutions.rb

@@ -11,7 +11,12 @@ module Institutions
   def self.loadpaths
     @loadpaths ||=
       [(defined?(::Rails) and ::Rails.version >= '3.0.1' ) ?
-        "#{Rails.root}/config" : DEFAULT_LOADPATH]
+        self.rails_loadpath : DEFAULT_LOADPATH]
+  end
+
+  # Necessary to use a proc to generate the rails root a bit later.
+  def self.rails_loadpath
+    lambda {return "#{Rails.root}/config"}
   end
 
   def self.filenames
@@ -24,7 +29,7 @@ module Institutions
     if loadfiles.empty?
       loadpaths.each do |loadpath|
         filenames.each do |filename|
-          loadfile = File.join(loadpath, filename)
+          loadfile = File.join((loadpath.is_a? Proc) ? loadpath.call : loadpath, filename)
           loadfiles<< loadfile if File.exists?(loadfile)
         end
       end
@@ -72,7 +77,7 @@ module Institutions
           @institutions.has_key?(code) ?
             @institutions[code].merge(elements) :
               @institutions[code] =
-                Institution.new(code, elements["name"] ? elements["name"] : code, elements)
+                Institution.new(code, elements["name"] ? elements["name"] : code.to_s, elements)
         end
       end
       # Handle inheritance for institutions

data/lib/institutions/institution/core.rb

@@ -29,7 +29,7 @@ module Institutions#:no_doc
       merge h unless h.nil?
       # If the institution is named default, take that as an
       # indication that it's the default institution
-      @default = true if (name.eql? "default" or name.eql? "DEFAULT") 
+      @default = true if name.downcase.eql? "default"
       # If default was never set, explicitly set default as false.
       @default = false if default.nil?
     end

data/lib/institutions/version.rb

@@ -1,3 +1,3 @@
 module Institutions
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/config/institutions.yml

@@ -8,7 +8,6 @@
 # all options are neccesarily listed as examples here, see source
 # or source-generated docs for more info.   
 default:
-  name: Default
   auth:
     link_code: NYU
   views:

data/test/institutions_test.rb

@@ -39,4 +39,10 @@ class InstitutionsTest < Test::Unit::TestCase
     institutions = Institutions.institutions
     assert_equal "NYU Libraries", institutions[:NYU].name
   end
+  
+  def test_institutions_default_as_name
+    Institutions.loadpaths << File.join("test", "config")
+    institutions = Institutions.institutions
+    assert institutions[:default].default
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: institutions
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4524913858757989027
+      hash: -3867727606638988063
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4524913858757989027
+      hash: -3867727606638988063
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24