data_kitten 1.3.1 → 1.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzYzNmUyZmIxZGNlOGViNGQwMmQ5YThiZDQzYWZiNTc2OTBkZWYwYQ==
+    NTg3MWUzZWM3MDJiMjM3YjRjM2NiNGNjMmEyNWQ2ZGI0ZDk4YTYyZg==
   data.tar.gz: !binary |-
-    NDVhMTRkZWRlMGI2YWEzNWZhNmRjZTRkNWJmNjAwOTRiNTVkMmQ0Yw==
+    MTk4YWMxMWRlODZiNmQ0ODQxOTMxMDJhZmZlODFlZDY1MjZlYWZkNQ==
 SHA512:
   metadata.gz: !binary |-
-    MDg5ZGZiNjRjYjM3ODgwNjRlYWU2NTlhM2EzMTgyNmRhOGM4MjQ1YWYzMGU3
-    YjU1NTI2ZmY4OGJkNWRiYTZhYzNmM2QzZWUwMjQzMDlhZGViYjlmYjM3ZmU1
-    MzA1ZGJkZGU5MWM0NjIyZWMzY2M5YThiNjA1ZTIwOTg4OGY2ZDY=
+    ZWM1NTRhZWUwMzg0ZGM4YzhkYmZkNWVjZDI0ZDQ4MDRlMzYzYWFkMWY5NjRi
+    ODYwOGExM2U3ZmZmZTdlYTQ4ZDYyYWFmMWUxOTI2NDUwMWI1NDRmZThkMWJm
+    ZWRjNzI5YWQxZDExMmM2Yjg2M2NhNmVlNTMzMDUwMTk3MTAxNTk=
   data.tar.gz: !binary |-
-    OTVmZTRlODU0ZDJkMmRhMjU3YTViY2VlODlhNDBlYjVkYjdlM2RhNDE4N2Uw
-    MGQ1MTQ4NTY2MGY2YTIwZjY4YmE5NzQ1OWExODJjNWM3MDk0YmU3YjcxZGVm
-    Njg0ZjQ0NzFjN2I0NmM5OTM4OWM0MzhlNTY2OWIyMjYyZDZiM2U=
+    ZmJhMzc0MjU3NGExODUwYTczZjVlNWNkMmI5NjgyYjZhZWVhNDA5YjdlZDFi
+    YTBmNjg2OGJmNzdlMGE1YTU4OTE4YzJhNzc5Mzg3OGI3MzlmYWRkZWIyY2Zl
+    OTM3NjY3YTNkMWY5YzU1MjRkMDJjZTIzN2MxM2Q3Y2VlYTc2OWM=

data/lib/data_kitten/dataset.rb

@@ -40,14 +40,16 @@ module DataKitten
     #   @param [Hash] options the details of the Dataset.
     #   @option options [String] :access_url A URL that can be used to access the Dataset. 
     #
-    def initialize(url_or_options)
+    def initialize(url_or_options, base_url=nil)
       url = case url_or_options
       when Hash
+        base_url ||= url_or_options[:base_url]
         url_or_options[:access_url]
       else
         url_or_options
       end
       @access_url = DataKitten::Fetcher.wrap(url)
+      @base_uri = URI(base_url) if base_url
 
       detect_origin
       detect_host
@@ -58,6 +60,10 @@ module DataKitten
       URI(@access_url.to_s)
     end
 
+    def base_uri
+      @base_uri || uri.merge("/")
+    end
+
     def url
       @access_url.to_s
     end

data/lib/data_kitten/fetcher.rb

@@ -62,6 +62,10 @@ module DataKitten
       !!(content_type_format =~ %r{^text/html}i)
     end
 
+    def json?
+      !!(content_type_format =~ %r{^application/json}i)
+    end
+
     private
     def response
       unless @requested

data/lib/data_kitten/origins/json.rb

@@ -0,0 +1,31 @@
+module DataKitten
+  
+  module Origins
+    
+    # JSON origin module. Automatically mixed into {Dataset} for datasets that are accessed through an API.
+    #
+    # @see Dataset
+    #
+    module JSON
+  
+      private
+  
+      def self.supported?(resource)
+        resource.json?
+      end
+
+      public
+
+      # The origin type of the dataset.
+      # @return [Symbol] +:html+
+      # @see Dataset#origin
+      def origin
+        :json
+      end
+
+    end
+
+  end
+
+end
+

data/lib/data_kitten/origins.rb

@@ -1,6 +1,7 @@
 require 'data_kitten/origins/git'
 require 'data_kitten/origins/web_service'
 require 'data_kitten/origins/html'
+require 'data_kitten/origins/json'
 require 'data_kitten/origins/linked_data'
 
 module DataKitten
@@ -11,8 +12,9 @@ module DataKitten
 
     def detect_origin
       [
-        DataKitten::Origins::Git,
         DataKitten::Origins::HTML,
+        DataKitten::Origins::JSON,
+        DataKitten::Origins::Git,
         DataKitten::Origins::WebService,
         DataKitten::Origins::LinkedData,
       ].each do |origin|

data/lib/data_kitten/publishing_formats/ckan.rb

@@ -1,4 +1,5 @@
 require 'data_kitten/utils/guessable_lookup.rb'
+require 'data_kitten/utils/ckan3_hash.rb'
 
 module DataKitten
 
@@ -10,29 +11,42 @@ module DataKitten
 
       def self.supported?(instance)
         uri = instance.uri
-        base_uri = uri.merge("/")
+        base_uri = instance.base_uri
         *base, package = uri.path.split('/')
-        # If the 2nd to last element in the path is 'dataset' then it's probably
-        # the CKAN dataset view page, the last element will be the dataset id
-        # or name
-        if base.last == "dataset"
-          instance.identifier = package
-          # build a base URI ending with a /
-          base_uri = uri.merge(base[0...-1].join('/') + '/')
-        # 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
+        if uri.path =~ %r{api/\d+/action/package_show/?$}
+          result = JSON.parse(RestClient.get(uri.to_s))['result']
+
+          instance.identifier = result['id']
+          result['extras'] = CKAN3Hash.new(result['extras'], 'key', 'value')
+          result['tags'] = CKAN3Hash.new(result['tags'], 'name', 'display_name').values
+          instance.metadata = result
+        elsif uri.path =~ %r{api/\d+/rest/dataset/}
+          result = JSON.parse(RestClient.get(uri.to_s))
+          instance.identifier = result['id']
+          instance.metadata = result
         else
-          results = begin
-            RestClient.get base_uri.merge("api/3/action/package_show").to_s, {:params => {:id => package}}
-          rescue RestClient::Exception
-            RestClient.get base_uri.merge("api/2/rest/dataset/#{package}").to_s
+          # If the 2nd to last element in the path is 'dataset' then it's probably
+          # the CKAN dataset view page, the last element will be the dataset id
+          # or name
+          if base.last == "dataset"
+            instance.identifier = package
+            # build a base URI ending with a /
+            base_uri = uri.merge(base[0...-1].join('/') + '/')
+          # 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
+          else
+            results = begin
+              RestClient.get base_uri.merge("api/3/action/package_show").to_s, {:params => {:id => package}}
+            rescue RestClient::Exception
+              RestClient.get base_uri.merge("api/2/rest/dataset/#{package}").to_s
+            end
+
+            result = JSON.parse results
+            instance.identifier = result.fetch("result", result)["id"]
           end
-
-          result = JSON.parse results
-          instance.identifier = result.fetch("result", result)["id"]
+          instance.metadata = JSON.parse RestClient.get base_uri.merge("api/rest/package/#{instance.identifier}").to_s
         end
-        instance.metadata = JSON.parse RestClient.get base_uri.merge("api/rest/package/#{instance.identifier}").to_s
         instance.metadata.extend(GuessableLookup)
         instance.source = instance.metadata
         return true
@@ -98,10 +112,15 @@ module DataKitten
       #
       # @see Dataset#publishers
       def publishers
-        id = metadata.lookup('organization', 'id') || metadata.lookup('groups', 0)
-        fetch_publisher(id)
-      rescue
-        []
+        org = fetch_organization
+        result = if org
+          [org]
+        elsif group_id = metadata.lookup('groups', 0, 'id')
+          [fetch_publisher(group_id)]
+        else
+          []
+        end
+        result.compact
       end
 
       def maintainers
@@ -251,15 +270,38 @@ module DataKitten
         nil
       end
 
+      def fetch_organization
+        if org = metadata['organization']
+          begin
+            uri = base_uri.merge("api/3/action/organization_show")
+            result = RestClient.get(uri.to_s, params: {id: org['id']})
+            org_data = JSON.parse(result)['result']
+            extras = CKAN3Hash.new(org_data['extras'], "key", "value")
+          rescue
+            uri = base_uri.merge("api/rest/group/#{org['id']}")
+            result = RestClient.get(uri.to_s)
+            org_data = JSON.parse(result)
+            extras = org_data['extras']
+          end
+          Agent.new(
+            :name => org_data['title'],
+            :mbox => (org_data['contact-email'] || extras['contact-email']),
+            :homepage => extras['website-url'] || base_uri.to_s
+          )
+        end
+      rescue
+        nil
+      end
+
       def fetch_publisher(id)
         uri = parsed_uri
         [
-          "#{uri.scheme}://#{uri.host}/api/3/action/organization_show?id=#{id}",
-          "#{uri.scheme}://#{uri.host}/api/3/action/group_show?id=#{id}",
-          "#{uri.scheme}://#{uri.host}/api/rest/group/#{id}"
+          "api/3/action/organization_show?id=#{id}",
+          "api/3/action/group_show?id=#{id}",
+          "api/rest/group/#{id}"
         ].each do |uri|
           begin
-            @group = JSON.parse RestClient.get uri
+            @group = JSON.parse RestClient.get base_uri.merge(uri).to_s
             break
           rescue
             # FakeWeb raises FakeWeb::NetConnectNotAllowedError, whereas 
@@ -268,13 +310,11 @@ module DataKitten
           end
         end
 
-        [
-          Agent.new(
-                    :name => @group["display_name"] || @group["result"]["title"],
+        if @group
+          Agent.new(:name => @group["display_name"] || @group["result"]["title"],
                     :homepage => select_extras(@group, "website-url"),
-                    :mbox => select_extras(@group, "contact-email")
-                    )
-        ]
+                    :mbox => select_extras(@group, "contact-email"))
+        end
       end
 
       def parsed_uri

data/lib/data_kitten/utils/ckan3_hash.rb

@@ -0,0 +1,8 @@
+class CKAN3Hash < Hash
+  def initialize(list, key_name, value_name)
+    super()
+    (list || []).each do |item|
+      self[item[key_name]] = item[value_name]
+    end
+  end
+end

data/lib/data_kitten/version.rb

@@ -1,3 +1,3 @@
 module DataKitten
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_kitten
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - James Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -190,6 +190,7 @@ files:
 - lib/data_kitten/origins.rb
 - lib/data_kitten/origins/git.rb
 - lib/data_kitten/origins/html.rb
+- lib/data_kitten/origins/json.rb
 - lib/data_kitten/origins/linked_data.rb
 - lib/data_kitten/origins/web_service.rb
 - lib/data_kitten/publishing_formats.rb
@@ -200,6 +201,7 @@ files:
 - lib/data_kitten/rights.rb
 - lib/data_kitten/source.rb
 - lib/data_kitten/temporal.rb
+- lib/data_kitten/utils/ckan3_hash.rb
 - lib/data_kitten/utils/guessable_lookup.rb
 - lib/data_kitten/version.rb
 homepage: http://github.com/data-kitten