exlibris-aleph 1.0.5 → 1.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmY2Y2UwNjVkZjE2NzA5ODE0ODgxNDM0MWQ4NDEwNzM5YWZiYzQ1OQ==
+    NjZlNDU1MDg1Y2QwNjU3ZjgwMmFhOTgzZjNkMzkzOGJiNDJmMGY0Mw==
   data.tar.gz: !binary |-
-    MmY3YzU3MjhiNjk5NGVmNzdkODU5NDhiZWRmNDk2YWMzMGRjMjdiNA==
+    ZTY3YzgxZWEwMTFiYjdmN2Q3MWNmOWQ5N2E1ZjAwNDQ2OTRkNzI1Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWY1YTQ5NTEwYmYwMjVjOGVlOWYxODRmZWU2ZDg0OWRlZTY3ZGI4ZmNjYTdm
-    YmE5OTQxMmM5NGU2ODAwYjE3YTk0YjUzZjg2ZTBlYzYwODJmYTBhMDdmNWZk
-    Nzg2ODExN2FjNGVhOGQzMjgyZDVkNzA2YWRjZjI3YzEzYjIyNTA=
+    ZmQ3OTJiY2ZhNTI5N2FkODhmOGMyMmNhN2JiNmM2Y2RhMjM2NGU2MTM0M2E2
+    ZjMyZDQ2ZmMxZGI0Y2U0YjAxMGI5YWUxZmFkYjYyMzNmMTBhODIxOTk2ODE1
+    ZjA0NTlhYzc4YWEwYjU2M2Y2MzkxNjM4MzdiODEwZDQzYzEwYTM=
   data.tar.gz: !binary |-
-    Y2Y5MzVlNGVmNmU5MjE1Mzk5NGY5MjM5ODM5YjgwNjhmOWM0MDJjZGNhZDc2
-    YzBjZjQwZjM1NTYzMTA3MjQyOGVhNWRjZGY2NmNkYmVlNmFkNDNmZjU4OTI3
-    MmZmNWUzN2U4OWVlOTgyZmRlZTdmZDA2NzQwZDc4ZGQ5MTRmOGQ=
+    OTFkNWMyNzM3N2I0NzUzZDQ2ZmFkZDAxZjNhZWE3MjI3ZTcwOGE2YTA0NTUw
+    NjRhMzg1MjI2MTBhYjIwNDcxYmZmZDNiMDAwZTBlOWZkMWQ4ODFlZTY4Njk5
+    NGEyNDQ0Y2FlNjlhZTI2YzA3MTQzMGQ1NjdmNmZkYmE4Yjk0N2M=

data/lib/exlibris/aleph/tab_helper.rb

@@ -63,8 +63,8 @@ module Exlibris
           instance_variable_set("@#{tab}".to_sym, {})
           # Define reader w/ refresh
           self.class.send(:define_method, tab) {
-            return instance_variable_get("@#{tab}".to_sym) unless refresh?
-            refresh and return instance_variable_get("@#{tab}".to_sym)
+            refresh if refresh?
+            instance_variable_get("@#{tab}".to_sym)
           }
         }
         refresh
@@ -223,18 +223,15 @@ module Exlibris
             sublibrary_permissions[params[:item_status_code]] unless sublibrary_permissions.nil?
         end
       rescue => e
-        logger.warn(
-            "Warning in #{self.class}. "+
-            "Item permissions not found. "+
-            "Additional parameters:\n"+
-            "\tADM library: #{params[:adm_library_code]}\n"+
-            "\tSub library: #{params[:sub_library_code]}\n"+
-            "\tItem status: #{params[:item_status_code]}\n"+
-            "\tItem process status: #{params[:item_process_status_code]}"
-          )
+        logger.error(%Q{
+          Error in #{self.class}.
+          Returning empty item permissions.
+          Parameters:
+            ADM library: #{params[:adm_library_code]}
+            Sub library: #{params[:sub_library_code]}
+            Item status: #{params[:item_status_code]}
+            Item process status: #{params[:item_process_status_code]}}.strip)
         logger.error("Error: \n\t#{e}")
-        logger.error("\titem_permissions_by_item_process_status is #{item_permissions_by_item_process_status.inspect}")
-        logger.error("\titem_permissions_by_item_status is #{item_permissions_by_item_process_status.inspect}")
       ensure
         return item_permissions
       end
@@ -245,21 +242,38 @@ module Exlibris
       private :refresh?
 
       def refresh
-        @@alephe_tabs.each_key do |key|
-          instance_variable_set("@#{key}".to_sym, YAML.load_file(File.join(yml_path, "alephe", "#{key}.yml")))
+        @@alephe_tabs.each_key do |tab|
+          instance_variable_set("@#{tab}".to_sym, YAML.load_file(File.join(yml_path, "alephe", "#{tab}.yml")))
         end
-        @@adm_tabs.each_key do |key|
+        @@adm_tabs.each_key do |tab|
           adms.each do |adm|
-            tab = instance_variable_get("@#{key}".to_sym)
-            tab[adm] = YAML.load_file(File.join(yml_path, adm, "#{key}.yml"))
-            instance_variable_set("@#{key}".to_sym, tab)
+            instance_variable_get("@#{tab}".to_sym)[adm] = 
+              YAML.load_file(File.join(yml_path, adm, "#{tab}.yml"))
           end
         end
         # Delete irrelevant sub libraries from @sub_library
         @sub_libraries.delete_if {|key,value| irrelevant_sub_libraries.include? key }
-        @updated_at = Time.now()
+        # Since we update the YAML files in a separate process, don't overwrite
+        # unless everything got some valid data.
+        @updated_at = Time.now() if successful_refresh?
       end
-      private :refresh?
+      private :refresh
+
+      # Did the refresh actually work?
+      def successful_refresh?
+        # No "false" entries in alephe tab variables
+        (@@alephe_tabs.keys.find { |tab| (not instance_variable_get("@#{tab}".to_sym))}.nil? and
+          # AND no "false" entries in adm tab variables
+          @@adm_tabs.keys.find{ |tab| adms.find { |adm| (not (instance_variable_get("@#{tab}".to_sym)[adm])) }}.nil?)
+      end
+      private :successful_refresh?
+
+      # Since we update the YAML files in a separate process, we need to 
+      # wait until we actually get some YAML to load it into the hash.
+      def hash_from_yaml_file(file)
+        yaml = YAML.load_file(file)
+      end
+      private :hash_from_yaml_file
 
       def adms
         @adms ||= self.class.adms

data/lib/exlibris/aleph/version.rb

@@ -1,5 +1,5 @@
 module Exlibris
   module Aleph
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
   end
 end

data/test/tab_helper_test.rb

@@ -36,6 +36,15 @@ class TabHelperTest < ActiveSupport::TestCase
     @helper.instance_variable_set(:@refresh_time, @helper.class.refresh_time)
   end
 
+  test "successful refresh?" do
+    @helper.send(:refresh)
+    assert @helper.send(:successful_refresh?)
+    @helper.instance_variable_get(:@patrons)["nyu50"] = false
+    assert((not @helper.send(:successful_refresh?)))
+    @helper.send(:refresh)
+    assert @helper.send(:successful_refresh?)
+  end
+
   test "sub_library_text" do
     assert_equal("NYU Bobst", @helper.sub_library_text("BOBST"))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exlibris-aleph
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Scot Dalton