osm 0.0.1 → 0.0.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 0.0.2
+
+ * Bug fixes.
+
 ## Version 0.0.1
 
  * Initial release.

data/lib/osm.rb

@@ -68,4 +68,14 @@ module Osm
     end
   end
 
+  def self.symbolize_hash(hash_in)
+    raise ArgumentError.new('You did not pass in a hash') unless hash_in.is_a?(Hash)
+
+    hash_out = {}
+    hash_in.each do |key, value|
+      hash_out[key.to_sym] = value
+    end
+    hash_out
+  end
+
 end

data/lib/osm/api.rb

@@ -489,10 +489,10 @@ module Osm
 
       data = perform_query("users.php?action=registerStructure&sectionid=#{section_id}&termid=#{term_id}", api_data)
 
-      data.each do |item|
-        item.symbolize_keys!
-        item[:rows].each do |row|
-          row.symbolize_keys!
+      data.each_with_index do |item, item_index|
+        data[item_index] = item = Osm::symbolize_hash(item)
+        item[:rows].each_with_index do |row, row_index|
+          item[:rows][row_index] = row = Osm::symbolize_hash(row)
         end
       end
       self.user_can_access :register, section_id, api_data
@@ -521,7 +521,7 @@ module Osm
 
       data = data['items']
       data.each do |item|
-        item.symbolize_keys!
+        item = Osm::symbolize_hash(item)
         item[:scoutid] = item[:scoutid].to_i
         item[:sectionid] = item[:sectionid].to_i
         item[:patrolid] = item[:patrolid].to_i

data/lib/osm/due_badges.rb

@@ -9,18 +9,18 @@ module Osm
     def initialize(data)
       data = {} unless data.is_a?(Hash)
 
-      @pending = (data['pending'] || {}).symbolize_keys
-      @descriptions = (data['description'] || {}).symbolize_keys
+      @pending = Osm::symbolize_hash(data['pending'] || {})
+      @descriptions = Osm::symbolize_hash(data['description'] || {})
 
       @pending.each_key do |key|
-        @pending[key].each do |item|
-          item.symbolize_keys!
+        @pending[key].each_with_index do |item, index|
+          @pending[key][index] = item = Osm::symbolize_hash(item)
           item[:sid] = item[:sid].to_i
           item[:completed] = item[:completed].to_i
         end
       end
       @descriptions.each_key do |key|
-        @descriptions[key].symbolize_keys!
+        @descriptions[key] = Osm::symbolize_hash(@descriptions[key])
         @descriptions[key][:section] = @descriptions[key][:section].to_sym
         @descriptions[key][:type] = @descriptions[key][:type].to_sym
       end

data/lib/osm/role.rb

@@ -12,7 +12,7 @@ module Osm
       @group_id = Osm::to_i_or_nil(data['groupid'])
       @group_normalized = Osm::to_i_or_nil(data['groupNormalised'])
       @default = data['isDefault'].eql?('1') ? true : false
-      @permissions = (data['permissions'] || {}).symbolize_keys
+      @permissions = Osm::symbolize_hash(data['permissions'] || {})
 
       # Convert permission values to a number
       @permissions.each_key do |key|

data/lib/osm/section.rb

@@ -20,10 +20,10 @@ module Osm
       @has_badge_records = data['hasUsedBadgeRecords'].eql?('1') ? true : false
       @has_programme = data['hasProgramme']
       @wizard = (data['wizard'] || '').downcase.eql?('true') ? true : false
-      @column_names = (data['columnNames'] || {}).symbolize_keys
-      @fields = (data['fields'] || {}).symbolize_keys
-      @intouch_fields = (data['intouch'] || {}).symbolize_keys
-      @mobile_fields = (data['mobFields'] || {}).symbolize_keys
+      @column_names = Osm::symbolize_hash(data['columnNames'] || {})
+      @fields = Osm::symbolize_hash(data['fields'] || {})
+      @intouch_fields = Osm::symbolize_hash(data['intouch'] || {})
+      @mobile_fields = Osm::symbolize_hash(data['mobFields'] || {})
       @extra_records = data['extraRecords'] || []
       @role = role
 
@@ -32,9 +32,9 @@ module Osm
         # Expect item to be: {:name=>String, :extraid=>FixNum}
         # Sometimes get item as: [String, {"name"=>String, "extraid"=>FixNum}]
         if item.is_a?(Array)
-          item = item[1].symbolize_keys
+          item = Osm::symbolize_hash(item[1])
         else
-          item.symbolize_keys!
+          item = Osm::symbolize_hash(item)
         end
       end
     end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &88201100 !ruby/object:Gem::Requirement
+  requirement: &74085370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *88201100
+  version_requirements: *74085370
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &88200740 !ruby/object:Gem::Requirement
+  requirement: &74084650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *88200740
+  version_requirements: *74084650
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &88200440 !ruby/object:Gem::Requirement
+  requirement: &74084280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *88200440
+  version_requirements: *74084280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &88200110 !ruby/object:Gem::Requirement
+  requirement: &74083800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *88200110
+  version_requirements: *74083800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &88199790 !ruby/object:Gem::Requirement
+  requirement: &74083320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *88199790
+  version_requirements: *74083320
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &88199510 !ruby/object:Gem::Requirement
+  requirement: &74061350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *88199510
+  version_requirements: *74061350
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email:
@@ -90,7 +90,6 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.rdoc
 - README.md
 - Rakefile