institutions 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTEyNzY5MDg5YzJhN2MxZTllM2M0NWNkZjY4OTQwNGM2NTJjNzM4YQ==
+  data.tar.gz: !binary |-
+    ZDdjZTE4ZWYwNmQzYWFjZDM1ZDgwZDYyYWE4Mjk3YWI0ZmIyYWNhNw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NTE1MDMzYTY5NzYyNjZmNDExNzAzMjhlMDJlYmMwYjMxYjY1MjhhMzZjMmI3
+    M2NkMmMxNTlhZjgzM2Q1MzM0YTM4ZmE1MWNlOTEzY2JhZjI2MzI2MjJmYjgy
+    Y2JlM2JlMDg0NTU5NzMzZjQ4MzUxNGFmYWI5NjJhZDlkMTQyZDU=
+  data.tar.gz: !binary |-
+    ZDk2MmU4MWFmNjEzYzM4ZTlmNzhkZWVhMjI5OTI2OGM3YzYxMWFmMjFhYjY3
+    MDA0Y2ZiN2IwYjMwMjdkZTg0N2NlNjljNGMzOTY2YWY2OGNkNzgzODcxNTJi
+    M2YxZGY4MWRjMTA3OThmMjYyMWMzMDhmMTdmNjIyMGFjYjAyYWI=

data/README.rdoc

@@ -1,5 +1,5 @@
 = Institutions
-{<img src="https://secure.travis-ci.org/scotdalton/institutions.png?branch=master" alt="Build Status" />}[https://travis-ci.org/scotdalton/institutions]
+{<img src="https://api.travis-ci.org/scotdalton/institutions.png?branch=master" alt="Build Status" />}[https://travis-ci.org/scotdalton/institutions]
 {<img src="https://gemnasium.com/scotdalton/institutions.png" alt="Dependency Status" />}[https://gemnasium.com/scotdalton/institutions]
 {<img src="https://codeclimate.com/badge.png" alt="Code Climage" />}[https://codeclimate.com/github/scotdalton/institutions]
 
@@ -20,4 +20,29 @@ Specify additional directories to search for institutional YAMLs.
 === Setting file name
 Specify additional YAML file names that contain institutions.
   require 'institutions'
-  Institutions.filenames << "my_institution.yml"
+  Institutions.filenames << "my_institution.yml"
+
+== Institution attributes
+Institutions have a number of attributes available, separated
+into logical modules
+=== Core
++code+::          +String+ of unique code for the institution (*required*)
++name+::          +String+ of user friendly name for the institution (*required*)
++default+::       +Boolean+ indicating if this is a default institution
+
+=== Auth
++auth+::          +Hash+ of attributes for an authentication/authorization system
+
+=== Ip Addresses
++ip_addresses+::  +Array+ of ip addresses for the institution
+
+=== MVC
++models+::          +Hash+ of attributes for models in an MVC application
++views+::           +Hash+ of attributes for views in an MVC application
++controllers+::     +Hash+ of attributes for controllers in an MVC application
+
+=== Parents
++parent_code+::     +String+ of code representing the institution's parent
+
+=== Services
++services+::        +Hash+ of services for the given institution

data/lib/institutions/institution/util.rb

@@ -22,7 +22,7 @@ module Institutions#:no_doc
     # 
     def method_missing(method, *args, &block)
       instance_variable = instance_variablize(method)
-      if instance_variable_defined? instance_variable
+      if respond_to_missing?(method) and instance_variable_defined?(instance_variable)
         self.class.send :attr_reader, method.to_sym
         instance_variable_get instance_variable
       else
@@ -46,7 +46,7 @@ module Institutions#:no_doc
     end
     
     def valid_instance_variable?(id)
-      id.to_sym.id2name.match(/[\@\=\?+]/).nil?
+      id.to_sym.id2name.match(/[\@\=\?+\[\]]/).nil?
     end
 
     # Convert s to an instance variable

data/lib/institutions/version.rb

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

data/lib/institutions.rb

@@ -1,6 +1,8 @@
 # Order of paths, then order of files dictates overrides.
 
 module Institutions
+  require 'yaml'
+  require 'erb'
   require 'require_all'
   require_rel 'institutions'
 
@@ -71,7 +73,7 @@ module Institutions
       @institutions = {}
       loadfiles.each do |loadfile|
         # Loop through institutions in the yaml
-        YAML.load_file(loadfile).each_pair do |code, elements|
+        YAML.load(ERB.new(File.read(loadfile)).result).each_pair do |code, elements|
           code = code.to_sym
           # Merge the new elements or add a new Institution
           @institutions.has_key?(code) ?

data/test/config/institutions.yml

@@ -9,11 +9,11 @@
 # or source-generated docs for more info.   
 default:
   auth:
-    link_code: NYU
+    link_code: <%= nyu = "NYU" %>
   views:
     dir: nyu
     sfx_base_url: http://sfx.library.nyu.edu/sfxlcl41?
-NYU:
+<%= nyu %>:
   name: NYU Libraries
   parent_code: default
   ip_addresses:

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: institutions
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Scot Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ipaddr_range_set
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -131,33 +120,26 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/scotdalton/institutions
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3867727606638988063
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3867727606638988063
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Abstract mechanism for setting up Institutions (whatever that means).
 test_files:
 - test/config/institutions.yml