osm 0.0.23 → 0.0.24

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 0.0.24
+
+  * Make Section::FlexiRecord sortable
+
 ## Version 0.0.23
 
   * get\_badge\_stock\_levels now returns a hash whoose values are Fixnum not String

data/README.md

@@ -110,14 +110,12 @@ however it should be noted that when the OSM API adds a feature it can be diffic
   * Register - Update attendance
   * Flexi Records:
     * Update data
-    * Delete
-    * Update
     * Add Column
   * Events:
     * Attendance (everything)
+    * Add column
     * Create
     * Update
-    * Delete
   * Member:
     * Update
     * Add

data/lib/osm/section.rb

@@ -102,6 +102,7 @@ module Osm
       fr.each do |record_data|
         attributes[:flexi_records].push FlexiRecord.from_api(record_data)
       end
+      attributes[:flexi_records].sort
 
       new(attributes)
     end
@@ -137,17 +138,17 @@ module Osm
       end
     end
 
-    def <=>(another_section)
+    def <=>(another)
       begin
-        return self.role <=> another_section.role
+        return self.role <=> another.role
       rescue NoMethodError
-        return false
+        return 1
       end
     end
 
-    def ==(another_section)
+    def ==(another)
       begin
-        return self.id == another_section.id
+        return self.id == another.id
       rescue NoMethodError
         return false
       end
@@ -171,6 +172,7 @@ module Osm
       "#<#{self.class.name}#{separator}#{attribute_descriptions}>"
     end
 
+
     class FlexiRecord
       include ::ActiveAttr::MassAssignmentSecurity
       include ::ActiveAttr::Model
@@ -206,6 +208,15 @@ module Osm
           :name => data['name'],
         })
       end
+
+      def <=>(another)
+        begin
+          return self.name <=> another.name
+        rescue NoMethodError
+          return 1
+        end
+      end
+
     end # Class Section::FlexiRecord
 
   end # Class Section

data/spec/osm/section_spec.rb

@@ -154,4 +154,14 @@ describe "Section" do
     end
   end
 
+
+  it "Sorts Flexi Records by name" do
+    fr1 = Osm::Section::FlexiRecord.new(:id => 1, :name => 'A')
+    fr2 = Osm::Section::FlexiRecord.new(:id => 1, :name => 'B')
+    fr3 = Osm::Section::FlexiRecord.new(:id => 1, :name => 'C')
+    records = [fr2, fr1, fr3]
+
+    records.sort.should == [fr1, fr2, fr3]
+  end
+
 end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000Z
+date: 2012-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &83976150 !ruby/object:Gem::Requirement
+  requirement: &71355080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *83976150
+  version_requirements: *71355080
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &83963430 !ruby/object:Gem::Requirement
+  requirement: &71354100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *83963430
+  version_requirements: *71354100
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &83962070 !ruby/object:Gem::Requirement
+  requirement: &71353110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *83962070
+  version_requirements: *71353110
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &83961120 !ruby/object:Gem::Requirement
+  requirement: &71352230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *83961120
+  version_requirements: *71352230
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &83959290 !ruby/object:Gem::Requirement
+  requirement: &71351620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *83959290
+  version_requirements: *71351620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &83957900 !ruby/object:Gem::Requirement
+  requirement: &71350940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *83957900
+  version_requirements: *71350940
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &83955930 !ruby/object:Gem::Requirement
+  requirement: &71350120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *83955930
+  version_requirements: *71350120
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email: