osm 1.2.17 → 1.2.18.dev

data/lib/osm/section.rb

@@ -15,14 +15,6 @@ module Osm
     #   @return [Date] when the section's subscription to OSM expires
     # @!attribute [rw] type
     #   @return [Symbol] the section type (:beavers, :cubs, :scouts, :exporers, :network, :adults, :waiting, :unknown)
-    # @!attribute [rw] column_names
-    #   @return [Hash] custom names to use for the data columns
-    # @!attribute [rw] fields
-    #   @return [Hash] which columns are shown in OSM
-    # @!attribute [rw] intouch_fields
-    #   @return [Hash] which columns are shown in OSM's in touch reports
-    # @!attribute [rw] mobile_fields
-    #   @return [Hash] which columns are shown in the OSM mobile app
     # @!attribute [rw] flexi_records
     #   @return [Array<FlexiRecord>] list of the extra records the section has
     # @!attribute [rw] gocardless
@@ -83,10 +75,6 @@ module Osm
     attribute :subscription_level, :default => 1
     attribute :subscription_expires, :type => Date
     attribute :type, :default => :unknown
-    attribute :column_names, :default => {}
-    attribute :fields, :default => {}
-    attribute :intouch_fields, :default => {}
-    attribute :mobile_fields, :default => {}
     attribute :flexi_records, :default => []
     attribute :gocardless, :type => Boolean
     attribute :myscout_events_expires, :type => Date
@@ -116,7 +104,7 @@ module Osm
 
     if ActiveModel::VERSION::MAJOR < 4
       attr_accessible :id, :name, :group_id, :group_name, :subscription_level, :subscription_expires,
-                      :type, :column_names, :fields, :intouch_fields, :mobile_fields, :flexi_records,
+                      :type, :flexi_records,
                       :gocardless, :myscout_events_expires, :myscout_badges_expires,
                       :myscout_programme_expires, :myscout_details_expires, :myscout_events,
                       :myscout_badges, :myscout_programme, :myscout_payments, :myscout_details,
@@ -136,16 +124,11 @@ module Osm
     validates_numericality_of :myscout_payment_reminder_frequency, :only_integer=>true, :greater_than_or_equal_to=>-1
     validates_numericality_of :sms_messages_sent, :only_integer=>true, :greater_than_or_equal_to=>0
     validates_numericality_of :sms_messages_remaining, :only_integer=>true, :greater_than_or_equal_to=>0
-
     validates_presence_of :name
     validates_presence_of :group_name
     validates_presence_of :subscription_level
     validates_presence_of :subscription_expires
     validates_presence_of :type
-#    validates_presence_of :column_names, :unless => Proc.new { |a| a.column_names == {} }
-#    validates_presence_of :fields, :unless => Proc.new { |a| a.fields == {} }
-#    validates_presence_of :intouch_fields, :unless => Proc.new { |a| a.intouch_fields == {} }
-#    validates_presence_of :mobile_fields, :unless => Proc.new { |a| a.mobile_fields == {} }
 #    validates_presence_of :flexi_records, :unless => Proc.new { |a| a.flexi_records == [] }
 
     validates_inclusion_of :subscription_level, :in => (1..3), :message => 'is not a valid subscription level'
@@ -161,10 +144,6 @@ module Osm
     validates_inclusion_of :myscout_programme_show, :in => [-2, -1, 0, 5, 10, 15, 20]
     validates_inclusion_of :sms_sent_test, :in => [true, false]
 
-    validates :column_names, :hash => {:key_type => Symbol, :value_type => String}
-    validates :fields, :hash => {:key_type => Symbol, :value_in => [true, false]}
-    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}
 
@@ -223,10 +202,6 @@ module Osm
           :subscription_expires => Osm::parse_date(section_data['subscription_expires']),
           :type => !section_data['sectionType'].nil? ? section_data['sectionType'].to_sym : (!section_data['section'].nil? ? section_data['section'].to_sym : :unknown),
           :num_scouts => section_data['numscouts'],
-          :column_names => section_data['columnNames'].is_a?(Hash) ? Osm::symbolize_hash(section_data['columnNames']) : {},
-          :fields => section_data['fields'].is_a?(Hash) ? Osm::symbolize_hash(section_data['fields']) : {},
-          :intouch_fields => section_data['intouch'].is_a?(Hash) ? Osm::symbolize_hash(section_data['intouch']) : {},
-          :mobile_fields => section_data['mobFields'].is_a?(Hash) ? Osm::symbolize_hash(section_data['mobFields']) : {},
           :flexi_records => flexi_records.sort,
           :group_id => role_data['groupid'],
           :group_name => role_data['groupname'],

data/lib/validity_validator.rb

@@ -0,0 +1,11 @@
+class ValidityValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    record.errors.add(attribute, "must be valid") unless value.try('valid?')
+    error_messages = (value.try(:errors).try(:messages) || {})
+    error_messages.each do |attr, messages|
+      messages.each do |message|
+        record.errors.add(attribute, "#{attr} attribute is invalid: #{message}")
+      end # each message
+    end # each attribute
+  end
+end

data/osm.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'dirty_hashy', '~> 0.2.1'        # Used to track changed data in Badge::Data and FlexiRecord::Data
 
   s.add_development_dependency 'rake', '~> 10.0'
-  s.add_development_dependency 'rspec', '~> 2.0', '>= 2.14.1'
+  s.add_development_dependency 'rspec', '>= 2.14.1', '< 4'
   s.add_development_dependency 'fakeweb', '~> 1.3'
   s.add_development_dependency 'guard-rspec', '~> 4.2', '>= 4.2.5'
   s.add_development_dependency 'rb-inotify', '~> 0.9'

data/spec/array_of_validator_spec.rb

@@ -32,7 +32,7 @@ class NovalidTestModel < Osm::Model
 end
 
 
-describe "array_of validator" do
+describe "Array of validator" do
 
   it "Allows an empty array" do
     i = FixnumTestModel.new(array: [])

data/spec/hash_validator_spec.rb

@@ -0,0 +1,133 @@
+# encoding: utf-8
+require 'spec_helper'
+
+
+class KeyTypeTestModel
+  include ActiveAttr::Model
+  attribute :hash_attr
+  validates :hash_attr, :hash => {:key_type => Fixnum}
+end
+
+class KeyInTestModel
+  include ActiveAttr::Model
+  attribute :hash_attr
+  validates :hash_attr, :hash => {:key_in => [1, 2]}
+end
+
+class ValueTypeTestModel
+  include ActiveAttr::Model
+  attribute :hash_attr
+  validates :hash_attr, :hash => {:value_type => Fixnum}
+end
+
+class ValueInTestModel
+  include ActiveAttr::Model
+  attribute :hash_attr
+  validates :hash_attr, :hash => {:value_in => [1, 2]}
+end
+
+
+describe "Hash validator" do
+
+
+  describe "Key type option" do
+
+    it "Has only correct keys" do
+      model = KeyTypeTestModel.new(hash_attr: {1=>'1', 2=>'2'})
+      model.valid?.should == true
+      model.errors.count.should == 0
+    end
+
+    it "Has an incorrect key" do
+      model = KeyTypeTestModel.new(hash_attr: {1=>'1', 2=>'2', '3'=>'3'})
+      model.valid?.should == false
+      model.errors.count.should == 1
+      model.errors.messages.should == {hash_attr: ['keys must be a Fixnum ("3" is not).']}
+    end
+
+    it "Has several incorrect keys" do
+      model = KeyTypeTestModel.new(hash_attr: {1=>'1', 2=>'2', '3'=>'3', '4'=>'4'})
+      model.valid?.should == false
+      model.errors.count.should == 2
+      model.errors.messages.should == {hash_attr: ['keys must be a Fixnum ("3" is not).', 'keys must be a Fixnum ("4" is not).']}
+    end
+
+  end
+
+
+  describe "Key in option" do
+
+    it "Has only correct keys" do
+      model = KeyInTestModel.new(hash_attr: {1=>'1', 2=>'2'})
+      model.valid?.should == true
+      model.errors.count.should == 0
+    end
+
+    it "Has an incorrect key" do
+      model = KeyInTestModel.new(hash_attr: {1=>'1', 2=>'2', 3=>'3'})
+      model.valid?.should == false
+      model.errors.count.should == 1
+      model.errors.messages.should == {hash_attr: ['keys must be in [1, 2] (3 is not).']}
+    end
+
+    it "Has several incorrect keys" do
+      model = KeyInTestModel.new(hash_attr: {1=>'1', 2=>'2', 3=>'3', 4=>'4'})
+      model.valid?.should == false
+      model.errors.count.should == 2
+      model.errors.messages.should == {hash_attr: ['keys must be in [1, 2] (3 is not).', 'keys must be in [1, 2] (4 is not).']}
+    end
+
+  end
+
+
+  describe "Value type option" do
+
+    it "Has only correct keys" do
+      model = ValueTypeTestModel.new(hash_attr: {'1'=>1, '2'=>2})
+      model.valid?.should == true
+      model.errors.count.should == 0
+    end
+
+    it "Has an incorrect key" do
+      model = ValueTypeTestModel.new(hash_attr: {'1'=>1, '2'=>2, '3'=>'3'})
+      model.valid?.should == false
+      model.errors.count.should == 1
+      model.errors.messages.should == {hash_attr: ['values must be a Fixnum ("3" for key "3" is not).']}
+    end
+
+    it "Has several incorrect keys" do
+      model = ValueTypeTestModel.new(hash_attr: {'1'=>1, '2'=>2, '3'=>'3', '4'=>'4'})
+      model.valid?.should == false
+      model.errors.count.should == 2
+      model.errors.messages.should == {hash_attr: ['values must be a Fixnum ("3" for key "3" is not).', 'values must be a Fixnum ("4" for key "4" is not).']}
+    end
+
+  end
+
+
+  describe "Value in option" do
+
+    it "Has only correct keys" do
+      model = ValueInTestModel.new(hash_attr: {'1'=>1, '2'=>2})
+      model.valid?.should == true
+      model.errors.count.should == 0
+    end
+
+    it "Has an incorrect key" do
+      model = ValueInTestModel.new(hash_attr: {'1'=>1, '2'=>2, '3'=>'3'})
+      model.valid?.should == false
+      model.errors.count.should == 1
+      model.errors.messages.should == {hash_attr: ['values must be in [1, 2] ("3" for key "3" is not).']}
+    end
+
+    it "Has several incorrect keys" do
+      model = ValueInTestModel.new(hash_attr: {'1'=>1, '2'=>2, '3'=>'3', '4'=>'4'})
+      model.valid?.should == false
+      model.errors.count.should == 2
+      model.errors.messages.should == {hash_attr: ['values must be in [1, 2] ("3" for key "3" is not).', 'values must be in [1, 2] ("4" for key "4" is not).']}
+    end
+
+  end
+
+
+end

data/spec/osm/activity_spec.rb

@@ -125,8 +125,8 @@ describe "Activity" do
       activity.location.should == :indoors
       activity.shared.should == 0
       activity.rating.should == 4
-      activity.editable.should be_true
-      activity.deletable.should be_false
+      activity.editable.should == true
+      activity.deletable.should == false
       activity.used.should == 3
       activity.versions[0].version.should == 0
       activity.versions[0].created_by.should == 1
@@ -146,7 +146,7 @@ describe "Activity" do
       activity.badges[0].requirement_id.should == 93384
       activity.badges[0].requirement_label.should == 'B: Fire drill'
       activity.badges[0].data.should == 'Yes'
-      activity.valid?.should be_true
+      activity.valid?.should == true
     end
   
   
@@ -165,13 +165,13 @@ describe "Activity" do
   
       HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":0}'}) }
       activity = Osm::Activity.new(:id => 2)
-      activity.add_to_programme(@api, 1, Date.new(2000, 1, 2), 'Notes').should be_true
+      activity.add_to_programme(@api, 1, Date.new(2000, 1, 2), 'Notes').should == true
     end
   
     it "Add activity to programme (failed)" do
       HTTParty.should_receive(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":1}'}) }
       activity = Osm::Activity.new(:id => 2)
-      activity.add_to_programme(@api, 1, Date.new(2000, 1, 2), 'Notes').should be_false
+      activity.add_to_programme(@api, 1, Date.new(2000, 1, 2), 'Notes').should == false
     end
   
   
@@ -223,7 +223,7 @@ describe "Activity" do
         :shared => 0,
         :section_id => 1,
       )
-      activity.update(@api, 1, true).should be_true
+      activity.update(@api, 1, true).should == true
     end
   
     it "Update activity in OSM (failed)" do
@@ -237,7 +237,7 @@ describe "Activity" do
         :location => :indoors,
         :running_time => 0,
       )
-      activity.update(@api, 1, true).should be_false
+      activity.update(@api, 1, true).should == false
     end
   
   end

data/spec/osm/api_access_spec.rb

@@ -15,7 +15,7 @@ describe "API Access" do
     api_access.id.should == 1
     api_access.name.should == 'Name'
     api_access.permissions.should == {:permission => [:read]}
-    api_access.valid?.should be_true
+    api_access.valid?.should == true
   end
 
   it "Sorts by id" do

data/spec/osm/api_spec.rb

@@ -26,11 +26,11 @@ describe "API" do
   end
 
   it "Exposes the debug option seperatly too" do
-    Osm::Api.debug.should be_false
+    Osm::Api.debug.should == false
     Osm::Api.debug = true
-    Osm::Api.debug.should be_true
+    Osm::Api.debug.should == true
     Osm::Api.debug = false
-    Osm::Api.debug.should be_false
+    Osm::Api.debug.should == false
   end
 
 
@@ -60,7 +60,7 @@ describe "API" do
   end
 
   it "sets a new API user" do
-    @api.set_user('1', '2').is_a?(Osm::Api).should be_true
+    @api.set_user('1', '2').is_a?(Osm::Api).should == true
 
     HTTParty.should_receive(:post).with("https://www.onlinescoutmanager.co.uk/test", {:body => {
       'apiid' => @CONFIGURATION[:api][:osm][:id],

data/spec/osm/badge_spec.rb

@@ -35,7 +35,7 @@ describe "Badge" do
       badge.id.should == 12
       badge.version.should == 3
       badge.group_name.should == ''
-      badge.latest.should be_true
+      badge.latest.should == true
       badge.sharing.should == :draft
       badge.user_id.should == 4
       badge.levels.should == [1, 2, 3]
@@ -48,25 +48,25 @@ describe "Badge" do
       badge.level_requirement.should == 8
       badge.requires_modules.should == [['A'], ['B', 'C']]
       badge.show_level_letters.should == true
-      badge.valid?.should be_true
+      badge.valid?.should == true
     end
 
     it "Valid with nil for levels" do
       badge = Osm::Badge.new(@badge_options.merge(levels: nil))
       badge.levels.should be_nil
-      badge.valid?.should be_true
+      badge.valid?.should == true
     end
 
     it "Valid with nil for level_requirement" do
       badge = Osm::Badge.new(@badge_options.merge(level_requirement: nil))
       badge.level_requirement.should be_nil
-      badge.valid?.should be_true
+      badge.valid?.should == true
     end
     
     it "Valid with nil for add_columns_to_module" do
       badge = Osm::Badge.new(@badge_options.merge(add_columns_to_module: nil))
       badge.add_columns_to_module.should be_nil
-      badge.valid?.should be_true
+      badge.valid?.should == true
     end
 
   end
@@ -86,9 +86,9 @@ describe "Badge" do
     requirement.description.should == 'description'
     requirement.mod.should == m
     requirement.id.should == 1
-    requirement.editable.should be_true
+    requirement.editable.should == true
     requirement.badge.identifier.should == 'key'
-    requirement.valid?.should be_true
+    requirement.valid?.should == true
   end
 
   it "Create RequirementModule" do
@@ -112,12 +112,12 @@ describe "Badge" do
     m.completed_into_column.should == 3
     m.numeric_into_column.should == 4
     m.add_column_id_to_numeric.should == 5
-    m.valid?.should be_true
+    m.valid?.should == true
   end
 
   it "Works out if we add columns to this badge" do
-    Osm::Badge.new(add_columns_to_module: 123).add_columns?.should be_true
-    Osm::Badge.new(add_columns_to_module: nil).add_columns?.should be_false
+    Osm::Badge.new(add_columns_to_module: 123).add_columns?.should == true
+    Osm::Badge.new(add_columns_to_module: nil).add_columns?.should == false
   end
 
   it "Produces a map of module letter <-> module id" do
@@ -174,7 +174,7 @@ describe "Badge" do
     data.requirements.should == {}
     data.section_id.should == 2
     data.badge.identifier.should == 'key'
-    data.valid?.should be_true
+    data.valid?.should == true
   end
 
 
@@ -215,14 +215,14 @@ describe "Badge" do
 
 
   it "Works out if a requirement has been met" do
-    data = Osm::Badge::Data.new(requirements: {1 => ''}).requirement_met?(1).should be_false
-    data = Osm::Badge::Data.new(requirements: {1 => 'xStuff'}).requirement_met?(1).should be_false
-    data = Osm::Badge::Data.new(requirements: {1 => '0'}).requirement_met?(1).should be_false
-    data = Osm::Badge::Data.new(requirements: {1 => 0}).requirement_met?(1).should be_false
-    data = Osm::Badge::Data.new(requirements: {}).requirement_met?(1).should be_false
-    data = Osm::Badge::Data.new(requirements: {1 => 'Stuff'}).requirement_met?(1).should be_true
-    data = Osm::Badge::Data.new(requirements: {1 => '1'}).requirement_met?(1).should be_true
-    data = Osm::Badge::Data.new(requirements: {1 => 1}).requirement_met?(1).should be_true
+    data = Osm::Badge::Data.new(requirements: {1 => ''}).requirement_met?(1).should == false
+    data = Osm::Badge::Data.new(requirements: {1 => 'xStuff'}).requirement_met?(1).should == false
+    data = Osm::Badge::Data.new(requirements: {1 => '0'}).requirement_met?(1).should == false
+    data = Osm::Badge::Data.new(requirements: {1 => 0}).requirement_met?(1).should == false
+    data = Osm::Badge::Data.new(requirements: {}).requirement_met?(1).should == false
+    data = Osm::Badge::Data.new(requirements: {1 => 'Stuff'}).requirement_met?(1).should == true
+    data = Osm::Badge::Data.new(requirements: {1 => '1'}).requirement_met?(1).should == true
+    data = Osm::Badge::Data.new(requirements: {1 => 1}).requirement_met?(1).should == true
   end
 
 
@@ -308,13 +308,13 @@ describe "Badge" do
       data = Osm::Badge::Data.new(:awarded => 2, :badge => badge)
 
       data.stub(:earnt) { 1 }
-      data.earnt?.should be_false
+      data.earnt?.should == false
 
       data.stub(:earnt) { 2 }
-      data.earnt?.should be_false
+      data.earnt?.should == false
 
       data.stub(:earnt) { 3 }
-      data.earnt?.should be_true
+      data.earnt?.should == true
     end
 
     it "Non staged" do
@@ -339,10 +339,10 @@ describe "Badge" do
       )
 
       data = Osm::Badge::Data.new(:due => 1, :awarded => 1, :badge => badge)
-      data.earnt?.should be_false
+      data.earnt?.should == false
 
       data = Osm::Badge::Data.new(:due => 1, :awarded => 0, :badge => badge)
-      data.earnt?.should be_true
+      data.earnt?.should == true
 
 
       # Number of modules required
@@ -350,10 +350,10 @@ describe "Badge" do
       this_badge.min_modules_required = 2
 
       data = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'y', 20=>'y'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_true
+      data.earnt?.should == true
 
       data = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'y', 20=>'x'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_false
+      data.earnt?.should == false
 
 
       # Number of requirements needed
@@ -362,13 +362,13 @@ describe "Badge" do
       this_badge.min_requirements_required = 2
 
       data = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'y', 20=>'y'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_true
+      data.earnt?.should == true
 
       data = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'x', 20=>'y'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_true
+      data.earnt?.should == true
 
       data = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'x', 20=>'x'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_false
+      data.earnt?.should == false
 
 
       # Module combinations
@@ -376,16 +376,16 @@ describe "Badge" do
       this_badge.requires_modules = [['a'], ['b', 'c']]
 
       data = Osm::Badge::Data.new(:requirements => {10=>'x', 11=>'x', 20=>'x', 30=>'x'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_false
+      data.earnt?.should == false
 
       data = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'y', 20=>'x', 30=>'x'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_false
+      data.earnt?.should == false
 
       data = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'y', 20=>'y', 30=>'x'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_true
+      data.earnt?.should == true
 
       data = Osm::Badge::Data.new(:requirements => {10=>'y', 11=>'y', 20=>'x', 30=>'y'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_true
+      data.earnt?.should == true
 
       # Requirements from another badge
       this_badge = badge.clone
@@ -395,23 +395,23 @@ describe "Badge" do
       # Simply met
       this_badge.other_requirements_required = [{id: 100, min: 0}]
       data = Osm::Badge::Data.new(:requirements => {10=>'y'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_true # Assume met if not in requirements Hash
+      data.earnt?.should == true # Assume met if not in requirements Hash
       data = Osm::Badge::Data.new(:requirements => {10=>'y', 100=>'x'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_false
+      data.earnt?.should == false
       data = Osm::Badge::Data.new(:requirements => {10=>'y', 100=>'y'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_true
+      data.earnt?.should == true
       # Minimum value
       this_badge.other_requirements_required = [{id: 100, min: 2}]
       data = Osm::Badge::Data.new(:requirements => {10=>'y'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_true # Assume met if not in requirements Hash
+      data.earnt?.should == true # Assume met if not in requirements Hash
       data = Osm::Badge::Data.new(:requirements => {10=>'y', 100=>'x'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_false
+      data.earnt?.should == false
       data = Osm::Badge::Data.new(:requirements => {10=>'y', 100=>'1'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_false
+      data.earnt?.should == false
       data = Osm::Badge::Data.new(:requirements => {10=>'y', 100=>'2'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_true
+      data.earnt?.should == true
       data = Osm::Badge::Data.new(:requirements => {10=>'y', 100=>'3'}, :due => 0, :awarded => 0, :badge => this_badge)
-      data.earnt?.should be_true
+      data.earnt?.should == true
     end
   end
 
@@ -485,10 +485,10 @@ describe "Badge" do
   end
 
   it "Works out if the badge has been started" do
-    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {1 => 'Yes', 2 => ''}).started?.should be_true
-    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {1 => 'Yes', 2 => ''}, :due => 1).started?.should be_false
-    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {1 => 'xNo', 2 => ''}).started?.should be_false
-    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {1 => '', 2 => ''}).started?.should be_false
+    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {1 => 'Yes', 2 => ''}).started?.should == true
+    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {1 => 'Yes', 2 => ''}, :due => 1).started?.should == false
+    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {1 => 'xNo', 2 => ''}).started?.should == false
+    Osm::Badge::Data.new(:badge => Osm::CoreBadge.new, :requirements => {1 => '', 2 => ''}).started?.should == false
 
     # Staged Activity Badge
     Osm::Badge::Data.new(
@@ -503,7 +503,7 @@ describe "Badge" do
       ),
       :requirements => {1000 => 'Yes', 2000 => 'Yes', 2001 => ''},
       :due => 1,
-    ).started?.should be_true
+    ).started?.should == true
 
     # Staged Count Badge
     Osm::Badge::Data.new(
@@ -511,13 +511,13 @@ describe "Badge" do
       :requirements => {1000 => 5, 2000 => '5', 3000 => ''},
       :due => 5,
       :awarded => 4,
-    ).started?.should be_false # Finished lvl 5 & not started lvl 10
+    ).started?.should == false # Finished lvl 5 & not started lvl 10
     Osm::Badge::Data.new(
       :badge => Osm::StagedBadge.new(:levels => [0,1,2,3,4,5,10,15,20], :show_level_letters => false, :level_requirement => 1000),
       :requirements => {1000 => 6, 2000 => '6', 3000 => ''},
       :due => 5,
       :awarded => 3,
-    ).started?.should be_true # Finished lvl 5 & started lvl 10
+    ).started?.should == true # Finished lvl 5 & started lvl 10
   end
 
   it "Works out what stage of the badge has been started" do
@@ -660,7 +660,7 @@ describe "Badge" do
           badge.identifier.should == '123_0'
           badge.id.should == 123
           badge.version.should == 0
-          badge.latest.should be_true
+          badge.latest.should == true
           badge.user_id.should == 0
           badge.sharing.should == :default_locked
           badge.requirements.size.should == 1
@@ -672,7 +672,7 @@ describe "Badge" do
           badge.other_requirements_required.should == []
           badge.badges_required.should == []
           badge.show_level_letters.should == true
-          badge.valid?.should be_true
+          badge.valid?.should == true
           badge.modules.size.should == 1
           m = badge.modules[0]
           m.badge.id.should == 123
@@ -684,15 +684,15 @@ describe "Badge" do
           m.completed_into_column.should == nil
           m.numeric_into_column.should == nil
           m.add_column_id_to_numeric.should == nil
-          m.valid?.should be_true
+          m.valid?.should == true
           requirement = badge.requirements[0]
           requirement.name.should == 'r_name'
           requirement.description.should == 'r_description'
           requirement.id.should == 2345
           requirement.mod.should == m
-          requirement.editable.should be_true
+          requirement.editable.should == true
           requirement.badge.should == badge
-          requirement.valid?.should be_true
+          requirement.valid?.should == true
         end
       end
 
@@ -774,7 +774,7 @@ describe "Badge" do
         @data.due = 1
         @data.awarded = 1
         @data.awarded_date = date
-        @data.update(@api).should be_true
+        @data.update(@api).should == true
       end
 
       it "Success (just requirement)" do
@@ -785,7 +785,7 @@ describe "Badge" do
         @data.should_not_receive(:mark_due)
 
         @data.requirements[2345] = '2'
-        @data.update(@api).should be_true
+        @data.update(@api).should == true
       end
 
       it "Success (just due)" do
@@ -796,7 +796,7 @@ describe "Badge" do
         @data.should_receive(:mark_due).with(@api, 1) { true }
 
         @data.due = 1
-        @data.update(@api).should be_true
+        @data.update(@api).should == true
       end
 
       it "Success (just awarded)" do
@@ -808,7 +808,7 @@ describe "Badge" do
 
         @data.awarded = 1
         @data.awarded_date = date
-        @data.update(@api).should be_true
+        @data.update(@api).should == true
       end
 
       it "Failed (requirement)" do
@@ -823,7 +823,7 @@ describe "Badge" do
         @data.due = 1
         @data.awarded = 1
         @data.awarded_date = date
-        @data.update(@api).should be_false
+        @data.update(@api).should == false
       end
 
       it "Failed (due)" do
@@ -837,7 +837,7 @@ describe "Badge" do
         @data.due = 1
         @data.awarded = 1
         @data.awarded_date = date
-        @data.update(@api).should be_false
+        @data.update(@api).should == false
       end
 
       it "Failed (awarded)" do
@@ -851,7 +851,7 @@ describe "Badge" do
         @data.due = 1
         @data.awarded = 1
         @data.awarded_date = date
-        @data.update(@api).should be_false
+        @data.update(@api).should == false
       end
 
     end
@@ -883,7 +883,7 @@ describe "Badge" do
       HTTParty.should_receive(:post).with(awarded_url, {:body => awarded_post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>awarded_body_data.to_json}) }
       Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
 
-      data.mark_awarded(@api, Date.new(2000, 1, 2), 1).should be_true
+      data.mark_awarded(@api, Date.new(2000, 1, 2), 1).should == true
     end
 
     it "Mark badge due" do
@@ -914,7 +914,7 @@ describe "Badge" do
       HTTParty.should_receive(:post).with(awarded_url, {:body => awarded_post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>awarded_body_data.to_json}) }
       Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
 
-      data.mark_due(@api, 1).should be_true
+      data.mark_due(@api, 1).should == true
     end
 
     it "Get summary data for a section" do