atdis 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 661d7d16f8ddc03b59e867f8a1bf3a691d66f02a
-  data.tar.gz: 0630e75e2045725a519b3fe7b1e6995b0184f2e6
+  metadata.gz: 582504f7e4d3344558df19bd967db447c881931a
+  data.tar.gz: b48255b2d8920eaf72ac22eff1981a14c0283727
 SHA512:
-  metadata.gz: ac95146aa0dd9a03477ec1f7aad2380d0291a1f6585c951f4f6bcef334bc286b25354763f3a4cb2aff618e95b098ff50245d05934e87ed1ca943e9770f648085
-  data.tar.gz: 1d1faec28b50806f0b1f804b21d62e3d013cd855cdabed897bcf90ebca6123cfcf4847ade63f6c1f765379828baf10b3482709357b9f15c7fda1f7f207dd6a7f
+  metadata.gz: a8432f063d638330887b15a2f9dbb4e15e867b529a9dc2bf13d2ed612485982e55f5d6b920c59a924fcf5bb31c4d6984a7acd0b32455306979beea0c9593ed57
+  data.tar.gz: 0bfb0c80d9f5d2c5b57afe5b9e6c47132b38226b84fbf466a03a1a3d69f20ddfd1480d45c26e7577796787076c492c15127ebf48cec73afd8340f1201cf2720e

data/lib/atdis/models/page.rb

@@ -28,7 +28,7 @@ module ATDIS
       end
 
       def count_is_consistent
-        if count
+        if count && response.respond_to?(:count)
           errors.add(:count, ErrorMessage["is not the same as the number of applications returned", "6.4"]) if count != response.count
           errors.add(:count, ErrorMessage["should not be larger than the number of results per page", "6.4"]) if count > pagination.per_page
         end

data/lib/atdis/models/pagination.rb

@@ -59,7 +59,7 @@ module ATDIS
         if pages && per_page && count && count > pages * per_page
           errors.add(:count, ErrorMessage["is larger than can be retrieved through paging", "6.4"])
         end
-        if pages && per_page && count && count <= (pages - 1) * per_page
+        if pages && per_page && count && count > 0 && count <= (pages - 1) * per_page
           errors.add(:count, ErrorMessage["could fit into a smaller number of pages", "6.4"])
         end
       end

data/lib/atdis/version.rb

@@ -1,3 +1,3 @@
 module Atdis
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/atdis/feed_spec.rb

@@ -5,7 +5,7 @@ describe ATDIS::Feed do
   let(:page) { double }
 
   it "should return all the applications" do
-    ATDIS::Models::Page.should_receive(:read_url).with("http://www.council.nsw.gov.au/atdis/1.0/applications.json").and_return(page)
+  expect(ATDIS::Models::Page).to receive(:read_url).with("http://www.council.nsw.gov.au/atdis/1.0/applications.json").and_return(page)
     feed.applications.should == page
   end
 
@@ -89,7 +89,7 @@ describe ATDIS::Feed do
   describe "#application" do
     it {
       application = double
-      ATDIS::Models::Application.should_receive(:read_url).with("http://www.council.nsw.gov.au/atdis/1.0/27B%2F6.json").and_return(application)
+      expect(ATDIS::Models::Application).to receive(:read_url).with("http://www.council.nsw.gov.au/atdis/1.0/27B%2F6.json").and_return(application)
       feed.application("27B/6").should == application
     }
   end

data/spec/atdis/models/application_spec.rb

@@ -3,9 +3,9 @@ require "spec_helper"
 describe ATDIS::Models::Application do
   context "extra parameter in json" do
     it "should not be valid" do
-      ATDIS::Models::Location.should_receive(:interpret).with("location").and_return(double(valid?: true))
-      ATDIS::Models::Document.should_receive(:interpret).with("document").and_return(double(valid?: true))
-      ATDIS::Models::Event.should_receive(:interpret).with("event").and_return(double(valid?: true))
+      expect(ATDIS::Models::Location).to receive(:interpret).with("location").and_return(double(valid?: true))
+      expect(ATDIS::Models::Document).to receive(:interpret).with("document").and_return(double(valid?: true))
+      expect(ATDIS::Models::Event).to receive(:interpret).with("event").and_return(double(valid?: true))
 
       a = ATDIS::Models::Application.interpret(
         info: {
@@ -41,7 +41,7 @@ describe ATDIS::Models::Application do
     it "should parse the json and create an application object" do
       application = double
 
-      ATDIS::Models::Application.should_receive(:new).with(
+      expect(ATDIS::Models::Application).to receive(:new).with(
         info: {
           dat_id: "DA2013-0381",
           development_type: "residential",
@@ -100,7 +100,7 @@ describe ATDIS::Models::Application do
 
     it "should create a nil valued application when there is no information in the json" do
       application = double
-      ATDIS::Models::Application.should_receive(:new).with({json_left_overs:{}, info: {},
+      expect(ATDIS::Models::Application).to receive(:new).with({json_left_overs:{}, info: {},
         reference: {}}).and_return(application)
 
       ATDIS::Models::Application.interpret(info: {}, reference: {}).should == application
@@ -118,7 +118,7 @@ describe ATDIS::Models::Application do
     let(:a) { ATDIS::Models::Application.new }
     it "should type cast to a location" do
       location = double
-      ATDIS::Models::Location.should_receive(:interpret).with(address: "123 Fourfivesix Street").and_return(location)
+      expect(ATDIS::Models::Location).to receive(:interpret).with(address: "123 Fourfivesix Street").and_return(location)
       a.locations = [{ address: "123 Fourfivesix Street" }]
       a.locations.should == [location]
     end
@@ -134,8 +134,8 @@ describe ATDIS::Models::Application do
     let(:a) { ATDIS::Models::Application.new }
     it "should type cast to several events" do
       event1, event2 = double, double
-      ATDIS::Models::Event.should_receive(:interpret).with(id: "event1").and_return(event1)
-      ATDIS::Models::Event.should_receive(:interpret).with(id: "event2").and_return(event2)
+      expect(ATDIS::Models::Event).to receive(:interpret).with(id: "event1").and_return(event1)
+      expect(ATDIS::Models::Event).to receive(:interpret).with(id: "event2").and_return(event2)
       a.events = [ { id: "event1" }, { id: "event2" } ]
       a.events.should == [event1, event2]
     end
@@ -145,8 +145,8 @@ describe ATDIS::Models::Application do
     let(:a) { ATDIS::Models::Application.new }
     it "should type cast to several documents" do
       document1, document2 = double, double
-      ATDIS::Models::Document.should_receive(:interpret).with(ref: "27B/6/a").and_return(document1)
-      ATDIS::Models::Document.should_receive(:interpret).with(ref: "27B/6/b").and_return(document2)
+      expect(ATDIS::Models::Document).to receive(:interpret).with(ref: "27B/6/a").and_return(document1)
+      expect(ATDIS::Models::Document).to receive(:interpret).with(ref: "27B/6/b").and_return(document2)
       a.documents = [ { ref: "27B/6/a" }, { ref: "27B/6/b" } ]
       a.documents.should == [document1, document2]
     end
@@ -156,8 +156,8 @@ describe ATDIS::Models::Application do
     let(:a) { ATDIS::Models::Application.new }
     it "should type cast to several people" do
       tuttle, buttle = double, double
-      ATDIS::Models::Person.should_receive(:interpret).with(name: "Tuttle").and_return(tuttle)
-      ATDIS::Models::Person.should_receive(:interpret).with(name: "Buttle").and_return(buttle)
+      expect(ATDIS::Models::Person).to receive(:interpret).with(name: "Tuttle").and_return(tuttle)
+      expect(ATDIS::Models::Person).to receive(:interpret).with(name: "Buttle").and_return(buttle)
       a.people = [ { name: "Tuttle" }, { name: "Buttle" } ]
       a.people.should == [tuttle, buttle]
     end
@@ -181,9 +181,9 @@ describe ATDIS::Models::Application do
 
   describe "validations" do
     before :each do
-      ATDIS::Models::Location.should_receive(:interpret).with("address").and_return(double(valid?: true))
-      ATDIS::Models::Document.should_receive(:interpret).with("document").and_return(double(valid?: true))
-      ATDIS::Models::Event.should_receive(:interpret).with("event").and_return(double(valid?: true))
+      expect(ATDIS::Models::Location).to receive(:interpret).with("address").and_return(double(valid?: true))
+      expect(ATDIS::Models::Document).to receive(:interpret).with("document").and_return(double(valid?: true))
+      expect(ATDIS::Models::Event).to receive(:interpret).with("event").and_return(double(valid?: true))
     end
 
     let(:a) { ATDIS::Models::Application.new(
@@ -215,7 +215,7 @@ describe ATDIS::Models::Application do
     describe ".location" do
       it "should not be valid if the location is not valid" do
         l = double(valid?: false)
-        ATDIS::Models::Location.should_receive(:interpret).with(foo: "some location data").and_return(l)
+        expect(ATDIS::Models::Location).to receive(:interpret).with(foo: "some location data").and_return(l)
         a.locations = [{foo: "some location data"}]
         a.should_not be_valid
       end
@@ -223,7 +223,7 @@ describe ATDIS::Models::Application do
 
     describe "events" do
       it "has to be an array" do
-        ATDIS::Models::Event.should_receive(:interpret).with(foo: "bar").and_return(double(valid?: true))
+        expect(ATDIS::Models::Event).to receive(:interpret).with(foo: "bar").and_return(double(valid?: true))
         a.events = {foo: "bar"}
         #a.events.should be_nil
         a.should_not be_valid

data/spec/atdis/models/land_title_ref_spec.rb

@@ -4,8 +4,8 @@ describe ATDIS::Models::LandTitleRef do
   context "torrens" do
     before(:each) {
       m = double
-      ATDIS::Models::TorrensTitle.should_receive(:interpret).with({lot: "10"}).and_return(m)
-      m.should_receive(:valid?).and_return(true)
+      expect(ATDIS::Models::TorrensTitle).to receive(:interpret).with({lot: "10"}).and_return(m)
+      expect(m).to receive(:valid?).and_return(true)
     }
     let(:l) { ATDIS::Models::LandTitleRef.new(torrens: {lot: "10"}) }
     it { l.should be_valid }
@@ -27,8 +27,8 @@ describe ATDIS::Models::LandTitleRef do
   context "both torrens and other" do
     before(:each) {
       m = double
-      ATDIS::Models::TorrensTitle.should_receive(:interpret).with({lot: "10"}).and_return(m)
-      m.should_receive(:valid?).and_return(true)
+      expect(ATDIS::Models::TorrensTitle).to receive(:interpret).with({lot: "10"}).and_return(m)
+      expect(m).to receive(:valid?).and_return(true)
     }
     let(:l) { ATDIS::Models::LandTitleRef.new(torrens: {lot: "10"}, other: {some: "foo", random: "stuff"})}
     it {

data/spec/atdis/models/page_spec.rb

@@ -5,6 +5,12 @@ describe ATDIS::Models::Page do
     ATDIS::Models::Page.attribute_names.should == ["response", "count", "pagination"]
   end
 
+  it "should error if response is null" do
+    page = ATDIS::Models::Page.new(response: nil, count: 0, pagination: {pages: 1, per_page: 20, count: 0, current: 1})
+    page.should_not be_valid
+    page.errors.messages.should == {:response => [ATDIS::ErrorMessage["can't be blank", "4.3"]]}
+  end
+
   describe "validations" do
     context "results block that is a hash" do
       before :each do
@@ -131,14 +137,14 @@ describe ATDIS::Models::Page do
 
       it do
         page.should_not be_valid
-        page.errors.messages.has_key?(:json).should be_true
+        page.errors.messages.has_key?(:json).should be_truthy
         page.errors.messages.count.should == 1
         # The error messages returned by the library are different for different Ruby versions
         ruby19_message = ATDIS::ErrorMessage["Invalid JSON: 784: unexpected token at '{\n  \"response\": [\n    {\n      \"application\": {\n        \"description\": \"application2\"\n      }\n    }\n  ],\n}\n'", nil]
         ruby20_message = ATDIS::ErrorMessage["Invalid JSON: 795: unexpected token at '{\n  \"response\": [\n    {\n      \"application\": {\n        \"description\": \"application2\"\n      }\n    }\n  ],\n}\n'", nil]
         page.errors.messages[:json].count.should == 1
         message = page.errors.messages[:json].first
-        (message == ruby19_message || message == ruby20_message).should be_true
+        (message == ruby19_message || message == ruby20_message).should be_truthy
       end
     end
 

data/spec/atdis/models/pagination_spec.rb

@@ -60,6 +60,13 @@ describe ATDIS::Models::Pagination do
     end
   end
 
+  context "zero results returned" do
+    let (:pagination) { ATDIS::Models::Pagination.new(previous: nil, current: 1, next: nil, per_page: 25, pages: 1, count: 0) }
+    it do
+      pagination.should be_valid
+    end
+  end
+
   context "count is larger than would be expected" do
     let(:pagination) { ATDIS::Models::Pagination.new(
       previous: nil, current: 1, next: 2, per_page: 25, pages: 4, count: 101

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atdis
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Matthew Landauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler