osm 0.1.14 → 0.1.15

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## Version 0.1.15
+
+  * Rename grouping\_name attribute of Member to grouping
+
 ## Version 0.1.14
 
-  * Fix group\_name attribute of Member not being set when getting data from OSM
+  * Fix grouping\_name attribute of Member not being set when getting data from OSM
 
 ## Version 0.1.13
 

data/lib/osm/member.rb

@@ -74,8 +74,8 @@ module Osm
     #   @return [Fixnum] the grouping within the section that the member belongs to
     # @!attribute [rw] grouping_leader
     #   @return [Fixnum] whether the member is the grouping leader (0=no, 1=seconder/APL, 2=sixer/PL)
-    # @!attribute [rw] grouping_name
-    #   @return [Fixnum] the grouping within the section that the member belongs to
+    # @!attribute [rw] grouping
+    #   @return [Fixnum] the grouping within the section that the member belongs to (as displayed in OSM, if member was retrieved from OSM)
     # @!attribute [rw] joined
     #   @return [Date] when the member joined the section
     # @!attribute [rw] age
@@ -118,7 +118,7 @@ module Osm
     attribute :custom8, :type => String, :default => ''
     attribute :custom9, :type => String, :default => ''
     attribute :grouping_id, :type => Integer
-    attribute :grouping_name, :type => String, :default => ''
+    attribute :grouping, :type => String, :default => ''
     attribute :grouping_leader, :type => Integer
     attribute :joined, :type => Date
     attribute :age, :type => String
@@ -128,7 +128,7 @@ module Osm
                     :phone1, :phone2, :phone3, :phone4, :address, :address2, :date_of_birth, :started,
                     :joining_in_years, :parents, :notes, :medical, :religion, :school, :ethnicity, :subs,
                     :custom1, :custom2, :custom3, :custom4, :custom5, :custom6, :custom7, :custom8, :custom9,
-                    :grouping_id, :grouping_name, :grouping_leader, :joined, :age, :joined_years
+                    :grouping_id, :grouping, :grouping_leader, :joined, :age, :joined_years
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0, :unless => Proc.new { |r| r.id.nil? }
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
@@ -200,7 +200,7 @@ module Osm
           :custom8 => item['custom8'],
           :custom9 => item['custom9'],
           :grouping_id => Osm::to_i_or_nil(item['patrolid']),
-          :grouping_name => item['patrol'],
+          :grouping => item['patrol'],
           :grouping_leader => Osm::to_i_or_nil(item['patrolleader']),
           :joined => Osm::parse_date(item['joined']),
           :age => item['age'].gsub(' ', ''),

data/spec/osm/member_spec.rb

@@ -41,7 +41,7 @@ describe "Member" do
       :custom9 => 'Custom Field 9',
       :grouping_id => '3',
       :grouping_leader => 0,
-      :grouping_name => 'Grouping',
+      :grouping => 'Grouping',
       :joined => '2006-01-07',
       :age => '06/07',
       :joined_years => 1,
@@ -83,7 +83,7 @@ describe "Member" do
     member.custom8.should == 'Custom Field 8'
     member.custom9.should == 'Custom Field 9'
     member.grouping_id.should == 3
-    member.grouping_name.should == 'Grouping'
+    member.grouping.should == 'Grouping'
     member.grouping_leader.should == 0
     member.joined.should == Date.new(2006, 1, 7)
     member.age.should == '06/07'

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-01-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &89509420 !ruby/object:Gem::Requirement
+  requirement: &83848700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *89509420
+  version_requirements: *83848700
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &89507010 !ruby/object:Gem::Requirement
+  requirement: &83848170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *89507010
+  version_requirements: *83848170
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &89506490 !ruby/object:Gem::Requirement
+  requirement: &83845760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *89506490
+  version_requirements: *83845760
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &89491300 !ruby/object:Gem::Requirement
+  requirement: &83845500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *89491300
+  version_requirements: *83845500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &89490450 !ruby/object:Gem::Requirement
+  requirement: &83845130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '10.0'
   type: :development
   prerelease: false
-  version_requirements: *89490450
+  version_requirements: *83845130
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &89489940 !ruby/object:Gem::Requirement
+  requirement: &83828750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *89489940
+  version_requirements: *83828750
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &89489540 !ruby/object:Gem::Requirement
+  requirement: &83828240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *89489540
+  version_requirements: *83828240
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email: