osm 1.2.20 → 1.2.21

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.2.1
+  - 2.3.0
   - jruby-1.7.20.1
 gemfile:
   - Gemfile

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 1.2.21
+
+  * Fix updating requirement data of a Osm::Badge::Data to a blank string incorrectly returns false when the update was made into OSM
+  * Fix updating additional details for a Osm::Member to a blank string incorrectly returns false when the update was made into OSM
+
 ## Version 1.2.20
 
   * Fix to OSM changing the URL to get API permissions from
@@ -46,7 +51,6 @@
     * Addition of remaining_credits(api, section, options={}) method
     * Addition of number_selected(api, section, members, options={}) method to tell how many numbers a message would be sent to
   * Add :migration as an API target
->>>>>>> NewContactSystem
 
 ## Version 1.2.17
 

data/README.md

@@ -17,12 +17,6 @@ This project uses continuous integration to help ensure that a quality product i
 Travis CI monitors two branches (versions) of the code - Master (which is what gets released)
 and Staging (which is what is currently being developed ready for moving to master).
 
-[![Build Status](https://secure.travis-ci.org/robertgauld/osm.png?
-branch=master)](http://travis-ci.org/robertgauld/osm)
-
-[![Build Status](https://secure.travis-ci.org/robertgauld/osm.png?
-branch=staging)](http://travis-ci.org/robertgauld/osm)
-
 
 ## Ruby Versions
 This gem supports the following versions of ruby, it may work on other versions but is not tested against them so don't rely on it.
@@ -30,6 +24,7 @@ This gem supports the following versions of ruby, it may work on other versions
   * 1.9.3
   * 2.0.0
   * 2.2.1
+  * 2.3.0
   * jruby-1.7.20.1
 
 

data/lib/osm/badge.rb

@@ -815,7 +815,7 @@ module Osm
             })
             requirements_updated = false unless result.is_a?(Hash) &&
                                    (result['scoutid'].to_i == member_id) &&
-                                   (result[requirement.to_s] == now)
+                                   (result[requirement.to_s].to_s == now.to_s)
           end
         end
 

data/lib/osm/member.rb

@@ -386,7 +386,7 @@ module Osm
           'group_id' => GID_CUSTOM,
           'context' => 'members',
         })
-        updated = updated && data.is_a?(Hash) && data['data'].is_a?(Hash) && data['data']['value'].eql?(new_value)
+        updated = updated && data.is_a?(Hash) && data['data'].is_a?(Hash) && data['data']['value'].to_s.eql?(new_value.to_s)
       end # each attr to update
 
       # Do contacts

data/spec/osm/badge_spec.rb

@@ -788,6 +788,17 @@ describe "Badge" do
         @data.update(@api).should == true
       end
 
+      it "Success (just requirement) (to blank)" do
+        date = Date.new(2000, 1, 2)
+        HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/ext/badges/records/?action=updateSingleRecord', {:body => @update_post_data.merge('value' => '')}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>@update_body_data.merge('2345' => nil).to_json}) }
+        Osm::Section.stub(:get) { Osm::Section.new(:id => 2, :type => :beavers) }
+        @data.should_not_receive(:mark_awarded)
+        @data.should_not_receive(:mark_due)
+
+        @data.requirements[2345] = ''
+        @data.update(@api).should == true
+      end
+
       it "Success (just due)" do
         date = Date.new(2000, 1, 2)
         HTTParty.should_not_receive(:post)

data/spec/osm/member_spec.rb

@@ -900,6 +900,39 @@ describe "Member" do
         @member.update(@api).should == true
       end
 
+      it "When setting data to a blank string" do
+        HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/ext/members/contact/?action=update', {:body => {
+          "apiid" => "1",
+          "token" => "API TOKEN",
+          "userid" => "user_id",
+          "secret" => "secret",
+          "sectionid" => 2,
+          "scoutid" => 1,
+          "column" => "firstname",
+          "value" => "",
+        }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true}'}) }
+
+        HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/ext/customdata/?action=updateColumn&section_id=2', {:body => {
+          "apiid" => "1",
+          "token" => "API TOKEN",
+          "userid" => "user_id",
+          "secret" => "secret",
+          "context" => "members",
+          "associated_type" => "member",
+          "associated_id" => 1,
+          "group_id" => 5,
+          "column_id" => 123,
+          "value" => "",
+        }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"data":{"value":null}}'}) }
+
+        Osm::Term.stub(:get_for_section) { [] }
+
+        @member.stub('valid?'){ true }
+        @member.first_name = ''
+        @member.additional_information[123] = ''
+        @member.update(@api).should == true
+      end
+
     end
 
     it "Get Photo link" do

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.20"
+  VERSION = "1.2.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.20
+  version: 1.2.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport