osm 1.2.18.dev.14 → 1.2.18

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.2.1
 gemfile:
   - Gemfile
   - gemfiles/rails3

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## Version 1.2.18
 
-  * THIS IS A DEVELOPMENT VERSION OF THIS RELEASE. IT EXISTS ONLY SO YOU CAN PLAY WITH THE NEW STRUCTIRE OF MEMBERS YOU'LL GET WHEN OSM CHANGES. WRITING CHANGES BACK TO OSM HAS NOT YET BEEN UPDATED.
+  * Add gem version into the cache key
   * Osm::Section - removal of column_names, fields, intouch_fields, mobile_fields and sms_* attributes
   * Osm::Member - lots of changes to reflect OSM's new structure for member's details (main ones listed below):
     * Removal of type attribute (I never could work out what it represented)
@@ -38,6 +38,7 @@
     * 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/lib/osm/model.rb

@@ -112,7 +112,7 @@ module Osm
     end
     def self.cache_key(api, key)
       key = key.join('-') if key.is_a?(Array)
-      "#{@@cache_prepend.empty? ? '' : "#{@@cache_prepend}-"}#{api.site}-#{key}"
+      "#{@@cache_prepend.empty? ? '' : "#{@@cache_prepend}-"}#{Osm::VERSION}-#{api.site}-#{key}"
     end
 
 

data/spec/osm/api_spec.rb

@@ -88,8 +88,8 @@ describe "API" do
 
     it "Get from cache" do
       permissions = {1 => {:a => [:read, :write]}, 2 => {:a => [:read]}}
-      OsmTest::Cache.should_receive('exist?').with('OSMAPI-osm-permissions-user_id') { true }
-      OsmTest::Cache.should_receive('read').with('OSMAPI-osm-permissions-user_id') { permissions }
+      OsmTest::Cache.should_receive('exist?').with("OSMAPI-#{Osm::VERSION}-osm-permissions-user_id") { true }
+      OsmTest::Cache.should_receive('read').with("OSMAPI-#{Osm::VERSION}-osm-permissions-user_id") { permissions }
       @api.get_user_permissions.should == permissions
     end
 
@@ -105,17 +105,17 @@ describe "API" do
       }
       url = 'https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles'
 
-      OsmTest::Cache.should_not_receive('exist?').with('OSMAPI-osm-permissions-user_id')
-      OsmTest::Cache.should_not_receive('read').with('OSMAPI-osm-permissions-user_id')
+      OsmTest::Cache.should_not_receive('exist?').with("OSMAPI-#{Osm::VERSION}-osm-permissions-user_id")
+      OsmTest::Cache.should_not_receive('read').with("OSMAPI-#{Osm::VERSION}-osm-permissions-user_id")
       HTTParty.should_receive(:post).with(url, {:body=>body}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>data.to_json}) }
       @api.get_user_permissions(:no_cache => true).should == {1 => {:badge => [:read]}}
     end
 
     it "Set" do
       permissions = {1 => {:a => [:read, :write]}, 2 => {:a => [:read]}}
-      OsmTest::Cache.should_receive('exist?').with('OSMAPI-osm-permissions-user_id') { true }
-      OsmTest::Cache.should_receive('read').with('OSMAPI-osm-permissions-user_id') { permissions }
-      OsmTest::Cache.should_receive('write').with('OSMAPI-osm-permissions-user_id', permissions.merge(3 => {:a => [:read]}), {:expires_in=>600}) { true }
+      OsmTest::Cache.should_receive('exist?').with("OSMAPI-#{Osm::VERSION}-osm-permissions-user_id") { true }
+      OsmTest::Cache.should_receive('read').with("OSMAPI-#{Osm::VERSION}-osm-permissions-user_id") { permissions }
+      OsmTest::Cache.should_receive('write').with("OSMAPI-#{Osm::VERSION}-osm-permissions-user_id", permissions.merge(3 => {:a => [:read]}), {:expires_in=>600}) { true }
       @api.set_user_permissions(3, {:a => [:read]})
     end
 

data/spec/osm/model_spec.rb

@@ -66,22 +66,22 @@ describe "Model" do
   describe "Caching" do
 
     it "Checks for existance" do
-      OsmTest::Cache.should_receive('exist?').with('OSMAPI-osm-key') { true }
+      OsmTest::Cache.should_receive('exist?').with("OSMAPI-#{Osm::VERSION}-osm-key") { true }
       ModelTester.cache('exist?', @api, 'key').should == true
     end
 
     it "Writes" do
-      OsmTest::Cache.should_receive('write').with('OSMAPI-osm-key', 'data', {:expires_in=>600}) { true }
+      OsmTest::Cache.should_receive('write').with("OSMAPI-#{Osm::VERSION}-osm-key", 'data', {:expires_in=>600}) { true }
       ModelTester.cache('write', @api, 'key', 'data').should == true
     end
 
     it "Reads" do
-      OsmTest::Cache.should_receive('read').with('OSMAPI-osm-key') { 'data' }
+      OsmTest::Cache.should_receive('read').with("OSMAPI-#{Osm::VERSION}-osm-key") { 'data' }
       ModelTester.cache('read', @api, 'key').should == 'data'
     end
 
     it "Deletes" do
-      OsmTest::Cache.should_receive('delete').with('OSMAPI-osm-key') { true }
+      OsmTest::Cache.should_receive('delete').with("OSMAPI-#{Osm::VERSION}-osm-key") { true }
       ModelTester.cache('delete', @api, 'key').should == true
     end
 
@@ -94,7 +94,7 @@ describe "Model" do
     end
 
     it "Builds a key from an array" do
-      ModelTester.cache('key', @api, ['a', 'b']).should == 'OSMAPI-osm-a-b'
+      ModelTester.cache('key', @api, ['a', 'b']).should == "OSMAPI-#{Osm::VERSION}-osm-a-b"
     end
 
   end
@@ -103,15 +103,15 @@ describe "Model" do
   describe "Get items from ids" do
 
     it "All items in cache" do
-      OsmTest::Cache.write('OSMAPI-osm-items', [1, 2])
-      OsmTest::Cache.write('OSMAPI-osm-item-1', '1')
-      OsmTest::Cache.write('OSMAPI-osm-item-2', '2')
+      OsmTest::Cache.write("OSMAPI-#{Osm::VERSION}-osm-items", [1, 2])
+      OsmTest::Cache.write("OSMAPI-#{Osm::VERSION}-osm-item-1", '1')
+      OsmTest::Cache.write("OSMAPI-#{Osm::VERSION}-osm-item-2", '2')
       ModelTester.test_get_all(@api, 'items', 'item').should == ['1', '2']
     end
     
     it "An item not in cache" do
-      OsmTest::Cache.write('OSMAPI-osm-items', [1, 2])
-      OsmTest::Cache.write('OSMAPI-osm-item-1', '1')
+      OsmTest::Cache.write("OSMAPI-#{Osm::VERSION}-osm-items", [1, 2])
+      OsmTest::Cache.write("OSMAPI-#{Osm::VERSION}-osm-item-1", '1')
       ModelTester.stub(:get_all) { ['A', 'B'] }
       ModelTester.test_get_all(@api, 'items', 'item').should == ['A', 'B']
     end

data/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.18.dev.14
-  prerelease: 7
+  version: 1.2.18
+  prerelease: 
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -308,9 +308,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: osm
 rubygems_version: 1.8.23.2