osm 1.2.11 → 1.2.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzVhNDE1ZTEwZGVlNDJkNjYzNjFlY2JjMGVmOThlNzExZDc0NWU1NA==
+    YTNjYzU0YTc4NDUxYTkwY2JiMmZhY2U3MTkxNDgyZTgwMWYyYmZmNg==
   data.tar.gz: !binary |-
-    ZjI1YmNmOTEyMjFkMjJkYzUzZjI1YzUyNTUxYzRlN2E1ZmFlMzY0ZQ==
+    ZmE0YTNhOWM3MGRkZmEzNDk4ZmE4MzI2NTQ0M2E5OGU5ODNkNDg2Ng==
 SHA512:
   metadata.gz: !binary |-
-    ZGJhZjk3MDAyZTNhOTg0MjNkMTczMWE0MTc3ZDJlNmU4MDdkM2IyOTM2YTBi
-    MGIzNDllMDU2MzViNjQzMzcwYzEyN2ZmZmM1NmM4MjVkNmE0ZDZhZGRmY2Q3
-    MjkxNzE5ZDQwZTZlMzM0ZWU5NTIzZmRmNTA1N2RkZWUxN2JjYjA=
+    M2ZhMjBjNjVlYmY2YzY1MjBmZGVkMGQwNmQ1NjMyOGZhZGUyYmU0ODI3ZWU1
+    MTEzMmI0MDU0MTU1ODllODRiYWU4MjdjNGQ2MWM3NGQ3Mjk4NTFiYmRkMDU3
+    YTU2MTQ5YjM4MzExNDZjZWJmZDU2Y2U2NWJkMzdjOTdmMzgzOWI=
   data.tar.gz: !binary |-
-    MzcyMjU0OTczNjc3YmVmNmVjODA4YjI1N2ViZTcwMmU0MTQwYzg1YTMxMjcz
-    MDJhMjJkOTBlMDBmNTRkOTRkZWI4M2MwOGZiMzBmN2UyMzYzMDM1OTk4MWE3
-    NjgzNTk3YTg3N2I5YTA4MGI5YmZhYmQxZDYyODA2NmVhNWVjY2I=
+    YmMwMjkwNTk2M2M3ZWUxOGMwMTNlNzZjZTAyMGRhZTg3OWVjMTI2NTM2Njlh
+    OTk2MDIyNGRjNDlhZWFlZTEwNDQzNjBlNzU1OGFlODcyOWUxODNiNzFjMTA2
+    NjY2NDI1ZmRiNjNiNDQ2NzAwMzRkYjI3N2JhNDMzMzBiNDk2YWI=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Version 1.2.12
+
+ * Add leader? method to member (true if member is in the leaders grouping)
+ * Add youth? method to member (true if member is in a non-leaders grouping)
+ * Adjust Osm::Event::BadgeLink attributes (label becomes requirement\_label, add badge\_label)
+
 ## Version 1.2.11
 
  * Fix handling blank event config from OSM (JSON parse error)

data/README.md

@@ -176,3 +176,4 @@ See the [Roadmap page in the wiki](https://github.com/robertgauld/osm/wiki/Roadm
 
   * MyScout (Everything)
   * Adult Section Specific Stuff
+  * Quartmaster DB

data/lib/osm/event.rb

@@ -245,7 +245,7 @@ module Osm
             'badge' => badge.badge_key,
             'columnname' => badge.requirement_key,
             'data' => badge.data,
-            'newcolumnname' => badge.label,
+            'newcolumnname' => badge.requirement_label,
           })
           badges_created = false unless badge_data.is_a?(Hash) && badge_data['ok']
         end
@@ -329,7 +329,7 @@ module Osm
               'badge' => badge.badge_key,
               'columnname' => badge.requirement_key,
               'data' => badge.data,
-              'newcolumnname' => badge.label,
+              'newcolumnname' => badge.requirement_label,
               'badgetype' => badge.badge_type,
             })
           end
@@ -350,7 +350,7 @@ module Osm
               'badge' => badge.badge_key,
               'columnname' => badge.requirement_key,
               'data' => badge.data,
-              'newcolumnname' => badge.label,
+              'newcolumnname' => badge.requirement_label,
               'badgetype' => badge.badge_type,
             })
           end
@@ -563,7 +563,7 @@ module Osm
       badges_data = event_data['badgelinks']
       badges_data = [] unless badges_data.is_a?(Array)
       badges_data.each do |field|
-        badges.push BadgeLink.new(badge_key: field['badge'], badge_type: field['badgetype'].to_sym, badge_section: field['section'].to_sym, requirement_key: field['columnname'], label: field['columnnameLongName'], data: field['data'])
+        badges.push BadgeLink.new(badge_key: field['badge'], badge_type: field['badgetype'].to_sym, badge_section: field['section'].to_sym, requirement_key: field['columnname'], badge_label: field['badgeLongName'], requirement_label: field['columnnameLongName'], data: field['data'])
       end
       event.badges = badges
 
@@ -571,7 +571,7 @@ module Osm
     end
 
 
-    # When creating a BadgeLink for an existing column in a hikes/nights badge the label is optional
+    # When creating a BadgeLink for an existing column in a hikes/nights badge the requirement_label is optional
     # When creating a BadgeLink for a new column in a hikes/nights badge the requirement_key MUST be blank
 # TODO : Add validation for above statements
     class BadgeLink
@@ -582,12 +582,14 @@ module Osm
       #   @return [String] the badge being done
       # @!attribute [rw] badge_type
       #   @return [Symbol] the type of badge
+      # @!attribute [rw] badge_label
+      #   @return [String] human friendly badge name
       # @!attribute [rw] requirement_key
       #   @return [String] the requirement being done
       # @!attribute [rw] badge_section
       #   @return [Symbol] the section type that the badge belongs to
-      # @!attribute [rw] label
-      #   @return [String] human firendly label for the badge and requirement
+      # @!attribute [rw] requirement_label
+      #   @return [String] human firendly requirement label
       # @!attribute [rw] data
       #   @return [String] what to put in the column when the badge records are updated
 
@@ -595,11 +597,12 @@ module Osm
       attribute :badge_type, :type => Object
       attribute :requirement_key, :type => String
       attribute :badge_section, :type => Object
-      attribute :label, :type => String
+      attribute :badge_label, :type => String
+      attribute :requirement_label, :type => String
       attribute :data, :type => String
 
       if ActiveModel::VERSION::MAJOR < 4
-        attr_accessible :badge_key, :badge_type, :requirement_key, :badge_section, :label, :data
+        attr_accessible :badge_key, :badge_type, :requirement_key, :badge_section, :badge_label, :requirement_label, :data
       end
 
       validates_presence_of :badge_key

data/lib/osm/member.rb

@@ -380,6 +380,18 @@ module Osm
       return "#{first_name}#{seperator.to_s}#{last_name}"
     end
 
+    # Check if the member is in the leaders grouping
+    # @return [Boolean]
+    def leader?
+      grouping_id.eql?(-2)
+    end
+
+    # Check if the member is in a non-leaders grouping
+    # @return [Boolean]
+    def youth?
+      grouping_id > 0
+    end
+
     # Get the Key to use in My.SCOUT links for this member
     # @param [Osm::Api] api The api to use to make the request
     # @return [String] the key

data/spec/osm/event_spec.rb

@@ -127,7 +127,8 @@ describe "Event" do
         :badge_type => :activity,
         :requirement_key => 'a_01',
         :badge_section => :cubs,
-        :label => 'Cubs Artist Activity - A: Poster',
+        :requirement_label => 'A: Poster',
+        :badge_label => 'Artist',
         :data => 'abc'
       )
   
@@ -135,7 +136,8 @@ describe "Event" do
       bl.badge_type.should == :activity
       bl.requirement_key.should == 'a_01'
       bl.badge_section.should == :cubs
-      bl.label.should == 'Cubs Artist Activity - A: Poster'
+      bl.badge_label.should == 'Artist'
+      bl.requirement_label.should == 'A: Poster'
       bl.data.should == 'abc'
       bl.valid?.should be_true
     end
@@ -236,11 +238,12 @@ describe "Event" do
         event.columns[0].label.should == 'Label'
         event.columns[0].parent_required.should be_true
         event.badges[0].badge_key.should == 'athletics'
+        event.badges[0].badge_label.should == 'Athletics'
         event.badges[0].badge_section.should == :cubs
         event.badges[0].badge_type.should == :activity
         event.badges[0].requirement_key.should == 'b_06'
         event.badges[0].data.should == ''
-        event.badges[0].label.should == 'B: Run'
+        event.badges[0].requirement_label.should == 'B: Run'
         event.badges[1].badge_key.should == 'hikes'
         event.badges[1].badge_section.should == :staged
         event.badges[1].badge_type.should == :staged
@@ -624,7 +627,7 @@ describe "Event" do
             badge_type: :activity,
             requirement_key: 'a_01',
             badge_section: :beavers,
-            label: '',
+            requirement_label: '',
             data: '',
           )]
           event = Osm::Event.create(@api, @attributes)
@@ -652,7 +655,7 @@ describe "Event" do
             badge_type: :staged,
             requirement_key: '',
             badge_section: :staged,
-            label: 'Label for added column',
+            requirement_label: 'Label for added column',
             data: '1',
           )]
           event = Osm::Event.create(@api, @attributes)
@@ -680,7 +683,7 @@ describe "Event" do
             badge_type: :staged,
             requirement_key: 'custom_01234',
             badge_section: :staged,
-            label: '',
+            requirement_label: '',
             data: '2',
           )]
           event = Osm::Event.create(@api, @attributes)

data/spec/osm/member_spec.rb

@@ -101,6 +101,17 @@ describe "Member" do
     member.name('_').should == 'First_Last'
   end
 
+  it "Tells if member is a leader" do
+    Osm::Member.new(grouping_id: -2).leader?.should be_true  # In the leader grouping
+    Osm::Member.new(grouping_id: 2).leader?.should be_false  # In a youth grouping
+    Osm::Member.new(grouping_id: 0).leader?.should be_false  # Not in a grouping
+  end
+
+  it "Tells if member is a youth member" do
+    Osm::Member.new(grouping_id: -2).youth?.should be_false  # In the leader grouping
+    Osm::Member.new(grouping_id: 2).youth?.should be_true  # In a youth grouping
+    Osm::Member.new(grouping_id: 0).youth?.should be_false  # Not in a grouping
+  end
 
   it "Provides each part of age" do
     data = {

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.11"
+  VERSION = "1.2.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.12
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport