osm 1.2.5 → 1.2.6

data/.gitignore

@@ -18,6 +18,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+gemfiles/*.lock
 
 # YARD artifacts
 .yardoc

data/.travis.yml

@@ -2,6 +2,9 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+gemfile:
+  - Gemfile
+  - gemfiles/rails3
 branches:
   only:
     - master

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.2.6
+
+  * Update dependancies to allow using with a rails 4 app (rails 3 is still tested against by travis)
+
 ## Version 1.2.5
 
   * Fix undefined local variable or method 'section_id' in Osm::Model require_permission

data/Rakefile

@@ -1,3 +1,5 @@
+require "rake"
+require "rubygems"
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
@@ -11,4 +13,4 @@ namespace :ci do
   task :travis do
     Rake::Task[:spec].invoke
   end
-end
+end

data/gemfiles/rails3

@@ -0,0 +1,13 @@
+source "https://rubygems.org"
+
+gem 'active_attr', '~> 0.8'
+gem 'activemodel', '~> 3.2'
+gem 'activesupport', '~> 3.2'
+gem 'dirty_hashy', '~> 0.2.1'
+gem 'httparty', '~> 0.9'
+gem 'rake', '~> 10.1'
+gem 'rspec', '~> 2.0', '< 2.14'
+gem 'fakeweb', '~> 1.3.0'
+gem 'osm', :path=>'../'
+
+#gemspec :path=>"../"

data/lib/osm/activity.rb

@@ -67,9 +67,12 @@ module Osm
     attribute :files, :default => []
     attribute :badges, :default => []
 
-    attr_accessible :id, :version, :group_id, :user_id, :title, :description, :resources, :instructions,
-                    :running_time, :location, :shared, :rating, :editable, :deletable, :used, :versions,
-                    :sections, :tags, :files, :badges
+    if ActiveModel::VERSION::MAJOR < 4
+      attr_accessible :id, :version, :group_id, :user_id, :title, :description,
+                      :resources, :instructions, :running_time, :location,
+                      :shared, :rating, :editable, :deletable, :used, :versions,
+                      :sections, :tags, :files, :badges
+    end
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0
     validates_numericality_of :version, :only_integer=>true, :greater_than_or_equal_to=>0, :allow_nil=>true
@@ -263,7 +266,7 @@ module Osm
 
     private
     class File
-      include ActiveModel::MassAssignmentSecurity
+      include ActiveModel::MassAssignmentSecurity if ActiveModel::VERSION::MAJOR < 4
       include ActiveAttr::Model
 
       # @!attribute [rw] id
@@ -280,7 +283,9 @@ module Osm
       attribute :file_name, :type => String
       attribute :name, :type => String
 
-      attr_accessible :id, :activity_id, :file_name, :name
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :id, :activity_id, :file_name, :name
+      end
 
       validates_numericality_of :id, :only_integer=>true, :greater_than=>0
       validates_numericality_of :activity_id, :only_integer=>true, :greater_than=>0
@@ -301,7 +306,7 @@ module Osm
     end # Class Activity::File
 
     class Badge
-      include ActiveModel::MassAssignmentSecurity
+      include ActiveModel::MassAssignmentSecurity if ActiveModel::VERSION::MAJOR < 4
       include ActiveAttr::Model
 
       # @!attribute [rw] activity_id
@@ -324,7 +329,9 @@ module Osm
       attribute :requirement, :type => String
       attribute :label, :type => String
 
-      attr_accessible :activity_id, :section_type, :type, :badge, :requirement, :label
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :activity_id, :section_type, :type, :badge, :requirement, :label
+      end
 
       validates_numericality_of :activity_id, :only_integer=>true, :greater_than=>0
       validates_presence_of :badge
@@ -342,7 +349,7 @@ module Osm
     end # Class Activity::Badge
 
     class Version
-      include ActiveModel::MassAssignmentSecurity
+      include ActiveModel::MassAssignmentSecurity if ActiveModel::VERSION::MAJOR < 4
       include ActiveAttr::Model
 
       # @!attribute [rw] version
@@ -359,7 +366,9 @@ module Osm
       attribute :created_by_name, :type => String
       attribute :label, :type => String
 
-      attr_accessible :version, :created_by, :created_by_name, :label
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :version, :created_by, :created_by_name, :label
+      end
 
       validates_numericality_of :version, :only_integer=>true, :greater_than_or_equal_to=>0
       validates_numericality_of :created_by, :only_integer=>true, :greater_than=>0

data/lib/osm/api_access.rb

@@ -13,7 +13,9 @@ module Osm
     attribute :name, :type => String
     attribute :permissions, :default => {}
 
-    attr_accessible :id, :name, :permissions
+    if ActiveModel::VERSION::MAJOR < 4
+      attr_accessible :id, :name, :permissions
+    end
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0
     validates_presence_of :name

data/lib/osm/badge.rb

@@ -26,7 +26,9 @@ module Osm
     attribute :needed_from_section, :type => Object
     attribute :requirements, :type => Object
 
-    attr_accessible :name, :requirement_notes, :osm_key, :sections_needed, :total_needed, :needed_from_section, :requirements
+    if ActiveModel::VERSION::MAJOR < 4
+      attr_accessible :name, :requirement_notes, :osm_key, :sections_needed, :total_needed, :needed_from_section, :requirements
+    end
 
     validates_numericality_of :sections_needed, :only_integer=>true, :greater_than_or_equal_to=>-1
     validates_numericality_of :total_needed, :only_integer=>true, :greater_than_or_equal_to=>-1
@@ -195,7 +197,7 @@ module Osm
 
 
     class Requirement
-      include ActiveModel::MassAssignmentSecurity
+      include ActiveModel::MassAssignmentSecurity if ActiveModel::VERSION::MAJOR < 4
       include ActiveAttr::Model
 
       # @!attribute [rw] badge
@@ -215,7 +217,9 @@ module Osm
       attribute :field, :type => String
       attribute :editable, :type => Boolean
 
-      attr_accessible :name, :description, :field, :editable, :badge
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :name, :description, :field, :editable, :badge
+      end
 
       validates_presence_of :name
       validates_presence_of :description
@@ -271,7 +275,9 @@ module Osm
       attribute :section_id, :type => Integer
       attribute :badge, :type => Object
 
-      attr_accessible :member_id, :first_name, :last_name, :completed, :awarded, :awarded_date, :requirements, :section_id, :badge
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :member_id, :first_name, :last_name, :completed, :awarded, :awarded_date, :requirements, :section_id, :badge
+      end
 
       validates_presence_of :badge
       validates_presence_of :first_name

data/lib/osm/badges.rb

@@ -106,7 +106,9 @@ module Osm
       attribute :by_member, :default => {}
       attribute :member_names, :default => {}
 
-      attr_accessible :badge_names, :by_member, :member_names
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :badge_names, :by_member, :member_names
+      end
 
       validates :badge_names, :hash => {:key_type => String, :value_type => String}
       validates :member_names, :hash => {:key_type => Fixnum, :value_type => String}

data/lib/osm/budget.rb

@@ -12,7 +12,9 @@ module Osm
     attribute :section_id, :type => Integer
     attribute :name, :type => String
 
-    attr_accessible :id, :section_id, :name
+    if ActiveModel::VERSION::MAJOR < 4
+      attr_accessible :id, :section_id, :name
+    end
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0, :unless => Proc.new { |r| r.id.nil? }
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0

data/lib/osm/event.rb

@@ -62,10 +62,12 @@ module Osm
     attribute :attendance_reminder, :type => Integer, :default => 0
     attribute :allow_booking, :type => Boolean, :default => true
 
-    attr_accessible :id, :section_id, :name, :start, :finish, :cost, :location, :notes, :archived,
-                    :fields, :columns, :notepad, :public_notepad, :confirm_by_date, :allow_changes,
-                    :reminders, :attendance_limit, :attendance_limit_includes_leaders,
-                    :attendance_reminder, :allow_booking
+    if ActiveModel::VERSION::MAJOR < 4
+      attr_accessible :id, :section_id, :name, :start, :finish, :cost, :location, :notes, :archived,
+                      :fields, :columns, :notepad, :public_notepad, :confirm_by_date, :allow_changes,
+                      :reminders, :attendance_limit, :attendance_limit_includes_leaders,
+                      :attendance_reminder, :allow_booking
+    end
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0, :allow_nil => true
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
@@ -432,7 +434,9 @@ module Osm
       attribute :parent_required, :type => Boolean, :default => false
       attribute :event
 
-      attr_accessible :id, :name, :label, :parent_required, :event
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :id, :name, :label, :parent_required, :event
+      end
 
       validates_presence_of :id
       validates_presence_of :name
@@ -545,7 +549,9 @@ module Osm
       attribute :payments, :default => {}
       attribute :payment_control
 
-      attr_accessible :member_id, :grouping_id, :fields, :row, :event, :first_name, :last_name, :date_of_birth, :attending, :payments, :payment_control
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :member_id, :grouping_id, :fields, :row, :event, :first_name, :last_name, :date_of_birth, :attending, :payments, :payment_control
+      end
 
       validates_numericality_of :row, :only_integer=>true, :greater_than_or_equal_to=>0
       validates_numericality_of :member_id, :only_integer=>true, :greater_than=>0

data/lib/osm/flexi_record.rb

@@ -12,7 +12,9 @@ module Osm
     attribute :section_id, :type => Integer
     attribute :name, :type => String
 
-    attr_accessible :id, :section_id, :name
+    if ActiveModel::VERSION::MAJOR < 4
+      attr_accessible :id, :section_id, :name
+    end
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0, :unless => Proc.new { |r| r.id.nil? }
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
@@ -140,7 +142,9 @@ module Osm
       attribute :name, :type => String
       attribute :editable, :type => Boolean, :default => false
 
-      attr_accessible :flexi_record, :id, :name, :editable
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :flexi_record, :id, :name, :editable
+      end
 
       validates_presence_of :flexi_record
       validates_presence_of :id
@@ -248,7 +252,9 @@ module Osm
       attribute :grouping_id, :type => Integer
       attribute :fields, :default => {}
 
-      attr_accessible :flexi_record, :member_id, :grouping_id, :fields
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :flexi_record, :member_id, :grouping_id, :fields
+      end
 
       validates_presence_of :flexi_record
       validates_numericality_of :member_id, :only_integer=>true, :greater_than=>0

data/lib/osm/giftaid.rb

@@ -139,7 +139,9 @@ module Osm
 
       attribute :donation_date, :type => Date
 
-      attr_accessible :note, :donation_date
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :note, :donation_date
+      end
 
       validates_presence_of :donation_date
 
@@ -190,7 +192,9 @@ module Osm
       attribute :total, :type => String
       attribute :donations, :type => Object, :default => DirtyHashy.new
 
-      attr_accessible :member_id, :first_name, :last_name, :section_id, :grouping_id, :total, :tax_payer_name, :tax_payer_address, :tax_payer_postcode, :donations
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :member_id, :first_name, :last_name, :section_id, :grouping_id, :total, :tax_payer_name, :tax_payer_address, :tax_payer_postcode, :donations
+      end
 
       validates_numericality_of :member_id, :only_integer=>true, :greater_than=>0
       validates_numericality_of :grouping_id, :only_integer=>true, :greater_than_or_equal_to=>-2

data/lib/osm/grouping.rb

@@ -19,7 +19,9 @@ module Osm
     attribute :active, :type => Boolean
     attribute :points, :type => Integer
 
-    attr_accessible :id, :section_id, :name, :active, :points
+    if ActiveModel::VERSION::MAJOR < 4
+      attr_accessible :id, :section_id, :name, :active, :points
+    end
 
     validates_numericality_of :id, :only_integer=>true, :greater_than_or_equal_to=>-2
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0

data/lib/osm/invoice.rb

@@ -24,7 +24,9 @@ module Osm
     attribute :archived, :type => Boolean, :default => false
     attribute :finalised, :type => Boolean, :default => false
 
-    attr_accessible :id, :section_id, :name, :extra_details, :date, :archived, :finalised
+    if ActiveModel::VERSION::MAJOR < 4
+      attr_accessible :id, :section_id, :name, :extra_details, :date, :archived, :finalised
+    end
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0, :unless => Proc.new { |r| r.id.nil? }
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
@@ -293,7 +295,9 @@ module Osm
       attribute :description, :type => String
       attribute :budget_name, :type => String, :default => 'Default'
 
-      attr_accessible :id, :invoice, :record_id, :date, :amount, :type, :payto, :description, :budget_name
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :id, :invoice, :record_id, :date, :amount, :type, :payto, :description, :budget_name
+      end
 
       validates_numericality_of :id, :only_integer=>true, :greater_than=>0, :unless => Proc.new { |r| r.id.nil? }
       validates_numericality_of :record_id, :only_integer=>true, :greater_than=>0, :unless => Proc.new { |r| r.record_id.nil? }

data/lib/osm/meeting.rb

@@ -45,7 +45,9 @@ module Osm
     attribute :activities, :default => []
     attribute :badge_links, :default => []
 
-    attr_accessible :id, :section_id, :title, :notes_for_parents, :games, :pre_notes, :post_notes, :leaders, :date, :activities, :start_time, :finish_time, :badge_links
+    if ActiveModel::VERSION::MAJOR < 4
+      attr_accessible :id, :section_id, :title, :notes_for_parents, :games, :pre_notes, :post_notes, :leaders, :date, :activities, :start_time, :finish_time, :badge_links
+    end
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
@@ -313,7 +315,7 @@ module Osm
 
     private
     class Activity
-      include ActiveModel::MassAssignmentSecurity
+      include ActiveModel::MassAssignmentSecurity if ActiveModel::VERSION::MAJOR < 4
       include ActiveAttr::Model
 
       # @!attribute [rw] activity_id
@@ -327,7 +329,9 @@ module Osm
       attribute :title, :type => String
       attribute :notes, :type => String, :default => ''
 
-      attr_accessible :activity_id, :title, :notes
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :activity_id, :title, :notes
+      end
 
       validates_numericality_of :activity_id, :only_integer=>true, :greater_than=>0
       validates_presence_of :title
@@ -347,7 +351,7 @@ module Osm
 
 
     class BadgeLink
-      include ActiveModel::MassAssignmentSecurity
+      include ActiveModel::MassAssignmentSecurity if ActiveModel::VERSION::MAJOR < 4
       include ActiveAttr::Model
 
       # @!attribute [rw] badge_key
@@ -367,7 +371,9 @@ module Osm
       attribute :badge_section, :type => Object
       attribute :label, :type => String
 
-      attr_accessible :badge_key, :badge_type, :requirement_key, :badge_section, :label
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :badge_key, :badge_type, :requirement_key, :badge_section, :label
+      end
 
       validates_presence_of :badge_key
       validates_format_of :requirement_key, :with => /\A[a-z]_\d{2}\Z/, :message => 'is not in the correct format (e.g. "a_01")'

data/lib/osm/member.rb

@@ -124,12 +124,14 @@ module Osm
     attribute :joined_years, :type => Integer
     attribute :has_photo, :type => Boolean, :default => false
 
-    attr_accessible :id, :section_id, :type, :first_name, :last_name, :email1, :email2, :email3, :email4,
-                    :phone1, :phone2, :phone3, :phone4, :address, :address2, :date_of_birth, :started,
-                    :joining_in_years, :parents, :notes, :medical, :religion, :school, :ethnicity, :subs,
-                    :custom1, :custom2, :custom3, :custom4, :custom5, :custom6, :custom7, :custom8, :custom9,
-                    :grouping_id, :grouping_leader, :joined, :age, :joined_years,
-                    :has_photo
+    if ActiveModel::VERSION::MAJOR < 4
+      attr_accessible :id, :section_id, :type, :first_name, :last_name, :email1, :email2, :email3, :email4,
+                      :phone1, :phone2, :phone3, :phone4, :address, :address2, :date_of_birth, :started,
+                      :joining_in_years, :parents, :notes, :medical, :religion, :school, :ethnicity, :subs,
+                      :custom1, :custom2, :custom3, :custom4, :custom5, :custom6, :custom7, :custom8, :custom9,
+                      :grouping_id, :grouping_leader, :joined, :age, :joined_years,
+                      :has_photo
+    end
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0, :unless => Proc.new { |r| r.id.nil? }
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0

data/lib/osm/model.rb

@@ -8,7 +8,7 @@ module Osm
   # This class is expected to be inherited from.
   # It provides the caching and permission handling for model objects.
   class Model
-    include ActiveModel::MassAssignmentSecurity
+    include ActiveModel::MassAssignmentSecurity if ActiveModel::VERSION::MAJOR < 4
     include ActiveAttr::Model
 
     @@cache = nil               # Class to use for caching

data/lib/osm/register.rb

@@ -145,7 +145,9 @@ module Osm
       attribute :name, :type => String
       attribute :tooltip, :type => String, :default => ''
 
-      attr_accessible :id, :name, :tooltip
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :id, :name, :tooltip
+      end
 
       validates_presence_of :id
       validates_presence_of :name
@@ -189,7 +191,9 @@ module Osm
       attribute :total, :type => Integer
       attribute :attendance, :default => {}
 
-      attr_accessible :member_id, :first_name, :last_name, :section_id, :grouping_id, :total, :attendance
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :member_id, :first_name, :last_name, :section_id, :grouping_id, :total, :attendance
+      end
 
       validates_numericality_of :member_id, :only_integer=>true, :greater_than=>0
       validates_numericality_of :grouping_id, :only_integer=>true, :greater_than_or_equal_to=>-2

data/lib/osm/section.rb

@@ -114,17 +114,19 @@ module Osm
     attribute :sms_messages_sent, :type => Integer, :default => 0
     attribute :sms_messages_remaining, :type => Integer, :default => 0
 
-    attr_accessible :id, :name, :group_id, :group_name, :subscription_level, :subscription_expires,
-                    :type, :column_names, :fields, :intouch_fields, :mobile_fields, :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,
-                    :myscout_emails, :myscout_email_address_from, :myscout_email_address_copy,
-                    :myscout_badges_partial, :myscout_programme_summary, :myscout_programme_times,
-                    :myscout_programme_show, :myscout_event_reminder_count,
-                    :myscout_event_reminder_frequency, :myscout_payment_reminder_count,
-                    :myscout_payment_reminder_frequency, :myscout_details_email_changes_to,
-                    :sms_sent_test, :sms_messages_sent, :sms_messages_remaining
+    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,
+                      :gocardless, :myscout_events_expires, :myscout_badges_expires,
+                      :myscout_programme_expires, :myscout_details_expires, :myscout_events,
+                      :myscout_badges, :myscout_programme, :myscout_payments, :myscout_details,
+                      :myscout_emails, :myscout_email_address_from, :myscout_email_address_copy,
+                      :myscout_badges_partial, :myscout_programme_summary, :myscout_programme_times,
+                      :myscout_programme_show, :myscout_event_reminder_count,
+                      :myscout_event_reminder_frequency, :myscout_payment_reminder_count,
+                      :myscout_payment_reminder_frequency, :myscout_details_email_changes_to,
+                      :sms_sent_test, :sms_messages_sent, :sms_messages_remaining
+    end
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0, :allow_nil => true
     validates_numericality_of :group_id, :only_integer=>true, :greater_than=>0, :allow_nil => true

data/lib/osm/sms.rb

@@ -76,7 +76,9 @@ module Osm
       attribute :credits, :type => Integer
       attribute :status, :type => Object
 
-      attr_accessible :sms_id, :user_id, :member_id, :section_id, :from_name, :from_number, :to_name, :to_number, :message, :scheduled, :last_updated, :credits, :status
+      if ActiveModel::VERSION::MAJOR < 4
+        attr_accessible :sms_id, :user_id, :member_id, :section_id, :from_name, :from_number, :to_name, :to_number, :message, :scheduled, :last_updated, :credits, :status
+      end
 
       validates_numericality_of :sms_id, :only_integer=>true, :greater_than_or_equal_to=>0
       validates_numericality_of :user_id, :only_integer=>true, :greater_than_or_equal_to=>0

data/lib/osm/term.rb

@@ -19,7 +19,9 @@ module Osm
     attribute :start, :type => Date
     attribute :finish, :type => Date
 
-    attr_accessible :id, :section_id, :name, :start, :finish
+    if ActiveModel::VERSION::MAJOR < 4
+      attr_accessible :id, :section_id, :name, :start, :finish
+    end
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0

data/osm.gemspec

@@ -19,16 +19,16 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'activesupport', '~> 3.2'  # Used to parse JSON from OSM
-  s.add_runtime_dependency 'httparty', '~> 0.9'       # Used to make web requests to the API
+  s.add_runtime_dependency 'activesupport', '>= 3.2', '< 5' # Used to parse JSON from OSM
+  s.add_runtime_dependency 'httparty', '~> 0.9'             # Used to make web requests to the API
   s.add_runtime_dependency 'active_attr', '~> 0.8'
-  s.add_runtime_dependency 'activemodel', '~> 3.2'
-  s.add_runtime_dependency 'dirty_hashy', '~> 0.2.1'  # Used to track changed data in Badge::Data and FlexiRecord::Data
+  s.add_runtime_dependency 'activemodel', '>= 3.2', '< 5'
+  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'
+  s.add_development_dependency 'rspec', '~> 2.0', '>= 2.14.1'
   s.add_development_dependency 'fakeweb', '~> 1.3'
-  s.add_development_dependency 'guard-rspec', '~> 3.0'
+  s.add_development_dependency 'guard-rspec', '~> 4.2', '>= 4.2.5'
   s.add_development_dependency 'rb-inotify', '~> 0.9'
 
 end

data/spec/osm/model_spec.rb

@@ -6,7 +6,7 @@ describe "Model" do
 
   class ModelTester < Osm::Model
     attribute :id
-    attr_accessible :id
+    attr_accessible :id if ActiveModel::VERSION::MAJOR < 4
 
     def self.test_get_config
       {

data/spec/osm/osm_spec.rb

@@ -61,12 +61,12 @@ describe "Online Scout Manager" do
     class TestA < Osm::Model
       attribute :id
       attribute :b
-      attr_accessible :id, :b
+      attr_accessible :id, :b if ActiveModel::VERSION::MAJOR < 4
     end
     class TestB < Osm::Model
       attribute :id
       attribute :a
-      attr_accessible :id, :a
+      attr_accessible :id, :a if ActiveModel::VERSION::MAJOR < 4
     end
 
     it "Returns a string" do

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-14 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
@@ -64,17 +70,23 @@ dependencies:
   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
@@ -114,7 +126,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +137,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +164,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +175,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +212,7 @@ files:
 - LICENSE.rdoc
 - README.md
 - Rakefile
+- gemfiles/rails3
 - lib/array_of_validator.rb
 - lib/hash_validator.rb
 - lib/osm.rb