osm 0.0.20 → 0.0.21

data/CHANGELOG.md

@@ -1,15 +1,19 @@
+## Version 0.0.21
+
+  * Fix getting section\_id and grouping\_id for api.get\_members
+
 ## Version 0.0.20
 
-  * Start deprecation of api\_data option in Api methods (raise a warning and adjust documentation)
+  * Start deprecation of api\_data option in api methods (raise a warning and adjust documentation)
   * Hide sesitive information when printing data sent to OSM in debug mode
   * Add archived attribute to Event
-  * Add :include\_archived option to Api.get\_events method
+  * Add :include\_archived option to api.get\_events method
   * Add retreival of Flexi Records
   * Make set\_user method of Api public
 
 ## Version 0.0.19
 
-  * Fix caching error in Api.get\_register\_data
+  * Fix caching error in api.get\_register\_data
 
 ## Version 0.0.18
 
@@ -51,7 +55,7 @@
 
 ## Version 0.0.14
 
-  * Fix Api.get_register\_data\ returning wrong object
+  * Fix api.get_register\_data\ returning wrong object
   * Fix check of :num\_scouts in Section.initalize
 
 ## Version 0.0.13
@@ -66,8 +70,8 @@
     * Activity.files now returns an array of Osm::Activity::File objects
     * Activity.versions now returns an array of Osm::Activity::Version objects
     * Section.flexi_records now returns an array of Osm::Section::FlexiRecord objects
-    * Api.get\_register\_structure now returns an array of RegisterField objects
-  * Api.get\_register becomes Api.get\_register\_data and now returns an array of RegisterData objects
+    * api.get\_register\_structure now returns an array of RegisterField objects
+  * api.get\_register becomes api.get\_register\_data and now returns an array of RegisterData objects
   * Attribute name changes:
     * Activity::Badge.section becomes section\_type
     * Activity::File.file\_id becomes id

data/lib/osm/api.rb

@@ -375,7 +375,7 @@ module Osm
 
       result = Array.new
       data['items'].each do |item|
-        result.push Osm::Member.from_api(item)
+        result.push Osm::Member.from_api(item, section_id)
       end
       self.user_can_access :member, section_id, api_data
       cache_write(cache_key, result, :expires_in => @@default_cache_ttl)

data/lib/osm/member.rb

@@ -119,10 +119,10 @@ module Osm
 
     # Initialize a new Member from api data
     # @param [Hash] data the hash of data provided by the API
-    def self.from_api(data)
+    def self.from_api(data, section_id)
       new({
+        :section_id => section_id,
         :id => Osm::to_i_or_nil(data['scoutid']),
-        :section_id => Osm::to_i_or_nil(data['sectionidO']),
         :type => data['type'],
         :first_name => data['firstname'],
         :last_name => data['lastname'],
@@ -146,8 +146,8 @@ module Osm
         :school => data['school'],
         :ethnicity => data['ethnicity'],
         :subs => data['subs'],
-        :grouping_id => Osm::to_i_or_nil(data['patrolidO']),
-        :grouping_leader => Osm::to_i_or_nil(data['patrolleaderO']),
+        :grouping_id => Osm::to_i_or_nil(data['patrolid']),
+        :grouping_leader => Osm::to_i_or_nil(data['patrolleader']),
         :joined => Osm::parse_date(data['joined']),
         :age => data['age'],
         :joined_years => data['yrs'].to_i,

data/osm.gemspec

@@ -18,13 +18,13 @@ 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'                 # Used to make web requests to the API
-  s.add_runtime_dependency 'active_attr'
-  s.add_runtime_dependency 'activemodel'
+  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'
+  s.add_runtime_dependency 'activemodel', '~> 3.2'
 
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'fakeweb'
+  s.add_development_dependency 'rake', '~> 0.9'
+  s.add_development_dependency 'rspec', '~> 2.11'
+  s.add_development_dependency 'fakeweb', '~> 1.3'
 
 end

data/spec/osm/member_spec.rb

@@ -36,10 +36,10 @@ describe "Member" do
       'age' => '06/07',
       'yrs' => 1,
       'patrol' => 'Blue',
-      'patrolidO' => '3',
+      'patrolidO' => '4',
       'patrolleaderO' => 0,
     }
-    member = Osm::Member.from_api(data)
+    member = Osm::Member.from_api(data, 2)
 
     member.id.should == 1
     member.section_id.should == 2

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -13,81 +13,81 @@ date: 2012-09-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &80777240 !ruby/object:Gem::Requirement
+  requirement: &84462520 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *80777240
+  version_requirements: *84462520
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &80776920 !ruby/object:Gem::Requirement
+  requirement: &84461050 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *80776920
+  version_requirements: *84461050
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &80776570 !ruby/object:Gem::Requirement
+  requirement: &84459560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *80776570
+  version_requirements: *84459560
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &80776260 !ruby/object:Gem::Requirement
+  requirement: &84432320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *80776260
+  version_requirements: *84432320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &80775920 !ruby/object:Gem::Requirement
+  requirement: &84430640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *80775920
+  version_requirements: *84430640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &80775540 !ruby/object:Gem::Requirement
+  requirement: &84429660 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *80775540
+  version_requirements: *84429660
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &80775080 !ruby/object:Gem::Requirement
+  requirement: &84429240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *80775080
+  version_requirements: *84429240
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email: