krikri 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88f2fda2ab3d73eefca94acf0d09535360c2f8a2
-  data.tar.gz: 7e7728069c141de05865fcc778eff47478a32307
+  metadata.gz: 85a1cc695e659e9b4ccc25b8864d4a767bda8327
+  data.tar.gz: cd1d7d097a711712357d70f107f7d7019b034da0
 SHA512:
-  metadata.gz: 86e64af30ab18c16a0873aa9ae5394a8f8e60cc10b7b7a58025128fb89bfb93f24dc9c8868083d1609ef3741a03aeeb77c69bb597d834f44a162100e853945b9
-  data.tar.gz: d752ec0976968d5ae7a7a0534e63e7785fa38cbede0a2f8bfecb0e065bb33642bf0a03203411f569fa336051bdf36ecfcd6c3d508c57dff3074280cf5f11955d
+  metadata.gz: 72f31b3ffb3bae41116d2359b8deef556884ac362ca204f4259444c46bfed27dd50f41b336f7fa4dee8abb197c9c18600d3e4cca3a7bd2ca6ed5fa55361d6984
+  data.tar.gz: 58ceef4e5c312d4417838d412327cd38ed2b4f85d67b867b3f2e2b284c391539fa969b687d6fda4df5b7178822a5210946ae4bdb4c1e6892cf363b42f04e2238

data/lib/krikri/engine.rb

@@ -71,10 +71,9 @@ module Krikri
         configure :base_uri => Krikri::Settings['marmotta']['item_container']
 
         def mint_id!(seed = nil)
-          return set_subject!(seed) if seed
-          return set_subject!(SecureRandom.hex) if
-            originalRecord.empty? || originalRecord.first.node?
-          set_subject!(local_name_from_original_record)
+          set_subject!(mint_id_fragment(seed))
+          sourceResource.first.set_subject!(rdf_subject / '#sourceResource') \
+            unless sourceResource.empty?
         end
 
         ##
@@ -98,6 +97,13 @@ module Krikri
           "definitive identifier." unless originalRecord.length == 1
           originalRecord.first.rdf_subject.path.split('/').last.split('.').first
         end
+
+        def mint_id_fragment(seed = nil)
+          return seed if seed
+          return SecureRandom.hex if
+            originalRecord.empty? || originalRecord.first.node?
+          local_name_from_original_record
+        end
       end
     end
   end

data/lib/krikri/version.rb

@@ -1,3 +1,3 @@
 module Krikri
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/internal/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mark/Documents/Code/dpla/KriKri
   specs:
-    krikri (0.1.3)
+    krikri (0.2.0)
       analysand (= 4.0.0)
       blacklight (~> 5.8.0)
       devise (~> 3.4.1)
@@ -61,10 +61,10 @@ GEM
       rack
       yajl-ruby
     arel (5.0.1.20140414130214)
-    autoprefixer-rails (5.1.4)
+    autoprefixer-rails (5.1.7)
       execjs
       json
-    bcrypt (3.1.9)
+    bcrypt (3.1.10)
     blacklight (5.8.2)
       bootstrap-sass (~> 3.2)
       deprecation
@@ -91,7 +91,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.9.1)
-    deprecation (0.1.0)
+    deprecation (0.2.1)
       activesupport
     devise (3.4.1)
       bcrypt (~> 3.0)
@@ -130,7 +130,7 @@ GEM
     htmlentities (4.3.3)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
-    jbuilder (2.2.7)
+    jbuilder (2.2.8)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jettywrapper (2.0.2)
@@ -148,7 +148,7 @@ GEM
     json-stream (0.2.1)
     jsonpath (0.5.6)
       multi_json
-    kaminari (0.16.2)
+    kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     libv8 (3.16.14.7)
@@ -225,7 +225,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rdf (1.1.7)
+    rdf (1.1.8)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (1.1.0)
       rdf (>= 1.1)
@@ -274,7 +274,7 @@ GEM
       rdf (~> 1.1)
     rdoc (4.2.0)
       json (~> 1.4)
-    redis (3.2.0)
+    redis (3.2.1)
     redis-namespace (1.5.1)
       redis (~> 3.0, >= 3.0.4)
     ref (1.0.5)

data/spec/internal/config/initializers/blacklight_initializer.rb

@@ -3,5 +3,5 @@
 # will use the application's secret key base instead.
 #
 
-# Blacklight.secret_key = '29faa8fc9c7ffd16938dcee14517bfd20c3525ff22614da2533fa44c031763066a152b245f21a0951b3169ca509b4782fb5356db0e200f521b933cdbf07ca97e'
+# Blacklight.secret_key = '46fd7cfe99cd274fc27b148a4d8496329285e9f30c68b6b4b0884b1ec34e7ea1a07319a924cb07bebd5a1e37254d64af4a14272e8abe01a04d4ec7ab104dc80b'
 

data/spec/internal/config/initializers/devise.rb

@@ -4,7 +4,7 @@ Devise.setup do |config|
   # The secret key used by Devise. Devise uses this key to generate
   # random tokens. Changing this key will render invalid all existing
   # confirmation, reset password and unlock tokens in the database.
-  # config.secret_key = 'fe691834695b452b036b7af5a2cebe6da4e0fbc69c9aa42230b034c2c66804719dee1931550484f9aa8180367b592d7d81f5b3f3d1f8aa28871092315cbb9431'
+  # config.secret_key = '80867b57de833ebbc01c92a9690ddb984f1f4b59a00987c165f077f77410ab5c1052db203d4bcda9e616abebdb2f7273fd0b403754fe37a30e9162f29b26861c'
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
@@ -97,7 +97,7 @@ Devise.setup do |config|
   config.stretches = Rails.env.test? ? 1 : 10
 
   # Setup a pepper to generate the encrypted password.
-  # config.pepper = 'f500f40e44bb5546c7fd0eaaf7fc434a501cd66c05e6a7229488fb1efc03884b52ee3d10c537bdc71e8f502ce476703272bd17a186be89bfd57c2cde49141cde'
+  # config.pepper = 'fc4c93d9e11793531d87649d98426494afb9579e0d71823d4a5191fb6e571a288745a88a4e42453d573de9aa759b9e092e968d22f6083a6256056c4479eba97d'
 
   # ==> Configuration for :confirmable
   # A period that the user is allowed to access the website even without

data/spec/internal/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 31785645f89e3940ab561f57e50e8b402db3efe7be70ee3c2a664805615bab72e4c95c3839c0e96a96ce1bd704d5f7926ed6f3cb2eb8963b5fd9e3bac85171b0
+  secret_key_base: 358e78d2c430855abbe370afe91dd7d15d086e7e1d5ba9a6fec2c5a45c6c2e30f388aa4220944281080d68260827b998fe326a42c3cf02ab332fc73aeb51df24
 
 test:
-  secret_key_base: 25bcec9527f618d77b75a8e85eaa0e06b73f2a7a6313b3633059d443ce59297ffb8517fcad1ec325acca5bb5be995acf5f848813683e02b6654ea6142a08dbaa
+  secret_key_base: 6893d86cc6fc0fcacb9f5feb2c9018a0f98cc738a5836f8837f58aa963924f5a7e88380c520b3c2478c59dfecbdf8f062171905f11a35d3acf75e63b96d1efdb
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/spec/internal/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150220192809) do
+ActiveRecord::Schema.define(version: 20150224000622) do
 
   create_table "bookmarks", force: true do |t|
     t.integer  "user_id",       null: false