ood_appkit 2.1.0 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d15b784a8f841fdf52efda26ca485b71c5879df5904ae10f1ee6d8351ee82a7
-  data.tar.gz: b2fecbbd426e8bd0b36b3a7fb168ae2aa50394a62f832a3d58c0b39f05fb44ee
+  metadata.gz: ec0ba73ed6fe4e22e0fec2ee9b517bbf6c6936901b3fa551d749bdbd37f41750
+  data.tar.gz: b886c68b390e7778a202a170ee6c91b3c14e634d503e0fd29819783ea3eeb0b7
 SHA512:
-  metadata.gz: d05cf4daeb01a91ba80ee4d17cad14bbbdd7316166ceb0475ba69ae97c9dffe660a9cc45111d02e8164add7b0fcc9cb43fb0b51a2e7cee761217b3ea3ad4c274
-  data.tar.gz: 2cf3958034b82b058447b7194e66cde738288a13bf0b8dec032e92bc042c5c947fe3cc5c9cce43cf7e892bc8e7c2cb98da5e84683a3b30f4ed0c02d91cc4e1c2
+  metadata.gz: 81ff7cd9661603e2c5061653de406f7570cdc3ee3c476b6de52b161c541900b738d6064478758a50b997331adb8a5adef2e09aaf10775296144e639f26741214
+  data.tar.gz: 51241e4dabb81e0695135bf7fd7dbebb0c4994a481dbfefc0e61fa61d61079d3b3324bca756520d60087ae4ce9798d883e162dea97f3f314760f2ec36a912a15

data/lib/ood_appkit/urls/editor.rb

@@ -4,7 +4,7 @@ module OodAppkit
     class Editor < Url
       # @param (see Url#initialize)
       # @param edit_url [#to_s] the URL used to request the file editor api
-      def initialize(edit_url: '/edit', template: '{/url*}{+path}', **kwargs)
+      def initialize(edit_url: '/edit', template: '{/url*}{/fs}{+path}', **kwargs)
         super(template: template, **kwargs)
         @edit_url = parse_url_segments(edit_url.to_s)
       end
@@ -13,13 +13,15 @@ module OodAppkit
       # @param opts [#to_h] the available options for this method
       # @option opts [#to_s, nil] :path ("") The absolute path to the file on
       #   the filesystem
+      # @option opts [#to_s, nil] :fs ("") The filesystem for the path
       # @return [Addressable::URI] absolute url to access path in file editor
       #   api
       def edit(opts = {})
         opts = opts.to_h.compact.symbolize_keys
 
         path = opts.fetch(:path, "").to_s
-        @template.expand url: @base_url + @edit_url, path: path
+        fs = opts.fetch(:fs, "fs").to_s
+        @template.expand url: @base_url + @edit_url, fs: fs, path: path
       end
     end
   end

data/lib/ood_appkit/urls/files.rb

@@ -5,7 +5,7 @@ module OodAppkit
       # @param (see Url#initialize)
       # @param fs_url [#to_s] the URL used to request a filesystem view in the app
       # @param api_url [#to_s] the URL used to request the app's api
-      def initialize(fs_url: '/fs', api_url: '/api/v1/fs', template: '{/url*}{+path}', **kwargs)
+      def initialize(fs_url: '', api_url: '/api/v1', template: '{/url*}{/fs}{+path}', **kwargs)
         super(template: template, **kwargs)
         @fs_url  = parse_url_segments(fs_url.to_s)
         @api_url = parse_url_segments(api_url.to_s)
@@ -15,24 +15,28 @@ module OodAppkit
       # @param opts [#to_h] the available options for this method
       # @option opts [#to_s, nil] :path ("") The absolute path to the file on
       #   the filesystem
+      # @option opts [#to_s, nil] :fs ("") The filesystem for the path
       # @return [Addressable::URI] absolute url to access path in file app
       def url(opts = {})
         opts = opts.to_h.compact.symbolize_keys
 
         path = opts.fetch(:path, "").to_s
-        @template.expand url: @base_url + @fs_url, path: path
+        fs = opts.fetch(:fs, "fs").to_s
+        @template.expand url: @base_url + @fs_url, fs: fs, path: path
       end
 
       # URL to access this app's API for a given absolute file path
       # @param opts [#to_h] the available options for this method
       # @option opts [#to_s, nil] :path ("") The absolute path to the file on
       #   the filesystem
+      # @option opts [#to_s, nil] :fs ("") The filesystem for the path
       # @return [Addressable::URI] absolute url to access path in files app api
       def api(opts = {})
         opts = opts.to_h.compact.symbolize_keys
 
         path = opts.fetch(:path, "").to_s
-        @template.expand url: @base_url + @api_url, path: path
+        fs = opts.fetch(:fs, "fs").to_s
+        @template.expand url: @base_url + @api_url, fs: fs, path: path
       end
     end
   end

data/lib/ood_appkit/version.rb

@@ -2,5 +2,5 @@
 
 module OodAppkit
   # The current version of OodAppkit
-  VERSION = '2.1.0'
+  VERSION = '2.1.4'
 end

data/test/ood_appkit_test.rb

@@ -23,6 +23,23 @@ class OodAppkitTest < ActiveSupport::TestCase
 
     assert_equal "/f/fs/nfs/17/efranz/ood_dev", f.url(path: "/nfs/17/efranz/ood_dev").to_s
     assert_equal "/f/fs/nfs/17/efranz/ood_dev", f.url(path: Pathname.new("/nfs/17/efranz/ood_dev")).to_s
+
+    assert_equal "/f/s3/mybucket/foo", f.url(path: "/mybucket/foo", fs: "s3").to_s
+    assert_equal "/f/s3/mybucket/foo", f.url(path: Pathname.new("/mybucket/foo"), fs: "s3").to_s
+
+    assert_equal "/f/api/v1/fs/foo/bar", f.api(path: "/foo/bar").to_s
+    assert_equal "/f/api/v1/s3/foo/bar", f.api(path: "/foo/bar", fs: "s3").to_s
+
+    assert_equal "/f/Remote%200.-_/foo/bar", f.url(path: "/foo/bar", fs: "Remote 0.-_").to_s
   end
 
+  test "editor urls" do
+    e = OodAppkit::Urls::Editor.new(base_url: "/f")
+
+    assert_equal "/f/edit/fs/foo/bar", e.edit(path: "/foo/bar").to_s
+    assert_equal "/f/edit/fs/foo/bar", e.edit(path: Pathname.new("/foo/bar")).to_s
+    assert_equal "/f/edit/s3/foo/bar", e.edit(path: "/foo/bar", fs: "s3").to_s
+
+    assert_equal "/f/edit/Remote%200.-_/foo/bar", e.edit(path: "/foo/bar", fs: "Remote 0.-_").to_s
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_appkit
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.4
 platform: ruby
 authors:
 - Eric Franz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,9 +18,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
 - !ruby/object:Gem::Dependency
   name: ood_core
   requirement: !ruby/object:Gem::Requirement
@@ -192,43 +186,43 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Open OnDemand gem to help build OOD apps and interface with other OOD apps.
 test_files:
-- test/ood_appkit_test.rb
-- test/test_helper.rb
-- test/dummy/public/favicon.ico
-- test/dummy/public/500.html
-- test/dummy/public/404.html
-- test/dummy/public/422.html
+- test/dummy/README.rdoc
 - test/dummy/Rakefile
+- test/dummy/app/assets/config/manifest.js
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/bin/bundle
+- test/dummy/bin/rails
+- test/dummy/bin/rake
 - test/dummy/config/application.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/database.yml
-- test/dummy/config/routes.rb
 - test/dummy/config/boot.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/production.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/bundle
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/assets/config/manifest.js
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config/routes.rb
 - test/dummy/config.ru
-- test/dummy/README.rdoc
+- test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/public/500.html
+- test/dummy/public/favicon.ico
 - test/integration/navigation_test.rb
+- test/ood_appkit_test.rb
+- test/test_helper.rb