osm 0.2.0 → 0.2.2

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## Version 0.2.2
+
+  * Add comparing and sorting (using <=>, <, <=, >, >= and between?) to each model
+    * Activity - id then version
+    * Activity::File - activity\_id then name
+    * Activity::Version - activity\_id then version
+    * ApiAccess - id
+    * Event - start, name then id (shortcuts, returning 0 if ids are equal)
+    * Event::Column - event then id
+    * Event::Attendance - event then row
+    * FlexiRecord - section\_id then name
+    * FlexiRecord::Column - flexi\_record then id (system ones first then user ones)
+    * FlexiRecord::Data - flexi\_record, grouping\_id then member\_id
+    * Grouping - section\_id then name
+    * Meeting - section\_id, date, start\_time then id
+    * Meeting::Activity - title then activity\_id
+    * Member - section\_id, grouping\_id, grouping\_leader (descending), last\_name then first\_name
+    * Register::Field - id
+    * Register::Attendance - section\_id, grouping\_id, last\_name then first\_name
+    * Section - group\_name, type (by age) then name
+    * Term - section\_id, start then id
+
 ## Version 0.2.0
 
   * Raises Forbidden exception if:

data/lib/osm/activity.rb

@@ -253,6 +253,13 @@ module Osm
       end
     end
 
+    # Compare Activity based on id then version
+    def <=>(another)
+      result = self.id <=> another.try(:id)
+      result = self.version <=> another.try(:version) if result == 0
+      return result
+    end
+
 
     private
     class File
@@ -284,6 +291,13 @@ module Osm
       #   Initialize a new Term
       #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
+      # Compare File based on activity_id then name
+      def <=>(another)
+        result = self.activity_id <=> another.try(:activity_id)
+        result = self.name <=> another.try(:name) if result == 0
+        return result
+      end
+
     end # Class Activity::File
 
     class Badge
@@ -356,6 +370,13 @@ module Osm
       #   Initialize a new Version
       #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
+      # Compare Version based on activity_id then version
+      def <=>(another)
+        result = self.activity_id <=> another.try(:activity_id)
+        result = self.version <=> another.try(:version) if result == 0
+        return result
+      end
+
     end # Class Activity::Version
 
   end # Class Activity

data/lib/osm/api_access.rb

@@ -106,6 +106,7 @@ module Osm
     #   Initialize a new Term
     #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
+
   end # Class ApiAccess
 
 end # Module

data/lib/osm/event.rb

@@ -321,6 +321,15 @@ module Osm
       return attendance_limit - attendees(api)
     end
 
+    # Compare Event based on start, name then id
+    def <=>(another)
+      return 0 if self.id == another.try(:id)
+      result = self.start <=> another.try(:start)
+      result = self.name <=> another.try(:name) if result == 0
+      result = self.id <=> another.try(:id) if result == 0
+      return result
+    end
+
 
     private
     def attendees(api)
@@ -357,6 +366,7 @@ module Osm
       end
       event.columns = columns
       return event
+
     end
 
 
@@ -437,6 +447,13 @@ module Osm
         return true
       end
 
+      # Compare Column based on event then id
+      def <=>(another)
+        result = self.event <=> another.try(:event)
+        result = self.id <=> another.try(:id) if result == 0
+        return result
+      end
+
     end # class Column
 
 
@@ -502,6 +519,13 @@ module Osm
         end
       end
 
+      # Compare Activity based on event then row
+      def <=>(another)
+        result = self.event <=> another.try(:event)
+        result = self.row <=> another.try(:row) if result == 0
+        return result
+      end
+
     end # Class Attendance
 
   end # Class Event

data/lib/osm/flexi_record.rb

@@ -28,7 +28,7 @@ module Osm
       cache_key = ['flexi_record_columns', self.id]
 
       if !options[:no_cache] && Osm::Model.cache_exist?(api, cache_key)
-        return Osm::Model.cache_read(api, cache_key)
+        return cache_read(api, cache_key)
       end
 
       data = api.perform_query("extras.php?action=getExtra&sectionid=#{self.section_id}&extraid=#{self.id}")
@@ -44,7 +44,7 @@ module Osm
           )
         end
       end
-      Osm::Model.cache_write(api, cache_key, structure)
+      cache_write(api, cache_key, structure)
 
       return structure
     end
@@ -65,7 +65,7 @@ module Osm
         ActiveSupport::JSON.decode(data['config']).each do |field|
           if field['name'] == name
             # The cached fields for the flexi record will be out of date - remove them
-             Osm::Model.cache_delete(api, ['flexi_record_columns', id])
+            cache_delete(api, ['flexi_record_columns', id])
             return true
           end
         end
@@ -85,7 +85,7 @@ module Osm
       cache_key = ['flexi_record_data', id, term_id]
 
       if !options[:no_cache] && Osm::Model.cache_exist?(api, cache_key)
-        return Osm::Model.cache_read(api, cache_key)
+        return cache_read(api, cache_key)
       end
 
       data = api.perform_query("extras.php?action=getExtraRecords&sectionid=#{section.id}&extraid=#{id}&termid=#{term_id}&section=#{section.type}")
@@ -112,17 +112,15 @@ module Osm
         end
       end
 
-      Osm::Model.cache_write(api, cache_key, to_return)
+      cache_write(api, cache_key, to_return)
       return to_return
     end
 
-
+    # Compare Activity based on section_id then name
     def <=>(another)
-      begin
-        return self.name <=> another.name
-      rescue NoMethodError
-        return 1
-      end
+      result = self.section_id <=> another.try(:section_id)
+      result = self.name <=> another.try(:name) if result == 0
+      return result
     end
 
 
@@ -208,6 +206,26 @@ module Osm
         return true
       end
 
+      # Compare Column based on flexi_record then id
+      def <=>(another)
+        result = self.flexi_record <=> another.try(:flexi_record)
+        if result == 0
+          if id.match(/\Af_\d+\Z/)
+            # This is a user column
+            unless another.try(:id).to_s.match(/\Af_\d+\Z/)
+              return 1
+            end
+          else
+            # This is a system column
+            if another.try(:id).to_s.match(/\Af_\d+\Z/)
+              return -1
+            end
+          end
+          result = self.id <=> another.try(:id)
+        end
+        return result
+      end
+
     end # Class FlexiRecord::Column
 
 
@@ -280,6 +298,14 @@ module Osm
         return updated
       end
 
+      # Compare Data based on flexi_record, grouping_id then member_id
+      def <=>(another)
+        result = self.flexi_record <=> another.try(:flexi_record)
+        result = self.grouping_id <=> another.try(:grouping_id) if result == 0
+        result = self.member_id <=> another.try(:member_id) if result == 0
+        return result
+      end
+
     end # Class FlexiRecord::Data
 
   end # Class FlexiRecord

data/lib/osm/grouping.rb

@@ -104,6 +104,12 @@ module Osm
       return result
     end
 
+    # Compare Grouping based on section_id then name
+    def <=>(another)
+      result = self.section_id <=> another.try(:section_id)
+      result = self.name <=> another.try(:name) if result == 0
+      return result
+    end
 
   end # Class Grouping
 

data/lib/osm/meeting.rb

@@ -241,26 +241,18 @@ module Osm
       return data
     end
 
-
+    # Compare Meeting based on section_id, date, start_time then id
     def <=>(another)
-      begin
-        compare = self.section_id <=> another.section_id
-        return compare unless compare == 0
-  
-        compare = self.date <=> another.date
-        return compare unless compare == 0
-
+      result = self.section_id <=> another.try(:section_id)
+      result = self.date <=> another.try(:date) if result == 0
+      if result == 0
         my_start_time = self.start_time.split(':').map{ |i| i.to_i }
         another_start_time = another.start_time.split(':').map{ |i| i.to_i }
-        compare = my_start_time[0] <=> another_start_time[0]
-        return compare unless compare == 0
-        compare = my_start_time[1] <=> another_start_time[1]
-        return compare unless compare == 0
-  
-        return self.id <=> another.id
-      rescue NoMethodError
-        return 0
-      end
+        result = my_start_time[0] <=> another_start_time[0] if result == 0
+        result = compare = my_start_time[1] <=> another_start_time[1] if result == 0
+      end  
+      result = self.id <=> another.try(:id) if result == 0
+      return result
     end
 
 
@@ -289,6 +281,13 @@ module Osm
       #   Initialize a new Meeting::Activity
       #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
+      # Compare Activity based on title then activity_id
+      def <=>(another)
+        result = self.title <=> another.try(:title)
+        result = self.activity_id <=> another.try(:activity_id) if result == 0
+        return result
+      end
+
     end # Class Meeting::Activity
 
   end # Class Meeting

data/lib/osm/member.rb

@@ -389,6 +389,16 @@ module Osm
       return "https://www.onlinescoutmanager.co.uk/parents/#{link_to}.php?sc=#{self.id}&se=#{section_id}&c=#{@myscout_link_key}"
     end
 
+    # Compare Activity based on section_id, grouping_id, grouping_leader (descending), last_name then first_name
+    def <=>(another)
+      result = self.section_id <=> another.try(:section_id)
+      result = self.grouping_id <=> another.try(:grouping_id) if result == 0
+      result = -(self.grouping_leader <=> another.try(:grouping_leader)) if result == 0
+      result = self.last_name <=> another.try(:last_name) if result == 0
+      result = self.first_name <=> another.try(:last_name) if result == 0
+      return result
+    end
+
   end # Class Member
 
 end # Module

data/lib/osm/model.rb

@@ -38,10 +38,34 @@ module Osm
     end
 
 
+    # Default to_i conversion is of id
     def to_i
-      id
+      id.to_i
     end
 
+    # Default compare based on id
+    def <=>(another)
+      return self.id <=> another.try(:id)
+    end
+
+    # Add other compare functions
+    def <(another)
+      send('<=>', another) < 0
+    end
+    def <=(another)
+      send('<=>', another) <= 0
+    end
+    def >(another)
+      send('<=>', another) > 0
+    end
+    def >=(another)
+      send('<=>', another) >= 0
+    end
+    def between?(min, max)
+      (send('<=>', min) > 0) && (send('<=>', max) < 0)
+    end
+
+
     # Get a list of attributes which have changed
     # @return Array[String] the names of attributes which have changed
     def changed_attributes

data/lib/osm/register.rb

@@ -143,10 +143,17 @@ module Osm
       validates_presence_of :name
       validates_presence_of :tooltip, :allow_blank => true
 
+
       # @!method initialize
       #   Initialize a new RegisterField
       #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
+
+      # Compare Field based on id then version
+      def <=>(another)
+        return self.id <=> another.try(:id)
+      end
+
     end # Class Register::Field
 
 
@@ -185,11 +192,22 @@ module Osm
 
       validates :attendance, :hash => {:key_type => Date, :value_in => ['Yes', 'No', nil]}
 
+
       # @!method initialize
       #   Initialize a new registerData
       #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
-    end # Class Register::Data
+
+      # Compare Attendance based on section_id, grouping_id, last_name then first_name
+      def <=>(another)
+        result = self.section_id <=> another.try(:section_id)
+        result = self.grouping_id <=> another.try(:grouping_id) if result == 0
+        result = self.last_name <=> another.try(:last_name) if result == 0
+        result = self.first_name <=> another.try(:last_name) if result == 0
+        return result
+      end
+
+    end # Class Register::Attendance
 
   end # Class Register
   

data/lib/osm/section.rb

@@ -1,8 +1,6 @@
 module Osm
 
   class Section < Osm::Model
-    class FlexiRecord; end # Ensure the constant exists for the validators
-
     # @!attribute [rw] id
     #   @return [Fixnum] the id for the section
     # @!attribute [rw] name
@@ -134,6 +132,7 @@ module Osm
     validates :intouch_fields, :hash => {:key_type => Symbol, :value_in => [true, false]}
     validates :mobile_fields, :hash => {:key_type => Symbol, :value_in => [true, false]}
     validates :myscout_emails, :hash => {:key_in => [:email1, :email2, :email3, :email4], :value_in => [true, false]}
+    validates :flexi_records, :array_of => {:item_type => Osm::FlexiRecord, :item_valid => true}
 
 
     # @!method initialize
@@ -356,27 +355,18 @@ module Osm
       }[subscription_level]
     end
 
+    # Compare Section based on group_name type (age order), then name
     def <=>(another)
-      begin
-        compare_group_name = group_name <=> another.group_name
-        return compare_group_name unless compare_group_name == 0
-  
-        return 0 if type == another.type
-        [:beavers, :cubs, :scouts, :explorers, :waiting, :adults].each do |type|
-          return -1 if type == type
-          return 1 if another.type == type
+      result = self.group_name <=> another.try(:group_name)
+      result = 0 if self.type == another.try(:type) && result == 0
+      [:beavers, :cubs, :scouts, :explorers, :waiting, :adults].each do |type|
+        if result == 0
+          result = -1 if self.type == type
+          result =  1 if another.try(:type) == type
         end
-      rescue NoMethodError
-        return 1
-      end
-    end
-
-    def ==(another)
-      begin
-        return self.id == another.id
-      rescue NoMethodError
-        return false
       end
+      result = self.name <=> another.try(:name) if result == 0
+      return result
     end
 
   end # Class Section

data/lib/osm/term.rb

@@ -222,26 +222,12 @@ module Osm
       return (start <= date) && (finish >= date)
     end
 
+    # Compare Term based on section_id, start then id
     def <=>(another_term)
-      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 0
-      end
-    end
-
-    def ==(another_term)
-      begin
-        return self.id == another_term.id
-      rescue NoMethodError
-        return false
-      end
+      result = self.section_id <=> another_term.section_id
+      result = self.start <=> another_term.start if result == 0
+      result = self.id <=> another_term.id if result == 0
+      return result
     end
 
   end # Class Term

data/spec/osm/activity_spec.rb

@@ -3,18 +3,51 @@ require 'spec_helper'
 
 describe "Activity" do
 
-    it "Get OSM link" do
-      activity = Osm::Activity.new(
-        :id => 1,
-        :running_time => 10,
-        :title => 'Title',
-        :description => 'Description',
-        :resources => 'Resources',
-        :instructions => 'Instructions',
-        :location => :indoors,
-      )
-      activity.osm_link.should == 'https://www.onlinescoutmanager.co.uk/?l=p1'
+  it "Get OSM link" do
+    activity = Osm::Activity.new(
+      :id => 1,
+      :running_time => 10,
+      :title => 'Title',
+      :description => 'Description',
+      :resources => 'Resources',
+      :instructions => 'Instructions',
+      :location => :indoors,
+    )
+    activity.osm_link.should == 'https://www.onlinescoutmanager.co.uk/?l=p1'
+  end
+
+  it "Sorts by id then version" do
+    a1 = Osm::Activity.new(:id => 1, :version => 1)
+    a2 = Osm::Activity.new(:id => 2, :version => 1)
+    a3 = Osm::Activity.new(:id => 2, :version => 2)
+
+    activities = [a2, a3, a1]
+    activities.sort.should == [a1, a2, a3]
+  end
+
+
+  describe "Activity::File" do
+    it "Sorts by activity_id then name" do
+      a1 = Osm::Activity::File.new(:activity_id => 1, :name => 'a')
+      a2 = Osm::Activity::File.new(:activity_id => 2, :name => 'a')
+      a3 = Osm::Activity::File.new(:activity_id => 2, :name => 'b')
+
+      activities = [a2, a3, a1]
+      activities.sort.should == [a1, a2, a3]
+    end
+  end
+
+
+  describe "Activity::Version" do
+    it "Sorts by activity_id then version" do
+      a1 = Osm::Activity::File.new(:activity_id => 1, :version => 1)
+      a2 = Osm::Activity::File.new(:activity_id => 2, :version => 1)
+      a3 = Osm::Activity::File.new(:activity_id => 2, :version => 2)
+
+      activities = [a2, a3, a1]
+      activities.sort.should == [a1, a2, a3]
     end
+  end
 
 
   describe "Using The API" do

data/spec/osm/api_access_spec.rb

@@ -18,6 +18,14 @@ describe "API Access" do
     api_access.valid?.should be_true
   end
 
+  it "Sorts by id" do
+    a1 = Osm::ApiAccess.new(:id => 1)
+    a2 = Osm::ApiAccess.new(:id => 2)
+
+    data = [a2, a1]
+    data.sort.should == [a1, a2]
+  end
+
 
   describe "Using the API" do
 

data/spec/osm/event_spec.rb

@@ -51,24 +51,46 @@ describe "Event" do
     Osm::Event.new(:attendance_limit => 1).limited_attendance?.should be_true
   end
 
+  it "Sorts by start, name then ID (unless IDs are equal)" do
+    e1 = Osm::Event.new(:start => '2000-01-01 01:00:00', :name => 'An event', :id => 1)
+    e2 = Osm::Event.new(:start => '2000-01-02 01:00:00', :name => 'An event', :id => 2)
+    e3 = Osm::Event.new(:start => '2000-01-02 01:00:00', :name => 'Event name', :id => 3)
+    e4 = Osm::Event.new(:start => '2000-01-02 01:00:00', :name => 'Event name', :id => 4)
+    events = [e2, e4, e3, e1]
+
+    events.sort.should == [e1, e2, e3, e4]
+    (Osm::Event.new(:id => 1) <=> Osm::Event.new(:id => 1)).should == 0
+  end
 
-  it "Create Event::Attendance" do
-    data = {
-      :member_id => 1,
-      :grouping_id => 2,
-      :row => 3,
-      :columns => [],
-      :event => Osm::Event.new(:id => 1, :section_id => 1, :name => 'Name', :columns => [])
-    }
+  describe "Event::Attendance" do 
+  
+    it "Create" do
+      data = {
+        :member_id => 1,
+        :grouping_id => 2,
+        :row => 3,
+        :columns => [],
+        :event => Osm::Event.new(:id => 1, :section_id => 1, :name => 'Name', :columns => [])
+      }
 
-    ea = Osm::Event::Attendance.new(data)  
-    ea.member_id.should == 1
-    ea.grouping_id.should == 2
-    ea.fields.should == {}
-    ea.row.should == 3
-    ea.valid?.should be_true
-  end
+      ea = Osm::Event::Attendance.new(data)  
+      ea.member_id.should == 1
+      ea.grouping_id.should == 2
+      ea.fields.should == {}
+      ea.row.should == 3
+      ea.valid?.should be_true
+    end
+
+    it "Sorts by event ID then row" do
+      ea1 = Osm::Event::Attendance.new(:event => Osm::Event.new(:id => 1), :row => 1)
+      ea2 = Osm::Event::Attendance.new(:event => Osm::Event.new(:id => 2), :row => 1)
+      ea3 = Osm::Event::Attendance.new(:event => Osm::Event.new(:id => 2), :row => 2)
+      event_attendances = [ea3, ea2, ea1]
 
+      event_attendances.sort.should == [ea1, ea2, ea3]
+    end
+
+  end
 
   describe "Using the API" do
 

data/spec/osm/flexi_record_spec.rb

@@ -17,25 +17,58 @@ describe "Flexi Record" do
     fr.valid?.should be_true
   end
 
-  it "Create FlexiRecord::Column" do
-    field = Osm::FlexiRecord::Column.new(
-      :id => "f_1",
-      :name => "Field Name",
-      :editable => true,
-      :flexi_record => Osm::FlexiRecord.new(),
-    )
+  describe "FlexiRecord::Column" do
+
+    it "Create" do
+      field = Osm::FlexiRecord::Column.new(
+        :id => "f_1",
+        :name => "Field Name",
+        :editable => true,
+        :flexi_record => Osm::FlexiRecord.new(),
+      )
+
+      field.id.should == 'f_1'
+      field.name.should == 'Field Name'
+      field.editable.should be_true
+      field.valid?.should be_true
+    end
+
+    it "Sorts by flexirecord then id (system first then user)" do
+      frc1 = Osm::FlexiRecord::Column.new(:flexi_record => Osm::FlexiRecord.new(:section_id => 1), :id => 'f_1')
+      frc2 = Osm::FlexiRecord::Column.new(:flexi_record => Osm::FlexiRecord.new(:section_id => 2), :id => 'a')
+      frc3 = Osm::FlexiRecord::Column.new(:flexi_record => Osm::FlexiRecord.new(:section_id => 2), :id => 'b')
+      frc4 = Osm::FlexiRecord::Column.new(:flexi_record => Osm::FlexiRecord.new(:section_id => 2), :id => 'f_1')
+      frc5 = Osm::FlexiRecord::Column.new(:flexi_record => Osm::FlexiRecord.new(:section_id => 2), :id => 'f_2')
+
+      columns = [frc3, frc2, frc1, frc5, frc4]
+      columns.sort.should == [frc1, frc2, frc3, frc4, frc5]
+    end
 
-    field.id.should == 'f_1'
-    field.name.should == 'Field Name'
-    field.editable.should be_true
-    field.valid?.should be_true
   end
 
-  it "Create FlexiRecord::Data" do
-    rd = Osm::FlexiRecord::Data.new(
-      :member_id => 1,
-      :grouping_id => 2,
-      :fields => {
+
+  describe "FlexiRecord::Data" do
+
+    it "Create" do
+      rd = Osm::FlexiRecord::Data.new(
+        :member_id => 1,
+        :grouping_id => 2,
+        :fields => {
+          'firstname' => 'First',
+          'lastname' => 'Last',
+          'dob' => Date.new(1899, 11, 30),
+          'total' => 3,
+          'completed' => nil,
+          'age' => nil,
+          'f_1' => 'a',
+          'f_2' => 'b',
+        },
+        :flexi_record => Osm::FlexiRecord.new()
+      )
+
+      rd.member_id.should == 1
+      rd.grouping_id.should == 2
+      rd.fields.should == {
         'firstname' => 'First',
         'lastname' => 'Last',
         'dob' => Date.new(1899, 11, 30),
@@ -44,29 +77,27 @@ describe "Flexi Record" do
         'age' => nil,
         'f_1' => 'a',
         'f_2' => 'b',
-      },
-      :flexi_record => Osm::FlexiRecord.new()
-    )
+      }
+      rd.valid?.should be_true
+    end
+
+    it "Sorts by flexirecord, grouping_id then member_id" do
+      frd1 = Osm::FlexiRecord::Data.new(:flexi_record => Osm::FlexiRecord.new(:section_id => 1), :grouping_id => 1, :member_id => 1)
+      frd2 = Osm::FlexiRecord::Data.new(:flexi_record => Osm::FlexiRecord.new(:section_id => 2), :grouping_id => 1, :member_id => 1)
+      frd3 = Osm::FlexiRecord::Data.new(:flexi_record => Osm::FlexiRecord.new(:section_id => 2), :grouping_id => 2, :member_id => 1)
+      frd4 = Osm::FlexiRecord::Data.new(:flexi_record => Osm::FlexiRecord.new(:section_id => 2), :grouping_id => 2, :member_id => 2)
+
+      datas = [frd3, frd2, frd1, frd4]
+      datas.sort.should == [frd1, frd2, frd3, frd4]
+    end
 
-    rd.member_id.should == 1
-    rd.grouping_id.should == 2
-    rd.fields.should == {
-      'firstname' => 'First',
-      'lastname' => 'Last',
-      'dob' => Date.new(1899, 11, 30),
-      'total' => 3,
-      'completed' => nil,
-      'age' => nil,
-      'f_1' => 'a',
-      'f_2' => 'b',
-    }
-    rd.valid?.should be_true
   end
 
-  it "Sorts by name" do
-    fr1 = Osm::FlexiRecord.new(:id => 3, :name => 'A')
-    fr2 = Osm::FlexiRecord.new(:id => 2, :name => 'B')
-    fr3 = Osm::FlexiRecord.new(:id => 1, :name => 'C')
+
+  it "Sorts by section ID then name" do
+    fr1 = Osm::FlexiRecord.new(:section_id => 1, :name => 'A')
+    fr2 = Osm::FlexiRecord.new(:section_id => 2, :name => 'B')
+    fr3 = Osm::FlexiRecord.new(:section_id => 2, :name => 'C')
     records = [fr2, fr1, fr3]
 
     records.sort.should == [fr1, fr2, fr3]

data/spec/osm/grouping_spec.rb

@@ -3,6 +3,15 @@ require 'spec_helper'
 
 describe "Grouping" do
 
+  it "Sorts by section_id then name" do
+    g1 = Osm::Grouping.new(:section_id => 1, :name => 'a')
+    g2 = Osm::Grouping.new(:section_id => 2, :name => 'a')
+    g3 = Osm::Grouping.new(:section_id => 2, :name => 'b')
+
+    data = [g3, g1, g2]
+    data.sort.should == [g1, g2, g3]
+  end
+
   describe "Using the API" do
 
     it "Get for section" do
@@ -76,6 +85,7 @@ describe "Grouping" do
 
       grouping.update(@api).should be_true
     end
+
     it "Update in OSM (failed)" do
       grouping = Osm::Grouping.new(
         :id => 1,

data/spec/osm/meeting_spec.rb

@@ -47,17 +47,30 @@ describe "Meeting" do
   end
 
 
-  it "Create Meeting::Activity" do
-    ea = Osm::Meeting::Activity.new(
-      :activity_id => 2,
-      :title => 'Activity Name',
-      :notes => 'Notes',
-    )
+  describe "Meeting::Activity" do
+
+    it "Create Meeting::Activity" do
+      ea = Osm::Meeting::Activity.new(
+        :activity_id => 2,
+        :title => 'Activity Name',
+        :notes => 'Notes',
+      )
+
+      ea.activity_id.should == 2
+      ea.title.should == 'Activity Name'
+      ea.notes.should == 'Notes'
+      ea.valid?.should be_true
+    end
+
+    it "Sorts by title then activity_id" do
+      a1 = Osm::Meeting::Activity.new(:title => 'a', :activity_id => 1)
+      a2 = Osm::Meeting::Activity.new(:title => 'b', :activity_id => 1)
+      a3 = Osm::Meeting::Activity.new(:title => 'b', :activity_id => 2)
+
+      data = [a2, a3, a1]
+      data.sort.should == [a1, a2, a3]
+    end
 
-    ea.activity_id.should == 2
-    ea.title.should == 'Activity Name'
-    ea.notes.should == 'Notes'
-    ea.valid?.should be_true
   end
 
 

data/spec/osm/member_spec.rb

@@ -113,6 +113,20 @@ describe "Member" do
   end
 
 
+  it "Sorts by section_id, grouping_id, grouping_leader (descending), last_name then first_name" do
+    m1 = Osm::Member.new(:section_id => 1, :grouping_id => 1, :grouping_leader => 1, :last_name => 'a', :first_name => 'a')
+    m2 = Osm::Member.new(:section_id => 2, :grouping_id => 1, :grouping_leader => 1, :last_name => 'a', :first_name => 'a')
+    m3 = Osm::Member.new(:section_id => 2, :grouping_id => 2, :grouping_leader => 1, :last_name => 'a', :first_name => 'a')
+    m4 = Osm::Member.new(:section_id => 2, :grouping_id => 2, :grouping_leader => 0, :last_name => 'a', :first_name => 'a')
+    m5 = Osm::Member.new(:section_id => 2, :grouping_id => 2, :grouping_leader => 0, :last_name => 'a', :first_name => 'a')
+    m6 = Osm::Member.new(:section_id => 2, :grouping_id => 2, :grouping_leader => 0, :last_name => 'b', :first_name => 'a')
+    m7 = Osm::Member.new(:section_id => 2, :grouping_id => 2, :grouping_leader => 0, :last_name => 'b', :first_name => 'b')
+
+    data = [m4, m2, m3, m1, m7, m6, m5]
+    data.sort.should == [m1, m2, m3, m4, m5, m6, m7]
+  end
+
+
   describe "Using the API" do
 
     it "Create from API data" do

data/spec/osm/model_spec.rb

@@ -5,8 +5,8 @@ require 'spec_helper'
 describe "Model" do
 
   class ModelTester < Osm::Model
-    attribute :test_attribute
-    attr_accessible :test_attribute
+    attribute :id
+    attr_accessible :id
 
     def self.test_get_config
       {
@@ -120,15 +120,63 @@ describe "Model" do
 
 
   describe "Track attribute changes" do
-    test = ModelTester.new(:test_attribute => 1)
-    test.test_attribute.should == 1
+    test = ModelTester.new(:id => 1)
+    test.id.should == 1
     test.changed_attributes.should == []
 
-    test.test_attribute = 2
-    test.changed_attributes.should == ['test_attribute']
+    test.id = 2
+    test.changed_attributes.should == ['id']
 
     test.reset_changed_attributes
     test.changed_attributes.should == []
   end
 
+
+  describe "Comparisons" do
+
+    before :each do
+      @mt1 = ModelTester.new(:id => 1)
+      @mt2 = ModelTester.new(:id => 2)
+      @mt3 = ModelTester.new(:id => 3)
+      @mt2a = ModelTester.new(:id => 2)
+    end
+
+    it "<=>" do
+      (@mt1 <=> @mt2).should == -1
+      (@mt2 <=> @mt1).should == 1
+      (@mt2 <=> @mt2a).should == 0
+    end
+
+    it ">" do
+      (@mt1 > @mt2).should be_false
+      (@mt2 > @mt1).should be_true
+      (@mt2 > @mt2a).should be_false
+    end
+
+    it ">=" do
+      (@mt1 >= @mt2).should be_false
+      (@mt2 >= @mt1).should be_true
+      (@mt2 >= @mt2a).should be_true
+    end
+
+    it "<" do
+      (@mt1 < @mt2).should be_true
+      (@mt2 < @mt1).should be_false
+      (@mt2 < @mt2a).should be_false
+    end
+
+    it "<=" do
+      (@mt1 <= @mt2).should be_true
+      (@mt2 <= @mt1).should be_false
+      (@mt2 <= @mt2a).should be_true
+    end
+
+    it "between" do
+      @mt2.between?(@mt1, @mt3).should be_true
+      @mt1.between?(@mt1, @mt3).should be_false
+      @mt3.between?(@mt1, @mt3).should be_false
+    end
+
+  end
+
 end

data/spec/osm/register_spec.rb

@@ -18,7 +18,16 @@ describe "Register" do
     field.valid?.should be_true
   end
 
-  it "Create Data" do
+  it "Sorts Field by id" do
+    a1 = Osm::Register::Field.new(:id => 'a')
+    a2 = Osm::Register::Field.new(:id => 'a')
+
+    data = [a2, a1]
+    data.sort.should == [a1, a2]
+  end
+
+
+  it "Create Attendance" do
     rd = Osm::Register::Attendance.new(
       :member_id => '1',
       :first_name => 'A',
@@ -45,6 +54,17 @@ describe "Register" do
     rd.valid?.should be_true
   end
 
+  it "Sorts Attendance by section_id, grouping_id, last_name then first_name" do
+    d1 = Osm::Register::Attendance.new(:section_id => 1, :grouping_id => 1, :last_name => 'a', :first_name => 'a')
+    d2 = Osm::Register::Attendance.new(:section_id => 2, :grouping_id => 1, :last_name => 'a', :first_name => 'a')
+    d3 = Osm::Register::Attendance.new(:section_id => 2, :grouping_id => 2, :last_name => 'a', :first_name => 'a')
+    d4 = Osm::Register::Attendance.new(:section_id => 2, :grouping_id => 2, :last_name => 'b', :first_name => 'a')
+    d5 = Osm::Register::Attendance.new(:section_id => 2, :grouping_id => 2, :last_name => 'b', :first_name => 'b')
+
+    data = [d4, d3, d5, d2, d1]
+    data.sort.should == [d1, d2, d3, d4, d5]
+  end
+
 
   describe "Using the API" do
 

data/spec/osm/section_spec.rb

@@ -228,12 +228,14 @@ describe "Section" do
   end
 
 
-  it "Sorts by Group Name then section type (age order)" do
-    section1 = Osm::Section.new(@attributes.merge(:group_id => 1, :group_name => '1st Somewhere', :type => :beavers))
-    section2 = Osm::Section.new(@attributes.merge(:group_id => 2, :group_name => '2nd Somewhere', :type => :beavers))
-    section3 = Osm::Section.new(@attributes.merge(:group_id => 2, :group_name => '2nd Somewhere', :type => :cubs))
-
-    [section2, section3, section1].sort.should == [section1, section2, section3]
+  it "Sorts by Group Name, section type (age order) then name" do
+    section1 = Osm::Section.new(@attributes.merge(:group_id => 1, :group_name => '1st Somewhere', :type => :beavers, :name => 'a'))
+    section2 = Osm::Section.new(@attributes.merge(:group_id => 2, :group_name => '2nd Somewhere', :type => :beavers, :name => 'a'))
+    section3 = Osm::Section.new(@attributes.merge(:group_id => 2, :group_name => '2nd Somewhere', :type => :cubs, :name => 'a'))
+    section4 = Osm::Section.new(@attributes.merge(:group_id => 2, :group_name => '2nd Somewhere', :type => :cubs, :name => 'b'))
+
+    data = [section2, section4, section3, section1]
+    data.sort.should == [section1, section2, section3, section4]
   end
 
 

data/spec/osm/term_spec.rb

@@ -37,7 +37,7 @@ describe "Term" do
     term.should_not == Osm::Term.new(@attributes.merge(:id => 3))
   end
 
-  it "Sorts by Section ID, Start date and th Term ID" do
+  it "Sorts by Section ID, Start date and then Term ID" do
     term1 = Osm::Term.new(@attributes.merge(:section_id => 1, :term => 11, :start => (Date.today - 60), :finish => (Date.today - 1)))
     term2 = Osm::Term.new(@attributes.merge(:section_id => 1, :term => 12, :start => (Date.today -  0), :finish => (Date.today + 0)))
     term3 = Osm::Term.new(@attributes.merge(:section_id => 1, :term => 13, :start => (Date.today +  1), :finish => (Date.today + 60)))

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000Z
+date: 2013-02-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &88142390 !ruby/object:Gem::Requirement
+  requirement: &86025430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *88142390
+  version_requirements: *86025430
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &88141970 !ruby/object:Gem::Requirement
+  requirement: &86024870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *88141970
+  version_requirements: *86024870
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &88141440 !ruby/object:Gem::Requirement
+  requirement: &86006950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *88141440
+  version_requirements: *86006950
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &88141060 !ruby/object:Gem::Requirement
+  requirement: &86006710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *88141060
+  version_requirements: *86006710
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &88140610 !ruby/object:Gem::Requirement
+  requirement: &86006480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '10.0'
   type: :development
   prerelease: false
-  version_requirements: *88140610
+  version_requirements: *86006480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &88122850 !ruby/object:Gem::Requirement
+  requirement: &86006220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *88122850
+  version_requirements: *86006220
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &88122440 !ruby/object:Gem::Requirement
+  requirement: &86005980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *88122440
+  version_requirements: *86005980
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &88122180 !ruby/object:Gem::Requirement
+  requirement: &86005750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *88122180
+  version_requirements: *86005750
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &88121560 !ruby/object:Gem::Requirement
+  requirement: &86005510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.8.8
   type: :development
   prerelease: false
-  version_requirements: *88121560
+  version_requirements: *86005510
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email: