rcap 1.3.1 → 2.0.0

data/spec/cap_1_2/resource_spec.rb

@@ -1,6 +1,17 @@
 require 'spec_helper'
 
 describe( RCAP::CAP_1_2::Resource ) do
+  before( :each ) do
+    @resource_builder = lambda do |resource|
+      resource.resource_desc = "Image of incident"
+      resource.uri           = "http://capetown.gov.za/cap/resources/image.png"
+      resource.mime_type     = 'image/png'
+      resource.deref_uri     = "IMAGE DATA"
+      resource.size          = 20480
+      resource.digest        = "2048"
+    end
+  end
+
   context( 'on initialisation' ) do
     before( :each ) do
       @resource = RCAP::CAP_1_2::Resource.new
@@ -15,15 +26,10 @@ describe( RCAP::CAP_1_2::Resource ) do
 
     context( 'from XML' ) do
       before( :each ) do
-        @original_resource = RCAP::CAP_1_2::Resource.new
-        @original_resource.resource_desc = "Image of incident"
-        @original_resource.uri           = "http://capetown.gov.za/cap/resources/image.png"
-        @original_resource.mime_type     = 'image/png'
-        @original_resource.deref_uri     = "IMAGE DATA"
-        @original_resource.size          = 20480
-        @original_resource.digest        = "2048"
-
-        @alert = RCAP::CAP_1_2::Alert.new( :infos => RCAP::CAP_1_2::Info.new( :resources => @original_resource ))
+        @original_resource = RCAP::CAP_1_2::Resource.new( &@resource_builder )
+
+        @alert = RCAP::CAP_1_2::Alert.new
+        @alert.add_info.add_resource( &@resource_builder )
         @xml_string = @alert.to_xml
         @xml_document = REXML::Document.new( @xml_string )
         @info_element = RCAP.xpath_first( @xml_document.root, RCAP::CAP_1_2::Info::XPATH, RCAP::CAP_1_2::Alert::XMLNS )
@@ -60,13 +66,7 @@ describe( RCAP::CAP_1_2::Resource ) do
 
     context( 'from a hash' ) do
       before( :each ) do
-        @original_resource = RCAP::CAP_1_2::Resource.new
-        @original_resource.resource_desc = "Image of incident"
-        @original_resource.uri           = "http://capetown.gov.za/cap/resources/image.png"
-        @original_resource.mime_type     = 'image/png'
-        @original_resource.deref_uri     = "IMAGE DATA"
-        @original_resource.size          = 20480
-        @original_resource.digest        = "2048"
+        @original_resource = RCAP::CAP_1_2::Resource.new( &@resource_builder )
 
         @resource = RCAP::CAP_1_2::Resource.from_h( @original_resource.to_h )
       end
@@ -95,18 +95,11 @@ describe( RCAP::CAP_1_2::Resource ) do
         @resource.digest.should == @original_resource.digest
       end
     end
-
   end
 
   context( 'when exported' ) do
     before( :each ) do
-      @resource = RCAP::CAP_1_2::Resource.new
-      @resource.resource_desc = "Image of incident"
-      @resource.uri           = "http://capetown.gov.za/cap/resources/image.png"
-      @resource.mime_type     = 'image/png'
-      @resource.deref_uri     = "IMAGE DATA"
-      @resource.size          = 20480
-      @resource.digest        = "2048"
+      @resource = RCAP::CAP_1_2::Resource.new( &@resource_builder )
     end
 
     context( 'to a hash' ) do
@@ -148,7 +141,10 @@ describe( RCAP::CAP_1_2::Resource ) do
 
   context( 'which is valid' ) do
     before( :each ) do
-      @resource = RCAP::CAP_1_2::Resource.new( :resource_desc => 'Resource Description', :mime_type => 'text/csv' )
+      @resource = RCAP::CAP_1_2::Resource.new do |resource|
+        resource.resource_desc = 'Resource Description'
+        resource.mime_type = 'text/csv'
+      end
       @resource.should( be_valid )
     end
 
@@ -167,7 +163,11 @@ describe( RCAP::CAP_1_2::Resource ) do
 
   context( 'with a non-rereferenced URI' ) do
     before( :each ) do
-      @resource = RCAP::CAP_1_2::Resource.new( :resource_desc => 'Resource Description', :mime_type => 'text/csv', :uri => 'http://tempuri.org/resource.csv' )
+      @resource = RCAP::CAP_1_2::Resource.new do |resource|
+         resource.resource_desc = 'Resource Description'
+         resource.mime_type     = 'text/csv'
+         resource.uri           = 'http://tempuri.org/resource.csv'
+      end
       @content = "1,2\n3,4"
       @encoded_content = Base64.encode64( @content )
       stub_request( :get, @resource.uri ).to_return( :status => 200, :body => @content )
@@ -189,10 +189,15 @@ describe( RCAP::CAP_1_2::Resource ) do
   end
 
   context( 'with a dereferenced URI' ) do
-    before( :each ) do 
+    before( :each ) do
       @content = "1,2\n3,4"
       @encoded_content = Base64.encode64( @content )
-      @resource = RCAP::CAP_1_2::Resource.new( :resource_desc => 'Resource Description', :mime_type => 'text/csv', :uri => 'http://tempuri.org/resource.csv', :deref_uri => @encoded_content )
+      @resource = RCAP::CAP_1_2::Resource.new do |resource|
+         resource.resource_desc = 'Resource Description'
+         resource.mime_type     = 'text/csv'
+         resource.uri           = 'http://tempuri.org/resource.csv'
+         resource.deref_uri     = @encoded_content
+      end
     end
 
     describe( '#calculate_hash_and_size' ) do

data/spec/validations_spec.rb

@@ -48,12 +48,28 @@ describe( Validation::ClassMethods ) do
     end
 
     it( 'should be valid if all the members are valid' ) do
-      @object_with_collection.collection = Array.new(3){ RCAP::CAP_1_1::Point.new( :lattitude => 0, :longitude => 0 )}
+      @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 )
     end
 
     it( 'should not be valid some of the members are invalid' ) do
-      @object_with_collection.collection = Array.new( 2 ){ RCAP::CAP_1_1::Point.new( :lattitude => 0, :longitude => 0 )} + [ RCAP::CAP_1_1::Point.new( :lattitude => "not a number", :longitude => 0)]
+      @object_with_collection.collection = Array.new( 2 ) do
+        RCAP::CAP_1_1::Point.new do |point|
+          point.lattitude = 0
+          point.longitude = 0
+        end
+      end
+
+      @object_with_collection.collection << RCAP::CAP_1_1::Point.new do |point|
+        point.lattitude = "not a number"
+        point.longitude = 0
+      end
+
       @object_with_collection.should_not( be_valid )
     end
   end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rcap
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 1
-  version: 1.3.1
+  version: 2.0.0
 platform: ruby
 authors: 
 - Farrel Lifson
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-26 00:00:00 Z
+date: 2012-11-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assistance
@@ -25,11 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 1
-        - 5
         version: 0.1.5
   type: :runtime
   version_requirements: *id001
@@ -41,11 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
         version: 1.5.1
   type: :runtime
   version_requirements: *id002
@@ -57,11 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
         version: 2.1.2
   type: :runtime
   version_requirements: *id003
@@ -73,11 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
         version: 2.5.0
   type: :development
   version_requirements: *id004
@@ -89,9 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -103,9 +75,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -125,12 +94,18 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- lib/extensions/array.rb
-- lib/extensions/date_time.rb
-- lib/extensions/string.rb
-- lib/extensions/time.rb
 - lib/rcap.rb
 - lib/rcap/alert.rb
+- lib/rcap/base/alert.rb
+- lib/rcap/base/area.rb
+- lib/rcap/base/circle.rb
+- lib/rcap/base/event_code.rb
+- lib/rcap/base/geocode.rb
+- lib/rcap/base/info.rb
+- lib/rcap/base/parameter.rb
+- lib/rcap/base/point.rb
+- lib/rcap/base/polygon.rb
+- lib/rcap/base/resource.rb
 - lib/rcap/cap_1_0/alert.rb
 - lib/rcap/cap_1_0/area.rb
 - lib/rcap/cap_1_0/circle.rb
@@ -162,6 +137,11 @@ files:
 - lib/rcap/cap_1_2/polygon.rb
 - lib/rcap/cap_1_2/resource.rb
 - lib/rcap/config.rb
+- lib/rcap/extensions/array.rb
+- lib/rcap/extensions/date.rb
+- lib/rcap/extensions/date_time.rb
+- lib/rcap/extensions/string.rb
+- lib/rcap/extensions/time.rb
 - lib/rcap/utilities.rb
 - lib/rcap/validations.rb
 - lib/rcap/version.rb
@@ -210,9 +190,9 @@ files:
 - spec/cap_1_2/point_spec.rb
 - spec/cap_1_2/polygon_spec.rb
 - spec/cap_1_2/resource_spec.rb
+- spec/extensions_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/utilities_spec.rb
 - spec/validations_spec.rb
 homepage: http://www.aimred.com/projects/rcap
 licenses: []
@@ -227,23 +207,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rcap
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: CAP(Common Alerting Protocol) API
@@ -292,8 +266,8 @@ test_files:
 - spec/cap_1_2/point_spec.rb
 - spec/cap_1_2/polygon_spec.rb
 - spec/cap_1_2/resource_spec.rb
+- spec/extensions_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/utilities_spec.rb
 - spec/validations_spec.rb
 has_rdoc: