osm 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 0.1.1
+
+  * Add get\_options Hash to Model.get\_user\_permissions
+  * Bug fixes
+
 ## Version 0.1.0
 
   * Configuration is through Osm::configure not Osm::Api.configure and it takes a different Hash

data/lib/osm/model.rb

@@ -33,7 +33,7 @@ module Osm
 
       @@cache = options[:cache]
       @@cache_prepend = options[:prepend_to_key] || 'OSMAPI'
-      @@cache_ttl = options[:ttl] || 1800
+      @@cache_ttl = options[:ttl] || 600
       nil
     end
 
@@ -70,10 +70,11 @@ module Osm
     # Get access permission for an API user
     # @param [Osm::Api] The api to use to make the request
     # @param [Fixnum, nil] section_id to get permissions for, if nil a Hash of all section's permissions is returned
+    # @!macro options_get
     # @return [Hash] the permissions Hash
-    def self.get_user_permissions(api, section_id=nil)
+    def self.get_user_permissions(api, section_id=nil, options={})
       key = ['permissions', api.user_id]
-      permissions = cache_exist?(api, key) ? cache_read(api, key) : Osm::Section.fetch_user_permissions(api)
+      permissions = (!options[:no_cache] && cache_exist?(api, key)) ? cache_read(api, key) : Osm::Section.fetch_user_permissions(api)
       return section_id.nil? ? permissions : (permissions[section_id] || {})
     end
 

data/lib/osm/section.rb

@@ -243,9 +243,9 @@ module Osm
         compare_group_name = group_name <=> another.group_name
         return compare_group_name unless compare_group_name == 0
   
-        return 0 if section.type == another.type
+        return 0 if type == another.type
         [:beavers, :cubs, :scouts, :explorers, :waiting, :adults].each do |type|
-          return -1 if section.type == type
+          return -1 if type == type
           return 1 if another.type == type
         end
       rescue NoMethodError

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &77741230 !ruby/object:Gem::Requirement
+  requirement: &76448860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *77741230
+  version_requirements: *76448860
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &77740810 !ruby/object:Gem::Requirement
+  requirement: &76448600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *77740810
+  version_requirements: *76448600
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &77740380 !ruby/object:Gem::Requirement
+  requirement: &76448350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *77740380
+  version_requirements: *76448350
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &77740070 !ruby/object:Gem::Requirement
+  requirement: &76448100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *77740070
+  version_requirements: *76448100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &77739770 !ruby/object:Gem::Requirement
+  requirement: &76447860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *77739770
+  version_requirements: *76447860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &77739280 !ruby/object:Gem::Requirement
+  requirement: &76447610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *77739280
+  version_requirements: *76447610
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &77738950 !ruby/object:Gem::Requirement
+  requirement: &76447360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *77738950
+  version_requirements: *76447360
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email: