administrate-field-shrine 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 389934d5957b4f97a218ee164ed76c644c9cd82c
-  data.tar.gz: 9d2e0f92201fd04eef9b4dd04bc0464ffe75774e
+SHA256:
+  metadata.gz: 40efacd811451bc5ebfc91ad020ffc2d5f37bd91ecb822c362ae742a993e9ead
+  data.tar.gz: ff9edae4ccc9feb317eb1d4e6166bcce4aec3b61820a80eeabab63ab11f1e2c5
 SHA512:
-  metadata.gz: 8dcfc61ff7e1609617f3c846a929d7195a2f472ca5c0712d2f859ef10df149d816332e7462f6c5813934b3a203fcc3c9cf826f52bc3a8cbe8295e31a7e98ac4b
-  data.tar.gz: a87567fe0cd44de8023666ab2a0b548f3ed4b21835480f776c6d7a5d1a7ec414b236b33d9dad3e29983122ffb618bd959fec923775ee1e58e6db0de4089b0688
+  metadata.gz: 4646ee6618fe4c3e03794907a7075c839d9257dca1a3fc08d4841066e8857bb409fab8a60e866d9ff7f58159c20eb72d6d78aeb65b57a1ce2ed0e94d5e6531cf
+  data.tar.gz: 0fb7ed8da3df263d78b3d1513ccd2bfa6a90cc448cd26fd81814d86702c035f74278a362573d842a38a1489f4ac230a89830cb6d0067c3811d9ea09bd3f35c93

data/administrate-field-shrine.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "administrate-field-shrine"
-  spec.version       = "0.0.3"
+  spec.version       = "0.0.5"
   spec.authors       = ["Ken Zheng"]
   spec.email         = ["zhdhui@gmail.com"]
 
@@ -23,17 +23,17 @@ Gem::Specification.new do |spec|
   end
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{\A(test|spec|features)/}) || f.match(%r{.*\.gem\z})
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'administrate', '~> 0.5.0'
-  spec.add_dependency 'rails', '>= 4.2', '< 5.2'
+  spec.add_dependency 'administrate', '> 0.5.0'
+  spec.add_dependency 'rails', '>= 4.2'
 
-  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "byebug"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/administrate/field/shrine.rb

@@ -7,14 +7,31 @@ module Administrate
       class Engine < ::Rails::Engine
       end
 
+      # we should first try the regular data.url because if the versions are generated
+      # in the background by a worker they won't be available immediately after
+      # submitting the form
+      # however, once data[:version].url is available data.url won't work,
+      # so we're covered in both cases
       def url
-        data.try(:url).to_s
+        (regular_url || version_url).to_s
+      end
+
+      def regular_url
+        data.try(:url)
+      end
+
+      def version_url
+        data.try(:[], version).try(:url)
       end
 
       def url_only?
         options.fetch(:url_only, false)
       end
 
+      def version
+        options.fetch(:version, nil)
+      end
+
       def cached_value
         resource.send("cached_#{attribute}_data")
       end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-shrine
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Ken Zheng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
@@ -31,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,23 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +101,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".byebug_history"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -143,8 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Shrine field plugin for Administrate.

data/.byebug_history

@@ -1,6 +0,0 @@
-q
-Administrate::Field::ShrineField.public_methods
-Administrate::Field::Shrine.public_methods
-Administrate::Field::Shrine.name
-Administrate::Field::ShrineField.name
-Administrate::Field::ShrineField