rcap 1.0.0.rc.1 → 1.0.0.rc.2

data/README.rdoc

@@ -8,7 +8,7 @@ RCAP currently supports CAP 1.1 and 1.2.
 
 == Version
 
-1.0
+1.0.0 RC 1
 
 == Dependencies
 
@@ -47,10 +47,12 @@ All RCAP classes reside in the RCAP namespace but including the RCAP module make
 
 === Creating an Alert
 
- alert = Alert.new( sender:   'cape_town_disaster_relief@capetown.municipal.za',
-                    status:   Alert::STATUS_ACTUAL,
-                    msg_type: Alert::MSG_TYPE_ALERT,
-                    scope:    Alert::SCOPE_PUBLIC )
+ alert = Alert.new( identifier: RCAP.generate_identifier,
+                    sent:       DateTime.now,
+                    sender:     'cape_town_disaster_relief@capetown.municipal.za',
+                    status:     Alert::STATUS_ACTUAL,
+                    msg_type:   Alert::MSG_TYPE_ALERT,
+                    scope:      Alert::SCOPE_PUBLIC )
 
  alert.add_info( event:       'Liquid Petroleoum Tanker Fire',
                  language:    'en-ZA',
@@ -70,7 +72,7 @@ All RCAP classes reside in the RCAP namespace but including the RCAP module make
  alert.status                           # "Actual"
  alert.infos[0].language                # "en-ZA"
  alert.infos[0].categories.join( ', ' ) # "Transport, Fire"
- alert.infos[0].areas[0].first          # "N2 Highway/R300 Interchange"
+ alert.infos[0].areas[0]                # "N2 Highway/R300 Interchange"
 
 === Parsing an Alert From An External Source
 
@@ -86,7 +88,7 @@ RCAP allows for the parsing of a CAP XML string
 
 ==== From YAML
 
-Alert messgaes can be read in from text files containing data formatted in YAML[http://yaml.org] as generated by Alert#to_yaml.
+Alert messgaes can be read in from text files containing data formatted in YAML[http://yaml.org] as generated by RCAP::CAP_1_2::Alert#to_yaml.
 
  alert = RCAP::Alert.from_yaml( yaml_string )
 
@@ -110,7 +112,7 @@ The RCAP API aims to codify as many of the rules of the CAP XML format into vali
  puts "Is info valid: #{ info.valid? }"
  info.errors.full_messages.each{ |message| puts "Error: #{ message }" }
 
-Will produce the folling output:
+Will produce the following output:
 
  Is info valid: false
  Error: severity is not present

data/lib/rcap/cap_1_1/circle.rb

@@ -10,7 +10,7 @@ module RCAP
       attr_accessor( :radius )
 
       validates_presence_of( :radius )
-      validates_numericality_of( :radius , :greater_than => 0 )
+      validates_numericality_of( :radius , :greater_than_or_equal: 0 )
 
       XML_ELEMENT_NAME = 'circle' # :nodoc:
 

data/lib/rcap/cap_1_1/point.rb

@@ -38,8 +38,8 @@ module RCAP
         [ self.lattitude, self.longitude ] == [ other.lattitude, other.longitude ]
       end
 
-      LATTITUDE_KEY = 'lattitude_hash'  # :nodoc:
-      LONGITUDE_KEY = 'longitude_hash'  # :nodoc:
+      LATTITUDE_KEY = 'lattitude'  # :nodoc:
+      LONGITUDE_KEY = 'longitude'  # :nodoc:
 
       def to_h # :nodoc:
         RCAP.attribute_values_to_hash(

data/lib/rcap/cap_1_2/circle.rb

@@ -10,7 +10,7 @@ module RCAP
       attr_accessor( :radius )
 
       validates_presence_of( :radius )
-      validates_numericality_of( :radius , :greater_than => 0 )
+      validates_numericality_of( :radius , :greater_than_or_equal: 0 )
 
       XML_ELEMENT_NAME = 'circle' # :nodoc:
 

data/lib/rcap/cap_1_2/point.rb

@@ -38,8 +38,8 @@ module RCAP
         [ self.lattitude, self.longitude ] == [ other.lattitude, other.longitude ]
       end
 
-      LATTITUDE_KEY = 'lattitude_hash'  # :nodoc:
-      LONGITUDE_KEY = 'longitude_hash'  # :nodoc:
+      LATTITUDE_KEY = 'lattitude'  # :nodoc:
+      LONGITUDE_KEY = 'longitude'  # :nodoc:
 
       def to_h # :nodoc:
         RCAP.attribute_values_to_hash(

data/lib/rcap/validations.rb

@@ -104,7 +104,7 @@ module Validation  # :nodoc:
 
     def validates_numericality_of( *attributes )
       options = {
-        :message => 'is not a number',
+        :message => 'is not a number or does not meet a conditional requirement',
       }.merge!(attributes.extract_options!)
 
       re = options[:only_integer] ? CAP_INTEGER_REGEX : CAP_NUMBER_REGEX
@@ -112,7 +112,8 @@ module Validation  # :nodoc:
       validates_each( *attributes ) do |object, attribute, value|
         next if (value.nil? && options[ :allow_nil ]) || (value.blank? && options[ :allow_blank ])
         unless ( value.to_s =~ re ) &&
-          ( options[ :greater_than ].nil? || value && value > options[ :greater_than ])
+          ( options[ :greater_than ].nil? || value && value > options[ :greater_than ]) &&
+          ( options[ :greater_than_or_equal ].nil? || value && value >= options[ :greater_than_or_equal])
           object.errors[ attribute ] << options[ :message ]
         end
       end

data/lib/rcap/version.rb

@@ -1,3 +1,3 @@
 module RCAP
-  VERSION = '1.0.0.rc.1'
+  VERSION = '1.0.0.rc.2'
 end

data/spec/validations_spec.rb

@@ -33,6 +33,14 @@ class ConditionalPresenceIsObject
   validates_conditional_presence_of( :dependent_value, when: :contingent_value, is: 1 )
 end
 
+class NumericalityObject
+  include Validation
+  attr_accessor( :gt, :gte )
+
+  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
@@ -165,4 +173,28 @@ describe( Validation::ClassMethods ) do
       end
     end
   end
+
+  describe( 'validates_numericality_of' ) do
+    before( :each ) do
+      @object = NumericalityObject.new
+      @object.gt = 1
+      @object.gte = 0
+      @object.should( be_valid )
+    end
+
+    it( 'should not be valid with a non-numerical value' ) do
+      @object.gt = 'one'
+      @object.should_not( be_valid )
+    end
+
+    it( 'should not be valid if set :greater_than is false' ) do
+      @object.gt = 0
+      @object.should_not( be_valid )
+    end
+
+    it( 'should not be valid if set :greater_than_or_equal is false' ) do
+      @object.gte = -1
+      @object.should_not( be_valid )
+    end
+  end
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - rc
-  - 1
-  version: 1.0.0.rc.1
+  - 2
+  version: 1.0.0.rc.2
 platform: ruby
 authors: 
 - Farrel Lifson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-03 00:00:00 +02:00
+date: 2011-04-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency