rcap 2.4.1 → 2.5.0

data/spec/extensions_spec.rb

@@ -1,67 +1,67 @@
 require 'spec_helper'
 
-describe( Array ) do
-  describe( 'to_s_for_cap' ) do
-    context( 'with an element containing white space' ) do
-      before( :all ) do
-        @list = [ 'one', 'white space', 'three' ]
+describe(Array) do
+  describe('to_s_for_cap') do
+    context('with an element containing white space') do
+      before(:all) do
+        @list = ['one', 'white space', 'three']
       end
 
-      it( 'should format the list correctly' ) do
+      it('should format the list correctly') do
         @list.to_s_for_cap.should == 'one "white space" three'
       end
     end
 
-    context( 'without an element containing white space' ) do
-      before( :all ) do
-        @list = [ 'one', 'two', 'three' ]
+    context('without an element containing white space') do
+      before(:all) do
+        @list = %w(one two three)
       end
-      it( 'should format the list correctly' ) do
+      it('should format the list correctly') do
         @list.to_s_for_cap.should == 'one two three'
       end
     end
   end
 end
 
-describe( String ) do
-  describe( 'for_cap_list' ) do
-    context( 'with white space' ) do
-      before( :all ) do
+describe(String) do
+  describe('for_cap_list') do
+    context('with white space') do
+      before(:all) do
         @string = 'white space'
       end
 
-      it( 'should format the string correctly' ) do
+      it('should format the string correctly') do
         @string.for_cap_list.should == '"white space"'
       end
     end
 
-    context( 'without white space' ) do
-      before( :all ) do
-        @string= 'one'
+    context('without white space') do
+      before(:all) do
+        @string = 'one'
       end
-      it( 'should format the string correctly' ) do
+      it('should format the string correctly') do
         @string.for_cap_list.should == 'one'
       end
     end
   end
 
-  describe( 'unpack_cap_list' ) do
-    it( 'shoud unpack strings in quotes correctly' ) do
-      'Item1 "Item 2" Item3'.unpack_cap_list.should == [ "Item1", "Item 2", "Item3" ]
+  describe('unpack_cap_list') do
+    it('shoud unpack strings in quotes correctly') do
+      'Item1 "Item 2" Item3'.unpack_cap_list.should == ['Item1', 'Item 2', 'Item3']
     end
 
-    it( 'should unpack strings correclty' ) do
-      'Item1 Item2 Item3'.unpack_cap_list.should == [ "Item1", "Item2", "Item3" ]
+    it('should unpack strings correclty') do
+      'Item1 Item2 Item3'.unpack_cap_list.should == %w(Item1 Item2 Item3)
     end
   end
 
-  describe( 'attribute_values_to_hash' ) do
-    it( 'should reject nil values' ) do
-      RCAP.attribute_values_to_hash( ["a", nil ]).should == {}
+  describe('attribute_values_to_hash') do
+    it('should reject nil values') do
+      RCAP.attribute_values_to_hash(['a', nil]).should == {}
     end
 
-    it( 'should not reject non-nil and non-empty values' ) do
-      RCAP.attribute_values_to_hash( [ "a", 1 ], [ "b", [ 2 ]]).should == { "a" => 1, "b" => [ 2 ]}
+    it('should not reject non-nil and non-empty values') do
+      RCAP.attribute_values_to_hash(['a', 1], ['b', [2]]).should == { 'a' => 1, 'b' => [2] }
     end
   end
 end

data/spec/info_spec.rb

@@ -1,34 +1,34 @@
 require 'spec_helper'
 
-describe( RCAP::Info ) do
-  describe( 'initialising' ) do
-    context( 'a CAP 1.2 info' ) do
-      let( :alert ) do
+describe(RCAP::Info) do
+  describe('initialising') do
+    context('a CAP 1.2 info') do
+      let(:alert) do
         RCAP::CAP_1_2::Alert.new
       end
 
-      let( :original_info ) do
+      let(:original_info) do
         RCAP::CAP_1_2::Info.new do |info|
-          info.event = "Event"
+          info.event = 'Event'
           info.urgency = RCAP::CAP_1_2::Info::URGENCY_EXPECTED
           info.severity = RCAP::CAP_1_2::Info::SEVERITY_SEVERE
           info.certainty = RCAP::CAP_1_2::Info::CERTAINTY_LIKELY
         end
       end
 
-      shared_examples_for( 'the 1.2 Info object is initialised correctly' ) do
-        it( 'sets the event' ){ info.event.should == original_info.event }
-        it( 'sets the urgency' ){ info.urgency.should == original_info.urgency }
-        it( 'sets the severity' ){ info.severity.should == original_info.severity }
-        it( 'sets the certainty' ){ info.certainty.should == original_info.certainty }
+      shared_examples_for('the 1.2 Info object is initialised correctly') do
+        it('sets the event') { info.event.should == original_info.event }
+        it('sets the urgency') { info.urgency.should == original_info.urgency }
+        it('sets the severity') { info.severity.should == original_info.severity }
+        it('sets the certainty') { info.certainty.should == original_info.certainty }
       end
 
-      context( 'from a Hash' ) do
-        let( :info ) do
-          RCAP::Info.from_h( alert, original_info.to_h )
+      context('from a Hash') do
+        let(:info) do
+          RCAP::Info.from_h(alert, original_info.to_h)
         end
 
-        it_should_behave_like( 'the 1.2 Info object is initialised correctly' )
+        it_should_behave_like('the 1.2 Info object is initialised correctly')
       end
     end
   end

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'rcap'
 require 'webmock/rspec'
 
 def random_circle_hash
-  { :lattitude => rand( 360 ) - 180,
-    :longitude => rand( 180 ) - 90,
-    :radius => rand( 50 ) }
+  { lattitude: rand(360) - 180,
+    longitude: rand(180) - 90,
+    radius: rand(50) }
 end

data/spec/validations_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 class ObjectWithValidatesCollection
   include Validation
-  attr_accessor( :collection )
-  validates_collection_of( :collection )
+  attr_accessor(:collection)
+  validates_collection_of(:collection)
   def initialize
     @collection = []
   end
@@ -11,54 +11,54 @@ end
 
 class DependencyObject
   include Validation
-  attr_accessor( :dependent_value, :contingent_value )
-  validates_dependency_of( :dependent_value, :on => :contingent_value )
+  attr_accessor(:dependent_value, :contingent_value)
+  validates_dependency_of(:dependent_value, on: :contingent_value)
 end
 
 class DependencyWithObject
   include Validation
-  attr_accessor( :dependent_value, :contingent_value )
-  validates_dependency_of( :dependent_value, :on => :contingent_value, :with_value => 1 )
+  attr_accessor(:dependent_value, :contingent_value)
+  validates_dependency_of(:dependent_value, on: :contingent_value, with_value: 1)
 end
 
 class ConditionalPresenceObject
   include Validation
-  attr_accessor( :dependent_value, :contingent_value )
-  validates_conditional_presence_of( :dependent_value, when: :contingent_value )
+  attr_accessor(:dependent_value, :contingent_value)
+  validates_conditional_presence_of(:dependent_value, when: :contingent_value)
 end
 
 class ConditionalPresenceIsObject
   include Validation
-  attr_accessor( :dependent_value, :contingent_value )
-  validates_conditional_presence_of( :dependent_value, when: :contingent_value, is: 1 )
+  attr_accessor(:dependent_value, :contingent_value)
+  validates_conditional_presence_of(:dependent_value, when: :contingent_value, is: 1)
 end
 
 class NumericalityObject
   include Validation
-  attr_accessor( :gt, :gte )
+  attr_accessor(:gt, :gte)
 
-  validates_numericality_of( :gt, greater_than: 0 )
-  validates_numericality_of( :gte, greater_than_or_equal: 0 )
+  validates_numericality_of(:gt, greater_than: 0)
+  validates_numericality_of(:gte, greater_than_or_equal: 0)
 end
 
-describe( Validation::ClassMethods ) do
-  describe( 'validates_collection_of' ) do
-    before( :each ) do
+describe(Validation::ClassMethods) do
+  describe('validates_collection_of') do
+    before(:each) do
       @object_with_collection = ObjectWithValidatesCollection.new
     end
 
-    it( 'should be valid if all the members are valid' ) do
+    it('should be valid if all the members are valid') do
       @object_with_collection.collection = Array.new(3) do
         RCAP::CAP_1_1::Point.new do |point|
           point.lattitude = 0
           point.longitude = 0
         end
       end
-      @object_with_collection.should( be_valid )
+      @object_with_collection.should(be_valid)
     end
 
-    it( 'should not be valid some of the members are invalid' ) do
-      @object_with_collection.collection = Array.new( 2 ) do
+    it('should not be valid some of the members are invalid') do
+      @object_with_collection.collection = Array.new(2) do
         RCAP::CAP_1_1::Point.new do |point|
           point.lattitude = 0
           point.longitude = 0
@@ -66,151 +66,151 @@ describe( Validation::ClassMethods ) do
       end
 
       @object_with_collection.collection << RCAP::CAP_1_1::Point.new do |point|
-        point.lattitude = "not a number"
+        point.lattitude = 'not a number'
         point.longitude = 0
       end
 
-      @object_with_collection.should_not( be_valid )
+      @object_with_collection.should_not(be_valid)
     end
   end
 
-  describe( 'validates_dependency_of' ) do
-    context( 'without :with_value' ) do
-      before( :each ) do
+  describe('validates_dependency_of') do
+    context('without :with_value') do
+      before(:each) do
         @object = DependencyObject.new
         @object.dependent_value = 1
         @object.contingent_value = 1
-        @object.should( be_valid )
+        @object.should(be_valid)
       end
 
-      it( 'should not be valid if the contigent value is nil' ) do
+      it('should not be valid if the contigent value is nil') do
         @object.contingent_value = nil
-        @object.should_not( be_valid )
+        @object.should_not(be_valid)
       end
 
-      it( 'should be valid if the dependent value is nil' ) do
+      it('should be valid if the dependent value is nil') do
         @object.dependent_value = nil
-        @object.should( be_valid )
+        @object.should(be_valid)
       end
 
-      it( 'should be valid if both are nil' ) do
+      it('should be valid if both are nil') do
         @object.dependent_value = nil
         @object.contingent_value = nil
-        @object.should( be_valid )
+        @object.should(be_valid)
       end
     end
 
-    context( 'with :with_value' ) do
-      before( :each ) do
+    context('with :with_value') do
+      before(:each) do
         @object = DependencyWithObject.new
         @object.dependent_value = 1
         @object.contingent_value = 1
-        @object.should( be_valid )
+        @object.should(be_valid)
       end
 
-      it( 'should not be valid if the contigent value is nil' ) do
+      it('should not be valid if the contigent value is nil') do
         @object.contingent_value = nil
-        @object.should_not( be_valid )
+        @object.should_not(be_valid)
       end
 
-      it( 'should not be valid if the contingent value is not the required value' ) do
+      it('should not be valid if the contingent value is not the required value') do
         @object.contingent_value = 0
-        @object.should_not( be_valid )
+        @object.should_not(be_valid)
       end
 
-      it( 'should be valid if the dependent value is nil' ) do
+      it('should be valid if the dependent value is nil') do
         @object.dependent_value = nil
-        @object.should( be_valid )
+        @object.should(be_valid)
       end
 
-      it( 'should be valid if both are nil' ) do
+      it('should be valid if both are nil') do
         @object.dependent_value = nil
         @object.contingent_value = nil
-        @object.should( be_valid )
+        @object.should(be_valid)
       end
     end
   end
 
-  describe( 'validates_conditional_presence_of' ) do
-    context( 'without :is' ) do
-      before( :each ) do
+  describe('validates_conditional_presence_of') do
+    context('without :is') do
+      before(:each) do
         @object = ConditionalPresenceObject.new
         @object.dependent_value = 1
         @object.contingent_value = 1
-        @object.should( be_valid )
+        @object.should(be_valid)
       end
 
-      it( 'should not be valid if dependent_value is nil' ) do
+      it('should not be valid if dependent_value is nil') do
         @object.dependent_value = nil
-        @object.should_not( be_valid )
+        @object.should_not(be_valid)
       end
 
-      it( 'should be valid if contingent_value is nil' ) do
+      it('should be valid if contingent_value is nil') do
         @object.contingent_value = nil
-        @object.should( be_valid )
+        @object.should(be_valid)
       end
 
-      it( 'should be valid if both dependent_value and contingent_value is nil' ) do
+      it('should be valid if both dependent_value and contingent_value is nil') do
         @object.dependent_value = nil
         @object.contingent_value = nil
-        @object.should( be_valid )
+        @object.should(be_valid)
       end
 
     end
 
-    context( 'with :is' ) do
-      before( :each ) do
+    context('with :is') do
+      before(:each) do
         @object = ConditionalPresenceIsObject.new
         @object.dependent_value = 1
         @object.contingent_value = 1
-        @object.should( be_valid )
+        @object.should(be_valid)
       end
 
-      it( 'should not be valid if dependent_value is nil' ) do
+      it('should not be valid if dependent_value is nil') do
         @object.dependent_value = nil
-        @object.should_not( be_valid )
+        @object.should_not(be_valid)
       end
 
-      it( 'should be valid if contingent_value is nil' ) do
+      it('should be valid if contingent_value is nil') do
         @object.contingent_value = nil
-        @object.should( be_valid )
+        @object.should(be_valid)
       end
 
-      it( 'should be valid if dependent_value is nil and contingent_value is not required value' ) do
+      it('should be valid if dependent_value is nil and contingent_value is not required value') do
         @object.dependent_value = nil
         @object.contingent_value = 2
-        @object.should( be_valid )
+        @object.should(be_valid)
       end
 
-      it( 'should be valid if both dependent_value and contingent_value is nil' ) do
+      it('should be valid if both dependent_value and contingent_value is nil') do
         @object.dependent_value = nil
         @object.contingent_value = nil
-        @object.should( be_valid )
+        @object.should(be_valid)
       end
     end
   end
 
-  describe( 'validates_numericality_of' ) do
-    before( :each ) do
+  describe('validates_numericality_of') do
+    before(:each) do
       @object = NumericalityObject.new
       @object.gt = 1
       @object.gte = 0
-      @object.should( be_valid )
+      @object.should(be_valid)
     end
 
-    it( 'should not be valid with a non-numerical value' ) do
+    it('should not be valid with a non-numerical value') do
       @object.gt = 'one'
-      @object.should_not( be_valid )
+      @object.should_not(be_valid)
     end
 
-    it( 'should not be valid if set :greater_than is false' ) do
+    it('should not be valid if set :greater_than is false') do
       @object.gt = 0
-      @object.should_not( be_valid )
+      @object.should_not(be_valid)
     end
 
-    it( 'should not be valid if set :greater_than_or_equal is false' ) do
+    it('should not be valid if set :greater_than_or_equal is false') do
       @object.gte = -1
-      @object.should_not( be_valid )
+      @object.should_not(be_valid)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rcap
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Farrel Lifson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json