tripod 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1498353ae2811f7c6fced7033b9e9f4a3291943e
-  data.tar.gz: 0b78fa2cacd589e25d29a7b01d74dbf72680c124
+  metadata.gz: d0d0bb81441871fbdb4115e399bca413f309c7c4
+  data.tar.gz: 3b72bae40446b70dd252383f82193c4764a2b669
 SHA512:
-  metadata.gz: 53236582779d2d9b41c1124e6d610e37189ff817b881499419d707784b5234dfdd135c5d69ebe27e2b0f501c8effdb92554c4e9ff39bfb885bcb691166aeae9b
-  data.tar.gz: 2d03193a9747055ad07c00a537528c292217ef7d805744747469ea5b2e73118cf34df923d8a971a91c73e738511b72ecf20eb1c947190afb3e2cd573ec4cb048
+  metadata.gz: 614d0632c00fd4b5c99347f035fad525a2e9a9cf9240cd9376bf1c6fa1585ccda99a28ff0c8f74c988f7c8480723845195b6ffc74d05b5a7c1321ba849436062
+  data.tar.gz: 515dafcdb449015ef2b8728b00c65687f3d777e232022e34e9d96311a77229a7c9b2eea7332ea6dae7c19c34ba34a52e2b6117bc038fa81314cbba64b819b795

data/README.md

@@ -134,6 +134,8 @@ Tripod doesn't supply a database. You need to install one. I recommend [Fuseki](
 
 With a Fuseki instance ready and up, edit the config in `spec/spec_helper.rb` to reflect your settings. Make sure you `bundle` to pull in all dependencies before trying to run the tests.
 
+Some tests require memcached to be set up and running. The tests that require memcached are tagged with `:caching_tests => true`; do with this information what you will. 
+
 [Full Documentation](http://rubydoc.info/gems/tripod/frames)
 
 Copyright (c) 2012 [Swirrl IT Limited](http://swirrl.com). Released under MIT License

data/lib/tripod.rb

@@ -70,6 +70,7 @@ module Tripod
   #     config.cache_store = nil #e.g Tripod::CacheStores::MemcachedCacheStore.new('localhost:11211')
   #       # note: if using memcached, make sure you set the -I (slab size) to big enough to store each result
   #       # and set the -m (total size) to something quite big (or the cache will recycle too often).
+  #       # also note that the connection pool size can be passed in as an optional second parameter.
   #     config.logger = Logger.new(STDOUT) # you can set this to the Rails.logger in a rails app.
   #   end
   #
@@ -100,6 +101,7 @@ require "tripod/persistence"
 require "tripod/eager_loading"
 require "tripod/serialization"
 require "tripod/state"
+require "tripod/graphs"
 require "tripod/version"
 
 # these need to be at the end
@@ -107,4 +109,5 @@ require "tripod/components"
 require "tripod/resource"
 
 require 'active_support/i18n'
-I18n.load_path << File.dirname(__FILE__) + '/tripod/locale/en.yml'
+I18n.enforce_available_locales = true
+I18n.load_path << File.dirname(__FILE__) + '/tripod/locale/en.yml'

data/lib/tripod/cache_stores/memcached_cache_store.rb

@@ -1,4 +1,5 @@
 require 'dalli'
+require 'connection_pool'
 
 module Tripod
   module CacheStores
@@ -9,33 +10,50 @@ module Tripod
     class MemcachedCacheStore
 
       # initialize a memcached cache store at the specified port (default 'localhost:11211')
-      def initialize(location)
-        @dalli = Dalli::Client.new(location, :value_max_bytes => Tripod.response_limit_bytes)
+      # a pool size should also be specified (defaults to 1 for development/local use reasons)
+      def initialize(location, size = 1)
+        @dalli_pool = ConnectionPool.new(:size => size, :timeout => 3) { Dalli::Client.new(location, :value_max_bytes => Tripod.response_limit_bytes) }
       end
 
       # takes a block
       def fetch(key)
         raise ArgumentError.new("expected a block") unless block_given?
 
-        @dalli.fetch(key) do
-          yield
+        @dalli_pool.with do |client|
+          client.fetch(key) { yield }
         end
       end
 
       def exist?(key)
-        !!@dalli.get(key)
+        @dalli_pool.with do |client|
+          !!client.get(key)
+        end
       end
 
       def write(key, data)
-        @dalli.set(key, data)
+        @dalli_pool.with do |client|
+          client.set(key, data)
+        end
       end
 
       def read(key)
-        @dalli.get(key)
+        @dalli_pool.with do |client|
+          client.get(key)
+        end
+      end
+
+      def stats
+        output = []
+        @dalli_pool.with do |client|
+          output << client.stats
+        end
+        output
       end
 
       def clear!
-        @dalli.flush
+        @dalli_pool.with do |client|
+          client.flush
+        end
       end
 
     end

data/lib/tripod/components.rb

@@ -24,5 +24,5 @@ module Tripod::Components
   include Tripod::EagerLoading
   include Tripod::Serialization
   include Tripod::State
-
-end
+  include Tripod::Graphs
+end

data/lib/tripod/graphs.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+# This module defines behaviour for resources with data across multiple graphs
+module Tripod::Graphs
+  extend ActiveSupport::Concern
+
+  def graphs
+    select_query = "SELECT DISTINCT ?g WHERE { GRAPH ?g {<#{uri.to_s}> ?p ?o } }"
+    result = Tripod::SparqlClient::Query.select(select_query)
+    result.map{|r| r["g"]["value"]}
+  end
+end

data/lib/tripod/persistence.rb

@@ -73,9 +73,9 @@ module Tripod::Persistence
       transaction = Tripod::Persistence::Transaction.get_transaction(opts[:transaction])
 
       if self.valid?
-
+        graph_selector = self.graph_uri.present? ? "<#{graph_uri.to_s}>" : "?g"
         query = "
-          DELETE {GRAPH ?g {<#{@uri.to_s}> ?p ?o}} WHERE {GRAPH ?g {<#{@uri.to_s}> ?p ?o}};
+          DELETE {GRAPH #{graph_selector} {<#{@uri.to_s}> ?p ?o}} WHERE {GRAPH #{graph_selector} {<#{@uri.to_s}> ?p ?o}};
           INSERT DATA {
             GRAPH <#{@graph_uri}> {
               #{ @repository.dump(:ntriples) }
@@ -174,4 +174,4 @@ module Tripod::Persistence
 
   end
 
-end
+end

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/spec/tripod/eager_loading_spec.rb

@@ -143,13 +143,13 @@ describe Tripod::EagerLoading do
     context "when eager load not called" do
       context "and related resource exists" do
         it "should return false" do
-          @john.has_related_resource?(RDF::URI.new('http://example.com/name'), Resource).should be_false
+          @john.has_related_resource?(RDF::URI.new('http://example.com/name'), Resource).should be false
         end
       end
 
       context "and related resource doesn't exist" do
         it "should return false" do
-          @john.has_related_resource?(RDF::URI.new('http://example.com/nonexistent/person'), Person).should be_false
+          @john.has_related_resource?(RDF::URI.new('http://example.com/nonexistent/person'), Person).should be false
         end
       end
     end
@@ -161,13 +161,13 @@ describe Tripod::EagerLoading do
 
       context "and related resource exists" do
         it "should return true" do
-          @john.has_related_resource?(RDF::URI.new('http://example.com/name'), Resource).should be_true
+          @john.has_related_resource?(RDF::URI.new('http://example.com/name'), Resource).should be true
         end
       end
 
       context "and related resource doesn't exist" do
         it "should return false" do
-          @john.has_related_resource?(RDF::URI.new('http://example.com/nonexistent/person'), Person).should be_false
+          @john.has_related_resource?(RDF::URI.new('http://example.com/nonexistent/person'), Person).should be false
         end
       end
     end

data/spec/tripod/graphs_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+
+describe Tripod::Graphs do
+  describe "#graphs" do
+    let(:uri) { 'http://example.com/foobar' }
+    let(:graph_uri) { 'http://example.com/irl' }
+    let(:another_graph_uri) { 'http://example.com/make-believe' }
+    let(:person) do
+      p = Person.new(uri, graph_uri: graph_uri)
+      p.write_predicate('http://example.com/vocation', RDF::URI.new('http://example.com/accountant'))
+      p.save!
+      p
+    end
+
+    before do
+      p2 = Person.new(uri, graph_uri: another_graph_uri)
+      p2.write_predicate('http://example.com/vocation', RDF::URI.new('http://example.com/lion-tamer'))
+      p2.save!
+      p2
+    end
+
+    it 'should return an array of all the graphs for which there are triples about this URI' do
+      person.graphs.should =~ [graph_uri, another_graph_uri]
+    end
+  end
+end

data/spec/tripod/memcached_cache_store_spec.rb

@@ -0,0 +1,57 @@
+require "spec_helper"
+
+describe Tripod::CacheStores, :caching_tests => true do
+
+  let(:query) { "SELECT * WHERE {?s ?p ?o}" }
+  let(:accept_header) { "application/sparql-results+json" }
+  let(:params) { {:query => query}.to_query }
+  let(:streaming_opts) { {:accept => accept_header, :timeout_seconds => Tripod.timeout_seconds} }
+
+  before do
+    Tripod.cache_store = Tripod::CacheStores::MemcachedCacheStore.new('localhost:11211', 10)
+
+    p = Person.new('http://example.com/id/garry')
+    p.name = "garry"
+    p.save!
+    p
+  end
+
+  # if Tripod cache_store is not reset to nil, other tests will fail due to caching
+  after(:all) do
+    Tripod.cache_store = nil
+  end
+
+  describe "sending a query with caching enabled" do
+    before do
+      @query_result = Tripod::SparqlClient::Query.query(query, accept_header)
+      @cache_key = 'SPARQL-QUERY-' + Digest::SHA2.hexdigest([accept_header, query].join("-"))
+      @stream_data = -> { Tripod::Streaming.get_data(Tripod.query_endpoint, params, streaming_opts) }
+    end
+
+    it "should set the data in the cache" do 
+      Tripod.cache_store.fetch(@cache_key, &@stream_data).should_not be_nil
+    end
+
+    describe "with a large number of subsequent requests" do
+      before do
+        @number_of_memcache_get_calls = Tripod.cache_store.stats[0]["localhost:11211"]["cmd_get"]
+        @number_of_memcache_set_calls = Tripod.cache_store.stats[0]["localhost:11211"]["cmd_set"]
+
+        100.times do
+          Thread.new do
+            Tripod::SparqlClient::Query.query(query, accept_header)
+          end
+        end
+      end
+
+      it "should increase number of memcache get calls" do
+        Tripod.cache_store.stats[0]["localhost:11211"]["cmd_get"].to_i.should be > @number_of_memcache_get_calls.to_i
+      end
+
+      it "should not increase cache size" do
+        Tripod.cache_store.stats[0]["localhost:11211"]["cmd_set"].to_i.should == @number_of_memcache_set_calls.to_i
+      end
+    end
+  end
+
+end

data/spec/tripod/persistence_spec.rb

@@ -63,6 +63,24 @@ describe Tripod::Persistence do
       p2.repository.dump(:ntriples).should == saved_person.repository.dump(:ntriples)
     end
 
+    context 'given triples about this resource in another graph' do
+      let(:graph_uri) { 'http://example.com/my_other_life' }
+      let(:father) { RDF::URI.new('http://example.com/vader') }
+
+      before do
+        p = Person.new(saved_person.uri, graph_uri: graph_uri)
+        p.father = father
+        p.save!
+      end
+
+      it 'should leave those triples untouched' do
+        saved_person.name = 'Luke'
+        saved_person.save!
+        p = Person.find(saved_person.uri, graph_uri: graph_uri)
+        p.father.should == father
+      end
+    end
+
     it 'runs the callbacks' do
       unsaved_person.should_receive(:pre_save)
       unsaved_person.save
@@ -95,7 +113,7 @@ describe Tripod::Persistence do
 
   describe '.update_attribute' do
     let (:person) { Person.new('http://example.com/newperson') }
-    
+
     context 'without transactions' do
       before { person.stub(:save) }
 
@@ -136,7 +154,7 @@ describe Tripod::Persistence do
 
   describe '.update_attributes' do
     let (:person) { Person.new('http://example.com/newperson') }
-    
+
     context "without transactions" do
       before { person.stub(:save) }
 
@@ -246,4 +264,4 @@ describe Tripod::Persistence do
 
   end
 
-end
+end

data/tripod.gemspec

@@ -27,5 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rdf-json"
   gem.add_dependency "json-ld", "~> 0.9.1" # use v.0.9 for now, as v1.0 changes what is returned for dumping a resource to include other defined resources.
   gem.add_dependency "guid"
-  gem.add_dependency "dalli", "~> 2.6"
+  gem.add_dependency "dalli", "~> 2.7.0"
+  gem.add_dependency "connection_pool", "~> 2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Ric Roberts
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -144,14 +144,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: RDF ruby ORM
 email:
 - ric@swirrl.com
@@ -192,6 +206,7 @@ files:
 - lib/tripod/fields.rb
 - lib/tripod/fields/standard.rb
 - lib/tripod/finders.rb
+- lib/tripod/graphs.rb
 - lib/tripod/locale/en.yml
 - lib/tripod/persistence.rb
 - lib/tripod/predicates.rb
@@ -214,6 +229,8 @@ files:
 - spec/tripod/eager_loading_spec.rb
 - spec/tripod/fields_spec.rb
 - spec/tripod/finders_spec.rb
+- spec/tripod/graphs_spec.rb
+- spec/tripod/memcached_cache_store_spec.rb
 - spec/tripod/persistence_spec.rb
 - spec/tripod/predicates_spec.rb
 - spec/tripod/repository_spec.rb
@@ -258,6 +275,8 @@ test_files:
 - spec/tripod/eager_loading_spec.rb
 - spec/tripod/fields_spec.rb
 - spec/tripod/finders_spec.rb
+- spec/tripod/graphs_spec.rb
+- spec/tripod/memcached_cache_store_spec.rb
 - spec/tripod/persistence_spec.rb
 - spec/tripod/predicates_spec.rb
 - spec/tripod/repository_spec.rb