osm 0.0.2 → 0.0.3

data/lib/osm/grouping.rb

@@ -2,7 +2,7 @@ module Osm
 
   class Grouping
 
-    attr_reader :id, :name, :active
+    attr_reader :id, :name, :active, :points
 
     # Initialize a new Grouping using the hash returned by the API call
     # @param data the hash of data for the object returned by the API
@@ -10,6 +10,7 @@ module Osm
       @id = Osm::to_i_or_nil(data['patrolid'])
       @name = data['name']
       @active = (data['active'] == 1)
+      @points = Osm::to_i_or_nil(data['points'])
     end
 
   end

data/lib/osm/member.rb

@@ -2,13 +2,13 @@ module Osm
 
   class Member
 
-    attr_reader :id, :section_id, :type, :first_name, :last_name, :email1, :email2, :email3, :email4, :phone1, :phone2, :phone3, :phone4, :address, :address2, :date_of_birth, :started, :joined_in_years, :parents, :notes, :medical, :religion, :school, :ethnicity, :subs, :grouping_id, :grouping_leader, :joined, :age, :joined_years, :patrol
+    attr_reader :id, :section_id, :type, :first_name, :last_name, :email1, :email2, :email3, :email4, :phone1, :phone2, :phone3, :phone4, :address, :address2, :date_of_birth, :started, :joined_in_years, :parents, :notes, :medical, :religion, :school, :ethnicity, :subs, :grouping_id, :grouping_leader, :joined, :age, :joined_years
 
     # Initialize a new Member using the hash returned by the API call
     # @param data the hash of data for the object returned by the API
     def initialize(data)
       @id = Osm::to_i_or_nil(data['scoutid'])
-      @section_id = Osm::to_i_or_nil(data['sectionid'])
+      @section_id = Osm::to_i_or_nil(data['sectionid0'])
       @type = data['type']
       @first_name = data['firstname']
       @last_name = data['lastname']
@@ -32,12 +32,11 @@ module Osm
       @school = data['school']
       @ethnicity = data['ethnicity']
       @subs = data['subs']
-      @grouping_id = Osm::to_i_or_nil(data['patrolid'])
-      @grouping_leader = data['patrolleader'] # 0 - No, 1 = seconder, 2 = sixer
+      @grouping_id = Osm::to_i_or_nil(data['patrolid0'])
+      @grouping_leader = data['patrolleader0'] # 0 - No, 1 = seconder, 2 = sixer
       @joined = Osm::parse_date(data['joined'])
       @age = data['age'] # 'yy / mm'
       @joined_years = data['yrs'].to_i
-      @patrol = data['patrol']
     end
 
     # Get the years element of this scout's age

data/spec/osm/grouping_spec.rb

@@ -7,13 +7,15 @@ describe "Grouping" do
     data = {
       'patrolid' => 1,
       'name' => 'Patrol Name',
-      'active' => 1
+      'active' => 1,
+      'points' => '2',
     }
     patrol = Osm::Grouping.new(data)
 
     patrol.id.should == 1
     patrol.name.should == 'Patrol Name'
     patrol.active.should == true
+    patrol.points.should == 2
   end
 
 end

data/spec/osm/member_spec.rb

@@ -6,7 +6,7 @@ describe "Member" do
   it "Create" do
     data = {
       'scoutid' => 1,
-      'sectionid' => 2,
+      'sectionid0' => 2,
       'type' => '',
       'firstname' => 'First',
       'lastname' => 'Last',
@@ -36,6 +36,8 @@ describe "Member" do
       'age' => '06/07',
       'yrs' => 1,
       'patrol' => 'Blue',
+      'patrolid0' => '3',
+      'patrolleader0' => 0,
     }
     member = Osm::Member.new(data)
 
@@ -69,7 +71,6 @@ describe "Member" do
     member.joined.should == Date.new(2006, 1, 7)
     member.age.should == '06/07'
     member.joined_years.should == 1
-    member.patrol.should == 'Blue'
   end
 
 

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &74085370 !ruby/object:Gem::Requirement
+  requirement: &76964710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *74085370
+  version_requirements: *76964710
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &74084650 !ruby/object:Gem::Requirement
+  requirement: &76964200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *74084650
+  version_requirements: *76964200
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &74084280 !ruby/object:Gem::Requirement
+  requirement: &76963780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74084280
+  version_requirements: *76963780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &74083800 !ruby/object:Gem::Requirement
+  requirement: &76962870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74083800
+  version_requirements: *76962870
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &74083320 !ruby/object:Gem::Requirement
+  requirement: &76961400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74083320
+  version_requirements: *76961400
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &74061350 !ruby/object:Gem::Requirement
+  requirement: &76960050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74061350
+  version_requirements: *76960050
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email: