shrine-sql 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0be3b2fc90a4117a0f9ee77be1b735630c414d08
-  data.tar.gz: 9bc258b1ce55a676a83cbe4bd203b75e247ec02d
+  metadata.gz: e3ce6de1e86bfa4b3bbcc7f3e6f066d826b6f946
+  data.tar.gz: e3e3233a2f828548bc775c04b4a2e8071ae9dccd
 SHA512:
-  metadata.gz: 3f45d5520f916b766c30d9eaf22078b8d6905cf9edafd0c1824b574cd57741177eb80a84ae0a061f6aa57784d1fca76b882ff38ef189a3ff2e965a7075abba18
-  data.tar.gz: c614f098019442f864d3317535a1a4d57236bb47047c309a4f4ce5c633abe7e1402f7cf7a8a27093d1c36a5ecf8050fa49a4eeaf0960417de64a2df41ec3c8d8
+  metadata.gz: f25aa9d884a6393c7f0c4e87dbbae48fbeb13e4f5816f39efc6e202ff6ab346837bd36449c4352a6b81de8384f59b93ea00a3ddc0fd188cdb5e37d3fadf60e25
+  data.tar.gz: 03bc507da8227201add9b53a8bc29b66f7dbcccc426a1b7f22ae73a8800f65855411f22c15ecf29148d219d2ead2a3d3d437ea5249c9a786c8e259140919974a

data/README.md

@@ -16,7 +16,8 @@ We first need to create the table for our files, with "id" and "content" columns
 ```rb
 create_table :files do
   primary_key :id
-  column :content, :text
+  column :content, :text # :bytea for PostgreSQL, :blob for MySQL
+  column :metadata, :text # :varchar
 end
 ```
 
@@ -47,13 +48,12 @@ Shrine.plugin :data_uri
 user.avatar.data_uri #=> "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUA"
 ```
 
-Note that `UploadedFile#data_uri` is only available in Shrine >= 1.1.
+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. Depending on your needs, you can also make the primary key column a
-UUID type, if your database supports it.
+lookups.
 
 ## Contributing
 

data/lib/shrine/storage/sql.rb

@@ -1,5 +1,6 @@
 require "sequel"
 require "stringio"
+require "json"
 
 class Shrine
   module Storage
@@ -12,12 +13,14 @@ class Shrine
       end
 
       def upload(io, id, metadata = {})
-        generated_id = dataset.insert(content: io.read)
+        generated_id = store(io, id, metadata)
         id.replace(generated_id.to_s)
       end
 
       def download(id)
-        tempfile = Tempfile.new("shrine", binmode: true)
+        metadata = JSON.parse(metadata(id))
+        extname = File.extname(metadata["filename"].to_s)
+        tempfile = Tempfile.new(["shrine", extname], binmode: true)
         File.write(tempfile.path, content(id))
         tempfile
       end
@@ -53,9 +56,33 @@ class Shrine
 
       private
 
+      def store(io, id, metadata)
+        if copyable?(io, id)
+          copy(io, id, metadata)
+        else
+          insert(io, id, metadata)
+        end
+      end
+
+      def insert(io, id, metadata)
+        dataset.insert(content: io.read, metadata: metadata.to_json)
+      end
+
+      def copy(io, id, metadata)
+        record = io.storage.dataset.where(id: io.id).select(:content, :metadata)
+        dataset.insert([:content, :metadata], record)
+      end
+
+      def copyable?(io, id)
+        io.is_a?(UploadedFile) && io.storage.is_a?(Storage::Sql)
+      end
+
       def content(id)
-        record = dataset.first!(id: id)
-        record[:content]
+        dataset.where(id: id).get(:content)
+      end
+
+      def metadata(id)
+        dataset.where(id: 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       = "0.1.0"
+  gem.version       = "1.0.0"
 
   gem.required_ruby_version = ">= 2.1"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine-sql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -116,4 +116,3 @@ signing_key:
 specification_version: 4
 summary: Provides SQL database storage for Shrine.
 test_files: []
-has_rdoc: