shrine-sql 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3ce6de1e86bfa4b3bbcc7f3e6f066d826b6f946
-  data.tar.gz: e3e3233a2f828548bc775c04b4a2e8071ae9dccd
+  metadata.gz: 390d8c1697c7dd5c6234658ed978505b68a5e920
+  data.tar.gz: c9a9428f60f34709aa857e83dfe9bd8d71b72863
 SHA512:
-  metadata.gz: f25aa9d884a6393c7f0c4e87dbbae48fbeb13e4f5816f39efc6e202ff6ab346837bd36449c4352a6b81de8384f59b93ea00a3ddc0fd188cdb5e37d3fadf60e25
-  data.tar.gz: 03bc507da8227201add9b53a8bc29b66f7dbcccc426a1b7f22ae73a8800f65855411f22c15ecf29148d219d2ead2a3d3d437ea5249c9a786c8e259140919974a
+  metadata.gz: e87f71d1e8b0591713edfdeca6330caa2514373b35f26b86e5ecde01c0e3c8503bd90b9fccbd4de313dffd700e4e27a47fdbb63bde4e665bad036fc83d66b05b
+  data.tar.gz: eb0e2108cce021bf4be832767c1fe27397a757734e5acf639a736472e544e3ac53c14ae5c82890bd97a3f1d0b87b43223622f3df032d73518e4c2ac258b770b4

data/README.md

@@ -37,24 +37,33 @@ Sequel.
 
 ### URL
 
-The shrine-sql storage itself doesn't provide any kind of URL, but you can load
-the `data_uri` plugin, which provides `UploadedFile#data_uri` which returns the
-data URI of the file, which you can display in the browser:
+By itself shrine-sql doesn't provide URLs to files, but they can be streamed
+via a URL with the `download_endpoint` plugin:
 
 ```rb
-Shrine.plugin :data_uri
+# Assuming :store uses the SQL storage.
+Shrine.plugin :download_endpoint, storages: [:store]
 ```
 ```rb
-user.avatar.data_uri #=> "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUA"
+Rails.application.routes.draw do
+  mount Shrine::DownloadEndpoint => "/attachments"
+end
+```
+```rb
+user.avatar_url #=> "/attachments/store/938432984643.jpg"
 ```
-
-Note that `UploadedFile#data_uri` is available starting from Shrine 1.1.
 
 ### Indices
 
 It is recommended that you add a unique index to the "id" column, for faster
 lookups.
 
+## Copying
+
+If you're using the SQL storage for both cache and store, moving from cache to
+store will copy the record using SQL instead "reuploading" it, which means the
+file contents won't be read into memory.
+
 ## Contributing
 
 You can run the tests with Rake:

data/lib/shrine/storage/sql.rb

@@ -1,3 +1,4 @@
+require "shrine"
 require "sequel"
 require "stringio"
 require "json"
@@ -14,17 +15,19 @@ class Shrine
 
       def upload(io, id, metadata = {})
         generated_id = store(io, id, metadata)
-        id.replace(generated_id.to_s)
+        id.replace(generated_id.to_s + File.extname(id))
       end
 
       def download(id)
-        metadata = JSON.parse(metadata(id))
-        extname = File.extname(metadata["filename"].to_s)
-        tempfile = Tempfile.new(["shrine", extname], binmode: true)
+        tempfile = Tempfile.new(["shrine", File.extname(id)], binmode: true)
         File.write(tempfile.path, content(id))
         tempfile
       end
 
+      def stream(id)
+        yield content(id)
+      end
+
       def open(id)
         StringIO.new(content(id))
       end
@@ -34,19 +37,18 @@ class Shrine
       end
 
       def exists?(id)
-        this = dataset.where(id: id).limit(1)
-        !this.get(Sequel::SQL::AliasedExpression.new(1, :one)).nil?
+        !find(id).get(Sequel::SQL::AliasedExpression.new(1, :one)).nil?
       end
 
       def delete(id)
-        dataset.where(id: id).delete
+        find(id).delete
       end
 
       def multi_delete(ids)
-        dataset.where(id: ids).delete
+        find(ids).delete
       end
 
-      def url(id, options = {})
+      def url(id, **options)
       end
 
       def clear!(confirm = nil)
@@ -54,6 +56,13 @@ class Shrine
         dataset.delete
       end
 
+      protected
+
+      def find(id_or_ids)
+        ids = Array(id_or_ids).map { |s| File.basename(s, ".*") }
+        dataset.where(id: ids).limit(ids.count)
+      end
+
       private
 
       def store(io, id, metadata)
@@ -69,7 +78,7 @@ class Shrine
       end
 
       def copy(io, id, metadata)
-        record = io.storage.dataset.where(id: io.id).select(:content, :metadata)
+        record = io.storage.find(io.id).select(:content, :metadata)
         dataset.insert([:content, :metadata], record)
       end
 
@@ -78,11 +87,11 @@ class Shrine
       end
 
       def content(id)
-        dataset.where(id: id).get(:content)
+        find(id).get(:content)
       end
 
       def metadata(id)
-        dataset.where(id: id).get(:metadata)
+        find(id).get(:metadata)
       end
     end
   end

data/shrine-sql.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-sql"
-  gem.version       = "1.0.0"
+  gem.version       = "1.0.1"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -13,10 +13,10 @@ Gem::Specification.new do |gem|
   gem.files        = Dir["README.md", "LICENSE.txt", "lib/**/*.rb", "shrine-sql.gemspec"]
   gem.require_path = "lib"
 
+  gem.add_dependency "shrine", "~> 1.1"
   gem.add_dependency "sequel"
 
   gem.add_development_dependency "sqlite3"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "shrine"
   gem.add_development_dependency "minitest"
 end

metadata

@@ -1,37 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: shrine-sql
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: shrine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shrine
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,3 +116,4 @@ signing_key:
 specification_version: 4
 summary: Provides SQL database storage for Shrine.
 test_files: []
+has_rdoc: