osm 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 651a0cdcdd3d694935cd01e1500494bf8cd4c7cf
-  data.tar.gz: 3e28fa840b8b180292c469f068f6667c01f9bbc9
+  metadata.gz: 67e1f0345412482f0042df2e2c01cfcfcf3b4898
+  data.tar.gz: bc3cdb62a5cc7f084c4c47d299ea075a6651456f
 SHA512:
-  metadata.gz: 6a31dd0a2da75b15f7c53fb2346e238d0044c3ecca6f04ad14c49bd06818f856987d185474f88a016b76f5df76e889e10464012ace57829bad3d6e049cf8c617
-  data.tar.gz: 0bf8a3ac116819ddda8b030c5caad9b6e77896be6b0e9d075ff92905bc82fda39c536d9ca215d58e221a1e40e9e5bbbba830feaff57abda82488c8e84d4f934b
+  metadata.gz: 439ce355dcb274fca820926190d6cb82d2f32296ceeb038784e10ed674db4661ce0fff618f99ad108bacdd30e31ce6ed65e1dd47737ac77fcd625284482e7dda
+  data.tar.gz: 68a847aea26f457ce6625e40d6acbd11256a3291b1447fc00735cfc6927e14d675343939cfd0d2e36fe2c0ed2d39047df33ec664e18797c7ba27072bbb4e253c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Version 1.3.1
+
+  * Fix "undefined method '<=' for nil:NilClass" when testing if member is current
+  * Update httparty gem (CVE 2013-1801)
+  
+
 ## Version 1.3.0
 
   * Add fetching of file names for events (unable to download)

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', all_on_start: true, all_after_pass: true do
+guard 'rspec', all_on_start: true, all_after_pass: true, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^lib/([^/]+)/(.+)\.rb$}) { |m| "spec/#{m[1]}/#{m[2]}_spec.rb" }

data/lib/osm/member.rb

@@ -452,13 +452,16 @@ module Osm
     end
 
     # Check if this is a current member of the section they were retrieved for
-    # @param [Date] date The date to check membership status for
-    # @return [Boolean]
+    # @param date [Date] The date to check membership status for
+    # @return true, false
     def current?(date=Date.today)
+      return nil if started_section.nil? and finished_section.nil?
       if finished_section.nil?
-        return (started_section <= date)
+        started_section <= date
+      elsif started_section.nil?
+        finished_section >= date
       else
-        return (started_section <= date) && (finished_section >= date)
+        (started_section <= date) && (finished_section >= date)
       end
     end
 

data/osm.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency 'activesupport', '>= 3.2', '< 5' # Used to parse JSON from OSM
-  s.add_runtime_dependency 'httparty', '~> 0.9'             # Used to make web requests to the API
+  s.add_runtime_dependency 'httparty', '~> 0.10'            # Used to make web requests to the API
   s.add_runtime_dependency 'active_attr', '~> 0.8'
   s.add_runtime_dependency 'activemodel', '>= 3.2', '< 5'
   s.add_runtime_dependency 'dirty_hashy', '~> 0.2.1'        # Used to track changed data in Badge::Data and FlexiRecord::Data

data/spec/osm/member_spec.rb

@@ -112,28 +112,52 @@ describe "Member" do
   end
 
 
-  describe "Tells if the member is currently in the section" do
-    it "Today" do
-      Osm::Member.new(started_section: Date.yesterday).current?.should == true
-      Osm::Member.new(started_section: Date.today).current?.should == true
-      Osm::Member.new(started_section: Date.tomorrow).current?.should == false
-      Osm::Member.new(started_section: Date.yesterday, finished_section: Date.yesterday).current?.should == false
-      Osm::Member.new(started_section: Date.yesterday, finished_section: Date.today).current?.should == true
-      Osm::Member.new(started_section: Date.yesterday, finished_section: Date.tomorrow).current?.should == true
+  describe 'Tells if the member is currently in the section' do
+    context 'Using the current date' do
+      it 'Has a started_section and a finished_section date' do
+        expect(Osm::Member.new(started_section: Date.yesterday, finished_section: Date.yesterday).current?).to eq(false)
+        expect(Osm::Member.new(started_section: Date.yesterday, finished_section: Date.today).current?).to eq(true)
+        expect(Osm::Member.new(started_section: Date.yesterday, finished_section: Date.tomorrow).current?).to eq(true)
+      end
+      it 'Only has a started_section date' do
+        expect(Osm::Member.new(started_section: Date.yesterday).current?).to eq(true)
+        expect(Osm::Member.new(started_section: Date.today).current?).to eq(true)
+        expect(Osm::Member.new(started_section: Date.tomorrow).current?).to eq(false)
+      end
+      it 'Only has a finished_section date' do
+        expect(Osm::Member.new(finished_section: Date.yesterday).current?).to eq(false)
+        expect(Osm::Member.new(finished_section: Date.today).current?).to eq(true)
+        expect(Osm::Member.new(finished_section: Date.tomorrow).current?).to eq(true)
+      end
+      it 'Has neither a started_section or finished_section date' do
+        expect(Osm::Member.new().current?).to be_nil
+      end
     end
 
-    it "Another date" do
-      yesterday = Date.new(2014, 10, 15)
-      today = Date.new(2014, 10, 16)
-      tomorrow = Date.new(2014, 10, 17)
-      Osm::Member.new(started_section: yesterday).current?(today).should == true
-      Osm::Member.new(started_section: today).current?(today).should == true
-      Osm::Member.new(started_section: tomorrow).current?(today).should == false
-      Osm::Member.new(started_section: yesterday, finished_section: yesterday).current?(today).should == false
-      Osm::Member.new(started_section: yesterday, finished_section: today).current?(today).should == true
-      Osm::Member.new(started_section: yesterday, finished_section: tomorrow).current?(today).should == true
-    end
-  end
+    context 'Using another date' do
+      let(:yesterday) { Date.new(2014, 10, 15) }
+      let(:today) { Date.new(2014, 10, 16) }
+      let(:tomorrow) { Date.new(2014, 10, 17) }
+      it 'Has a started_section and a finished_section date' do
+        expect(Osm::Member.new(started_section: yesterday, finished_section: yesterday).current?(today)).to eq(false)
+        expect(Osm::Member.new(started_section: yesterday, finished_section: today).current?(today)).to eq(true)
+        expect(Osm::Member.new(started_section: yesterday, finished_section: tomorrow).current?(today)).to eq(true)
+      end
+      it 'Only has a started_section date' do
+        expect(Osm::Member.new(started_section: yesterday).current?(today)).to eq(true)
+        expect(Osm::Member.new(started_section: today).current?(today)).to eq(true)
+        expect(Osm::Member.new(started_section: tomorrow).current?(today)).to eq(false)
+      end
+      it 'Only has a finished_section date' do
+        expect(Osm::Member.new(finished_section: yesterday).current?(today)).to eq(false)
+        expect(Osm::Member.new(finished_section: today).current?(today)).to eq(true)
+        expect(Osm::Member.new(finished_section: tomorrow).current?(today)).to eq(true)
+      end
+      it 'Has neither a started_section or finished_section date' do
+        expect(Osm::Member.new().current?(today)).to be_nil
+      end
+    end # context Using another date
+  end # describe Tells if the member is currently in the section
 
 
   it "Sorts by section_id, grouping_id, grouping_leader (descending), last_name then first_name" do

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2017-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
@@ -307,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: osm
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Use the Online Scout Manager API