osm 1.2.18.dev.11 → 1.2.18.dev.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmRiNTMyMmRkNGE5NmM4ZjI1YWZmNjI3NjFkZWQxNDU0YWYzOWVkZA==
+    NzIwZmViMGJkNTFjNzg0MjA4N2IxYmNmMGQyYTExMDEyYzU4YTUwYw==
   data.tar.gz: !binary |-
-    MGRhNjQ3NTAxZDMxYzMxN2NmZDE5MTU4YzY5ZDBkYWE5MTEyNGNiYQ==
+    MzBlYjljYTQ5YTU0NDJlNjU2ZTJmNzFkNTYxZTI3NzMxMTJkYzgzNw==
 SHA512:
   metadata.gz: !binary |-
-    MjkwNDIxMjRkODMyMzU2MDZkZTVmY2FjMmE3ZjkyMWUxMjhhYzhiODI3ZmZm
-    NDBlMTljZDg1NmI0ZWExNWMzYzBmOTRiMmI0NmNmMjNhMTcyMzU3ZDFlMTg4
-    ZGM4NjI5ZmYxNGIzY2Q1NWM0YzE1MDQ5ZTkwODcwODJmZGE2MDQ=
+    Y2Q2OTgwNmM1ZmVjZTNlODMyZTU1NjkxMmM1NmI5MmY4MWQ4ZWJlMGIxMTNk
+    MGJmMjUxNmI3NWM2MjY0NzMyZGQ0NzNmN2ZlMmVlNmY3YTRkODZhYTRiZjNl
+    MDA1NTBlMGU0MmQ5NDBiNjM2MDk2OTk5ZDRiMjYyMDNlNWVmNjk=
   data.tar.gz: !binary |-
-    MWU3YWE2YjMyNThhOWY5NTVkMmQyNDk3MGZlMTg1ZDFkMTcwODQ3NWMwZWQ1
-    MDg3MjFmMDRjZmZmZGY1MGM5ZjdlNDlmNWFjZjAyYjZlNzJlZWI4NGQxMGI1
-    ZTY4NmMzZDExZTJjMjI3MmMwZTY3MGQ4ZDk4N2RkMDc3N2U4NTM=
+    NDQ4ZTgyYWViYjdmNzJjYzg4YjA0ZmNmYmJiYjNkYWU3MTMxYzBhNGU5YTU0
+    MDhlMmQ2NTE3NzVjZDUwOTg4ZmQ0MDEwMDY1NDJhMDNhOTBiZTYzZWVlMDNh
+    MzdjODAzODIyYmM1Yjg2ZWJlNjE1NDQwOGQ0MGEyMjg2ZWE1OGM=

data/lib/osm/member.rb

@@ -217,7 +217,7 @@ module Osm
             receive_phone_2: member_contact[CID_RECIEVE_PHONE_2],
             receive_email_1: member_contact[CID_RECIEVE_EMAIL_1],
             receive_email_2: member_contact[CID_RECIEVE_EMAIL_2],
-            additional_information: member_custom.select{ |k,v| !['title'].include?(k) },
+            additional_information: DirtyHashy[ member_custom.select{ |k,v| !['title'].include?(k) } ],
             additional_information_labels: custom_labels[GID_MEMBER_CONTACT],
           ),
           :primary_contact => primary_contact.nil? ? nil : PrimaryContact.new(
@@ -291,8 +291,8 @@ module Osm
             additional_information: doctor_custom,
             additional_information_labels: custom_labels[GID_DOCTOR_CONTACT],
           ),
-          additional_information: custom_data.select{ |k,v| ! ['title'].include?(k) },
-          additional_information_labels: custom_labels[GID_CUSTOM].select{ |k,v| ! ['title'].include?(k) },
+          additional_information: DirtyHashy[ custom_data.select{ |k,v| !['title'].include?(k) } ],
+          additional_information_labels: custom_labels[GID_CUSTOM].select{ |k,v| !['title'].include?(k) },
         )
       end
 
@@ -372,7 +372,7 @@ module Osm
 
       # Do title attribute
       if force || changed_attributes.include?('title')
-        data = api.perform_query("ext/members/contact/?action=update", {
+        data = api.perform_query("ext/customdata/?action=updateColumn&section_id=#{section_id}", {
           'associated_id' => self.id,
           'associated_type' => 'member',
           'value' => title,
@@ -383,11 +383,10 @@ module Osm
         updated = updated && data.is_a?(Hash) && data['data'].is_a?(Hash) && data['data']['value'].eql?(title)
       end
 
-
       # Do 'floating' attributes
       if force || changed_attributes.include?('gender')
         new_value = {male: 'Male', female: 'Female', other: 'Other'}[gender] || 'Unspecified'
-        data = api.perform_query("ext/members/contact/?action=update", {
+        data = api.perform_query("ext/customdata/?action=updateColumn&section_id=#{section_id}", {
           'associated_id' => self.id,
           'associated_type' => 'member',
           'value' => new_value,
@@ -737,7 +736,7 @@ module Osm
           data["data[#{attr}]"] = additional_information[attr]
         end
 
-        updated = false
+        updated = true
         unless data.empty?
           result = api.perform_query("ext/customdata/?action=update&section_id=#{member.section_id}", {
             'associated_id' => member.id,

data/spec/osm/member_spec.rb

@@ -670,7 +670,7 @@ describe "Member" do
           "value" => "John",
         }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true}'}) }
 
-        HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/ext/members/contact/?action=update', {:body => {
+        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",
@@ -785,7 +785,7 @@ describe "Member" do
           }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true}'}) }
         end
 
-        HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/ext/members/contact/?action=update', {:body => {
+        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",
@@ -886,7 +886,7 @@ describe "Member" do
           "data[test_var]" => "This is a test",
         }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"status":true}'}) }
 
-        HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/ext/members/contact/?action=update', {:body => {
+        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",

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.18.dev.11"
+  VERSION = "1.2.18.dev.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.18.dev.11
+  version: 1.2.18.dev.12
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -287,9 +287,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: osm
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Use the Online Scout Manager API
 test_files: []
-has_rdoc: