osm 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1ecb36756b12ad4272e5ecbcc8e77c25c3cdc45
-  data.tar.gz: 2dd2a75365ade9411b436dc98d1cedf2d58818dd
+  metadata.gz: 0a7cefac5a329080926e39e4c7ea159140bdaf62
+  data.tar.gz: 4815f91adf15799318b1ac6152237bcc3ca1ab99
 SHA512:
-  metadata.gz: 0c7f3439f3535740c36fd0d0aad32e5a7f8cd3c756e1c0a8a7007088b7d01a1cd74e071f14dae60421d4d1a52fc7a944cc7bf76480e5879561b3bc630b1f8d0e
-  data.tar.gz: 231dbcf227706018d180dbab83a7359e7fe2a9078e7c0ee1571cfffe6890d78abf90b7adfc3727c42ff61ca1dbd69326b985bc5af2042776122bbbda36ad1edd
+  metadata.gz: 8bfc9afd8c0883e8082634a2a74c9a0cf62aa029176e302047d0fde0a2f34496af97496272ea119f5fdd0f373bd8674fc15a973fa302c8d3ef4b13454f802ef4
+  data.tar.gz: eac2fefb23834d536a0426aa22b92b268e224f086af500e538b965d8aed7fbc04d8e5ea7299518952842773d11b47bf6b12ecf2dfdee62891c439718d789c839

data/.travis.yml

@@ -1,32 +1,36 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.2.1
-  - 2.2.2
-  - 2.2.3
-  - 2.2.4
-  - 2.2.5
-  - 2.2.6
-  - 2.2.7
-  - 2.2.8
-  - 2.2.9
-  - 2.3.0
-  - 2.3.1
-  - 2.3.2
-  - 2.3.3
-  - 2.3.4
-  - 2.3.5
-  - 2.3.6
-  - jruby-1.7.20.1
+- 1.9.3
+- 2.0.0
+- 2.2.1
+- 2.2.2
+- 2.2.3
+- 2.2.4
+- 2.2.5
+- 2.2.6
+- 2.2.7
+- 2.2.8
+- 2.2.9
+- 2.3.0
+- 2.3.1
+- 2.3.2
+- 2.3.3
+- 2.3.4
+- 2.3.5
+- 2.3.6
+- jruby-1.7.20.1
 gemfile:
-  - Gemfile
-  - gemfiles/rails3
+- Gemfile
+- gemfiles/rails3
 branches:
   only:
-    - master
-    - staging
-    - /gh(?:\d)+(?:-.+)?/
-    - /dev_ver_\d+\.\d+/
+  - master
+  - staging
+  - "/gh(?:\\d)+(?:-.+)?/"
+  - "/dev_ver_\\d+\\.\\d+/"
 before_install: gem update bundler
 script: rake ci:travis
+notifications:
+  slack:
+    on_success: always
+    secure: SIgV9OYZYskwEJfUJQBh+fDtaa0vIhSwMZZ6DfVu6EyrHh61NlTzPwf9n9uYT14VeQ9lMNWNDB2Gu7AI+HDQF8YbUZxfINR506BLuXYXkDiPPTWN61BP+UjC0v+w3fQrvGrLsvRPyQfBRwVqKrsavzX9ubxQbs2iosfX9K8I2Mo=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.3.3
+
+  * Fix due to OSM's API changing data returned when getting a section's notepad.
+
 ## Version 1.3.2
 
   * Add travis testing against new ruby versions (CVE-2017-17405)

data/lib/osm/section.rb

@@ -269,8 +269,9 @@ module Osm
 
       notepad = ''
       notepads.each do |key, value|
-        cache_write(api, ['notepad', key.to_i], value)
-        notepad = value if key.to_i == id
+        raw_value = value.fetch('raw', '')
+        cache_write(api, ['notepad', key.to_i], raw_value)
+        notepad = raw_value if key.to_i == id
       end
 
       return notepad
@@ -282,7 +283,7 @@ module Osm
     # @return [Boolean] whether the notepad was sucessfully updated
     def set_notepad(api, content)
       require_access_to_section(api, self)
-      data = api.perform_query("users.php?action=updateNotepad&sectionid=#{id}", {'value' => content})
+      data = api.perform_query("users.php?action=updateNotepad&sectionid=#{id}", {'raw' => content})
 
       if data.is_a?(Hash) && data['ok'] # Success
         cache_write(api, ['notepad', id], content)

data/spec/array_of_validator_spec.rb

@@ -4,9 +4,9 @@ require 'spec_helper'
 
 module ArrayOfValidatorSpec
 
-  class FixnumTestModel < Osm::Model
+  class IntegerTestModel < Osm::Model
     attribute :array
-    validates :array, :array_of => {:item_type => Fixnum}
+    validates :array, :array_of => {:item_type => Integer}
   end
 
   class TestItem
@@ -37,7 +37,7 @@ module ArrayOfValidatorSpec
  describe "Array of validator" do
 
     it "Allows an empty array" do
-      i = FixnumTestModel.new(array: [])
+      i = IntegerTestModel.new(array: [])
       i.valid?.should == true
       i.errors.count.should == 0
     end
@@ -45,16 +45,16 @@ module ArrayOfValidatorSpec
     describe ":item_type option" do
 
       it "Allows arrays of the right type" do
-        i = FixnumTestModel.new(array: [1, 2, 3])
+        i = IntegerTestModel.new(array: [1, 2, 3])
         i.valid?.should == true
         i.errors.count.should == 0
       end
 
       it "Forbids arrays containing >= 1 incorrect type" do
-        i = FixnumTestModel.new(array: [1, '2', 3])
+        i = IntegerTestModel.new(array: [1, '2', 3])
         i.valid?.should == false
         i.errors.count.should == 1
-        i.errors.messages.should == {:array=>["items in the Array must be a Fixnum"]}
+        i.errors.messages.should == {:array=>["items in the Array must be a Integer"]}
       end
 
     end

data/spec/hash_validator_spec.rb

@@ -6,7 +6,7 @@ module HashValidatorSpec
   class KeyTypeTestModel
     include ActiveAttr::Model
     attribute :hash_attr
-    validates :hash_attr, :hash => {:key_type => Fixnum}
+    validates :hash_attr, :hash => {:key_type => Integer}
   end
 
   class KeyInTestModel
@@ -18,7 +18,7 @@ module HashValidatorSpec
   class ValueTypeTestModel
     include ActiveAttr::Model
     attribute :hash_attr
-    validates :hash_attr, :hash => {:value_type => Fixnum}
+    validates :hash_attr, :hash => {:value_type => Integer}
   end
 
   class ValueInTestModel
@@ -43,14 +43,14 @@ module HashValidatorSpec
         model = KeyTypeTestModel.new(hash_attr: {1=>'1', 2=>'2', '3'=>'3'})
         model.valid?.should == false
         model.errors.count.should == 1
-        model.errors.messages.should == {hash_attr: ['keys must be a Fixnum ("3" is not).']}
+        model.errors.messages.should == {hash_attr: ['keys must be a Integer ("3" is not).']}
       end
 
       it "Has several incorrect keys" do
         model = KeyTypeTestModel.new(hash_attr: {1=>'1', 2=>'2', '3'=>'3', '4'=>'4'})
         model.valid?.should == false
         model.errors.count.should == 2
-        model.errors.messages.should == {hash_attr: ['keys must be a Fixnum ("3" is not).', 'keys must be a Fixnum ("4" is not).']}
+        model.errors.messages.should == {hash_attr: ['keys must be a Integer ("3" is not).', 'keys must be a Integer ("4" is not).']}
       end
 
     end
@@ -93,14 +93,14 @@ module HashValidatorSpec
         model = ValueTypeTestModel.new(hash_attr: {'1'=>1, '2'=>2, '3'=>'3'})
         model.valid?.should == false
         model.errors.count.should == 1
-        model.errors.messages.should == {hash_attr: ['values must be a Fixnum ("3" for key "3" is not).']}
+        model.errors.messages.should == {hash_attr: ['values must be a Integer ("3" for key "3" is not).']}
       end
 
       it "Has several incorrect keys" do
         model = ValueTypeTestModel.new(hash_attr: {'1'=>1, '2'=>2, '3'=>'3', '4'=>'4'})
         model.valid?.should == false
         model.errors.count.should == 2
-        model.errors.messages.should == {hash_attr: ['values must be a Fixnum ("3" for key "3" is not).', 'values must be a Fixnum ("4" for key "4" is not).']}
+        model.errors.messages.should == {hash_attr: ['values must be a Integer ("3" for key "3" is not).', 'values must be a Integer ("4" for key "4" is not).']}
       end
 
     end

data/spec/osm/section_spec.rb

@@ -167,7 +167,7 @@ describe "Section" do
         'userid' => 'user_id',
         'secret' => 'secret',
       }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>{"1" => "Section 1", "2" => "Section 2"}.to_json}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>{"1" => {"raw" => "Section 1", "html" => "<p>Section 1</p>"}, "2" => {"raw" => "Section 2", "html" => "<p>Section 2</p>"}}.to_json}) }
       section = Osm::Section.new(:id => 1)
       section.get_notepad(@api).should == 'Section 1'
     end
@@ -179,7 +179,7 @@ describe "Section" do
         'token' => @CONFIGURATION[:api][:osm][:token],
         'userid' => 'user_id',
         'secret' => 'secret',
-        'value' => 'content'
+        'raw' => 'content'
       }
       HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true}'}) }
       section = Osm::Section.new(:id => 1)

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -307,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: osm
-rubygems_version: 2.6.14
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Use the Online Scout Manager API