atdis 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fccd4417bbe0c084467f43db250e77b96cfcbe8
-  data.tar.gz: 5d6c8771f2d059c498d9522981bb33e549d0653b
+  metadata.gz: 661d7d16f8ddc03b59e867f8a1bf3a691d66f02a
+  data.tar.gz: 0630e75e2045725a519b3fe7b1e6995b0184f2e6
 SHA512:
-  metadata.gz: 31d39abe6c1330329902dd0603e28e29fcd4a6560142bbe63d0f2d17bb7df8cc498a97a68ebb0aafe75aab537f4dad08a518f3fb8a042eabf98232d30aa992b9
-  data.tar.gz: 3e62c64543eb982604b5afddcd459295481cd3a2974810901bd164cf50d4c7304d195ea917c5abad6992a87fb5315211101d38a41c99ddd29744cbb4ac674d05
+  metadata.gz: ac95146aa0dd9a03477ec1f7aad2380d0291a1f6585c951f4f6bcef334bc286b25354763f3a4cb2aff618e95b098ff50245d05934e87ed1ca943e9770f648085
+  data.tar.gz: 1d1faec28b50806f0b1f804b21d62e3d013cd855cdabed897bcf90ebca6123cfcf4847ade63f6c1f765379828baf10b3482709357b9f15c7fda1f7f207dd6a7f

data/lib/atdis/models/info.rb

@@ -54,11 +54,22 @@ module ATDIS
       # TODO Validate contents of estimated_cost
 
       def dat_id_is_url_encoded!
-        if dat_id && CGI::escape(dat_id) != dat_id
+        if dat_id && !Info.url_encoded?(dat_id)
           errors.add(:dat_id, ErrorMessage.new("should be url encoded", "4.3.1"))
         end
       end
 
+      def self.url_encoded?(s)
+        url_encoded = true
+        s.each_char do |c|
+          # These characters are the valid ones in a url encoded string
+          unless c =~ /[a-zA-Z0-9\-_.~%+]/
+            url_encoded = false
+          end
+        end
+        url_encoded
+      end
+
       def related_apps_url_format
         if related_apps.respond_to?(:all?) && !related_apps.all? {|url| url.to_s =~ /atdis\/1.0\/[^\/]+\.json/}
           errors.add(:related_apps, ErrorMessage.new("contains url(s) not in the expected format", "4.3.1"))

data/lib/atdis/version.rb

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

data/spec/atdis/models/info_spec.rb

@@ -182,6 +182,11 @@ describe ATDIS::Models::Info do
       a.should_not be_valid
       a.errors.messages.should == {dat_id: [ATDIS::ErrorMessage["should be url encoded", "4.3.1"]]}
     end
+
+    it "should be valid if url encoded" do
+      a.dat_id = "010%2F2014%2F00000031%2F001"
+      a.should be_valid
+    end
   end
 
   describe "#description=" do

metadata

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