osm 0.0.16 → 0.0.17

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Version 0.0.17
+
+  * Fix try method is undefined
+  * Since 1/1/1970 is the epoch used by the OSM API, this date will be treated as nil (except member's date of birth)
+  * DueBadges now calculates the totals in the initialize method (no need to pass it in anymore)
+
 ## Version 0.0.16
 
   * -2 is a valid grouping\_id value (corrected in Grouping)

data/lib/osm.rb

@@ -5,12 +5,15 @@ require 'date'
 
 
 module Osm
+  OSM_EPOCH_S = '1970-01-01'
+  OSM_DATE_FORMAT = '%Y-%m-%d'
+  OSM_DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S'
 
   class Error < Exception; end
   class ConnectionError < Error; end
 
 
-  private
+  private  
   def self.make_array_of_symbols(array)
     array.each_with_index do |item, index|
       array[index] = item.to_sym
@@ -30,18 +33,18 @@ module Osm
     raise Error, 'There is no current term for the section.'
   end
 
-  def self.make_datetime(date, time)
-    date = nil if date.nil? || date.empty?
+  def self.make_datetime(date, time, options={})
+    date = nil if date.nil? || date.empty? || (date.eql?(OSM_EPOCH_S) && !options[:ignore_epoch])
     time = nil if time.nil? || time.empty?
     if (!date.nil? && !time.nil?)
       begin
-        return DateTime.strptime((date + ' ' + time), '%Y-%m-%d %H:%M:%S')
+        return DateTime.strptime((date + ' ' + time), OSM_DATETIME_FORMAT)
       rescue ArgumentError
         return nil
       end
     elsif !date.nil?
       begin
-        return DateTime.strptime(date, '%Y-%m-%d')
+        return DateTime.strptime(date, OSM_DATE_FORMAT)
       rescue ArgumentError
         return nil
       end
@@ -50,10 +53,10 @@ module Osm
     end
   end
 
-  def self.parse_date(date)
-    return nil if date.nil?
+  def self.parse_date(date, options={})
+    return nil if date.nil? || date.empty? || (date.eql?(OSM_EPOCH_S) && !options[:ignore_epoch])
     begin
-      return Date.strptime(date, '%Y-%m-%d')
+      return Date.strptime(date, OSM_DATE_FORMAT)
     rescue ArgumentError
       return nil
     end

data/lib/osm/api.rb

@@ -509,7 +509,7 @@ module Osm
     def create_evening(section, meeting_date, api_data={})
       section_id = id_for_section(section)
       evening_api_data = {
-        'meetingdate' => meeting_date.strftime('%Y-%m-%d'),
+        'meetingdate' => meeting_date.strftime(Osm::OSM_DATE_FORMAT),
         'sectionid' => section_id,
         'activityid' => -1
       }

data/lib/osm/due_badges.rb

@@ -11,13 +11,25 @@ module Osm
     #   @return [Hash] the total number of each badge which is due
 
     # Initialize a new DueBadges
-    # @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
+    # @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key, exclude total as this is calculated for you)
     def initialize(attributes={})
-      [:descriptions, :by_member, :totals].each do |attribute|
+      [:descriptions, :by_member].each do |attribute|
         raise ArgumentError, ":#{attribute} must be a Hash" unless attributes[attribute].is_a?(Hash)
       end
 
       attributes.each { |k,v| instance_variable_set("@#{k}", v) }
+
+      # Calculate totals
+      @totals = {}
+      @by_member.keys.each do |member_name|
+        @by_member[member_name].each do |badge_record|
+          badge_symbol = badge_record[:badge]
+          badge_extra = badge_record[:extra_information]
+          @totals[badge_record[:badge]] ||= {}
+          @totals[badge_symbol][badge_extra] ||= 0
+          @totals[badge_symbol][badge_extra] += 1
+        end
+      end
     end
 
 
@@ -45,19 +57,15 @@ module Osm
 
 
       attributes[:by_member] = {}
-      attributes[:totals] = {}
       attributes[:pending].each_key do |key|
         attributes[:pending][key].each do |item|
           name = "#{item[:firstname]} #{item[:lastname]}"
-          attributes[:by_member][name] = [] if attributes[:by_member][name].nil?
-
+          attributes[:by_member][name] ||= []
           badge = {
             :badge => key,
             :extra_information => item[:extra]
           }
           attributes[:by_member][name].push badge
-          attributes[:totals][key] = {} if attributes[:totals][key].nil?
-          attributes[:totals][key][item[:extra]] = attributes[:totals][key][item[:extra]].to_i + 1
         end
       end
       

data/lib/osm/evening.rb

@@ -95,7 +95,7 @@ module Osm
       {
         'eveningid' => evening_id,
         'sectionid' => section_id,
-        'meetingdate' => meeting_date.strftime('%Y-%m-%d'),
+        'meetingdate' => meeting_date.strftime(Osm::OSM_DATE_FORMAT),
         'starttime' => start_time,
         'endtime' => end_time,
         'title' => title,

data/lib/osm/member.rb

@@ -104,7 +104,7 @@ module Osm
         :phone4 => data['phone4'],
         :address => data['address'],
         :address2 => data['address2'],
-        :date_of_birth => Osm::parse_date(data['dob']),
+        :date_of_birth => Osm::parse_date(data['dob'], :ignore_epoch => true),
         :started => Osm::parse_date(data['started']),
         :joining_in_years => data['joining_in_yrs'].to_i,
         :parents => data['parents'],

data/lib/osm/register_data.rb

@@ -48,7 +48,7 @@ module Osm
 
       attributes[:attendance] = {}
       data.except('scoutid', 'patrolid', 'sectionid', 'firstname', 'lastname', 'total').keys.each do |key|
-        attributes[:attendance][Date.strptime(key, '%Y-%m-%d')] = data[key]
+        attributes[:attendance][Date.strptime(key, Osm::OSM_DATE_FORMAT)] = data[key]
       end
 
       new(attributes)

data/lib/osm/role.rb

@@ -77,18 +77,26 @@ module Osm
     end
 
     def <=>(another_role)
-      compare_group_name = self.group_name <=> another_role.group_name
-      return compare_group_name unless compare_group_name == 0
-
-      return 0 if self.section.type == another_role.section.type
-      [:beavers, :cubs, :scouts, :explorers, :waiting, :adults].each do |type|
-        return -1 if self.section.type == type
-        return 1 if another_role.section.type == type
+      begin
+        compare_group_name = self.group_name <=> another_role.group_name
+        return compare_group_name unless compare_group_name == 0
+  
+        return 0 if self.section.type == another_role.section.type
+        [:beavers, :cubs, :scouts, :explorers, :waiting, :adults].each do |type|
+          return -1 if self.section.type == type
+          return 1 if another_role.section.type == type
+        end
+      rescue NoMethodError
+        return false
       end
     end
 
     def ==(another_role)
-      self.section == another_role.try(:section)
+      begin
+        return self.section == another_role.section
+      rescue NoMethodError
+        return false
+      end
     end
 
   end

data/lib/osm/section.rb

@@ -122,11 +122,19 @@ module Osm
     end
 
     def <=>(another_section)
-      self.role <=> another_section.try(:role)
+      begin
+        return self.role <=> another_section.role
+      rescue NoMethodError
+        return false
+      end
     end
 
     def ==(another_section)
-      self.id == another_section.try(:id)
+      begin
+        return self.id == another_section.id
+      rescue NoMethodError
+        return false
+      end
     end
 
 

data/lib/osm/term.rb

@@ -79,17 +79,25 @@ module Osm
     end
 
     def <=>(another_term)
-      compare = self.section_id <=> another_term.try(:section_id)
-      return compare unless compare == 0
-
-      compare = self.start <=> another_term.try(:start)
-      return compare unless compare == 0
-
-      self.id <=> another_term.try(:id)
+      begin
+        compare = self.section_id <=> another_term.section_id
+        return compare unless compare == 0
+  
+        compare = self.start <=> another_term.start
+        return compare unless compare == 0
+  
+        return self.id <=> another_term.id
+      rescue NoMethodError
+        return false
+      end
     end
 
     def ==(another_term)
-      self.id == another_term.try(:id)
+      begin
+        return self.id == another_term.id
+      rescue NoMethodError
+        return false
+      end
     end
 
   end

data/spec/osm/event_spec.rb

@@ -11,8 +11,8 @@ describe "Event" do
       'name' => 'Event name',
       'startdate' => '2001-01-02',
       'starttime' => '12:00:00',
-      'enddate' => '2001-01-02',
-      'endtime' => '13:00:00',
+      'enddate' => '1970-01-01',
+      'endtime' => '',
       'cost' => 'Free',
       'location' => 'Somewhere',
       'notes' => 'None'
@@ -23,7 +23,7 @@ describe "Event" do
     event.section_id.should == 2
     event.name.should == 'Event name'
     event.start.should == DateTime.new(2001, 1, 2, 12, 0, 0)
-    event.end.should == DateTime.new(2001, 1, 2, 13, 0, 0)
+    event.end.should == nil
     event.cost.should == 'Free'
     event.location.should == 'Somewhere'
     event.notes.should == 'None'

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &80681880 !ruby/object:Gem::Requirement
+  requirement: &76908740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *80681880
+  version_requirements: *76908740
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &80681550 !ruby/object:Gem::Requirement
+  requirement: &76900500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80681550
+  version_requirements: *76900500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &80681190 !ruby/object:Gem::Requirement
+  requirement: &76900110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80681190
+  version_requirements: *76900110
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &80680950 !ruby/object:Gem::Requirement
+  requirement: &76899880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80680950
+  version_requirements: *76899880
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &80680740 !ruby/object:Gem::Requirement
+  requirement: &76899670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80680740
+  version_requirements: *76899670
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email: