data_kitten 1.0.2 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWUwYzRlMGU1MWNlYzNmZDNkZDIzYWQyOWZmZjAzNjcxZjVmMTVlZg==
+    Mjc1ZmZmMmFkOTcxZGYwMzI3ZTRiMzJlODU4ZmVlZDAxNTE0MzUwMA==
   data.tar.gz: !binary |-
-    M2U2M2U4Njg2MGQwYWUyMzdkMzk3YmNmMWJiMGNiNWMzODhkMTE2Nw==
+    MDU3Yzc5YTU4OGQwY2Y5OWI2YThkODUzYzUyOGZlNWY5MTZmNDEyNA==
 SHA512:
   metadata.gz: !binary |-
-    ZmJhNmJiMmFkNDhkZjI1NmI4NDYyOGEzMDkxNjBjMzcxYTY0OGMyZWY5NWYw
-    NTUzOTI3N2FlYmU5NzQ4ZTZjN2NiNTlhMWU4NjQ3NWRhMmYwOTE3ZTAwZGE0
-    ODNiYzM4NjYzOTdmMDVmMGFjNWQ4ZTQ4ZGVkZTFiOTAyNWNlMGY=
+    MDM4ZmFmMDkxZmU4ZDQ5ZWY4YzdkODg5YzJhNjNjZjMzNTAxM2ExYmIyOTA4
+    NTYyYmI0ZmJlNWFlYTI2OTk2MmE2YmY4MTg2MTkzOTliMGFiYjk3N2ZkYTE3
+    ODIwZTM1MmI2OGU2ODcwODlhN2U1MmQxOTRkY2Q2YzZkNTNmZWU=
   data.tar.gz: !binary |-
-    YzQ2YTM4YzllNDRhYzQzZjhkYWVmNjY0MThlMTZiZTg0ZjIwNWZlZDRiNmM5
-    ZmM5MWM4NDc4ZDViMDAwOWFhM2JjYTU1ZTI0YWVhNDQyYzMzZDJlYjY1MDkw
-    YzA1M2U1MmVlN2FlMmE4OGRkODAwYTA1Y2RhNTNhMGZlZDdiODk=
+    M2MyYTYwZGE0ZTBkYzNhYWYwM2I5NjcxYjI1ODA4ZDlhYTgxZDFhZGYwNzAx
+    NTU0MDQ5MjM2ZDViYzNkNmQzODk5NzEzYjZiMzNlZmEzN2YwZTM5MGM4NzYx
+    OGQ2NTExNTc4ZWFmZWI2OWFlN2EyNzRiOWMwN2YzMTkzMDZlMTg=

data/lib/data_kitten/dataset.rb

@@ -28,8 +28,6 @@ module DataKitten
     # @!attribute access_url
     #   @return [String] the URL that gives access to the dataset
     attr_accessor :access_url
-    alias_method :uri, :access_url
-    alias_method :url, :access_url
 
     # Create a new Dataset object
     # 
@@ -38,11 +36,19 @@ module DataKitten
     #                                      The class will attempt to auto-load metadata from this URL.
     #
     def initialize(options)
-      @access_url = options[:access_url]
+      @access_url = DataKitten::Fetcher.wrap(options[:access_url])
       detect_origin
       detect_host
       detect_publishing_format
     end
+
+    def uri
+      URI(@access_url.to_s)
+    end
+
+    def url
+      @access_url.to_s
+    end
   
     # Can metadata be loaded for this Dataset?
     #
@@ -224,4 +230,4 @@ module DataKitten
     end
 
   end
-end
+end

data/lib/data_kitten/fetcher.rb

@@ -0,0 +1,70 @@
+module DataKitten
+
+  class Fetcher
+
+    attr_reader :url
+
+    def self.wrap(url_or_fetcher)
+      if url_or_fetcher.is_a?(self)
+        url_or_fetcher
+      else
+        new(url_or_fetcher)
+      end
+    end
+
+    def initialize(url)
+      @url = url
+    end
+
+    def ok?
+      code == 200
+    end
+
+    def code
+      response ? response.code : @code
+    end
+
+    def body
+      response if response
+    end
+
+    def as_json
+      JSON.parse(body) if response
+    rescue JSON::ParserError
+      nil
+    end
+
+    def content_type
+      response.headers[:content_type] if response
+    end
+
+    def content_type_format
+      if val = content_type
+        val.split(';').first
+      end
+    end
+
+    def to_s
+      url.to_s
+    end
+
+    def html?
+      !!(content_type_format =~ %r{^text/html}i)
+    end
+
+    private
+    def response
+      unless @requested
+        @requested = true
+        begin
+          @response = RestClient.get(url)
+        rescue RestClient::ExceptionWithResponse => error
+          @error = error.response
+          @code = @error.code
+        end
+      end
+      @response
+    end
+  end
+  
+end

data/lib/data_kitten/hosts.rb

@@ -14,10 +14,11 @@ module DataKitten
         DataKitten::Hosts::Bitbucket,
         DataKitten::Hosts::Gist
       ].each do |host|
-        extend host if host.supported?(@access_url)
+        extend host if host.supported?(url)
+        break
       end
     end
 
   end
   
-end
+end

data/lib/data_kitten/origins/git.rb

@@ -10,8 +10,8 @@ module DataKitten
   
       private
   
-      def self.supported?(uri)
-        uri =~ /\A(git|https?):\/\/.*\.git\Z/
+      def self.supported?(resource)
+        resource.to_s =~ /\A(git|https?):\/\/.*\.git\Z/
       end
 
       public
@@ -63,4 +63,4 @@ module DataKitten
 
   end
 
-end
+end

data/lib/data_kitten/origins/html.rb

@@ -10,10 +10,8 @@ module DataKitten
   
       private
   
-      def self.supported?(uri)
-        RestClient.get(uri).headers[:content_type] =~ /text\/html/
-      rescue
-          false
+      def self.supported?(resource)
+        resource.html?
       end
 
       public
@@ -29,4 +27,4 @@ module DataKitten
 
   end
 
-end
+end

data/lib/data_kitten/origins/linked_data.rb

@@ -10,15 +10,10 @@ module DataKitten
   
       private
   
-      def self.supported?(uri)
-        content_type = RestClient.head(uri).headers[:content_type]
-        return nil unless content_type
-        
-        return RDF::Format.content_types.keys.include?( 
-            content_type.split(";").first )    
-            
-      rescue
-          false
+      def self.supported?(resource)
+        if type = resource.content_type_format
+          RDF::Format.content_types.keys.include?(type)
+        end
       end
 
       public
@@ -34,4 +29,4 @@ module DataKitten
 
   end
 
-end
+end

data/lib/data_kitten/publishing_formats/ckan.rb

@@ -9,7 +9,7 @@ module DataKitten
       private
 
       def self.supported?(instance)
-        uri = URI(instance.uri)
+        uri = instance.uri
         package = uri.path.split("/").last
         # If the package is a UUID - it's more than likely to be a CKAN ID
         if package.match(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/)
@@ -80,8 +80,9 @@ module DataKitten
       #
       # @see Dataset#licenses
       def licenses
-        uri = metadata["license_url"] || metadata["extras"]["licence_url"] rescue nil
-        name = metadata["license_title"] || metadata["extras"]["licence_url_title"] rescue nil
+        extras = metadata["extras"] || {}
+        uri = metadata["license_url"] || extras["licence_url"]
+        name = metadata["license_title"] || extras["licence_url_title"]
         [
           License.new(:id => metadata["license_id"],
                       :uri => uri,

data/lib/data_kitten/publishing_formats/datapackage.rb

@@ -17,7 +17,7 @@ module DataKitten
             datapackage = DataPackage::Package.new( JSON.parse( metadata ) )
             return datapackage.datapackage_version != nil
           else
-            datapackage = DataPackage::Package.new( instance.uri )
+            datapackage = DataPackage::Package.new( instance.url )
             return datapackage.datapackage_version != nil
           end
         rescue => e
@@ -157,7 +157,7 @@ module DataKitten
             metadata = load_file("datapackage.json")
             @datapackage = DataPackage::Package.new( JSON.parse( metadata ) )
           else
-            @datapackage = DataPackage::Package.new( access_url )
+            @datapackage = DataPackage::Package.new( url )
           end        
         end
         @datapackage         
@@ -166,4 +166,4 @@ module DataKitten
 
   end
   
-end
+end

data/lib/data_kitten/publishing_formats/linked_data.rb

@@ -26,7 +26,7 @@ module DataKitten
       #Supports content negotiation for various RDF serializations. Attempts "dataset autodiscovery" if it receives
       #an HTML response. This leaves the RDFa Publishing Format to just parse RDFa responses
       def self.create_graph(uri)
-        
+
         resp = RestClient.get uri, 
             :accept=>ACCEPT_HEADER            
         return false if resp.code != 200
@@ -55,15 +55,13 @@ module DataKitten
         graph << reader.new( StringIO.new( resp.body ))
                
         return graph     
-      rescue => e
-        #puts e
-        #puts e.backtrace
+      rescue
         nil
       end
 
       #Can we create an RDF graph for this object containing the description of a dataset?
       def self.supported?(instance)
-          graph = create_graph(instance.uri)
+          graph = create_graph(instance.url)
           return false unless graph
           return true if first_of_type(graph, 
               [RDF::Vocabulary.new("http://www.w3.org/ns/dcat#").Dataset, 
@@ -80,23 +78,16 @@ module DataKitten
         :rdf
       end
             
-      def uri
-        access_url
-      end
-      
       private
       
       def dataset_uri
-        access_url
+        url
       end
             
       def graph
-        if !@graph
-          @graph = LinkedData.create_graph(access_url)
-        end
-        @graph   
+        @graph ||= LinkedData.create_graph(dataset_uri)
       end
       
     end
   end
-end
+end

data/lib/data_kitten/version.rb

@@ -1,3 +1,3 @@
 module DataKitten
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/lib/data_kitten.rb

@@ -19,6 +19,7 @@ require 'data_kitten/temporal'
 require 'data_kitten/dataset'
 require 'data_kitten/distribution_format'
 require 'data_kitten/distribution'
+require 'data_kitten/fetcher'
 
 # A collection of classes that represent Datasets and other concepts, modeled on {http://www.w3.org/TR/vocab-dcat/ DCAT}.
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_kitten
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - James Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -195,6 +195,7 @@ files:
 - lib/data_kitten/dataset.rb
 - lib/data_kitten/distribution.rb
 - lib/data_kitten/distribution_format.rb
+- lib/data_kitten/fetcher.rb
 - lib/data_kitten/hosts.rb
 - lib/data_kitten/hosts/bitbucket.rb
 - lib/data_kitten/hosts/gist.rb
@@ -234,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Get dataset metadata in a consistent format - no matter what you throw at