artk 0.3.1 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWFjNGMyOWUwMWE1ZmNmOTJkMDY0ZTE5ZGNjYmJjNjAwZTU2Y2U4OQ==
-  data.tar.gz: !binary |-
-    OGU0YTQxMWQ1ZDUzYjQ3NzU4MmY4OGM3YmVlYjVkZTMzNDdlNjBiMw==
+SHA1:
+  metadata.gz: d6fd2c469afa569e5c82d81414c6738760e31a76
+  data.tar.gz: 2e9279e7cbc5f28bdec1cacf475355a786bc0ff6
 SHA512:
-  metadata.gz: !binary |-
-    MjljNDFhMmJjMjczYWViN2M1ZDQ3MDAxMDUxYTkyY2QwN2FmODUwOTllOWNi
-    ZDhjNzMyMWRiNTkxY2Q5NTVlZjk4MGYyYzRlOGEzMDM0MTkyYWI3MjliZjEz
-    MjFiZGNjMjM1NDY2N2RlYjM2NmIzZTVkY2Y5NDdiMGU3N2YxODg=
-  data.tar.gz: !binary |-
-    ZTgwMTNkMzE3OTBkMTU1NGM1Nzg2NDBhZjgyOGExMWRhOTBmYjkxYWE0ZjZl
-    NjlkZWM5ZGY3MThkODA2NGE5MWYxNThlMzQ5YWJiZDg4ZjkzZTFiZjhhNjIx
-    ZDY4MGFmNWQ4ZTM3YjhkODM4NDQ0ODdmNDY0NTlkYjJhOGJlYjI=
+  metadata.gz: 9ee856282d6a018546b3dda0f8e1bfe8ef6d579a247ad1403824d772226c5a87fb1bde4ba5f10fa0b0cc4a965b4770d917e30cbbaa8bc698b86451744a3609bd
+  data.tar.gz: 8080018c1d60d8930827852d005be66eb316469c60f6f25fcbaf3aea2421e472ceffdcf12b4e2c65652bfb088e4d0645c1ef183edca4d6219669762f21e270fb

data/app/controllers/artk/instances_controller.rb

@@ -0,0 +1,9 @@
+module Artk
+class InstancesController < Artk::ApplicationController
+
+  def index
+    @instances = Resource.find_by_ead_id(params[:resource_id]).component(params[:component_id]).instances
+  end
+  
+end
+end

data/app/models/artk/component.rb

@@ -3,6 +3,7 @@ class Component < Artk::Base
 
   belongs_to :resource, :foreign_key => "resourceId"
   has_many :sub_components, :class_name => "Component", :foreign_key => "parentResourceComponentId"
+  has_many :instances, :class_name => "Instance", :foreign_key => "resourceComponentId"
 
   def self.table_name
     "ResourcesComponents"
@@ -21,4 +22,4 @@ class Component < Artk::Base
   end 
 
 end
-end
+end

data/app/models/artk/instance.rb

@@ -0,0 +1,16 @@
+module Artk
+class Instance < Artk::Base
+
+  belongs_to :component, :foreign_key => "resourceComponentId"
+  belongs_to :location, :foreign_key => "locationId"
+
+  def self.table_name
+    "ArchDescriptionInstances"
+  end
+
+  def self.primary_key
+    "archDescriptionInstancesId"
+  end
+
+end
+end

data/app/models/artk/location.rb

@@ -0,0 +1,43 @@
+module Artk
+class Location < Artk::Base
+
+  has_many :instances, :foreign_key => "locationId"
+
+  def self.table_name
+    "LocationsTable"
+  end
+
+  def self.primary_key
+    "locationId"
+  end
+
+  def coordinate_value i
+    if self.alphanumeric_indicator(i).blank?
+      formatted_numeric_indicator self.numeric_indicator(i)
+    else
+      [formatted_numeric_indicator(self.numeric_indicator(i)), alphanumeric_indicator(i)].join
+    end
+  end
+
+  def coordinate_label i
+    self.send("coordinate"+i.to_s+"Label")
+  end
+
+  def numeric_indicator i
+    self.send("coordinate" + i.to_s + "NumericIndicator")
+  end
+
+  def alphanumeric_indicator i
+    self.send("coordinate" + i.to_s + "AlphaNumIndicator")
+  end
+
+  private
+
+  def formatted_numeric_indicator i
+    if i > 0
+      i.to_i.to_s
+    end
+  end
+
+end
+end

data/app/models/artk/resource.rb

@@ -62,4 +62,4 @@ class Resource < Artk::Base
   end
 
 end
-end
+end

data/config/routes.rb

@@ -5,7 +5,9 @@ Artk::Engine.routes.draw do
   # /resources/ARC-0001/components
 
   resources :resources, :only => [:index, :show] do
-    resources :components, :only => [:index, :show]
+    resources :components, :only => [:index, :show] do
+      resources :instances, :only => [:index]
+    end
   end
 
   resources :accessions, :only => [:index]

data/lib/artk/version.rb

@@ -1,3 +1,3 @@
 module Artk
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artk
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Adam Wead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,56 +28,56 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides a Rails interface to Archivist's Toolkit
@@ -87,30 +87,34 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- Rakefile
 - app/assets/javascripts/artk/application.js
 - app/assets/stylesheets/artk/application.css
 - app/controllers/artk/accessions_controller.rb
 - app/controllers/artk/application_controller.rb
 - app/controllers/artk/components_controller.rb
+- app/controllers/artk/instances_controller.rb
 - app/controllers/artk/resources_controller.rb
 - app/helpers/artk/application_helper.rb
 - app/models/artk/accession.rb
 - app/models/artk/base.rb
 - app/models/artk/component.rb
+- app/models/artk/instance.rb
+- app/models/artk/location.rb
 - app/models/artk/resource.rb
 - app/views/artk/components/index.html.erb
 - app/views/artk/components/show.html.erb
+- app/views/artk/instances/index.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.rb
 - lib/artk/engine.rb
 - lib/artk/version.rb
-- lib/artk.rb
 - lib/tasks/artk_tasks.rake
-- LICENSE
-- Rakefile
-- README.md
 homepage: https://github.com/awead/artk
 licenses:
 - Apache-2
@@ -121,17 +125,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provides a Rails interface to Archivist's Toolkit