data_kitten 1.3.3 → 1.3.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2ZhMGNkNzFlOWI5NmY5YzU4MDEyZTYzNTZiNzNlM2E1OTgzNTYwMA==
+    MjZjYjdjNTA1YmZmZjRlZWU1YjUxOTJkNWRjNjMzOTExYTY1NzAwMQ==
   data.tar.gz: !binary |-
-    YjE1NDFhMDE3Mzc1ZmEyOTU5MWE0YmYxNjdmMmMwYmEwYjVhZTFjNw==
+    Zjg5ZWFmNjA1M2EzMjhlNDJiYTVhMjEwZjQwMDk4NjdjZjI3NGNhMQ==
 SHA512:
   metadata.gz: !binary |-
-    NDczMTBmYjJiMTVmMWIyYTk3YzNmNWQ5ZTg4ODM1Njc4ZWJiNTZkMzRjYTU4
-    MTRhN2FiOTA5YTAzM2YwZGM3NDk2MWU2NGRiZDJlYTViOTgxMGQ2YjljODBi
-    MzkyMDhlYWI5MTI1YmZmYTc0YjI0YmM4MzIzNWM3YjVkNGY0YTM=
+    YjI2ZWFlYjhlNjEzZWI4YWUyNDhjZDdkM2Y4YWY1MzNiMGM1Nzk3NmUxZjNi
+    MDIyMmZiYTJiZmExMjVjMTIxYTJkMDA2OWRiNWYxZmY3OGVkNGRjMDE1Yzc0
+    ZTUxMjYwM2UyZDI1MDU1MTAyMTk3MjVhYzRiNGU4NDZhNzIwNzE=
   data.tar.gz: !binary |-
-    NDNhZjE2YjJlM2Q2MTYyYzkyNmQ5ZGRhYjZkOTM1ZTFmMzNlZTI5ZTM3MWJm
-    ZmU5NTcwZjM1ZjgzZmRkYzQxZmQzZjc2MTdlNDgzYWVhZmI2YTdkNGFiNjUw
-    MmU5OGY0MDNlMDA1ZGQyMzZlMTUzNTkxZDY2M2U3NWE4ODA1MmE=
+    ZmRjYjNiYWZhODE2YmNlNGMxMGQxN2I5ODExMThhNGNjYzRiNzAyOGU2ZmFj
+    Yjc0NDE0MTlkOGUzOGQ5MzM2M2U4ZWNmNDI2MmJiNTMwNzcyOTYwYTE0MzA4
+    ODU1NTY4MGRlNDFjMDcxMWNiYzA1YTFkYmQyNDI1ODVlMjc2NzA=

data/lib/data_kitten/publishing_formats/ckan.rb

@@ -31,7 +31,7 @@ module DataKitten
           if base.last == "dataset"
             instance.identifier = package
             # build a base URI ending with a /
-            base_uri = uri.merge(base[0...-1].join('/') + '/')
+            base_uri = get_base(uri)
           # If the package is a UUID - it's more than likely to be a CKAN ID
           elsif package.match(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/)
             instance.identifier = package
@@ -54,6 +54,15 @@ module DataKitten
         false
       end
 
+      def self.get_base(uri)
+        *base, package = uri.path.split('/')
+        if base.last == "dataset"
+          uri.merge(base[0...-1].join('/') + '/')
+        else
+          uri.merge("/")
+        end
+      end
+
       public
 
       # The publishing format for the dataset.
@@ -75,7 +84,7 @@ module DataKitten
       # @see Dataset#description
       def description
         metadata.lookup("notes") || metadata.lookup("description")
-      rescue 
+      rescue
         nil
       end
 
@@ -234,6 +243,10 @@ module DataKitten
         extract_spatial || extract_bbox
       end
 
+      def base_uri
+        DataKitten::PublishingFormats::CKAN.get_base(self.uri)
+      end
+
       private
 
       def without_empty_values(h)
@@ -254,7 +267,7 @@ module DataKitten
       rescue
         nil
       end
-      
+
       def extract_bbox
         west = Float(metadata.lookup("extras", "bbox-west-long"))
         east = Float(metadata.lookup("extras", "bbox-east-long"))
@@ -308,7 +321,7 @@ module DataKitten
             @group = JSON.parse RestClient.get base_uri.merge(uri).to_s
             break
           rescue
-            # FakeWeb raises FakeWeb::NetConnectNotAllowedError, whereas 
+            # FakeWeb raises FakeWeb::NetConnectNotAllowedError, whereas
             # RestClient raises RestClient::ResourceNotFound in the "real world".
             nil
           end

data/lib/data_kitten/version.rb

@@ -1,3 +1,3 @@
 module DataKitten
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_kitten
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - James Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake