atdis 0.1 → 0.2

data/lib/atdis/person.rb

@@ -1,10 +1,12 @@
 module ATDIS
   class Person < Model
-    field_mappings :name => [:name, String],
-      :role => [:role, String],
-      :contact => [:contact, String]
+    set_field_mappings [
+      [:name, [:name, String, {:level => 2}]],
+      [:role, [:role, String, {:level => 2}]],
+      [:contact, [:contact, String, {:level => 2}]]
+    ]
 
     # Mandatory parameters
-    validates :name, :role, :presence_before_type_cast => true    
+    validates :name, :role, :presence_before_type_cast => {:spec_section => "4.3.6"}    
   end
 end

data/lib/atdis/validators.rb

@@ -6,7 +6,9 @@ module ATDIS
       def validate_each(record, attribute, value)
         raw_value = record.send("#{attribute}_before_type_cast")
         if raw_value.present? && value.nil?
-          record.errors.add(attribute, "is not valid GeoJSON")
+          message = "is not valid GeoJSON"
+          message = ErrorMessage[message, options[:spec_section]] if options[:spec_section]
+          record.errors.add(attribute, message)
         end
       end
     end
@@ -15,7 +17,18 @@ module ATDIS
       def validate_each(record, attribute, value)
         raw_value = record.send("#{attribute}_before_type_cast")
         if raw_value.present? && !value.kind_of?(DateTime)
-          record.errors.add(attribute, "is not a valid date")
+          record.errors.add(attribute, ErrorMessage["is not a valid date", options[:spec_section]])
+        end
+      end
+    end
+
+    class DateTimeOrNoneValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        raw_value = record.send("#{attribute}_before_type_cast")
+        if raw_value.present? && raw_value != "none" && !value.kind_of?(DateTime)
+          message = "is not a valid date or none"
+          message = ErrorMessage[message, options[:spec_section]] if options[:spec_section]
+          record.errors.add(attribute, message)
         end
       end
     end
@@ -24,7 +37,19 @@ module ATDIS
       def validate_each(record, attribute, value)
         raw_value = record.send("#{attribute}_before_type_cast")
         if raw_value.present? && !value.kind_of?(URI::HTTP) && !value.kind_of?(URI::HTTPS) 
-          record.errors.add(attribute, "is not a valid URL")
+          message = "is not a valid URL"
+          message = ErrorMessage[message, options[:spec_section]] if options[:spec_section]
+          record.errors.add(attribute, message)
+        end
+      end
+    end
+
+    class ArrayValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        if value && !value.kind_of?(Array)
+          message = "should be an array"
+          message = ErrorMessage[message, options[:spec_section]] if options[:spec_section]
+          record.errors.add(attribute, message)
         end
       end
     end
@@ -33,8 +58,10 @@ module ATDIS
     class PresenceBeforeTypeCastValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
         raw_value = record.send("#{attribute}_before_type_cast")
-        unless raw_value.present?
-          record.errors.add(attribute, "can't be blank")
+        if !raw_value.kind_of?(Array) && !raw_value.present?
+          message = "can't be blank"          
+          message = ErrorMessage[message, options[:spec_section]] if options[:spec_section]
+          record.errors.add(attribute, message)
         end
       end
     end
@@ -43,7 +70,7 @@ module ATDIS
     class ValidValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
         if (value.respond_to?(:valid?) && !value.valid?) || (value && !value.respond_to?(:valid?) && !value.all?{|v| v.valid?})
-          record.errors.add(attribute, "is not valid")
+          record.errors.add(attribute, ErrorMessage["is not valid", nil])
         end
       end
     end

data/lib/atdis/version.rb

@@ -1,3 +1,3 @@
 module Atdis
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

data/spec/atdis/application_spec.rb

@@ -2,6 +2,18 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe ATDIS::Application do
 
+  describe ".level_used?" do
+    it "level 3" do
+      a = ATDIS::Application.new(:extended => {:some_info => "here"})
+      a.level_used?(3).should be_true
+    end
+
+    it "level 2" do
+      a = ATDIS::Application.new(:people => [])
+      a.level_used?(2).should be_true
+    end
+  end
+
   context "extra parameter in json" do
     it "should not be valid" do
       ATDIS::Location.should_receive(:interpret).with(:foo => "Some location data").and_return(double(:valid? => true))
@@ -20,10 +32,12 @@ describe ATDIS::Application do
           :foo => "bar",
           :more_info_url => "http://foo.com/bar"
         },
-        :location => {:foo => "Some location data"}
+        :location => {:foo => "Some location data"},
+        :events => [],
+        :documents => []
       })
       a.should_not be_valid
-      a.errors.messages.should == {:json => ['Unexpected parameters in json data: {"application":{"reference":{"foo":"bar"}}}']}
+      a.errors.messages.should == {:json => [ATDIS::ErrorMessage['Unexpected parameters in json data: {"application":{"reference":{"foo":"bar"}}}', "4"]]}
     end
   end
 
@@ -84,7 +98,10 @@ describe ATDIS::Application do
 
     it "should create a nil valued application when there is no information in the json" do
       application = double
-      ATDIS::Application.should_receive(:new).with({:json_left_overs => {}}).and_return(application)
+      ATDIS::Application.should_receive(:new).with({:json_left_overs => {}, :status=>nil, :determination_date=>nil, :estimated_cost=>nil,
+        :comments_url=>nil, :description=>nil, :more_info_url=>nil, :dat_id=>nil, :notification_start_date=>nil, :location=>nil,
+        :extended=>nil, :events=>nil, :last_modified_date=>nil, :notification_end_date=>nil, :documents=>nil, :authority=>nil,
+        :lodgement_date=>nil, :officer=>nil, :people=>nil}).and_return(application)
 
       ATDIS::Application.interpret(:application => {:info => {}, :reference => {}}).should == application
     end
@@ -251,10 +268,58 @@ describe ATDIS::Application do
   # TODO This should really be a test on the Model base class
   describe "#attribute_names" do
     it do
-      ATDIS::Application.attribute_names.sort.should == ["authority", "comments_url", "dat_id", "description",
-        "determination_date", "documents", "estimated_cost", "events", "extended", "last_modified_date",
-        "location", "lodgement_date", "more_info_url", "notification_end_date", "notification_start_date", "officer",
-        "people", "status"]
+      # These are also ordered in a way that corresponds to the specification. Makes for easy reading by humans.
+      ATDIS::Application.attribute_names.should == [
+        "dat_id",
+        "last_modified_date",
+        "description",
+        "authority",
+        "lodgement_date",
+        "determination_date",
+        "status",
+        "notification_start_date",
+        "notification_end_date",
+        "officer",
+        "estimated_cost",
+        "more_info_url",
+        "comments_url",
+        "location",
+        "events",
+        "documents",
+        "people",
+        "extended"
+      ]
+    end
+  end
+
+  describe ".level_attribute_names" do
+    it "L1" do
+      ATDIS::Application.level_attribute_names(1).should == [
+          "dat_id",
+          "last_modified_date",
+          "description",
+          "authority",
+          "lodgement_date",
+          "determination_date",
+          "status",
+          "notification_start_date",
+          "notification_end_date",
+          "officer",
+          "estimated_cost",
+          "more_info_url",
+          "comments_url",
+          "location",
+          "events",
+          "documents"
+      ]
+    end
+
+    it "L2" do
+      ATDIS::Application.level_attribute_names(2).should == ["people"]
+    end
+
+    it "L3" do
+      ATDIS::Application.level_attribute_names(3).should == ["extended"]
     end
   end
 
@@ -273,7 +338,9 @@ describe ATDIS::Application do
       :determination_date => DateTime.new(2013,6,20),  
       :status => "OPEN",
       :more_info_url => URI.parse("http://foo.com/bar"),
-      :location => {:address => "123 Fourfivesix Street Neutral Bay NSW 2089"}
+      :location => {:address => "123 Fourfivesix Street Neutral Bay NSW 2089"},
+      :events => [],
+      :documents => []
   ) }
 
     it { a.should be_valid }
@@ -290,19 +357,19 @@ describe ATDIS::Application do
     it ".dat_id" do
       a.dat_id = nil
       a.should_not be_valid
-      a.errors.messages.should == {:dat_id => ["can't be blank"]}
+      a.errors.messages.should == {:dat_id => [ATDIS::ErrorMessage["can't be blank", "4.3.1"]]}
     end
 
     describe ".last_modified_date" do
       it do
         a.last_modified_date = nil
         a.should_not be_valid
-        a.errors.messages.should == {:last_modified_date => ["can't be blank"]}
+        a.errors.messages.should == {:last_modified_date => [ATDIS::ErrorMessage["can't be blank", "4.3.1"]]}
       end
       it do
         a.last_modified_date = "18 January 2013"
         a.should_not be_valid
-        a.errors.messages.should == {:last_modified_date => ["is not a valid date"]}
+        a.errors.messages.should == {:last_modified_date => [ATDIS::ErrorMessage["is not a valid date", "4.3.8"]]}
       end
     end
 
@@ -310,7 +377,7 @@ describe ATDIS::Application do
       it do
         a.description = ""
         a.should_not be_valid
-        a.errors.messages.should == {:description => ["can't be blank"]}
+        a.errors.messages.should == {:description => [ATDIS::ErrorMessage["can't be blank", "4.3.1"]]}
       end
     end
 
@@ -318,7 +385,7 @@ describe ATDIS::Application do
       it do
         a.authority = nil
         a.should_not be_valid
-        a.errors.messages.should == {:authority => ["can't be blank"]}
+        a.errors.messages.should == {:authority => [ATDIS::ErrorMessage["can't be blank", "4.3.1"]]}
       end
     end
 
@@ -326,12 +393,12 @@ describe ATDIS::Application do
       it do
         a.lodgement_date = nil
         a.should_not be_valid
-        a.errors.messages.should == {:lodgement_date => ["can't be blank"]}
+        a.errors.messages.should == {:lodgement_date => [ATDIS::ErrorMessage["can't be blank", "4.3.1"]]}
       end
       it do
         a.lodgement_date = "18 January 2013"
         a.should_not be_valid
-        a.errors.messages.should == {:lodgement_date => ["is not a valid date"]}
+        a.errors.messages.should == {:lodgement_date => [ATDIS::ErrorMessage["is not a valid date", "4.3.8"]]}
       end
     end
 
@@ -339,12 +406,17 @@ describe ATDIS::Application do
       it do
         a.determination_date = nil
         a.should_not be_valid
-        a.errors.messages.should == {:determination_date => ["can't be blank"]}
+        a.errors.messages.should == {:determination_date => [ATDIS::ErrorMessage["can't be blank", "4.3.1"]]}
       end
       it do
         a.determination_date = "18 January 2013"
         a.should_not be_valid
-        a.errors.messages.should == {:determination_date => ["is not a valid date"]}
+        a.errors.messages.should == {:determination_date => [ATDIS::ErrorMessage["is not a valid date or none", "4.3.1"]]}
+      end
+      it "none should be allowed if the application is not yet determined" do
+        a.determination_date = "none"
+        a.determination_date.should be_nil
+        a.should be_valid
       end
     end
 
@@ -352,31 +424,70 @@ describe ATDIS::Application do
       it do
         a.status = nil
         a.should_not be_valid
-        a.errors.messages.should == {:status => ["can't be blank"]}
+        a.errors.messages.should == {:status => [ATDIS::ErrorMessage["can't be blank", "4.3.1"]]}
       end
     end
 
-    describe ".notification_start_date" do
-      it do
+    describe "notification_date" do
+      it "both valid start and end dates" do
         a.notification_start_date = DateTime.new(2013,4,20,2,1,7)
+        a.notification_end_date = DateTime.new(2013,5,20,0,0,0)
         a.should be_valid
       end
-      it do
+
+      it "invalid start date" do
         a.notification_start_date = "18 January 2013"
+        a.notification_end_date = DateTime.new(2013,2,1,0,0,0)
         a.should_not be_valid
-        a.errors.messages.should == {:notification_start_date => ["is not a valid date"]}
+        a.errors.messages.should == {:notification_start_date => [ATDIS::ErrorMessage["is not a valid date or none", "4.3.1"]]}
       end
-    end
 
-    describe ".notification_end_date" do
-      it do
-        a.notification_end_date = DateTime.new(2013,5,20,2,1,7)
+      it "invalid end date" do
+        a.notification_start_date = DateTime.new(2013,1,10,0,0,0)
+        a.notification_end_date = "18 January 2013"
+        a.should_not be_valid
+        a.errors.messages.should == {:notification_end_date => [ATDIS::ErrorMessage["is not a valid date or none", "4.3.1"]]}
+      end
+
+      it "only start date set" do
+        a.notification_start_date = DateTime.new(2013,4,20,2,1,7)
+        a.should_not be_valid
+        a.errors.messages.should == {:notification_end_date => [ATDIS::ErrorMessage["can not be blank if notification_start_date is set", "4.3.1"]]}
+      end
+
+      it "only end date set" do
+        a.notification_end_date = DateTime.new(2013,4,20,2,1,7)
+        a.should_not be_valid
+        a.errors.messages.should == {:notification_start_date => [ATDIS::ErrorMessage["can not be blank if notification_end_date is set", "4.3.1"]]}
+      end
+
+      it "end date is before start date" do
+        a.notification_start_date = DateTime.new(2013,5,20,0,0,0)
+        a.notification_end_date = DateTime.new(2013,4,20,2,1,7)
+        a.should_not be_valid        
+        a.errors.messages.should == {:notification_end_date => [ATDIS::ErrorMessage["can not be earlier than notification_start_date", "4.3.1"]]}
+      end
+
+      it "both dates set to none" do
+        a.notification_start_date = "none"
+        a.notification_end_date = "none"
+        a.notification_start_date.should be_nil
+        a.notification_end_date.should be_nil
         a.should be_valid
       end
-      it do
-        a.notification_end_date = "18 January 2013"
+
+      it "only start date set to none" do
+        a.notification_start_date = "none"
+        a.notification_end_date = DateTime.new(2013,2,1,0,0,0)
+        a.should_not be_valid
+        a.errors.messages.should == {:notification_start_date => [ATDIS::ErrorMessage["can't be none unless notification_end_date is none as well", "4.3.1"]]}
+      end
+
+      it "only end date set to none" do
+        a.notification_start_date = DateTime.new(2013,2,1,0,0,0)
+        a.notification_end_date = "none"
         a.should_not be_valid
-        a.errors.messages.should == {:notification_end_date => ["is not a valid date"]}
+        a.errors.messages.should == {:notification_end_date => [ATDIS::ErrorMessage["can't be none unless notification_start_date is none as well", "4.3.1"]]}
       end
     end
 
@@ -384,22 +495,44 @@ describe ATDIS::Application do
       it do
         a.more_info_url = nil
         a.should_not be_valid
-        a.errors.messages.should == {:more_info_url => ["can't be blank"]}
+        a.errors.messages.should == {:more_info_url => [ATDIS::ErrorMessage["can't be blank", "4.3.2"]]}
       end
       it do
         a.more_info_url = "This is not a valid url"
         a.should_not be_valid
-        a.errors.messages.should == {:more_info_url => ["is not a valid URL"]}
+        a.errors.messages.should == {:more_info_url => [ATDIS::ErrorMessage["is not a valid URL", "4.3.2"]]}
       end
       it do
         a.more_info_url = "foo.com"
         a.should_not be_valid
-        a.errors.messages.should == {:more_info_url => ["is not a valid URL"]}
+        a.errors.messages.should == {:more_info_url => [ATDIS::ErrorMessage["is not a valid URL", "4.3.2"]]}
       end
       it do
         a.more_info_url = "httpss://foo.com"
         a.should_not be_valid
-        a.errors.messages.should == {:more_info_url => ["is not a valid URL"]}
+        a.errors.messages.should == {:more_info_url => [ATDIS::ErrorMessage["is not a valid URL", "4.3.2"]]}
+      end
+    end
+
+    describe "events" do
+      it "has to be an array" do
+        ATDIS::Event.should_receive(:interpret).with(:foo => "bar").and_return(double(:valid? => true))
+        a.events = {:foo => "bar"}
+        #a.events.should be_nil
+        a.should_not be_valid
+        a.errors.messages.should == {:events => [ATDIS::ErrorMessage["should be an array", "4.3.4"]]}
+      end
+
+      it "can be an empty array" do
+        a.events = []
+        a.events.should == []
+        a.should be_valid
+      end
+
+      it "can not be empty" do
+        a.events = nil
+        a.should_not be_valid
+        a.errors.messages.should == {:events => [ATDIS::ErrorMessage["can't be blank", "4.3.4"]]}
       end
     end
   end

data/spec/atdis/document_spec.rb

@@ -1,6 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe ATDIS::Document do
+  it ".attribute_names" do
+    ATDIS::Document.attribute_names.should == ["ref", "title", "document_url"]
+  end
+
   it ".ref" do
     ATDIS::Document.interpret(:ref => "27B/6").ref.should == "27B/6"
   end

data/spec/atdis/event_spec.rb

@@ -1,6 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe ATDIS::Event do
+  it ".attribute_names" do
+    ATDIS::Event.attribute_names.should == ["id", "date", "description", "event_type", "status"]
+  end
+
   it ".id" do
     ATDIS::Event.interpret(:id => "27B/6").id.should == "27B/6"
   end

data/spec/atdis/location_spec.rb

@@ -1,6 +1,16 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe ATDIS::Location do
+  it ".attribute_names" do
+    ATDIS::Location.attribute_names.should == [
+      "address",
+      "lot",
+      "section",
+      "dpsp_id",
+      "geometry"
+    ]
+  end
+
   describe "validation" do
     context "valid location" do
       let(:l) { ATDIS::Location.new(
@@ -19,7 +29,7 @@ describe ATDIS::Location do
       it "address" do
         l.address = ""
         l.should_not be_valid
-        l.errors.messages.should == {:address => ["can't be blank"]}
+        l.errors.messages.should == {:address => [ATDIS::ErrorMessage["can't be blank", "4.3.3"]]}
       end
 
       it "geometry" do
@@ -27,6 +37,48 @@ describe ATDIS::Location do
         l.geometry.should be_nil
         l.should_not be_valid
       end
+
+      describe "lot" do
+        it "can not be blank" do
+          l.lot = ""
+          l.should_not be_valid
+          l.errors.messages.should == {:lot => [ATDIS::ErrorMessage["can't be blank", "4.3.3"]]}
+        end
+
+        it "can be none but is not interpreted in any special way" do
+          l.lot = "none"
+          l.lot.should == "none"
+          l.should be_valid
+        end
+      end
+
+      describe "section" do
+        it "can not be blank" do
+          l.section = ""
+          l.should_not be_valid
+          l.errors.messages.should == {:section => [ATDIS::ErrorMessage["can't be blank", "4.3.3"]]}
+        end
+
+        it "can be none" do
+          l.section = "none"
+          l.section.should be_nil
+          l.should be_valid
+        end
+      end
+
+      describe "dpsp_id" do
+        it "can not be blank" do
+          l.dpsp_id = ""
+          l.should_not be_valid
+          l.errors.messages.should == {:dpsp_id => [ATDIS::ErrorMessage["can't be blank", "4.3.3"]]}
+        end
+
+        it "can be none but is not interpreted in any special way" do
+          l.dpsp_id = "none"
+          l.dpsp_id.should == "none"
+          l.should be_valid
+        end
+      end
     end
   end
 
@@ -48,11 +100,10 @@ describe ATDIS::Location do
 
     it "should gracefully handle the land_title_ref block being missing" do
       l = ATDIS::Location.interpret(:address => "123 Fourfivesix Street Neutral Bay NSW 2089")
-      
       l.address.should == "123 Fourfivesix Street Neutral Bay NSW 2089"
-      l.lot.should be_nil
-      l.section.should be_nil
-      l.dpsp_id.should be_nil
+      l.lot.should == ""
+      l.section.should == ""
+      l.dpsp_id.should == ""
     end
 
     it "should pass on the responsibility for parsing the geometry section" do