atdis 0.3.11 → 0.5.0

data/spec/atdis/models/pagination_spec.rb

@@ -1,160 +1,260 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe ATDIS::Models::Pagination do
   context "valid pagination" do
-    let (:pagination) { ATDIS::Models::Pagination.new(
-      previous: nil, current: 1, next: 2, per_page: 25, pages: 4, count: 90
-    )}
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: nil, current: 1, next: 2, per_page: 25, pages: 4, count: 90 },
+        "UTC"
+      )
+    end
     it do
-      pagination.should be_valid
+      expect(pagination).to be_valid
     end
   end
 
   context "current is not set" do
-    let (:pagination) { ATDIS::Models::Pagination.new(
-      previous: nil, current: nil, next: 2, per_page: 25, pages: 4, count: 90
-    )}
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: nil, current: nil, next: 2, per_page: 25, pages: 4, count: 90 },
+        "UTC"
+      )
+    end
     it do
-      pagination.should_not be_valid
-      pagination.errors.messages.should == {current: [ATDIS::ErrorMessage["should be present if pagination is being used", "6.4"]]}
+      expect(pagination).to_not be_valid
+      expect(pagination.errors.messages).to eq(
+        current: [ATDIS::ErrorMessage["should be present if pagination is being used", "6.4"]]
+      )
     end
   end
 
   context "per_page is not set" do
-    let (:pagination) { ATDIS::Models::Pagination.new(
-      previous: nil, current: 1, next: 2, per_page: nil, pages: 4, count: 90
-    )}
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: nil, current: 1, next: 2, per_page: nil, pages: 4, count: 90 },
+        "UTC"
+      )
+    end
     it do
-      pagination.should_not be_valid
-      pagination.errors.messages.should == {per_page: [ATDIS::ErrorMessage["should be present if pagination is being used", "6.4"]]}
+      expect(pagination).to_not be_valid
+      expect(pagination.errors.messages).to eq(
+        per_page: [ATDIS::ErrorMessage["should be present if pagination is being used", "6.4"]]
+      )
     end
   end
 
   context "total_not_results is not set" do
-    let (:pagination) { ATDIS::Models::Pagination.new(
-      previous: nil, current: 1, next: 2, per_page: 25, pages: 4, count: nil
-    )}
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: nil, current: 1, next: 2, per_page: 25, pages: 4, count: nil },
+        "UTC"
+      )
+    end
     it do
-      pagination.should_not be_valid
-      pagination.errors.messages.should == {count: [ATDIS::ErrorMessage["should be present if pagination is being used", "6.4"]]}
+      expect(pagination).to_not be_valid
+      expect(pagination.errors.messages).to eq(
+        count: [ATDIS::ErrorMessage["should be present if pagination is being used", "6.4"]]
+      )
     end
   end
 
   context "pages is not set" do
-    let (:pagination) { ATDIS::Models::Pagination.new(
-      previous: nil, current: 1, next: 2, per_page: 25, pages: nil, count: 90
-    )}
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: nil, current: 1, next: 2, per_page: 25, pages: nil, count: 90 },
+        "UTC"
+      )
+    end
     it do
-      pagination.should_not be_valid
-      pagination.errors.messages.should == {pages: [ATDIS::ErrorMessage["should be present if pagination is being used", "6.4"]]}
+      expect(pagination).to_not be_valid
+      expect(pagination.errors.messages).to eq(
+        pages: [ATDIS::ErrorMessage["should be present if pagination is being used", "6.4"]]
+      )
     end
   end
 
   context "total no_results is less than would be expected" do
-    let (:pagination) { ATDIS::Models::Pagination.new(
-      previous: nil, current: 1, next: 2, per_page: 25, pages: 4, count: 75
-    )}
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: nil, current: 1, next: 2, per_page: 25, pages: 4, count: 75 },
+        "UTC"
+      )
+    end
     it do
-      pagination.should_not be_valid
-      pagination.errors.messages.should == {count: [ATDIS::ErrorMessage["could fit into a smaller number of pages", "6.4"]]}
+      expect(pagination).to_not be_valid
+      expect(pagination.errors.messages).to eq(
+        count: [ATDIS::ErrorMessage["could fit into a smaller number of pages", "6.4"]]
+      )
     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) }
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: nil, current: 1, next: nil, per_page: 25, pages: 1, count: 0 },
+        "UTC"
+      )
+    end
     it do
-      pagination.should be_valid
+      expect(pagination).to 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
-    )}
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: nil, current: 1, next: 2, per_page: 25, pages: 4, count: 101 },
+        "UTC"
+      )
+    end
     it do
-      pagination.should_not be_valid
-      pagination.errors.messages.should == {count: [ATDIS::ErrorMessage["is larger than can be retrieved through paging", "6.4"]]}
+      expect(pagination).to_not be_valid
+      expect(pagination.errors.messages).to eq(
+        count: [ATDIS::ErrorMessage["is larger than can be retrieved through paging", "6.4"]]
+      )
     end
   end
 
   context "current page is zero" do
-    let(:pagination) { ATDIS::Models::Pagination.new(
-      previous: nil, current: 0, next: 1, pages: 1, per_page: 25, count: 2
-    ) }
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: nil, current: 0, next: 1, pages: 1, per_page: 25, count: 2 },
+        "UTC"
+      )
+    end
     it do
-      pagination.should_not be_valid
-      pagination.errors.messages.should == {current: [ATDIS::ErrorMessage["can not be less than 1", "6.4"]]}
+      expect(pagination).to_not be_valid
+      expect(pagination.errors.messages).to eq(
+        current: [ATDIS::ErrorMessage["can not be less than 1", "6.4"]]
+      )
     end
   end
 
   context "current page is larger than the number of pages" do
-    let(:pagination) { ATDIS::Models::Pagination.new(
-      previous: nil, previous: 1, current: 2, next: 3, pages: 1, per_page: 25, count: 2
-    ) }
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: 1, current: 2, next: 3, pages: 1, per_page: 25, count: 2 },
+        "UTC"
+      )
+    end
     it do
-      pagination.should_not be_valid
-      pagination.errors.messages.should == {current: [ATDIS::ErrorMessage["is larger than the number of pages", "6.4"]]}
+      expect(pagination).to_not be_valid
+      expect(pagination.errors.messages).to eq(
+        current: [ATDIS::ErrorMessage["is larger than the number of pages", "6.4"]]
+      )
     end
   end
 
   context "next page number is not nil but on last page" do
-    let(:pagination) { ATDIS::Models::Pagination.new(
-      previous: 3, current: 4, next: 5, pages: 4, per_page: 25, count: 100
-    ) }
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: 3, current: 4, next: 5, pages: 4, per_page: 25, count: 100 },
+        "UTC"
+      )
+    end
     it do
-      pagination.should_not be_valid
-      pagination.errors.messages.should == {next: [ATDIS::ErrorMessage["should be null if on the last page", "6.4"]]}
+      expect(pagination).to_not be_valid
+      expect(pagination.errors.messages).to eq(
+        next: [ATDIS::ErrorMessage["should be null if on the last page", "6.4"]]
+      )
     end
   end
 
   context "next page number is nil but not on last page" do
-    let(:pagination) { ATDIS::Models::Pagination.new(
-      previous: 3, current: 4, next: nil, pages: 6, per_page: 25, count: 140
-    ) }
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: 3, current: 4, next: nil, pages: 6, per_page: 25, count: 140 },
+        "UTC"
+      )
+    end
     it do
-      pagination.should_not be_valid
-      pagination.errors.messages.should == {next: [ATDIS::ErrorMessage["can't be null if not on the last page", "6.4"]]}
+      expect(pagination).to_not be_valid
+      expect(pagination.errors.messages).to eq(
+        next: [ATDIS::ErrorMessage["can't be null if not on the last page", "6.4"]]
+      )
     end
   end
 
   context "next page number is pointing to a weird page number" do
-    let(:pagination) { ATDIS::Models::Pagination.new(
-      previous: nil, current: 1, next: 5, pages: 2, per_page: 25, count: 50
-    ) }
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: nil, current: 1, next: 5, pages: 2, per_page: 25, count: 50 },
+        "UTC"
+      )
+    end
     it do
-      pagination.should_not be_valid
-      pagination.errors.messages.should == {next: [ATDIS::ErrorMessage["should be one greater than current page number or null if last page", "6.4"]]}
+      expect(pagination).to_not be_valid
+      expect(pagination.errors.messages).to eq(
+        next: [
+          ATDIS::ErrorMessage[
+            "should be one greater than current page number or null if last page",
+            "6.4"
+          ]
+        ]
+      )
     end
   end
 
   context "previous page number not nil but on first page" do
-    let(:pagination) { ATDIS::Models::Pagination.new(
-      previous: 0, current: 1, next: 2, pages: 10, per_page: 25, count: 240
-    ) }
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: 0, current: 1, next: 2, pages: 10, per_page: 25, count: 240 },
+        "UTC"
+      )
+    end
     it do
-      pagination.should_not be_valid
-      pagination.errors.messages.should == {previous: [ATDIS::ErrorMessage["should be null if on the first page", "6.4"]]}
+      expect(pagination).to_not be_valid
+      expect(pagination.errors.messages).to eq(
+        previous: [ATDIS::ErrorMessage["should be null if on the first page", "6.4"]]
+      )
     end
   end
 
   context "previous page number if nil but not on first page" do
-    let(:pagination) { ATDIS::Models::Pagination.new(
-      previous: nil, current: 4, next: 5, pages: 10, per_page: 25, count: 240
-    ) }
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: nil, current: 4, next: 5, pages: 10, per_page: 25, count: 240 },
+        "UTC"
+      )
+    end
     it do
-      pagination.should_not be_valid
-      pagination.errors.messages.should == {previous: [ATDIS::ErrorMessage["can't be null if not on the first page", "6.4"]]}
+      expect(pagination).to_not be_valid
+      expect(pagination.errors.messages).to eq(
+        previous: [ATDIS::ErrorMessage["can't be null if not on the first page", "6.4"]]
+      )
     end
   end
 
   context "previous page number is pointing to a weird page number" do
-    let(:pagination) { ATDIS::Models::Pagination.new(
-      previous: 5, current: 2, next: nil, pages: 2, per_page: 25, count: 50
-    ) }
+    let(:pagination) do
+      ATDIS::Models::Pagination.new(
+        { previous: 5, current: 2, next: nil, pages: 2, per_page: 25, count: 50 },
+        "UTC"
+      )
+    end
     it do
-      pagination.should_not be_valid
-      pagination.errors.messages.should == {previous: [ATDIS::ErrorMessage["should be one less than current page number or null if first page", "6.4"]]}
-      pagination.json_errors.should == [[{previous: 5}, [ATDIS::ErrorMessage["previous should be one less than current page number or null if first page", "6.4"]]]]
+      expect(pagination).to_not be_valid
+      expect(pagination.errors.messages).to eq(
+        previous: [
+          ATDIS::ErrorMessage[
+            "should be one less than current page number or null if first page",
+            "6.4"
+          ]
+        ]
+      )
+      expect(pagination.json_errors).to eq(
+        [[
+          { previous: 5 },
+          [
+            ATDIS::ErrorMessage[
+              "previous should be one less than current page number or null if first page",
+              "6.4"
+            ]
+          ]
+        ]]
+      )
     end
   end
 end

data/spec/atdis/models/person_spec.rb

@@ -1,19 +1,23 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe ATDIS::Models::Person do
   it ".attribute_names" do
-    ATDIS::Models::Person.attribute_names.should == ["name", "role", "contact"]
+    expect(ATDIS::Models::Person.attribute_names).to eq %w[name role contact]
   end
 
   it ".name" do
-    ATDIS::Models::Person.interpret(name: "Tuttle").name.should == "Tuttle"
+    expect(ATDIS::Models::Person.interpret({ name: "Tuttle" }, "UTC").name).to eq "Tuttle"
   end
 
   it ".role" do
-    ATDIS::Models::Person.interpret(role: "Heating Engineer").role.should == "Heating Engineer"
+    expect(
+      ATDIS::Models::Person.interpret({ role: "Heating Engineer" }, "UTC").role
+    ).to eq "Heating Engineer"
   end
 
   it ".contact" do
-    ATDIS::Models::Person.interpret(contact: "94-FLUSH").contact.should == "94-FLUSH"
+    expect(ATDIS::Models::Person.interpret({ contact: "94-FLUSH" }, "UTC").contact).to eq "94-FLUSH"
   end
 end

data/spec/atdis/models/reference_spec.rb

@@ -1,43 +1,56 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe ATDIS::Models::Reference do
-  let(:a) { ATDIS::Models::Reference.new(
-    more_info_url: URI.parse("http://foo.com/bar"),
-  )}
+  let(:a) do
+    ATDIS::Models::Reference.new(
+      { more_info_url: URI.parse("http://foo.com/bar") },
+      "UTC"
+    )
+  end
 
   describe ".more_info_url" do
     it do
       a.more_info_url = nil
-      a.should_not be_valid
-      a.errors.messages.should == {more_info_url: [ATDIS::ErrorMessage["can't be blank", "4.3.2"]]}
+      expect(a).to_not be_valid
+      expect(a.errors.messages).to eq(
+        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: [ATDIS::ErrorMessage["is not a valid URL", "4.3.2"]]}
+      expect(a).to_not be_valid
+      expect(a.errors.messages).to eq(
+        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: [ATDIS::ErrorMessage["is not a valid URL", "4.3.2"]]}
+      expect(a).to_not be_valid
+      expect(a.errors.messages).to eq(
+        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: [ATDIS::ErrorMessage["is not a valid URL", "4.3.2"]]}
+      expect(a).to_not be_valid
+      expect(a.errors.messages).to eq(
+        more_info_url: [ATDIS::ErrorMessage["is not a valid URL", "4.3.2"]]
+      )
     end
   end
 
   describe "#more_info_url=" do
-    let(:a) { ATDIS::Models::Reference.new }
+    let(:a) { ATDIS::Models::Reference.new({}, "UTC") }
     it "should do no type casting when it's already a URI" do
       a.more_info_url = URI.parse("http://foo.com/bar")
-      a.more_info_url.should == URI.parse("http://foo.com/bar")
+      expect(a.more_info_url).to eq URI.parse("http://foo.com/bar")
     end
 
     it "should cast a string to a URI when it's a valid url" do
       a.more_info_url = "http://foo.com/bar"
-      a.more_info_url.should == URI.parse("http://foo.com/bar")
+      expect(a.more_info_url).to eq URI.parse("http://foo.com/bar")
     end
 
     context "not a valid url" do
@@ -45,10 +58,10 @@ describe ATDIS::Models::Reference do
         a.more_info_url = "This is not a url"
       end
       it "should be nil" do
-        a.more_info_url.should be_nil
+        expect(a.more_info_url).to be_nil
       end
       it "should keep the original string" do
-        a.more_info_url_before_type_cast.should == "This is not a url"
+        expect(a.more_info_url_before_type_cast).to eq "This is not a url"
       end
     end
   end

data/spec/atdis/models/response_spec.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe ATDIS::Models::Response do
-
 end