osm 0.1.16 → 0.1.17

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 0.1.17
+
+  * Add comparison to Evening
+  * Passing a Term to the get\_programme method of Evening is now optional
+
 ## Version 0.1.16
 
   * Member's grouping attribute:

data/README.md

@@ -134,9 +134,10 @@ however it should be noted that when the OSM API adds a feature it can be diffic
       * Retreive [issue 21]
       * Update [issue 22]
     * Retrieve details for each badge (stock, short column names etc.) [issue 20]
+    * Update badge stock [issue 56]
   * SMS:
-    * Retreival of delivery reports
-    * Sending a message
+    * Retrieval of delivery reports [issue 54]
+    * Sending a message [issue 54]
   * Gift aid (Everything)
   * Finances (Everything)
   * MyScout (Everything) (Maybe)

data/lib/osm/evening.rb

@@ -1,3 +1,5 @@
+# TODO with next version bump - rename to Meeting, also rename meeting_date to date
+
 module Osm
 
   class Evening < Osm::Model
@@ -64,7 +66,7 @@ module Osm
     # @!macro options_get
     # @return [Array<Osm::Evening>]
     # TODO Change to get_all in next version bump
-    def self.get_programme(api, section, term, options={})
+    def self.get_programme(api, section, term=nil, options={})
       section_id = section.to_i
       term_id = term.nil? ? Osm::Term.get_current_term_for_section(api, section).id : term.to_i
       cache_key = ['programme', section_id, term_id]
@@ -233,6 +235,28 @@ module Osm
     end
 
 
+    def <=>(another)
+      begin
+        compare = self.section_id <=> another.section_id
+        return compare unless compare == 0
+  
+        compare = self.meeting_date <=> another.meeting_date
+        return compare unless compare == 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
+    end
+
+
     private
     class Activity
       include ::ActiveAttr::MassAssignmentSecurity

data/lib/osm/term.rb

@@ -221,7 +221,7 @@ module Osm
   
         return self.id <=> another_term.id
       rescue NoMethodError
-        return false
+        return 0
       end
     end
 

data/spec/osm/evening_spec.rb

@@ -34,7 +34,19 @@ describe "Evening" do
     e.activities.should == []
     e.valid?.should be_true
   end
-  
+
+  it "Sorts by Section ID, Meeting date, Start time and then Evening ID" do
+    evening1 = Osm::Evening.new(:section_id => 1, :id => 1, :meeting_date => (Date.today - 1), :start_time => '18:00')
+    evening2 = Osm::Evening.new(:section_id => 2, :id => 1, :meeting_date => (Date.today - 1), :start_time => '18:00')
+    evening3 = Osm::Evening.new(:section_id => 2, :id => 1, :meeting_date => (Date.today + 1), :start_time => '18:00')
+    evening4 = Osm::Evening.new(:section_id => 2, :id => 1, :meeting_date => (Date.today + 1), :start_time => '19:00')
+    evening5 = Osm::Evening.new(:section_id => 2, :id => 2, :meeting_date => (Date.today + 1), :start_time => '19:00')
+
+    data = [evening5, evening3, evening2, evening4, evening1]
+    data.sort.should == [evening1, evening2, evening3, evening4, evening5]
+  end
+
+
   it "Create Evening::Activity" do
     ea = Osm::Evening::Activity.new(
       :activity_id => 2,

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000Z
+date: 2013-02-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &88296760 !ruby/object:Gem::Requirement
+  requirement: &80603000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *88296760
+  version_requirements: *80603000
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &88296420 !ruby/object:Gem::Requirement
+  requirement: &80601890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *88296420
+  version_requirements: *80601890
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &88296130 !ruby/object:Gem::Requirement
+  requirement: &80600900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *88296130
+  version_requirements: *80600900
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &88295670 !ruby/object:Gem::Requirement
+  requirement: &80599810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *88295670
+  version_requirements: *80599810
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &88295400 !ruby/object:Gem::Requirement
+  requirement: &80599380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '10.0'
   type: :development
   prerelease: false
-  version_requirements: *88295400
+  version_requirements: *80599380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &88295160 !ruby/object:Gem::Requirement
+  requirement: &80598830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *88295160
+  version_requirements: *80598830
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &88294750 !ruby/object:Gem::Requirement
+  requirement: &80596730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *88294750
+  version_requirements: *80596730
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email: