osm 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 0.1.5
+
+  * Bug fixes.
+
 ## Version 0.1.4
 
   * Osm::Model has new class method get\_user\_permission(api, section_id, permission)

data/lib/osm/evening.rb

@@ -171,7 +171,7 @@ module Osm
 
       # The cached programmes for the section will be out of date - remove them
       Osm::Term.get_for_section(api, section_id).each do |term|
-        self.class.cache_delete(api, ['programme', section_id, term.id]) if term.contains_date?(meeting_date)
+        cache_delete(api, ['programme', section_id, term.id]) if term.contains_date?(meeting_date)
       end
 
       return response.is_a?(Hash) && (response['result'] == 0)
@@ -186,13 +186,13 @@ module Osm
       section = Osm::Section.get(api, section_id)
       cache_key = ['badge_requirements', section.id, id]
 
-      if !options[:no_cache] && self.class.cache_exist?(api, cache_key) && get_user_permission(api, section_id, :programme).include?(:read)
-        return self.class.cache_read(api, cache_key)
+      if !options[:no_cache] && cache_exist?(api, cache_key) && get_user_permission(api, section_id, :programme).include?(:read)
+        return cache_read(api, cache_key)
       end
 
       data = api.perform_query("users.php?action=getActivityRequirements&date=#{meeting_date.strftime(Osm::OSM_DATE_FORMAT)}&sectionid=#{section.id}&section=#{section.type}")
 
-      self.class.cache_write(api, cache_key, data)
+      cache_write(api, cache_key, data)
       return data
     end
 

data/lib/osm/event.rb

@@ -159,7 +159,7 @@ module Osm
     # @param [Osm::Api] api The api to use to make the request
     # @return [Boolean] wether the update succedded
     def update(api)
-      raise Forbidden, 'you do not have permission to write to events for this section' unless self.class.get_user_permission(api, section_id, :events).include?(:write)
+      raise Forbidden, 'you do not have permission to write to events for this section' unless get_user_permission(api, section_id, :events).include?(:write)
 
       data = api.perform_query("events.php?action=addEvent&sectionid=#{section_id}", {
         'eventid' => id,
@@ -174,8 +174,8 @@ module Osm
       })
 
       # The cached events for the section will be out of date - remove them
-      self.class.cache_delete(api, ['event', id])
-      self.class.cache_delete(api, ['events', section_id])
+      cache_delete(api, ['event', id])
+      cache_delete(api, ['events', section_id])
 
       return data.is_a?(Hash) && (data['id'].to_i == id)
     end
@@ -184,13 +184,13 @@ module Osm
     # @param [Osm::Api] api The api to use to make the request
     # @return [Boolean] wether the delete succedded
     def delete(api)
-      raise Forbidden, 'you do not have permission to write to events for this section' unless self.class.get_user_permission(api, section_id, :events).include?(:write)
+      raise Forbidden, 'you do not have permission to write to events for this section' unless get_user_permission(api, section_id, :events).include?(:write)
 
       data = api.perform_query("events.php?action=deleteEvent&sectionid=#{section_id}&eventid=#{id}")
 
       # The cached events for the section will be out of date - remove them
-      self.class.cache_delete(api, ['events', section_id])
-      self.class.cache_delete(api, ['event', id])
+      cache_delete(api, ['events', section_id])
+      cache_delete(api, ['event', id])
 
       return data.is_a?(Hash) ? data['ok'] : false
     end
@@ -206,8 +206,8 @@ module Osm
       term_id = term.nil? ? Osm::Term.get_current_term_for_section(api, section).id : term.to_i
       cache_key = ['event_attendance', id]
 
-      if !options[:no_cache] && self.class.cache_exist?(api, cache_key) && self.class.get_user_permission(api, section_id, :events).include?(:read)
-        return self.class.cache_read(api, cache_key)
+      if !options[:no_cache] && cache_exist?(api, cache_key) && get_user_permission(api, section_id, :events).include?(:read)
+        return cache_read(api, cache_key)
       end
 
       data = api.perform_query("events.php?action=getEventAttendance&eventid=#{id}&sectionid=#{section_id}&termid=#{term_id}")
@@ -231,7 +231,7 @@ module Osm
         )
       end
 
-      self.class.cache_write(api, cache_key, attendance)
+      cache_write(api, cache_key, attendance)
       return attendance
     end
 
@@ -242,16 +242,16 @@ module Osm
     # @return [Boolean] wether the update succedded
     def add_field(api, label)
       raise ArgumentIsInvalid, 'label is invalid' if label.blank?
-      raise Forbidden, 'you do not have permission to write to events for this section' unless self.class.get_user_permission(api, section_id, :events).include?(:write)
+      raise Forbidden, 'you do not have permission to write to events for this section' unless get_user_permission(api, section_id, :events).include?(:write)
 
       data = api.perform_query("events.php?action=addColumn&sectionid=#{section_id}&eventid=#{id}", {
         'columnName' => label
       })
 
       # The cached events for the section will be out of date - remove them
-      self.class.cache_delete(api, ['events', section_id])
-      self.class.cache_delete(api, ['event', id])
-      self.class.cache_delete(api, ['event_attendance', id])
+      cache_delete(api, ['events', section_id])
+      cache_delete(api, ['event', id])
+      cache_delete(api, ['event_attendance', id])
 
       return data.is_a?(Hash) && (data['eventid'].to_i == id)
     end

data/lib/osm/model.rb

@@ -90,6 +90,7 @@ module Osm
       return (permissions || [])
     end
 
+
     # Set access permission for an API user
     # @param [Osm::Api] The api to use to make the request
     # @param [Fixnum, nil] section_id to set permissions for, if nil the Hash of all section's permissions is set
@@ -103,6 +104,17 @@ module Osm
     end
 
 
+    # Make selected class methods instance methods too
+    %w{
+      cache_read cache_write cache_exist? cache_delete
+      get_user_permissions get_user_permission set_user_permission
+    }.each do |method_name|
+      define_method method_name do |*options|
+        self.class.send(method_name, *options)
+      end
+    end
+
+
   end # Class Model
 
 end # Module

data/lib/osm/section.rb

@@ -192,8 +192,8 @@ module Osm
     def get_notepad(api, options={})
       cache_key = ['notepad', id]
 
-      if !options[:no_cache] && self.class.cache_exist?(api, cache_key) && get_user_permissions(api).keys.include?(section_id)
-        return self.class.cache_read(api, cache_key)
+      if !options[:no_cache] && cache_exist?(api, cache_key) && get_user_permissions(api).keys.include?(section_id)
+        return cache_read(api, cache_key)
       end
 
       notepads = api.perform_query('api.php?action=getNotepads')
@@ -201,7 +201,7 @@ module Osm
 
       notepad = ''
       notepads.each do |key, value|
-        self.class.cache_write(api, ['notepad', key.to_i], value)
+        cache_write(api, ['notepad', key.to_i], value)
         notepad = value if key.to_i == id
       end
 
@@ -217,15 +217,15 @@ module Osm
       term_id = term.nil? ? Osm::Term.get_current_term_for_section(api, self).id : term.to_i
       cache_key = ['badge_stock', id, term_id]
 
-      if !options[:no_cache] && self.class.cache_exist?(api, cache_key) && self.class.get_user_permission(api, self, :badge).include?(:read)
-        return self.class.cache_read(api, cache_key)
+      if !options[:no_cache] && cache_exist?(api, cache_key) && get_user_permission(api, self, :badge).include?(:read)
+        return cache_read(api, cache_key)
       end
 
       data = api.perform_query("challenges.php?action=getInitialBadges&type=core&sectionid=#{id}&section=#{type}&termid=#{term_id}")
       data = (data['stock'] || {}).select{ |k,v| !k.eql?('sectionid') }.
                                    inject({}){ |new_hash,(badge, level)| new_hash[badge] = level.to_i; new_hash }
 
-      self.class.cache_write(api, cache_key, data)
+      cache_write(api, cache_key, data)
       return data
     end
 

data/lib/osm/term.rb

@@ -159,8 +159,8 @@ module Osm
       })
 
       # The cached terms for the section will be out of date - remove them
-      self.class.cache_delete(api, ['term', id])
-      self.class.cache_delete(api, ['terms', api.user_id])
+      cache_delete(api, ['term', id])
+      cache_delete(api, ['terms', api.user_id])
 
       return data.is_a?(Hash) && data['terms'].is_a?(Hash)
     end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000Z
+date: 2012-10-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &78318930 !ruby/object:Gem::Requirement
+  requirement: &79214890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *78318930
+  version_requirements: *79214890
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &78318540 !ruby/object:Gem::Requirement
+  requirement: &79214510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *78318540
+  version_requirements: *79214510
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &78318210 !ruby/object:Gem::Requirement
+  requirement: &79214170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *78318210
+  version_requirements: *79214170
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &78317870 !ruby/object:Gem::Requirement
+  requirement: &79213800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *78317870
+  version_requirements: *79213800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &78317510 !ruby/object:Gem::Requirement
+  requirement: &79213530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *78317510
+  version_requirements: *79213530
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &78317150 !ruby/object:Gem::Requirement
+  requirement: &79213300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *78317150
+  version_requirements: *79213300
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &78316920 !ruby/object:Gem::Requirement
+  requirement: &79213050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *78316920
+  version_requirements: *79213050
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email: