lib/osm/api.rb in osm-0.0.9 vs lib/osm/api.rb in osm-0.0.10

@@ -267,11 +267,11 @@
     # @!macro options_get
     # @!macro options_api_data
     # @return [Array<Osm::Evening>]
     def get_programme(section, term, options={}, api_data={})
       section_id = id_for_section(section)
-      term_id = id_for_term(term)
+      term_id = id_for_term(term, section)
 
       if !options[:no_cache] && cache_exist?("programme-#{section_id}-#{term_id}") && self.user_can_access?(:programme, section_id, api_data)
         return cache_read("programme-#{section_id}-#{term_id}")
       end
 
@@ -327,11 +327,11 @@
     # @!macro options_get
     # @!macro options_api_data
     # @return [Array<Osm::Member>]
     def get_members(section, term=nil, options={}, api_data={})
       section_id = id_for_section(section)
-      term_id = id_for_term(term)
+      term_id = id_for_term(term, section)
 
       if !options[:no_cache] && cache_exist?("members-#{section_id}-#{term_id}") && self.user_can_access?(:member, section_id, api_data)
         return cache_read("members-#{section_id}-#{term_id}")
       end
 
@@ -426,11 +426,11 @@
     # @!macro options_get
     # @!macro options_api_data
     # @return [Osm::DueBadges]
     def get_due_badges(section, term=nil, options={}, api_data={})
       section_id = id_for_section(section)
-      term_id = id_for_term(term)
+      term_id = id_for_term(term, section)
 
       if !options[:no_cache] && cache_exist?("due_badges-#{section_id}-#{term_id}") && self.user_can_access?(:badge, section_id, api_data)
         return cache_read("due_badges-#{section_id}-#{term_id}")
       end
 
@@ -450,11 +450,11 @@
     # @!macro options_get
     # @!macro options_api_data
     # @return [Array<Hash>] representing the rows of the register
     def get_register_structure(section, term=nil, options={}, api_data={})
       section_id = id_for_section(section)
-      term_id = id_for_term(term)
+      term_id = id_for_term(term, section)
 
       if !options[:no_cache] && cache_exist?("register_structure-#{section_id}-#{term_id}") && self.user_can_access?(:register, section_id, api_data)
         return cache_read("register_structure-#{section_id}-#{term_id}")
       end
 
@@ -478,11 +478,11 @@
     # @!macro options_get
     # @!macro options_api_data
     # @return [Array<Hash>] representing the attendance of each member
     def get_register(section, term=nil, options={}, api_data={})
       section_id = id_for_section(section)
-      term_id = id_for_term(term)
+      term_id = id_for_term(term, section)
 
       if !options[:no_cache] && cache_exist?("register-#{section_id}-#{term_id}") && self.user_can_access?(:register, section_id, api_data)
         return cache_read("register-#{section_id}-#{term_id}")
       end
 
@@ -649,20 +649,24 @@
     # @param value the value to get the ID from
     # @param [String] error_name the name of the class to use in error messages
     # @param [String, Symbol] id_method the method to call on cl to get the ID
     # @return [Fixnum] the ID
     def id_for(cl, value, error_name, id_method=:id)
-      raise(ArgumentError, "Invalid type for #{error_name}") unless value.is_a?(cl) || value.is_a?(Fixnum)
-      id = value.is_a?(cl) ? value.send(id_method) : value
-      raise(ArgumentError, "Invalid #{error_name} ID") unless id > 0
-      return id
+      if value.is_a?(cl)
+        value = value.send(id_method)
+      else
+        raise(ArgumentError, "Invalid type for #{error_name}") unless value.is_a?(Fixnum)
+      end
+
+      raise(ArgumentError, "Invalid #{error_name} ID") unless value > 0
+      return value
     end
 
     def id_for_section(section)
       id_for(Osm::Section, section, 'section')
     end
-    def id_for_term(term)
-      return term.nil? ? Osm::find_current_term_id(self, section_id, api_data) : id_for(Osm::Term, term, 'term')
+    def id_for_term(term, section)
+      return term.nil? ? Osm::find_current_term_id(self, id_for_section(section), api_data) : id_for(Osm::Term, term, 'term')
     end
 
   end
 
 end