hanami-shrine 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 95f56d0ad09fa6ed64fe698379207bbc7bb4b2f4
-  data.tar.gz: 9ad7064c45f6f1d27bac6912d43764c9cf858502
+SHA256:
+  metadata.gz: 41356c8d9d02d064b43a70b7e9191c3bac0138e3f33da8a65c58a841919fbdd6
+  data.tar.gz: b5f971c13ed05a258022e99b05a8098882b7186909af58942c8b1de995bce2ff
 SHA512:
-  metadata.gz: bf8c05b4b151715ee75626b5ce683392aceac098bf6658409231bbe0ab5fba65b865634d59ca44b00fcb6e4fd51ccc42912263e04d9724c8afe2f03d5e95c306
-  data.tar.gz: f49c6ab6e59ab7a2c4b0966ce86f2164b7bdd6b934c275572f17798d5365274c3357246bbead1a10464e615f3f9133263fb56b5d6f8bfd33c58335ee463e967a
+  metadata.gz: 3cda9b682c9f43ef8d9a3c75352e20d9eb8db657066df66fad16440434e898eb80e168cdea3810c288cf60d022fb89e480f7bc353df4e4f00cf403ff15d9fb5c
+  data.tar.gz: 2529a59065783fcb04afa13f85aa465c3b38cffb910bf127fe3924ed202abcdbdf56880de54510a547a81b090e7465ccade45e64eeb2c70c8a1ab2378caaa67f

data/.env.travis

@@ -0,0 +1,3 @@
+POSTGRES_URL="postgres://localhost/test"
+MYSQL_URL="mysql2://travis@localhost/test"
+SQLITE_PATH="sqlite://spec/tmp/hanami_shrine_test"

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /spec/tmp/
 /tmp/
+.env

data/.rspec

@@ -1,2 +1 @@
---format documentation
 --color

data/.travis.yml

@@ -1,4 +1,19 @@
 language: ruby
 rvm:
   - 2.3.3
-before_install: gem install bundler -v 1.10.6
+before_install: gem install bundler -v 2.0.1
+
+services:
+  - postgresql
+  - mysql
+
+env:
+  - DB=sqlite
+  - DB=mysql
+  - DB=postgres
+
+script:
+  - cp .env.travis .env
+  - if [[ "$DB" == "mysql" ]]; then mysql -e 'CREATE DATABASE IF NOT EXISTS test;'; fi
+  - if [[ "$DB" == "postgres" ]]; then psql -c 'create database test;' -U postgres; fi
+  - bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.1
+
+* Make sure it's using Shrine 2.x, as this does not work with 3.0 (yet)
+
 ## 0.4.0
 
 * Added support for Shrine versions 2.7.0 and up, while dropping support for lower versions (@famano, see #6)

data/README.md

@@ -1,22 +1,11 @@
 # Hanami::Shrine
 
-This gem aims at providing support for [Shrine](https://github.com/janko-m/shrine) uploader in Hanami applications. It also tries to be as simple as possible, without polluting the world around.
+This gem aims at providing support for [Shrine](https://github.com/shrinerb/shrine) uploader in Hanami applications. It also tries to be as simple as possible, without polluting the world around.
 
 [![Build Status](https://travis-ci.org/katafrakt/hanami-shrine.svg)](https://travis-ci.org/katafrakt/hanami-shrine)
 [![Gem Version](https://badge.fury.io/rb/hanami-shrine.svg)](https://badge.fury.io/rb/hanami-shrine)
 [![Code Climate](https://codeclimate.com/github/katafrakt/hanami-shrine/badges/gpa.svg)](https://codeclimate.com/github/katafrakt/hanami-shrine)
 
-### Current compatibility status
-
-#### **0.1.x**
-* works with Hanami 0.7.x
-* works with Hanami 0.8.x without validations (which have been extracted to separate gem)
-
-#### **0.2.x**
-* works with Hanami 0.9.x and 1.0. 
-
-Future compatibility will only be provided with Hanami 1.0 and later (which will propably be compatible with 0.9 too).
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -31,7 +20,7 @@ And then execute:
 
 ## Usage
 
-Setup Shrine with `hanami` plugin enabled. Check [Shrine's repository](https://github.com/janko-m/shrine) for more detailed description of the process.
+Setup Shrine with `hanami` plugin enabled. Check [Shrine's repository](https://github.com/shrinerb/shrine) for more detailed description of the process.
 
 ```ruby
 class ImageAttachment < Shrine
@@ -66,6 +55,16 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+### Testing
+
+Testing is done against 3 major database engines: PostgreSQL, MySQL and sqlite3. It is steered by environment variable `DB`. To run locally, first `cp .env.travis .env`, then put values matching your local configuration there. After that, you can test all three versions:
+
+```
+DB=sqlite bundle exec rake
+DB=postgres bundle exec rake
+DB=mysql bundle exec rake
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/katafrakt/hanami-shrine.

data/Rakefile

@@ -4,3 +4,22 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+namespace :spec do
+  task :all do
+    require 'dotenv'
+    Dotenv.load!
+    require_relative 'spec/database_helper'
+
+    %w(sqlite postgres mysql).each do |adapter|
+      ENV['DB_ADAPTER'] = adapter
+      ENV['DB_URL'] = DatabaseHelper.db_url
+      p ENV.keys
+      puts '########################'
+      puts "# Running for: #{adapter}"
+      puts "########################\n\n"
+      Rake::Task['spec'].invoke
+      Rake::Task['spec'].reenable
+    end
+  end
+end

data/hanami-shrine.gemspec

@@ -19,12 +19,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'shrine', '>= 2.7.0'
+  spec.add_dependency 'shrine', '>= 2.16.0', '< 3.0'
   spec.add_dependency 'hanami-model', '>= 1.0'
   spec.add_dependency "hanami-utils", '>= 1.0'
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "> 1.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "json"
+  spec.add_development_dependency "dotenv"
+  spec.add_development_dependency "pg"
+  spec.add_development_dependency "mysql2"
 end

data/lib/hanami/shrine/version.rb

@@ -1,5 +1,5 @@
 module Hanami
   module Shrine
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

data/lib/shrine/plugins/hanami.rb

@@ -78,14 +78,20 @@ class Shrine
             end
 
             private
+
             def _attachments
               self.class._attachments
             end
 
             def save_attachments(entity)
+              if !entity.is_a?(::Hanami::Entity)
+                entity = self.class.entity.new(entity)
+              end
+
               _attachments.each do |a|
                 entity = save_attachment(entity, a[:name], a[:class])
               end
+
               yield(entity)
             end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-shrine
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Paweł Świątkowski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.16.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.16.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: hanami-model
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +62,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +114,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  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: pg
+  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'
 description: Support for Shrine gem in Hanami framework
 email:
 - inquebrantable@gmail.com
@@ -115,6 +163,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env.travis"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -148,8 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Support for Shrine gem in Hanami framework