tripod 0.7.5 → 0.7.7

data/lib/tripod.rb

@@ -34,7 +34,7 @@ require 'rdf/rdfxml'
 require 'rdf/n3'
 require 'rdf/json'
 require 'json/ld'
-
+require 'uri'
 require 'rest_client'
 
 module Tripod
@@ -90,6 +90,7 @@ require "tripod/resource_collection"
 require "tripod/predicates"
 require "tripod/attributes"
 require "tripod/callbacks"
+require "tripod/validations/is_url"
 require "tripod/errors"
 require "tripod/repository"
 require "tripod/fields"
@@ -103,4 +104,7 @@ require "tripod/version"
 
 # these need to be at the end
 require "tripod/components"
-require "tripod/resource"
+require "tripod/resource"
+
+require 'active_support/i18n'
+I18n.load_path << File.dirname(__FILE__) + '/tripod/locale/en.yml'

data/lib/tripod/attributes.rb

@@ -81,10 +81,10 @@ module Tripod::Attributes
   end
 
   def write_value_for_field(value, field)
-    return unless value
+    return if value.blank?
 
     if field.is_uri?
-      RDF::URI.new(value.to_s)
+      uri = RDF::URI.new(value.to_s)
     elsif field.datatype
       RDF::Literal.new(value, :datatype => field.datatype)
     else

data/lib/tripod/components.rb

@@ -16,6 +16,7 @@ module Tripod::Components
   include Tripod::Predicates
   include Tripod::Attributes
   include Tripod::Callbacks
+  include Tripod::Validations
   include Tripod::Persistence
   include Tripod::Fields
   include Tripod::Finders

data/lib/tripod/criteria/execution.rb

@@ -44,7 +44,7 @@ module Tripod
       sq = Tripod::SparqlQuery.new(build_select_query(opts))
       count_sparql = sq.as_count_query_str
       result = Tripod::SparqlClient::Query.select(count_sparql)
-      result[0]["c"]["value"].to_i
+      result[0]["tripod_count_var"]["value"].to_i
     end
 
     # PRIVATE:

data/lib/tripod/fields.rb

@@ -58,6 +58,11 @@ module Tripod::Fields
 
       # set up the accessors for the fields
       create_accessors(name, name, options)
+
+      # create a URL validation if appropriate
+      # (format nabbed from https://gist.github.com/joshuap/948880)
+      validates(name, is_url: true) if field.is_uri?
+
       field
     end
 

data/lib/tripod/locale/en.yml

@@ -0,0 +1,10 @@
+en:
+  activemodel:
+    errors:
+      # The default format to use in full error messages.
+      format: "%{attribute} %{message}"
+
+      # The values :model, :attribute and :value are always available for interpolation
+      # The value :count is available when applicable. Can be used for pluralization.
+      messages:
+        is_url: "is not a valid URL"

data/lib/tripod/sparql_query.rb

@@ -49,7 +49,7 @@ module Tripod
     def as_count_query_str
       check_subqueryable!
 
-      count_query = "SELECT (COUNT(*) as ?c) { #{self.body} }"
+      count_query = "SELECT (COUNT(*) as ?tripod_count_var) { #{self.body} }"
       count_query = "#{self.prefixes} #{count_query}" if self.prefixes
 
       # just returns the string representing the count query for this query.

data/lib/tripod/validations/is_url.rb

@@ -0,0 +1,23 @@
+module Tripod::Validations
+  class IsUrlValidator < ActiveModel::EachValidator
+    def validate_each(resource, attribute, value)
+      return unless value # nil values get passed over.
+      is_valid = value.is_a?(Array) ? value.all?{|v| is_url?(v)} : is_url?(value)
+      resource.errors.add(attribute, :is_url, options) unless is_valid
+    end
+
+    private
+
+    def is_url?(value)
+      uri = nil
+      begin
+        uri = URI.parse(value.to_s)
+      rescue
+        return false
+      end
+      return false unless ['http', 'https'].include?(uri.scheme)
+      return false unless uri.host && uri.host.split('.').length > 1
+      true
+    end
+  end
+end

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.7.5"
+  VERSION = "0.7.7"
 end

data/spec/tripod/attributes_spec.rb

@@ -74,7 +74,7 @@ describe Tripod::Attributes do
 
     context "where there is no field with the given name" do
       it "should raise a 'field not present' error" do
-        lambda { person.read_attribute(:hoof_size) }.should raise_error(Tripod::Errors::FieldNotPresent)
+        expect { person.read_attribute(:hoof_size) }.to raise_error(Tripod::Errors::FieldNotPresent)
       end
     end
   end
@@ -92,6 +92,11 @@ describe Tripod::Attributes do
       person.read_predicate('http://example.com/age').first.datatype.should == RDF::XSD.integer
     end
 
+    it "should not write the predicate given a blank value" do
+      person[:name] = ''
+      person.read_predicate('http://example.com/name').should be_empty
+    end
+
     context "where the attribute is a uri" do
       it "should convert a string to an RDF::URI" do
         person[:father] = 'http://example.com/darth'

data/spec/tripod/criteria_execution_spec.rb

@@ -190,7 +190,7 @@ describe Tripod::Criteria do
     end
 
     it "should execute the right Sparql" do
-      sparql = "SELECT (COUNT(*) as ?c) { SELECT DISTINCT ?uri (<http://example.com/graph> as ?graph) WHERE { GRAPH <http://example.com/graph> { ?uri a <http://example.com/person> . ?uri ?p ?o } }  LIMIT 10 OFFSET 20 }"
+      sparql = "SELECT (COUNT(*) as ?tripod_count_var) { SELECT DISTINCT ?uri (<http://example.com/graph> as ?graph) WHERE { GRAPH <http://example.com/graph> { ?uri a <http://example.com/person> . ?uri ?p ?o } }  LIMIT 10 OFFSET 20 }"
       Tripod::SparqlClient::Query.should_receive(:select).with(sparql).and_call_original
       Person.all.limit(10).offset(20).count
     end

data/spec/tripod/fields_spec.rb

@@ -24,13 +24,19 @@ describe Tripod::Fields do
     end
 
     context "when the value is not set" do
-      before do
-        barry.name = nil
-      end
+      before { barry.name = nil }
 
       it "should have a check? method which returns false" do
         barry.name?.should == false
       end
     end
+
+    context "given a field of type URI where an invalid URI is given" do
+      before { barry.father = 'Steven Notauri' }
+
+      it "should not be valid" do
+        barry.should_not be_valid
+      end
+    end
   end
 end

data/spec/tripod/sparql_query_spec.rb

@@ -88,14 +88,14 @@ describe Tripod::SparqlQuery do
       context 'without prefixes' do
         it "should return a new SparqlQuery with the original query wrapped in a count" do
           q = Tripod::SparqlQuery.new('SELECT ?s WHERE { ?s ?p ?o }')
-          q.as_count_query_str.should == 'SELECT (COUNT(*) as ?c) { SELECT ?s WHERE { ?s ?p ?o } }'
+          q.as_count_query_str.should == 'SELECT (COUNT(*) as ?tripod_count_var) { SELECT ?s WHERE { ?s ?p ?o } }'
         end
       end
 
       context 'with prefixes' do
         it "should move the prefixes to the start" do
           q = Tripod::SparqlQuery.new('PREFIX e: <http://example.com> SELECT ?s WHERE { ?s ?p ?o }')
-          q.as_count_query_str.should == 'PREFIX e: <http://example.com> SELECT (COUNT(*) as ?c) { SELECT ?s WHERE { ?s ?p ?o } }'
+          q.as_count_query_str.should == 'PREFIX e: <http://example.com> SELECT (COUNT(*) as ?tripod_count_var) { SELECT ?s WHERE { ?s ?p ?o } }'
         end
       end
     end

data/spec/tripod/validations/is_url_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+describe Tripod::Validations::IsUrlValidator do
+  let(:person) { Person.new('http://example.com/barry') }
+
+  it 'should be valid given a valid URL' do
+    person.father = 'http://example.com/bob'
+    person.should be_valid
+  end
+
+  it 'should invalidate given a non-http(s) URL' do
+    person.father = 'ftp://example.com/bob.nt'
+    person.should_not be_valid
+  end
+
+  it 'should invalidate given something unlike a URL' do
+    person.father = 'http:Bob'
+    person.should_not be_valid
+  end
+
+  it 'should invalidate given a domain without a TLD' do
+    person.father = 'http://bob'
+    person.should_not be_valid
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70124439331920 !ruby/object:Gem::Requirement
+  requirement: &70258719639060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124439331920
+  version_requirements: *70258719639060
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70124439346220 !ruby/object:Gem::Requirement
+  requirement: &70258719636980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70124439346220
+  version_requirements: *70258719636980
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70124439344500 !ruby/object:Gem::Requirement
+  requirement: &70258719656680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124439344500
+  version_requirements: *70258719656680
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70124439343180 !ruby/object:Gem::Requirement
+  requirement: &70258719655760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124439343180
+  version_requirements: *70258719655760
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70124439341020 !ruby/object:Gem::Requirement
+  requirement: &70258719654460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124439341020
+  version_requirements: *70258719654460
 - !ruby/object:Gem::Dependency
   name: rdf-n3
-  requirement: &70124439339640 !ruby/object:Gem::Requirement
+  requirement: &70258719651620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124439339640
+  version_requirements: *70258719651620
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70124439354600 !ruby/object:Gem::Requirement
+  requirement: &70258719649660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124439354600
+  version_requirements: *70258719649660
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: &70124439352980 !ruby/object:Gem::Requirement
+  requirement: &70258719666600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124439352980
+  version_requirements: *70258719666600
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70124439352500 !ruby/object:Gem::Requirement
+  requirement: &70258719664320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124439352500
+  version_requirements: *70258719664320
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70124439351820 !ruby/object:Gem::Requirement
+  requirement: &70258719663440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,7 +122,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70124439351820
+  version_requirements: *70258719663440
 description: RDF ruby ORM
 email:
 - ric@swirrl.com
@@ -162,6 +162,7 @@ files:
 - lib/tripod/fields.rb
 - lib/tripod/fields/standard.rb
 - lib/tripod/finders.rb
+- lib/tripod/locale/en.yml
 - lib/tripod/persistence.rb
 - lib/tripod/predicates.rb
 - lib/tripod/repository.rb
@@ -172,6 +173,7 @@ files:
 - lib/tripod/sparql_query.rb
 - lib/tripod/state.rb
 - lib/tripod/streaming.rb
+- lib/tripod/validations/is_url.rb
 - lib/tripod/version.rb
 - spec/app/models/person.rb
 - spec/app/models/resource.rb
@@ -191,6 +193,7 @@ files:
 - spec/tripod/sparql_query_spec.rb
 - spec/tripod/state_spec.rb
 - spec/tripod/streaming_spec.rb
+- spec/tripod/validations/is_url_spec.rb
 - tripod.gemspec
 homepage: http://github.com/Swirrl/tripod
 licenses: []
@@ -235,4 +238,5 @@ test_files:
 - spec/tripod/sparql_query_spec.rb
 - spec/tripod/state_spec.rb
 - spec/tripod/streaming_spec.rb
+- spec/tripod/validations/is_url_spec.rb
 has_rdoc: