osm 1.2.6 → 1.2.7.dev

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.2.7
+
+  * Fix can't compare exception when a FlexiRecord has a nil name.
+
 ## Version 1.2.6
 
   * Update dependancies to allow using with a rails 4 app (rails 3 is still tested against by travis)

data/README.md

@@ -1,15 +1,27 @@
 [![Gem Version](https://badge.fury.io/rb/osm.png)](http://badge.fury.io/rb/osm)
 [![Dependency Status](https://gemnasium.com/robertgauld/osm.png)](https://gemnasium.com/robertgauld/osm)
 
+Master branch:
+[![Build Status](https://secure.travis-ci.org/robertgauld/osm.png?branch=master)](http://travis-ci.org/robertgauld/osm)
+[![Coveralls Status](https://coveralls.io/repos/robertgauld/osm/badge.png?branch=master)](https://coveralls.io/r/robertgauld/osm)
+[![Code Climate](https://codeclimate.com/github/robertgauld/osm.png?branch=master)](https://codeclimate.com/github/robertgauld/osm)
+
+Staging branch:
+[![Build Status](https://secure.travis-ci.org/robertgauld/osm.png?branch=staging)](http://travis-ci.org/robertgauld/o
+[![Coveralls Status](https://coveralls.io/repos/robertgauld/osm/badge.png?branch=master)](https://coveralls.io/r/robertgauld/osm)
+[![Code Climate](https://codeclimate.com/github/robertgauld/osm.png?branch=staging)](https://codeclimate.com/github/robertgauld/osm)
+
 
 ##Build State
 This project uses continuous integration to help ensure that a quality product is delivered.
 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).
 
-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=master)](http://travis-ci.org/robertgauld/osm)
 
-Staging [![Build Status](https://secure.travis-ci.org/robertgauld/osm.png?branch=staging)](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
@@ -26,7 +38,7 @@ Use the [Online Scout Manager](https://www.onlinescoutmanager.co.uk) API.
 
 ## Installation
 
-**Requires Ruby 1.9.2 or later.**
+**Requires Ruby 1.9.3 or later.**
 
 Add to your Gemfile and run the `bundle` command to install it.
 

data/gemfiles/rails3

@@ -9,5 +9,7 @@ gem 'rake', '~> 10.1'
 gem 'rspec', '~> 2.0', '< 2.14'
 gem 'fakeweb', '~> 1.3.0'
 gem 'osm', :path=>'../'
+gem 'coveralls', '~> 0.7'
+gem 'simplecov', '~> 0.7'
 
 #gemspec :path=>"../"

data/lib/osm/flexi_record.rb

@@ -118,10 +118,10 @@ module Osm
       return to_return
     end
 
-    # Compare Activity based on section_id then name
+    # Compare FlexiRecord based on section_id then name
     def <=>(another)
-      result = self.section_id <=> another.try(:section_id)
-      result = self.name <=> another.try(:name) if result == 0
+      result = self.section_id.to_i <=> another.try(:section_id).to_i
+      result = self.name.to_s <=> another.try(:name).to_s if result == 0
       return result
     end
 

data/osm.gemspec

@@ -30,5 +30,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fakeweb', '~> 1.3'
   s.add_development_dependency 'guard-rspec', '~> 4.2', '>= 4.2.5'
   s.add_development_dependency 'rb-inotify', '~> 0.9'
+  s.add_development_dependency 'coveralls', '~> 0.7'
+  s.add_development_dependency 'simplecov', '~> 0.7'
 
 end

data/spec/spec_helper.rb

@@ -1,3 +1,12 @@
+require 'simplecov'
+SimpleCov.coverage_dir(File.join('tmp', 'coverage'))
+SimpleCov.start do
+  add_filter 'spec/'
+end
+
+require 'coveralls' and Coveralls.wear! if ENV['TRAVIS']
+
+
 require 'fakeweb'
 require 'httparty'
 require 'active_support'
@@ -7,6 +16,7 @@ require 'active_model'
 require 'osm'
 
 FakeWeb.allow_net_connect = false
+FakeWeb.allow_net_connect = %r[^https://coveralls.io] # Allow coveralls to report coverage
 
 
 RSpec.configure do |config|

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.6"
+  VERSION = "1.2.7.dev"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.6
-  prerelease: 
+  version: 1.2.7.dev
+  prerelease: 6
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -195,6 +195,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: Use the Online Scout Manager API (https://www.onlinescoutmanager.co.uk)
   to retrieve and save data.
 email:
@@ -272,9 +304,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: osm
 rubygems_version: 1.8.25