osm 1.2.22 → 1.2.23

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5a1c77bba99130c55b0574c0a890c685e99611c2
+  data.tar.gz: 5b81b4165fbd1244ae170f310e5968aa5ffa76ad
+SHA512:
+  metadata.gz: 996af429a7bc3cebae38f122bffc7b3201e16f61d55a54c4320f83ac1501023bb94ff87d23da474bdf92883828741fdf91b832dc82c01c89aed995eb9bf69631
+  data.tar.gz: 087c903f06680b4216c16809dad00b3303b689814c6dc631a25d796154eaf48e39ea9c2a98f3e9cba364e3e1e81cad08e2517a6a94710b62488386c9975b0034

data/.travis.yml

@@ -14,4 +14,5 @@ branches:
     - staging
     - /gh(?:\d)+(?:-.+)?/
     - /dev_ver_\d+\.\d+/
+before_install: gem update bundler
 script: rake ci:travis

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Version 1.2.23
+
+  * Geting list of user roles for getting sections and permissions now done using the get_user_roles method of api instances
+  * When user has no roles in OSM:
+    * get_user_roles will return an empty Array
+    * get_user_roles! (new method) will raise an Osm::NoActiveRoles exception
+  * Fix 'undefined local method or variable fetch_from_osm' when retrieving badges
+
 ## Version 1.2.22
 
  * Fix marking badge as due when not passing a level

data/lib/osm.rb

@@ -12,6 +12,7 @@ module Osm
   class Error < Exception; end
   class ConnectionError < Error; end
   class Forbidden < Osm::Error; end
+  class NoActiveRoles < Osm::Error; end
   class ArgumentIsInvalid < ArgumentError; end
   class ObjectIsInvalid < Error; end
   class Osm::Error::NoCurrentTerm < Osm::Error

data/lib/osm/activity.rb

@@ -5,6 +5,8 @@ module Osm
     class File; end # Ensure the constant exists for the validators
     class Version; end # Ensure the constant exists for the validators
 
+    SORT_BY = [:id, :version]
+
     # @!attribute [rw] id
     #   @return [Fixnum] the id for the activity
     # @!attribute [rw] version
@@ -274,13 +276,6 @@ 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

data/lib/osm/api.rb

@@ -169,6 +169,44 @@ module Osm
       }))
     end
 
+    # Get API user's roles in OSM
+    # @!macro options_get
+    # @return [Array<Hash>] data returned by OSM
+    def get_user_roles(*args)
+      begin
+        get_user_roles!(*args)
+      rescue Osm::NoActiveRoles
+        return []
+      end
+    end
+
+
+    # Get API user's roles in OSM
+    # @!macro options_get
+    # @return [Array<Hash>] data returned by OSM
+    # @raises Osm::NoActiveRoles
+    def get_user_roles!(options={})
+      cache_key = ['user_roles', @user_id]
+
+      if !options[:no_cache] && Osm::Model.cache_exist?(self, cache_key)
+        return Osm::Model.cache_read(self, cache_key)
+      end
+
+      begin
+        data = perform_query('api.php?action=getUserRoles')
+        Osm::Model.cache_write(self, cache_key, data)
+        return data
+
+      rescue Osm::Error => e
+        if e.message.eql?('false')
+          fail Osm::NoActiveRoles, "You do not have any active roles in OSM."
+        else
+          raise e
+        end
+      end
+
+    end
+
     # Get API user's permissions
     # @!macro options_get
     # @return nil if an error occured or the user does not have access to that section
@@ -180,10 +218,8 @@ module Osm
         return Osm::Model.cache_read(self, cache_key)
       end
 
-      data = perform_query('api.php?action=getUserRoles')
-
       all_permissions = Hash.new
-      data.each do |item|
+      get_user_roles(options).each do |item|
         unless item['section'].eql?('discount')  # It's not an actual section
           all_permissions.merge!(Osm::to_i_or_nil(item['sectionid']) => Osm.make_permissions_hash(item['permissions']))
         end
@@ -242,25 +278,22 @@ module Osm
       return nil if result.response.body.empty?
       case result.response.content_type
         when 'application/json', 'text/html'
-          raise Osm::Error, result.response.body unless looks_like_json?(result.response.body)
-          decoded = ActiveSupport::JSON.decode(result.response.body)
-          osm_error = get_osm_error(decoded)
-          raise Osm::Error, osm_error if osm_error
-          return decoded
+          begin
+            decoded = ActiveSupport::JSON.decode(result.response.body)
+            if osm_error = get_osm_error(decoded)
+              fail Osm::Error, osm_error if osm_error
+            end
+            return decoded
+          rescue ActiveModel::VERSION::MAJOR.eql?(4) ? JSON::ParserError : MultiJson::ParseError
+            fail Osm::Error, result.response.body
+          end
         when 'image/jpeg'
           return result.response.body
         else
-          raise Osm::Error, "Unhandled content-type: #{result.response.content_type}"
+          fail Osm::Error, "Unhandled content-type: #{result.response.content_type}"
       end
     end
 
-    # Check if text looks like it's JSON
-    # @param [String] text What to look at
-    # @return [Boolean]
-    def self.looks_like_json?(text)
-      (['[', '{'].include?(text[0]))
-    end
-
     # Get the error returned by OSM
     # @param data what OSM gave us
     # @return false if no error message was found

data/lib/osm/badge.rb

@@ -324,14 +324,14 @@ module Osm
       @module_completion_data = get_module_completion_data(api, options) if fetched_this_time
 
       if @module_completion_data[badge.id].nil? && !fetched_this_time
-        @module_completion_data = fetch_from_osm
+        @module_completion_data = get_module_completion_data(api, options)
         fetched_this_time = true
       end
       data = @module_completion_data[badge.id]
       raise ArgumentError, "That badge does't exist (bad ID)." if data.nil?
 
       if data[badge.version].nil? && !fetched_this_time
-        @module_completion_data = fetch_from_osm
+        @module_completion_data = get_module_completion_data(api, options)
         data = @module_completion_data[badge.id]
         fetched_this_time = true
       end
@@ -511,6 +511,8 @@ module Osm
 
 
     class Data < Osm::Model
+      SORT_BY = [:badge, :section_id, :member_id]
+
       # @!attribute [rw] member_id
       #   @return [Fixnum] ID of the member this data relates to
       # @!attribute [rw] first_name
@@ -843,14 +845,6 @@ module Osm
         return requirements_updated && due_updated && awarded_updated
       end
 
-      # Compare Badge::Data based on badge, section_id then member_id
-      def <=>(another)
-        result = self.badge <=> another.try(:badge)
-        result = self.section_id <=> another.try(:section_id) if result == 0
-        result = self.member_id <=> another.try(:member_id) if result == 0
-        return result
-      end
-
       def inspect
         Osm.inspect_instance(self, {:replace_with => {'badge' => :name}})
       end

data/lib/osm/budget.rb

@@ -1,6 +1,8 @@
 module Osm
 
   class Budget < Osm::Model
+    SORT_BY = [:section_id, :name]
+
     # @!attribute [rw] id
     #   @return [Fixnum] The OSM ID for the budget
     # @!attribute [rw] section_id
@@ -125,14 +127,6 @@ module Osm
       return false
     end
 
-
-    # Compare Budget 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 Budget
 
 end

data/lib/osm/event.rb

@@ -6,6 +6,7 @@ module Osm
 
     LIST_ATTRIBUTES = [:id, :section_id, :name, :start, :finish, :cost, :location, :notes, :archived, :public_notepad, :confirm_by_date, :allow_changes, :reminders, :attendance_limit, :attendance_limit_includes_leaders, :attendance_reminder, :allow_booking]
     EXTRA_ATTRIBUTES = [:notepad, :columns, :badges]
+    SORT_BY = [:start, :name, :id]
 
     # @!attribute [rw] id
     #   @return [Fixnum] the id for the event
@@ -501,15 +502,6 @@ module Osm
       cost.eql?('0.00')
     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)
@@ -581,6 +573,8 @@ module Osm
       include ActiveModel::MassAssignmentSecurity if ActiveModel::VERSION::MAJOR < 4
       include ActiveAttr::Model
 
+      SORT_BY = [:badge_section, :badge_type, :badge_name, :requirement_label]
+
       # @!attribute [rw] badge_type
       #   @return [Symbol] the type of badge
       # @!attribute [rw] badge_section
@@ -622,19 +616,12 @@ 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 BadgeLink based on section, type, badge_name, requirement_label, data
-      def <=>(another)
-        [:badge_section, :badge_type, :badge_name, :requirement_label].each do |attribute|
-          result = self.try(:data) <=> another.try(:data)
-          return result unless result == 0
-        end
-        return self.try(:data) <=> another.try(:data)
-      end
-
     end # Class Event::BadgeLink
 
 
     class Column < Osm::Model
+      SORT_BY = [:event, :id]
+
       # @!attribute [rw] id
       #   @return [String] OSM id for the column
       # @!attribute [rw] name
@@ -717,13 +704,6 @@ 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
-
       def inspect
         Osm.inspect_instance(self, options={:replace_with => {'event' => :id}})
       end
@@ -732,6 +712,8 @@ module Osm
 
 
     class Attendance < Osm::Model
+      SORT_BY = [:event, :row]
+
       # @!attribute [rw] member_id
       #   @return [Fixnum] OSM id for the member
       # @!attribute [rw] grouping__id
@@ -943,13 +925,6 @@ module Osm
         end
       end
 
-      # Compare Attendance 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
-
       def inspect
         Osm.inspect_instance(self, options={:replace_with => {'event' => :id}})
       end

data/lib/osm/flexi_record.rb

@@ -238,6 +238,8 @@ module Osm
 
 
     class Data < Osm::Model
+      SORT_BY = [:flexi_record, :grouping_id, :member_id]
+
       # @!attribute [rw] flexi_record
       #   @return [Boolean] The FlexiRecord this column belongs to
       # @!attribute [rw] member_id

data/lib/osm/giftaid.rb

@@ -134,6 +134,8 @@ module Osm
     end
 
     class Donation < Osm::Model
+      SORT_BY = [:donation_date]
+
       # @!attribute [rw] donation_date
       #   @return [Date] When the payment was made
 
@@ -151,15 +153,12 @@ module Osm
       #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
 
-      # Compare Payment based on donation_date then note
-      def <=>(another)
-        return self.donation_date <=> another.try(:donation_date)
-      end
-
     end # Class GiftAid::Donation
 
 
     class Data < Osm::Model
+      SORT_BY = [:section_id, :grouping_id, :last_name, :first_name]
+
       # @!attribute [rw] member_id
       #   @return [Fixnum] The OSM ID for the member
       # @!attribute [rw] grouping_id
@@ -279,16 +278,6 @@ module Osm
         return updated
       end
 
-
-      # Compare Data 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 GiftAid::Data
 
   end # Class GiftAid

data/lib/osm/grouping.rb

@@ -1,6 +1,7 @@
 module Osm
 
   class Grouping < Osm::Model
+    SORT_BY = [:section_id, :name]
 
     # @!attribute [rw] id
     #   @return [Fixnum] the id for grouping
@@ -106,13 +107,6 @@ 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
 
 end # Module

data/lib/osm/invoice.rb

@@ -1,6 +1,8 @@
 module Osm
 
   class Invoice < Osm::Model
+    SORT_BY = [:section_id, :name, :date]
+
     # @!attribute [rw] id
     #   @return [Fixnum] The OSM ID for the invoice
     # @!attribute [rw] section_id
@@ -239,14 +241,6 @@ module Osm
       return items
     end
 
-    # Compare Invoice based on section_id, name then date
-    def <=>(another)
-      result = self.section_id <=> another.try(:section_id)
-      result = self.name <=> another.try(:name) if result == 0
-      result = self.date <=> another.try(:date) if result == 0
-      return result
-    end
-
 
     private
     def self.new_invoice_from_data(invoice_data)
@@ -266,6 +260,8 @@ module Osm
 
 
     class Item < Osm::Model
+      SORT_BY = [:invoice, :date]
+
       # @!attribute [rw] id
       #   @return [Fixnum] The OSM ID for the invoice item
       # @!attribute [rw] invoice
@@ -415,13 +411,6 @@ module Osm
         return 0.0
       end
 
-      # Compare Invoice Item based on invoice then date
-      def <=>(another)
-        result = self.invoice <=> another.try(:invoice)
-        result = self.date <=> another.try(:date) if result == 0
-        return result
-      end
-
     end # class Invoice::Item
 
   end # class Invoice

data/lib/osm/meeting.rb

@@ -360,6 +360,7 @@ 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)
@@ -374,6 +375,8 @@ module Osm
       include ActiveModel::MassAssignmentSecurity if ActiveModel::VERSION::MAJOR < 4
       include ActiveAttr::Model
 
+      SORT_BY = [:badge_section, :badge_type, :badge_name, :requirement_label]
+
       # @!attribute [rw] badge_type
       #   @return [Symbol] the type of badge
       # @!attribute [rw] badge_section
@@ -415,15 +418,6 @@ 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 BadgeLink based on section, type, badge_name, requirement_label, data
-      def <=>(another)
-        [:badge_section, :badge_type, :badge_name, :requirement_label].each do |attribute|
-          result = self.try(:data) <=> another.try(:data)
-          return result unless result == 0
-        end
-        return self.try(:data) <=> another.try(:data)
-      end
-
     end # Class Meeting::BadgeLink
 
   end # Class Meeting

data/lib/osm/model.rb

@@ -11,6 +11,8 @@ module Osm
     include ActiveModel::MassAssignmentSecurity if ActiveModel::VERSION::MAJOR < 4
     include ActiveAttr::Model
 
+    SORT_BY = [:id]
+
     @@cache = nil               # Class to use for caching
     @@cache_prepend = 'OSMAPI'  # Prepended to the key
     @@cache_ttl = 600           # 10 minutes
@@ -43,12 +45,13 @@ module Osm
       id.to_i
     end
 
-    # Default compare based on id
+    # Compare functions
     def <=>(another)
-      return self.id <=> another.try(:id)
+      us_values = self.class::SORT_BY.map{ |i| self.try(i) }
+      them_values = self.class::SORT_BY.map{ |i| another.try(i) }
+      us_values <=> them_values
     end
 
-    # Add other compare functions
     def <(another)
       send('<=>', another) < 0
     end

data/lib/osm/register.rb

@@ -158,16 +158,12 @@ module Osm
       #   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
 
 
     class Attendance < Osm::Model
+      SORT_BY = [:section_id, :grouping_id, :last_name, :first_name]
+
       # @!attribute [rw] member_id
       #   @return [Fixnum] The OSM ID for the member
       # @!attribute [rw] grouping_id
@@ -224,16 +220,6 @@ module Osm
         attendance[date] != :yes
       end
 
-
-      # 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

@@ -153,12 +153,10 @@ module Osm
         return get_from_ids(api, ids, 'section', options, :get_all)
       end
 
-      data = api.perform_query('api.php?action=getUserRoles')
-
       result = Array.new
       ids = Array.new
       permissions = Hash.new
-      data.each do |role_data|
+      api.get_user_roles(options).each do |role_data|
         next if role_data['section'].eql?('discount')  # It's not an actual section
         next if role_data['sectionConfig'].nil? # No config for the section = user hasn't got access
 

data/lib/osm/term.rb

@@ -1,6 +1,7 @@
 module Osm
 
   class Term < Osm::Model
+    SORT_BY = [:section_id, :start, :id]
 
     # @!attribute [rw] id
     #   @return [Fixnum] the id for the term
@@ -232,14 +233,6 @@ module Osm
       return (start <= date) && (finish >= date)
     end
 
-    # Compare Term based on section_id, start then id
-    def <=>(another_term)
-      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
 
 end # Module

data/spec/osm/api_spec.rb

@@ -72,6 +72,31 @@ describe "API" do
   end
 
 
+  describe "Get user roles" do
+
+    before :each do
+      @api = Osm::Api.new(3, 4)
+    end
+
+    it "Returns what OSM gives on success" do
+      @api.stub(:perform_query).with('api.php?action=getUserRoles'){ ['a', 'b'] }
+      @api.get_user_roles.should == ['a', 'b']
+    end
+
+    it "User has no roles in OSM" do
+      @api.stub(:perform_query).with('api.php?action=getUserRoles'){ raise Osm::Error, 'false' }
+      expect{ @api.get_user_roles! }.to raise_error(Osm::NoActiveRoles)
+      @api.get_user_roles.should == []
+    end
+
+    it "Reraises any other Osm::Error" do
+      @api.stub(:perform_query).with('api.php?action=getUserRoles'){ raise Osm::Error, 'Test' }
+      expect{ @api.get_user_roles }.to raise_error(Osm::Error, 'Test')
+    end
+
+  end
+
+
   describe "User Permissions" do
 
     it "Get from API" do

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.22"
+  VERSION = "1.2.23"
 end

metadata

@@ -1,230 +1,205 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.22
-  prerelease: 
+  version: 1.2.23
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: dirty_hashy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
@@ -235,9 +210,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -295,26 +270,25 @@ files:
 homepage: https://github.com/robertgauld/osm
 licenses:
 - BSD 3 clause
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: osm
-rubygems_version: 1.8.23.2
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use the Online Scout Manager API
 test_files: []