osm 0.0.14 → 0.0.15

data/CHANGELOG.md

@@ -1,7 +1,12 @@
-## Version 0.0.14
+## Version 0.0.15
 
   * Add :debug option to Api.configure
   * -2 is a valid grouping\_id value
+  * Fix check of :section\_id in Member.initalize (apparently 0 is allowd in the API return data)
+  * Fix role's section not being set from API data
+
+## Version 0.0.14
+
   * Fix Api.get_register\_data\ returning wrong object
   * Fix check of :num\_scouts in Section.initalize
 

data/lib/osm/member.rb

@@ -68,13 +68,11 @@ module Osm
     # Initialize a new Member
     # @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
     def initialize(attributes={})
-      [:id, :section_id].each do |attribute|
-        raise ArgumentError, ":#{attribute} must be nil or a Fixnum > 0" unless attributes[attribute].nil? || (attributes[attribute].is_a?(Fixnum) && attributes[attribute] > 0)
+      [:id, :section_id, :grouping_leader].each do |attribute|
+        raise ArgumentError, ":#{attribute} must be nil or a Fixnum >= 0" unless attributes[attribute].nil? || (attributes[attribute].is_a?(Fixnum) && attributes[attribute] >= 0)
       end
       raise ArgumentError, ':grouping_id must be nil or a Fixnum >= -2' unless attributes[:grouping_id].nil? || (attributes[:grouping_id].is_a?(Fixnum) && attributes[:grouping_id] >= -2)
-      [:joined_years, :grouping_leader].each do |attribute|
-        raise ArgumentError, ":#{attribute} must be nil or a Fixnum >= -1" unless attributes[attribute].nil? || (attributes[attribute].is_a?(Fixnum) && attributes[attribute] >= -1)
-      end
+      raise ArgumentError, ':joined_years must be nil or a Fixnum >= -1' unless attributes[:joined_years].nil? || (attributes[:joined_years].is_a?(Fixnum) && attributes[:joined_years] >= -1)
       raise ArgumentError, ':joining_in_years must be nil or a Fixnum' unless attributes[:joining_in_years].nil? || attributes[:joining_in_years].is_a?(Fixnum)
       [:type, :first_name, :last_name, :email1, :email2, :email3, :email4, :phone1, :phone2, :phone3, :phone4, :address, :address2, :parents, :notes, :medical, :religion, :school, :ethnicity, :subs, :age].each do |attribute|
         raise ArgumentError, ":#{attribute} must be nil or a String" unless attributes[attribute].nil? || attributes[attribute].is_a?(String)
@@ -117,7 +115,7 @@ module Osm
         :ethnicity => data['ethnicity'],
         :subs => data['subs'],
         :grouping_id => Osm::to_i_or_nil(data['patrolidO']),
-        :grouping_leader => data['patrolleaderO'],
+        :grouping_leader => Osm::to_i_or_nil(data['patrolleaderO']),
         :joined => Osm::parse_date(data['joined']),
         :age => data['age'],
         :joined_years => data['yrs'].to_i,

data/lib/osm/role.rb

@@ -3,7 +3,8 @@ module Osm
   class Role
 
     attr_reader :section, :group_name, :group_id, :permissions
-    # @!attribute [r] section
+    # @!attribute [rw] section
+    #   @param [Osm::Section] section the section this role is related to (can only be set once)
     #   @return [Osm::Section] the section this role related to
     # @!attribute [r] group_name
     #   @return [String] the name of the group the section is in
@@ -30,7 +31,6 @@ module Osm
     # @param [Hash] data the hash of data provided by the API
     def self.from_api(data)
       attributes = {}
-      attributes[:section] = Osm::Section.from_api(data['sectionid'], data['sectionname'], ActiveSupport::JSON.decode(data['sectionConfig']), self)
       attributes[:group_name] = data['groupname']
       attributes[:group_id] = Osm::to_i_or_nil(data['groupid'])
 
@@ -40,7 +40,14 @@ module Osm
         permissions[key] = permissions[key].to_i
       end
 
-      new(attributes.merge(:permissions => permissions))
+      role = new(attributes.merge(:permissions => permissions))
+      role.section = Osm::Section.from_api(data['sectionid'], data['sectionname'], ActiveSupport::JSON.decode(data['sectionConfig']), role)
+      return role
+    end
+
+    def section=(section)
+      raise ArgumentError, 'section must be an Osm::Section' unless section.is_a?(Osm::Section)
+      @section = section if @section.nil?
     end
 
     # Determine if this role has read access for the provided permission

data/lib/osm/section.rb

@@ -32,7 +32,6 @@ module Osm
     # Initialize a new Section
     # @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
     def initialize(attributes={})
-puts ":num_scouts = #{attributes[:num_scouts].inspect}"
       raise ArgumentError, ':id must be nil or a Fixnum > 0' unless attributes[:id].nil? || (attributes[:id].is_a?(Fixnum) && attributes[:id] > 0)
       raise ArgumentError, ':section_name must be nil or a String' unless attributes[:section_name].nil? || attributes[:section_name].is_a?(String)
       raise ArgumentError, ':num_scouts must be nil or a Fixnum >= 0' unless attributes[:num_scouts].nil? || (attributes[:num_scouts].is_a?(Fixnum) && attributes[:num_scouts] >= 0)
@@ -61,7 +60,7 @@ puts ":num_scouts = #{attributes[:num_scouts].inspect}"
     # @param [Fixnum] id the section ID used by the API to refer to this section
     # @param [String] name the name given to the sction in OSM
     # @param [Hash] data the hash of data for the object returned by the API
-    # @param {Osm::Role] role the Osm::Role linked with this section
+    # @param [Osm::Role] role the Osm::Role linked with this section
     def self.from_api(id, name, data, role)
       subscription_levels = [:bronze, :silver, :gold]
       subscription_level = data['subscription_level'].to_i - 1

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &87769510 !ruby/object:Gem::Requirement
+  requirement: &76203780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *87769510
+  version_requirements: *76203780
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &87769250 !ruby/object:Gem::Requirement
+  requirement: &76203550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *87769250
+  version_requirements: *76203550
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &87768850 !ruby/object:Gem::Requirement
+  requirement: &76203320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87768850
+  version_requirements: *76203320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &87768490 !ruby/object:Gem::Requirement
+  requirement: &76203080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87768490
+  version_requirements: *76203080
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &87768140 !ruby/object:Gem::Requirement
+  requirement: &76202860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87768140
+  version_requirements: *76202860
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email: