krikri 0.12.3 → 0.12.4

data/lib/krikri/util/extended_date_parser.rb

@@ -87,7 +87,20 @@ module Krikri::Util
       run = str.gsub!(/.*c[irca\.]*/i, '')
       run ||= str.gsub!(/.*about/i, '')
       date = parse(str) if run
-      date.nil? ? nil : date.uncertain!
+
+      return nil if date.nil?
+
+      # The EDTF grammar does not support uncertainty on masked precision dates
+      if date.respond_to? :uncertain!
+        date.uncertain!
+      elsif date.is_a? EDTF::Interval
+        # Interval uncertainty is scoped to the begin and end dates;
+        # to be safe, we mark both.
+        date.from = date.from.uncertain! if date.from.respond_to? :uncertain!
+        date.to   = date.to.uncertain!   if date.to.respond_to? :uncertain!
+      end
+
+      date
     end
 
     ##

data/lib/krikri/util/extended_date_parser.rb~

@@ -0,0 +1,70 @@
+module Krikri::Util
+  module ExtendedDateParser
+    module_function
+
+    def parse(date_str)
+      date = Date.edtf(date_str)
+      date ||= partial_edtf(date_str)
+      date ||= decade_hyphen(date_str)
+      date ||= month_year(date_str)
+      date ||= decade_s(date_str)
+      date ||= hyphenated_partial_range(date_str)
+      date ||= begin
+                 Date.parse(date_str)
+               rescue ArgumentError
+                 nil
+               end
+    end
+
+    def range_match(str)
+      regexp = %r{
+        ([\d\-\.xu\?\~]*\d{4}[\d\-\.xu\?\~]*)
+        \s*[-\.]+\s*
+        ([\d\-\.xu\?\~]*\d{4}[\d\.\-xu\?\~]*)
+      }x
+      regexp.match(str) do |m|
+        [m[1], m[2]]
+      end
+    end
+
+    ##
+    # e.g. 01-2045
+    def month_year(str)
+      /(\d{2})-(\d{4})/.match(str) do |m|
+        Date.edtf("#{m[2]}-#{m[1]}")
+      end
+    end
+
+    ##
+    # e.g. 1990-92
+    def hyphenated_partial_range(str)
+      /^(\d{2})(\d{2})-(\d{2})$/.match(str) do |m|
+        Date.edtf("#{m[1]}#{m[2]}/#{m[1]}#{m[3]}")
+      end
+    end
+
+    ##
+    # e.g. 1970-08-01/02 or 1970-12/10
+    def partial_edtf(str)
+      /^(\d{4}(-\d{2})*)-(\d{2})\/(\d{2})$/.match(str) do |m|
+        Date.edtf("#{m[1]}-#{m[3]}/#{m[1]}-#{m[4]}")
+      end
+    end
+
+    ##
+    # e.g. 1990s
+    def decade_s(str)
+      /^(\d{3})0s$/.match(str) do |m|
+        Date.edtf("#{m[1]}x")
+      end
+    end
+
+    ##
+    # e.g. 199-
+    def decade_hyphen(str)
+      /^(\d{3})-$/.match(str) do |m|
+        Date.edtf("#{m[1]}x")
+      end
+    end
+  end
+end

data/lib/krikri/version.rb

@@ -1,3 +1,3 @@
 module Krikri
-  VERSION = '0.12.3'.freeze
+  VERSION = '0.12.4'.freeze
 end

data/lib/tasks/jetty.rake~

@@ -0,0 +1,12 @@
+require 'fileutils'
+
+namespace :jetty do
+
+  desc 'Configure solr schema'
+  task :solr_config do
+    cp('solr_conf/schema.xml', 'jetty/solr/blacklight-core/conf/schema.xml')
+    cp('solr_conf/solrconfig.xml',
+       'jetty/solr/blacklight-core/conf/solcconfig.xml')
+  end
+
+end

data/lib/tasks/krikri.rake~

@@ -0,0 +1,20 @@
+namespace :krikri do
+
+# Tasks will execute in spec/internal unless directory is changed
+
+  ITEMS_JSON = File.read(File.expand_path("../../../spec/items.json", __FILE__))
+
+  desc "Index sample data in solr"
+  task :index_sample_data do
+    require 'factory_girl'
+    Krikri::IndexService.add ITEMS_JSON
+    Krikri::IndexService.commit
+  end
+
+  desc "Delete sample data from solr"
+  task :delete_sample_data do
+    Krikri::IndexService.delete_by_id "sample_0"
+    Krikri::IndexService.commit
+  end
+
+end

data/spec/controllers/application_controller_spec.rb~

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Krikri::ApplicationController, :type => :controller do
+
+  describe '#set_current_provider' do
+    it do
+      require 'pry'
+      binding.pry
+    end
+  end
+end

data/spec/controllers/qa_reports_controller_spec.rb~

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Krikri::QAReportsController, :type => :controller do
+  routes { Krikri::Engine.routes }
+
+  describe 'GET #show' do
+    login_user
+
+    it 'sets provider variable' do
+      expect { get :show, id: 'moomin' }
+        .to change { assigns[:current_provider] }
+             .to an_instance_of(Krikri::Provider)
+    end
+  end
+end

data/spec/controllers/records_controller_spec.rb~

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Krikri::RecordsController, :type => :controller do
+  routes { Krikri::Engine.routes }
+
+  describe 'GET #index' do
+    get :index
+    expect(response).to render_template('krikri/records/index')
+  end
+
+end

data/spec/controllers/reports_controller_spec.rb~

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe Krikri::ReportsController, :type => :controller do
+  routes { Krikri::Engine.routes }
+
+end

data/spec/controllers/validation_reports_controller_spec.rb~

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Krikri::ValidationReportsController, :type => :controller do
+
+  routes { Krikri::Engine.routes }
+
+  describe '#show' do
+    login_user
+
+    it 'renders the :show view' do
+      get :show, id: 1
+      expect(response).to render_template('krikri/validation_report/showp')
+    end
+  end
+end

data/spec/factories/krikri_original_record.rb~

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :krikri_institutions, class: Krikri::OriginalRecord do
+
+  end
+end

data/spec/factories/krikri_provider.rb~

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :krikri_provider, class: Krikri::Provider do
+    label 'Moomin Valley Historical Society'
+
+    initialize_with { new(label.gsub(/\s/, '')) }
+  end
+end

data/spec/factories/krikri_provider_spec.rb~

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :krikri_provider, class: Krikri::Provider do
+    label 'Moomin Valley Historical Society'
+
+    initialize_with { new(label.gsub(/\s/, '')) }
+  end
+end

data/spec/factories/krikri_qa_report.rb~

@@ -0,0 +1,8 @@
+FactoryGirl.define do
+
+  factory :krikri_institution, class: Krikri::QAReport do
+    name 'Krikri Sample Institution'
+    notes 'These are notes about the Krikri Sample Institution.'
+  end
+
+end

data/spec/helpers/krikri/application_helper_spec.rb~

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Krikri::ApplicationHelper, :type => :helper do
+  describe `#local_name` do
+    let(:uri) { 'http://example.org/blah/moomin' }
+    let(:stub) { 'moomin' }
+
+    it 'splits string' do
+      expect(helper.local_name(uri)).to eq stub
+    end
+
+    it 'splits URI' do
+      expect(helper.local_name(RDF::URI(uri))).to eq stub
+    end
+  end
+end

data/spec/internal/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.1.14.1'
+gem 'rails', '4.1.6'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
 # Use SCSS for stylesheets
@@ -11,7 +11,7 @@ gem 'sass-rails', '~> 4.0.3'
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .js.coffee assets and views
 gem 'coffee-rails', '~> 4.0.0'
-# See https://github.com/rails/execjs#readme for more supported runtimes
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # gem 'therubyracer',  platforms: :ruby
 
 # Use jquery as the JavaScript library
@@ -36,7 +36,7 @@ gem 'sdoc', '~> 0.4.0',          group: :doc
 # gem 'debugger', group: [:development, :test]
 
         
-        gem 'krikri', :path => '/Users/mark/Documents/Code/dpla/KriKri'
+        gem 'krikri', :path => '/home/tjohnson/src/dpla/krikri'
 
 gem "factory_girl_rails", "~> 4.4.0", group: :development
 gem "jettywrapper", "~> 2.0", group: :development

data/spec/internal/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/mark/Documents/Code/dpla/KriKri
+  remote: /home/tjohnson/src/dpla/krikri
   specs:
-    krikri (0.11.2)
+    krikri (0.12.0)
       analysand (= 4.0.0)
       audumbla (~> 0.1)
       blacklight (~> 5.8.0)
@@ -26,17 +26,17 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.14.1)
-      actionpack (= 4.1.14.1)
-      actionview (= 4.1.14.1)
+    actionmailer (4.1.6)
+      actionpack (= 4.1.6)
+      actionview (= 4.1.6)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.14.1)
-      actionview (= 4.1.14.1)
-      activesupport (= 4.1.14.1)
+    actionpack (4.1.6)
+      actionview (= 4.1.6)
+      activesupport (= 4.1.6)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.14.1)
-      activesupport (= 4.1.14.1)
+    actionview (4.1.6)
+      activesupport (= 4.1.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
     active-triples (0.6.1)
@@ -45,14 +45,14 @@ GEM
       deprecation (~> 0.1)
       linkeddata (~> 1.1)
       rdf (~> 1.1)
-    activemodel (4.1.14.1)
-      activesupport (= 4.1.14.1)
+    activemodel (4.1.6)
+      activesupport (= 4.1.6)
       builder (~> 3.1)
-    activerecord (4.1.14.1)
-      activemodel (= 4.1.14.1)
-      activesupport (= 4.1.14.1)
+    activerecord (4.1.6)
+      activemodel (= 4.1.6)
+      activesupport (= 4.1.6)
       arel (~> 5.0.0)
-    activesupport (4.1.14.1)
+    activesupport (4.1.6)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -72,9 +72,9 @@ GEM
       dpla-map (~> 4.0.0.0.pre.10)
       geokit
       twofishes
-    autoprefixer-rails (6.3.3.1)
+    autoprefixer-rails (6.3.6)
       execjs
-    bcrypt (3.1.10)
+    bcrypt (3.1.11)
     blacklight (5.8.2)
       bootstrap-sass (~> 3.2)
       deprecation
@@ -110,8 +110,6 @@ GEM
       responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    domain_name (0.5.20160216)
-      unf (>= 0.0.5, < 1.0.0)
     dpla-map (4.0.0.0.pre.13)
       active-triples (~> 0.6.0)
     ebnf (1.0.0)
@@ -147,8 +145,6 @@ GEM
     hike (1.2.3)
     hitimes (1.2.3)
     htmlentities (4.3.4)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
     jbuilder (2.4.1)
@@ -194,17 +190,18 @@ GEM
       sparql (~> 1.1, >= 1.1.4)
       sparql-client (~> 1.1, >= 1.1.3)
     logger (1.2.8)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    mime-types (2.99.1)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0221)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
     mono_logger (1.1.0)
     multi_json (1.11.2)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
-    netrc (0.11.0)
     nio4r (1.2.1)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
@@ -224,24 +221,24 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.14.1)
-      actionmailer (= 4.1.14.1)
-      actionpack (= 4.1.14.1)
-      actionview (= 4.1.14.1)
-      activemodel (= 4.1.14.1)
-      activerecord (= 4.1.14.1)
-      activesupport (= 4.1.14.1)
+    rails (4.1.6)
+      actionmailer (= 4.1.6)
+      actionpack (= 4.1.6)
+      actionview (= 4.1.6)
+      activemodel (= 4.1.6)
+      activerecord (= 4.1.6)
+      activesupport (= 4.1.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.14.1)
+      railties (= 4.1.6)
       sprockets-rails (~> 2.0)
     rails_config (0.4.2)
       activesupport (>= 3.0)
-    railties (4.1.14.1)
-      actionpack (= 4.1.14.1)
-      activesupport (= 4.1.14.1)
+    railties (4.1.6)
+      actionpack (= 4.1.6)
+      activesupport (= 4.1.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
+    rake (11.1.2)
     rdf (1.1.17.1)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (1.1.0.1)
@@ -300,16 +297,14 @@ GEM
     ref (2.0.0)
     responders (1.1.2)
       railties (>= 3.2, < 4.2)
-    resque (1.25.2)
+    resque (1.26.0)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rsolr (1.0.13)
       builder (>= 2.1.2)
     rubyzip (1.2.0)
@@ -368,12 +363,8 @@ GEM
       thrift_client
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.2)
+    uglifier (3.0.0)
+      execjs (>= 0.3.0, < 3)
     vegas (0.1.11)
       rack (>= 1.0.0)
     warden (1.2.6)
@@ -392,7 +383,7 @@ DEPENDENCIES
   jquery-rails
   krikri!
   pry-rails
-  rails (= 4.1.14.1)
+  rails (= 4.1.6)
   sass-rails (~> 4.0.3)
   sdoc (~> 0.4.0)
   sqlite3
@@ -400,4 +391,4 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
 
 BUNDLED WITH
-   1.11.2
+   1.10.6