artk 0.2.1 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDE3MGM0Mjc4NzFkOTc1NTk5ZTNhZWRmODkzN2ExNWEzZTMxMGY5OQ==
+  data.tar.gz: !binary |-
+    NGMyZWRmMDk0OTY1YzMwY2M2YjU3ZTkzYmE1NTIwYmM3MmQ2ZGM0Mg==
+SHA512:
+  metadata.gz: !binary |-
+    MzQ4YTBiYjlmMjcxYmQ5MDZhYjFjNGNkYjY2NGI1MzE2YzJkNzJkNjY3ODUz
+    ZjgxNjkzNGE2ZDEyZTZkNGIyOGMwOTM2NTNlZjdkYzE2Y2ZjZDZjNzdlMjQy
+    N2NkMzQ2MmRkMzQzMWY3NmVlOGIwMzdjOWNjN2NiZGM0Njc1ODk=
+  data.tar.gz: !binary |-
+    NDA1YWMwYWZlNGE4ZWJmZmY4ZWM1NmExNjIyOTA1OTc2MmY3ODRiYTIwZTNi
+    NWExZmM1YzkzNTE3YjM4YzA5ZmExYzhjMWQzZjVjZDQ0ODMyYTY5MTIyZmQ5
+    Njg5MWU1MDc2YmUwZmRmNTk0MWI4OWU0YzliZjMwZTI2Y2IyZGI=

data/app/controllers/artk/application_controller.rb

@@ -1,4 +1,5 @@
 module Artk
   class ApplicationController < ActionController::Base
+    layout 'artk'
   end
 end

data/app/controllers/artk/components_controller.rb

@@ -3,19 +3,24 @@ class ComponentsController < Artk::ApplicationController
 
   def index
     @results = Resource.find_by_ead_id(params[:resource_id]).all_series.collect { |s| s.pid_and_title }
-    respond_to do |format|
-      format.html { render :layout => false, :text => @results.to_json }
-      format.json { render :layout => false, :text => @results.to_json }
-      format.js   { render :layout => false, :text => @results.to_json }
-    end
+    return_response
   end
 
   def show
     @results = Resource.find_by_ead_id(params[:resource_id]).component(params[:id])
-    respond_to do |format|
-      format.html { render :layout => false, :text => @results.to_json }
-      format.json { render :layout => false, :text => @results.to_json }
-      format.js   { render :layout => false, :text => @results.to_json }
+    return_response
+  end
+
+  private
+
+  def return_response
+    if request.xhr?
+      render :layout => false, :text => @results.to_json
+    else
+      respond_to do |format|
+        format.html
+        format.json { render :layout => false, :text => @results.to_json }
+      end
     end
   end
   

data/app/controllers/artk/resources_controller.rb

@@ -3,25 +3,16 @@ class ResourcesController < Artk::ApplicationController
 
   def index
     @results = return_resource_results.collect { |fa| fa.pid_and_title }
-    respond_to do |format|
-      format.html { render :layout => false, :text => @results.to_json }
-      format.json { render :layout => false, :text => @results.to_json }
-      format.js   { render :layout => false, :text => @results.to_json }
-    end
+    return_response
   end
 
   def show
-    @resource = Resource.find_by_ead_id(params[:id])
-    if @resource.nil?
+    @results = Resource.find_by_ead_id(params[:id])
+    if @results.nil?
       redirect_to :status => 404 
     else
-      respond_to do |format|
-        format.html { render :layout => false, :text => @resource.to_json }
-        format.json { render :layout => false, :text => @resource.to_json }
-        format.js   { render :layout => false, :text => @resource.to_json }
-      end
+      return_response
     end
-
   end
 
   private
@@ -34,5 +25,16 @@ class ResourcesController < Artk::ApplicationController
     end
   end
 
+  def return_response
+    if request.xhr?
+      render :layout => false, :text => @results.to_json
+    else
+      respond_to do |format|
+        format.html
+        format.json { render :layout => false, :text => @results.to_json }
+      end
+    end
+  end
+
 end
 end

data/app/models/artk/resource.rb

@@ -12,7 +12,7 @@ class Resource < Artk::Base
   end
 
   def self.finding_aids
-    self.where('eadFaUniqueIdentifier != "" and findingAidTitle !=""')
+    self.where('eadFaUniqueIdentifier != "" and findingAidTitle !=""').order("findingAidTitle")
   end
 
   # TODO: sanitize params?
@@ -37,7 +37,7 @@ class Resource < Artk::Base
     fifth   = fourth.collect { |r| retrieve_additional_series(r) }.flatten unless fourth.empty?
     sixth   = fifth.collect { |r| retrieve_additional_series(r) }.flatten unless fifth.empty?
 
-    return first + second + third + fourth + fifth + sixth
+    return (first + second + third + fourth + fifth + sixth).sort
   end
 
   # Returns a single Artk::Component for a given ref id

data/lib/artk/version.rb

@@ -1,3 +1,3 @@
 module Artk
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: artk
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Adam Wead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -109,7 +98,11 @@ files:
 - app/models/artk/base.rb
 - app/models/artk/component.rb
 - app/models/artk/resource.rb
-- app/views/layouts/artk/application.html.erb
+- app/views/artk/components/index.html.erb
+- app/views/artk/components/show.html.erb
+- app/views/artk/resources/index.html.erb
+- app/views/artk/resources/show.html.erb
+- app/views/layouts/artk.html.erb
 - config/routes.rb
 - lib/artk/engine.rb
 - lib/artk/version.rb
@@ -121,32 +114,25 @@ files:
 homepage: https://github.com/awead/artk
 licenses:
 - Apache-2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1506618296910395185
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1506618296910395185
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides a Rails interface to Archivist's Toolkit
 test_files: []