tripod 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 860ab59bda222badcfcec33c7581cb38c9689438
-  data.tar.gz: f3b261284e25ca436da10d9645069566ee5502ef
+  metadata.gz: 67821ecb6a48f3ebf994b42e4a97b4484d70659e
+  data.tar.gz: 641593641f0efbcd459b6747cd635a0132f7254d
 SHA512:
-  metadata.gz: 76536a9ac3b635dcc105d200b46ed62ff18e62aef98448ff2f025dd032348d4a5775fba2106a5b612777f1671de4bc804e658fde6a7ab48c17d894fa4c7dc582
-  data.tar.gz: bc4b45d80af1433da52118bf8c0fc9ebbcf62f2f194c36073983b83ef34a775b4d96806c304bc805f81dc80721b85dfc6400778d1a4af9157a3cec2420de1e42
+  metadata.gz: adc59ed6b6e5b72ceea3e5453ba45ee1b58f4e93a98e1197d2a18b38137a525d9944c35648d062dce47efa98061e991cc3a595b104b9cf3afad4ad0822cee57d
+  data.tar.gz: 8b5e6f4a90b66b9d60963f325d3cd05c9d1370b37194cdc14b9aa8a072256553db7e3712b4170858550c0e23e3ace2ccb3af8ed7688bbfcd58abe3a4e63db91b

data/lib/tripod.rb

@@ -52,6 +52,9 @@ module Tripod
   mattr_accessor :extra_endpoint_params
   @@extra_endpoint_params = {}
 
+  mattr_accessor :extra_endpoint_headers
+  @@extra_endpoint_headers = {}
+
   mattr_accessor :timeout_seconds
   @@timeout_seconds = 30
 

data/lib/tripod/fields.rb

@@ -5,9 +5,15 @@ require "tripod/fields/standard"
 module Tripod::Fields
   extend ActiveSupport::Concern
 
-  included do
-    class_attribute :fields
-    self.fields = {}
+  def self.included(base)
+    base.instance_eval do
+      @fields ||= {}
+    end
+    base.extend(ClassMethods)
+  end
+
+  def fields
+    self.class.fields
   end
 
   module ClassMethods
@@ -37,7 +43,7 @@ module Tripod::Fields
     #
     # @return [ Field ] The generated field
     def field(name, predicate, options = {})
-      # TODO: validate the field params/options here..
+      @fields ||= {}
       add_field(name, predicate, options)
     end
 
@@ -48,13 +54,27 @@ module Tripod::Fields
     #
     # @param [ Symbol ] name The name of the field.
     def get_field(name)
-      field = self.fields[name]
+      @fields ||= {}
+      field = fields[name]
       raise Tripod::Errors::FieldNotPresent.new unless field
       field
     end
 
+    # Return all of the fields on a +Resource+ in a manner that
+    # respects Ruby's inheritance rules.  i.e. subclass fields should
+    # override superclass fields with the same
+    def fields
+      tripod_superclasses.map { |c| c.instance_variable_get(:@fields) }.reduce do |acc,class_fields|
+        class_fields.merge(acc)
+      end
+    end
+
     protected
 
+    def tripod_superclasses
+      self.ancestors.select { |a| a.class == Class && a.respond_to?(:fields)}
+    end
+
     # Define a field attribute for the +Resource+.
     #
     # @example Set the field.
@@ -66,7 +86,8 @@ module Tripod::Fields
     def add_field(name, predicate, options = {})
       # create a field object and store it in our hash
       field = field_for(name, predicate, options)
-      fields[name] = field
+      @fields ||= {}
+      @fields[name] = field
 
       # set up the accessors for the fields
       create_accessors(name, name, options)
@@ -90,7 +111,7 @@ module Tripod::Fields
     # @param [ Symbol ] meth The name of the accessor.
     # @param [ Hash ] options The options.
     def create_accessors(name, meth, options = {})
-      field = fields[name]
+      field = @fields[name]
 
       create_field_getter(name, meth, field)
       create_field_setter(name, meth, field)
@@ -148,7 +169,7 @@ module Tripod::Fields
       end
     end
 
-     # Include the field methods as a module, so they can be overridden.
+    # Include the field methods as a module, so they can be overridden.
     #
     # @example Include the fields.
     #   Person.generated_methods

data/lib/tripod/sparql_client.rb

@@ -14,13 +14,14 @@ module Tripod::SparqlClient
     # @param [ String ] accept_header The accept header to send with the request
     # @param [ Hash ] any extra params to send with the request
     # @return [ RestClient::Response ]
-    def self.query(sparql, accept_header, extra_params={}, response_limit_bytes = :default)
+    def self.query(sparql, accept_header, extra_params={}, response_limit_bytes = :default, extra_headers = {})
 
       non_sparql_params = (Tripod.extra_endpoint_params).merge(extra_params)
       params_hash = {:query => sparql}.merge(non_sparql_params)
       params = self.to_query(params_hash)
       request_url = Tripod.query_endpoint
-      streaming_opts = {:accept => accept_header, :timeout_seconds => Tripod.timeout_seconds}
+      extra_headers.merge!(Tripod.extra_endpoint_headers)
+      streaming_opts = {:accept => accept_header, :timeout_seconds => Tripod.timeout_seconds, :extra_headers => extra_headers}
       streaming_opts.merge!(_response_limit_options(response_limit_bytes)) if Tripod.response_limit_bytes
 
       # Hash.to_query from active support core extensions

data/lib/tripod/streaming.rb

@@ -11,10 +11,17 @@ module Tripod
     #  :response_limit_bytes = nil
     def self.get_data(request_url, payload, opts={})
 
-      accept = opts[:accept] || "*/*"
+      accept = opts[:accept]
       timeout_in_seconds = opts[:timeout_seconds] || 10
       limit_in_bytes = opts[:response_limit_bytes]
 
+      # set request headers
+      headers = opts[:extra_headers] || {}
+
+      # if explicit accept option is given, set it in the headers (and overwrite any existing value in the extra_headers map)
+      # if none is given accept */*
+      headers['Accept'] = accept || headers['Accept'] || '*/*'
+
       uri = URI(request_url)
 
       http = Net::HTTP.new(uri.host, uri.port)
@@ -27,7 +34,7 @@ module Tripod
       response = StringIO.new
 
       begin
-        http.request_post(uri.request_uri, payload, 'Accept' => accept) do |res|
+        http.request_post(uri.request_uri, payload, headers) do |res|
 
           response_duration = Time.now - request_start_time if Tripod.logger.debug?
 

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/spec/tripod/fields_spec.rb

@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe Tripod::Fields do
-
   describe ".field" do
 
     let(:barry) do
@@ -50,3 +49,75 @@ describe Tripod::Fields do
     end
   end
 end
+
+module Spec
+  module Tripod
+    module Inheritance
+      BASE_PREDICATE = RDF::URI.new("http://base/predicate/overriden/from/SubSub/up")
+      BASE_PREDICATE_OVERIDE = RDF::URI.new("http://overide/base/predicate")
+
+      ANOTHER_PREDICATE = RDF::RDFS::label
+
+      class Base
+        include ::Tripod::Resource
+        field :inherited, BASE_PREDICATE
+      end
+
+      class Sub < Base
+        field :bar, ANOTHER_PREDICATE
+        # expects inerited to be ANOTHER_PREDICATE
+      end
+
+      class SubSub < Sub
+        field :inherited, BASE_PREDICATE_OVERIDE
+      end
+
+      class SubSubSub < SubSub
+        # defines no new fields, used to test no NullPointerExceptions
+        # etc on classes that don't define fields.
+      end
+
+      describe 'inheritance' do
+        describe Base do
+          subject(:base) { Base }
+
+          it "does not inhert fields from subclasses" do
+            expect(base.fields[:bar]).to be_nil
+          end
+
+          it "defines the :inherited field" do
+            inherited_field = base.fields[:inherited]
+            expect(inherited_field.predicate).to eq(BASE_PREDICATE)
+          end
+        end
+
+        describe Sub do
+          subject(:inherited) { Sub.get_field(:inherited) }
+          it "does not redefine :inherited field" do
+            expect(inherited.predicate).to eq(BASE_PREDICATE)
+          end
+        end
+
+        describe SubSub do
+          subject(:inherited) { SubSub.get_field(:inherited) }
+
+          it "overrides the :inherited field" do
+            expect(inherited.predicate).to eq(BASE_PREDICATE_OVERIDE)
+          end
+        end
+
+        describe SubSubSub do
+          it "inherits the :bar field from Sub" do
+            bar = SubSubSub.get_field(:bar)
+            expect(bar.predicate).to eq(ANOTHER_PREDICATE)
+          end
+
+          it "overrides the :inherited field in Base with the value from SubSub" do
+            inherited = SubSubSub.get_field(:inherited)
+            expect(inherited.predicate).to eq(BASE_PREDICATE_OVERIDE)
+          end
+        end
+      end
+    end
+  end
+end

data/tripod.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "tripod"
   gem.require_paths = ["lib"]
+  gem.license       = 'MIT'
   gem.version       = Tripod::VERSION
 
   gem.required_rubygems_version = ">= 1.3.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Ric Roberts
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -283,7 +283,8 @@ files:
 - spec/tripod/validations/is_url_spec.rb
 - tripod.gemspec
 homepage: http://github.com/Swirrl/tripod
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []