osm 1.0.2 → 1.0.3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 1.0.3
+
+  * Fix "undefined method 'downcase' for 0:Fixnum" caused by some badge requirement data being a Fixnum when a String contains just numbers.
+  * Update to use ActiveAttr gem version 0.8
+
 ## Version 1.0.2
 
   * Fix Regex for checking dates from OSM

data/lib/osm/activity.rb

@@ -263,8 +263,8 @@ module Osm
 
     private
     class File
-      include ::ActiveAttr::MassAssignmentSecurity
-      include ::ActiveAttr::Model
+      include ActiveModel::MassAssignmentSecurity
+      include ActiveAttr::Model
 
       # @!attribute [rw] id
       #   @return [Fixnum] the OSM ID for the file
@@ -301,8 +301,8 @@ module Osm
     end # Class Activity::File
 
     class Badge
-      include ::ActiveAttr::MassAssignmentSecurity
-      include ::ActiveAttr::Model
+      include ActiveModel::MassAssignmentSecurity
+      include ActiveAttr::Model
 
       # @!attribute [rw] activity_id
       #   @return [Fixnum] the activity being done
@@ -342,8 +342,8 @@ module Osm
     end # Class Activity::Badge
 
     class Version
-      include ::ActiveAttr::MassAssignmentSecurity
-      include ::ActiveAttr::Model
+      include ActiveModel::MassAssignmentSecurity
+      include ActiveAttr::Model
 
       # @!attribute [rw] version
       #   @return [Fixnum] the version of the activity

data/lib/osm/badge.rb

@@ -195,8 +195,8 @@ module Osm
 
 
     class Requirement
-      include ::ActiveAttr::MassAssignmentSecurity
-      include ::ActiveAttr::Model
+      include ActiveModel::MassAssignmentSecurity
+      include ActiveAttr::Model
 
       # @!attribute [rw] badge
       #   @return [Osm::Badge] the badge the requirement belongs to
@@ -300,7 +300,7 @@ module Osm
       def total_gained
         count = 0
         requirements.each do |field, data|
-          next if data.blank? || data[0].downcase.eql?('x')
+          next if data.blank? || data.to_s[0].downcase.eql?('x')
           count += 1
         end
         return count
@@ -328,7 +328,7 @@ module Osm
           field = field.split('_')[0]
           unless field.eql?('y')
             count[field] ||= 0
-            next if data.blank? || data[0].downcase.eql?('x')
+            next if data.blank? || data.to_s[0].downcase.eql?('x')
             count[field] += 1
           else
             # A total 'section'
@@ -352,7 +352,7 @@ module Osm
         requirements.each do |key, value|
           case key.split('_')[0]
             when 'a'
-              return true unless value.blank? || value[0].downcase.eql?('x')
+              return true unless value.blank? || value.to_s[0].downcase.eql?('x')
             when 'y'
               return true if (requirements['y_01'].to_i > 0)
           end
@@ -386,7 +386,7 @@ module Osm
             requirements.each do |key, value|
               next if key[0] < start_group # This stage is marked as completed
               next if key[0] > started     # This stage is after the stage currently started
-              started = key[0] unless value.blank? || value[0].downcase.eql?('x')
+              started = key[0] unless value.blank? || value.to_s[0].downcase.eql?('x')
             end
             return started.eql?('z') ? 0 : 'abcde'.index(started)+1
           end

data/lib/osm/meeting.rb

@@ -258,8 +258,8 @@ module Osm
 
     private
     class Activity
-      include ::ActiveAttr::MassAssignmentSecurity
-      include ::ActiveAttr::Model
+      include ActiveModel::MassAssignmentSecurity
+      include ActiveAttr::Model
 
       # @!attribute [rw] activity_id
       #   @return [Fixnum] the activity being done

data/lib/osm/model.rb

@@ -8,8 +8,8 @@ module Osm
   # This class is expected to be inherited from.
   # It provides the caching and permission handling for model objects.
   class Model
-    include ::ActiveAttr::MassAssignmentSecurity
-    include ::ActiveAttr::Model
+    include ActiveModel::MassAssignmentSecurity
+    include ActiveAttr::Model
 
     @@cache = nil               # Class to use for caching
     @@cache_prepend = 'OSMAPI'  # Prepended to the key

data/osm.gemspec

@@ -20,14 +20,14 @@ Gem::Specification.new do |s|
 
   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 'active_attr', '~> 0.6', '< 0.8'
+  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 trach changed data in Badge::Data and FlexiRecord::Data
+  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.11'
   s.add_development_dependency 'fakeweb', '~> 1.3'
-  s.add_development_dependency 'guard-rspec', '~> 2.4'
+  s.add_development_dependency 'guard-rspec', '~> 3.0'
   s.add_development_dependency 'rb-inotify', '~> 0.9'
 
 end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -49,9 +49,6 @@ dependencies:
     none: false
     requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - <
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
@@ -60,9 +57,6 @@ dependencies:
     none: false
     requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - <
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
@@ -152,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -160,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement