triannon 0.7.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2548790e908598e117e457e7e2d051e30a9f40e4
-  data.tar.gz: 92b887940f9dcc100cb1c6aeca47f44b1aa2f641
+  metadata.gz: 21dce7d9930428e39541a90880061ab9430c4ed3
+  data.tar.gz: 9db2857167c28d12b8e265b38d7ebbeb0b30ad9d
 SHA512:
-  metadata.gz: 1fefd1bc5ea2b5e8d69d2c48c4cd7d8422ba861815f6ad79b89a44abf05bd2d81588e2226f41f2c8ab823741e56188023da18b4429ba7eb520dc1b46a7f42ba6
-  data.tar.gz: 87e9f142299da474e9f4ea8ba7405efa549429e883d2d0350986814571dd4d73bee2ad9cc993d2061b55949530cf8e8c6c48188725172a31087e1800bcb35de5
+  metadata.gz: a972fe423f6d5bd9b71832694686f74e508fab8dfe9bac748146be479fd0ffe5ee12c003dc29f744ead0f338cd5110293403c4777157c193d0550943960f0d5f
+  data.tar.gz: 2b75bc5f07de320f259352ad2b3f386b3fdc4d385e20cae4a64959f4a53da4faa939fe544b71e1d0b1b478395213c353ef1a9b9630ea9988652a19f80ceade25

data/app/controllers/triannon/annotations_controller.rb

@@ -12,7 +12,7 @@ module Triannon
 
     # GET /annotations
     def index
-      @annotations = Annotation.all
+      redirect_to "/search"
     end
 
     # GET /annotations/1

data/app/models/triannon/annotation.rb

@@ -35,6 +35,7 @@ module Triannon
       anno
     end
 
+    # @deprecated - was used by old annotations#index action, before redirect to search (2015-04)
     def self.all
       Triannon::LdpLoader.find_all
     end

data/app/services/triannon/ldp_loader.rb

@@ -16,6 +16,7 @@ module Triannon
       oa_graph
     end
 
+    # @deprecated was needed by old annotations#index action, which now redirects to search (2015-04)
     def self.find_all
       l = Triannon::LdpLoader.new
       l.find_all
@@ -52,6 +53,7 @@ module Triannon
     end
 
     # @return [Array<Triannon::Annotation>] an array of Triannon::Annotation objects with just the id set. Enough info to build the index page
+    # @deprecated was needed by old annotations#index action, which now redirects to search (2015-04).
     def find_all
       root_ttl = get_ttl
       objs = []

data/config/routes.rb

@@ -1,7 +1,5 @@
 Triannon::Engine.routes.draw do
 
-  root to: 'annotations#index'
-
   resources :annotations, except: [:update, :edit],
     # show action must explicitly forbid "new", "iiif" and "oa" as id values;  couldn't
     #   figure out how to do it with regexp constraint since beginning and end regex
@@ -14,12 +12,14 @@ Triannon::Engine.routes.draw do
       get 'search', to: 'search#find'
     end
   end
-  
+
   get '/search', to: 'search#find'
 
+  root to: 'search#find'
+
   # allow jsonld context in path (only allow iiif or oa as values)
-  # must explicitly forbid "new" as id values;  couldn't
-  #   figure out how to do it with regexp constraint since beginning and end regex
+  #   must explicitly forbid "new" as id values;  couldn't figure
+  #   out how to do it with regexp constraint since beginning and end regex
   #   matchers aren't allowed when enforcing formats for segment (e.g. :id)
   get '/annotations/:jsonld_context/:id(.:format)', to: 'annotations#show',
     constraints: lambda { |request|

data/lib/triannon/version.rb

@@ -1,3 +1,3 @@
 module Triannon
-  VERSION = "0.7.2"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: triannon
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -351,7 +351,6 @@ files:
 - app/views/layouts/triannon/application.html.erb
 - app/views/triannon/annotations/_form.html.erb
 - app/views/triannon/annotations/edit.html.erb
-- app/views/triannon/annotations/index.html.erb
 - app/views/triannon/annotations/new.html.erb
 - app/views/triannon/annotations/show.html.erb
 - app/views/triannon/search/find.html.erb

data/app/views/triannon/annotations/index.html.erb

@@ -1,8 +0,0 @@
-<h1>Annotations</h1>
-<ul>
-  <% @annotations.each do |a| %>
-  <li><%= link_to a.id_as_url, annotation_path(a) %></li>
-  <% end %>
-</ul>
-
- <%= link_to 'New Annotation', new_annotation_path %>