institutions 0.0.1 → 0.0.2

data/.gitignore

@@ -1 +1,2 @@
-Gemfile.lock
+Gemfile.lock
+pkg/

data/lib/institutions.rb

@@ -5,17 +5,17 @@ module Institutions
   require_rel 'institutions'
 
   # Default paths/files for the module.
-  DEFAULT_LOADPATHS = [
-    (defined?(Rails) and Rails.root) ? 
-      "#{Rails.root}/config" : "./config" ]
-  DEFAULT_FILENAMES = ["institutions.yml"]
+  DEFAULT_LOADPATH = "./config"
+  DEFAULT_FILENAME = "institutions.yml"
 
   def self.loadpaths
-    @loadpaths ||= DEFAULT_LOADPATHS.dup
+    @loadpaths ||=
+      [(defined?(::Rails) and ::Rails.version >= '3.0.1' ) ?
+        "#{Rails.root}/config" : DEFAULT_LOADPATH]
   end
 
   def self.filenames
-    @filenames ||= DEFAULT_FILENAMES.dup
+    @filenames ||= [DEFAULT_FILENAME]
   end
 
   # Intended for internal use only.
@@ -58,7 +58,7 @@ module Institutions
   #   Institutions.loadpaths << File.join("path", "to", "new", "load", "directory")
   # To manipulate file name order and/or add file names
   #   Institutions.filenames << "newfile.yml"
-  # 
+  #
   def self.institutions
     unless @institutions
       raise NameError.new("No load path was specified.") if loadpaths.nil?
@@ -71,7 +71,7 @@ module Institutions
           # Merge the new elements or add a new Institution
           @institutions.has_key?(code) ?
             @institutions[code].merge(elements) :
-              @institutions[code] = 
+              @institutions[code] =
                 Institution.new(code, elements["name"] ? elements["name"] : code, elements)
         end
       end

data/lib/institutions/version.rb

@@ -1,3 +1,3 @@
 module Institutions
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/institutions_test.rb

@@ -4,9 +4,9 @@ class InstitutionsTest < Test::Unit::TestCase
   def setup
     # Undo any instance variable settings.
     Institutions.send(:instance_variable_set, :@loadpaths, nil)
-    assert_equal(Institutions::DEFAULT_LOADPATHS, Institutions.loadpaths)
+    assert_equal([Institutions::DEFAULT_LOADPATH], Institutions.loadpaths)
     Institutions.send(:instance_variable_set, :@filenames, nil)
-    assert_equal(Institutions::DEFAULT_FILENAMES, Institutions.filenames)
+    assert_equal([Institutions::DEFAULT_FILENAME], Institutions.filenames)
     Institutions.send(:instance_variable_set, :@institutions, nil)
     assert_nil(Institutions.send(:instance_variable_get, :@institutions))
   end
@@ -16,9 +16,9 @@ class InstitutionsTest < Test::Unit::TestCase
   end
   
   def test_path
-    assert_equal Institutions::DEFAULT_LOADPATHS, Institutions.loadpaths
+    assert_equal [Institutions::DEFAULT_LOADPATH], Institutions.loadpaths
     Institutions.loadpaths << File.join("../config")
-    assert_equal Institutions::DEFAULT_LOADPATHS.concat(["../config"]), Institutions.loadpaths
+    assert_equal [Institutions::DEFAULT_LOADPATH, "../config"], Institutions.loadpaths
   end
   
   def test_institutions

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: institutions
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -78613404009586632
+      hash: -332144587236410515
 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: -78613404009586632
+      hash: -332144587236410515
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24