hanami-shrine 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e247ae2c7d1155f30389af1800709dd2eca26692
-  data.tar.gz: b9cce6169be65754c1e79f3b2b14557c7eebbae1
+  metadata.gz: 775327ea4bdbd83afc7f6b957027d11e9e04449b
+  data.tar.gz: d8d444a0ba3d009b0709e82ad4223b9af80fe1dd
 SHA512:
-  metadata.gz: 79e3315c7a4cb0a14898b17eb67eaf995419971472fdb0b3f447158dc46b758d3c03ed5d7d01bed6730249ceefa1181a8e061cd3803184499d1dd23358168f13
-  data.tar.gz: fbf4bb823e49230e23ea3dee488b691e05ffe3ff86342406e8da955d6ae428d7c02e2483c8a8777b10e674c13e7ad63b729840442074e535517a7a2f4956cdfc
+  metadata.gz: 9722d16cd6a1f67e1ce58332043d604fd77dbbb2f37014084a0a132274ddfc0fca202be7bbecda778ecc02936193a7b1508072329e3cbb91a70910a6662e1ea4
+  data.tar.gz: 01d0e893e9f70607be1c540bd075224aa6f489aa383fa0059012b08215d9ef12a549d7b9b5b8a804d394c0ad639b27e3f672b1f499e717b388093b01981e00fd

data/Gemfile

@@ -5,3 +5,6 @@ gemspec
 gem 'shrine', '>= 2.0.0'
 gem 'sqlite3'
 gem 'pry'
+gem 'image_processing'
+gem "mini_magick", ">= 4.3.5"
+gem 'fastimage'

data/hanami-shrine.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'shrine'
   spec.add_dependency 'hanami-model', '>= 0.7'
+  spec.add_dependency "hanami-utils"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "json"
-  spec.add_development_dependency "hanami-validations"
 end

data/lib/hanami/shrine/version.rb

@@ -1,5 +1,5 @@
 module Hanami
   module Shrine
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/shrine/plugins/hanami.rb

@@ -1,4 +1,6 @@
 require 'shrine'
+require 'hanami/utils/class_attribute'
+require 'ostruct'
 
 class Shrine
   module Plugins
@@ -47,68 +49,72 @@ class Shrine
 
       class RepositoryMethods < Module
         def initialize(name, attacher_class)
-          module_eval <<-RUBY, __FILE__, __LINE__ + 1
+          class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def self.prepended(base)
+              base.send(:include, ::Hanami::Utils::ClassAttribute)
+              base.send(:class_attribute, :_attachments)
+              base.class_eval do
+                self._attachments ||= []
+                self._attachments << { name: :#{name}, class: #{attacher_class} }
+              end
+            end
+          RUBY
+
+          class_eval do
             def create(entity)
-              save_#{name}_attachment(entity) { |new_entity| super(new_entity) }
+              save_attachments(entity) { |new_entity| super(new_entity) }
             end
+
             def update(id, entity)
-              save_#{name}_attachment(entity) { |new_entity| super(id, new_entity) }
+              save_attachments(entity) { |new_entity| super(id, new_entity) }
             end
+
             def persist(entity)
-              save_#{name}_attachment(entity) { |new_entity| super(new_entity) }
+              save_attachments(entity) { |new_entity| super(new_entity) }
             end
+
             def delete(id)
-              delete_#{name}_attachment(id) { super(id) }
+              delete_attachments(id) { super(id) }
             end
 
             private
-            def save_#{name}_attachment(original_entity)
-              attacher_proxy = Entity.attacher(:#{name}, #{attacher_class})
+            def _attachments
+              self.class._attachments
+            end
+
+            def save_attachments(entity)
+              _attachments.each do |a|
+                entity = save_attachment(entity, a[:name], a[:class])
+              end
+              yield(entity)
+            end
 
-              if original_entity.#{name}
-                attacher_proxy.#{name} = original_entity.#{name}
-                attacher_proxy.#{name}_attacher.save
+            def save_attachment(original_entity, name, uploader_class)
+              file = original_entity.send(name)
 
-                attacher_proxy.#{name}_attacher.replace
-                attacher_proxy.#{name}_attacher._promote
+              if file
+                attacher = uploader_class::Attacher.new(OpenStruct.new, name)
+
+                attacher.assign(file)
+                attacher.finalize
 
                 original_entity_attributes = original_entity.attributes
-                original_entity_attributes.delete(:#{name})
+                original_entity_attributes.delete(name)
 
-                entity = original_entity.class.new(original_entity_attributes.merge(#{name}_data: attacher_proxy.#{name}_data))
+                entity = original_entity.class.new(original_entity_attributes.merge(:"#{name}_data" => attacher.read))
               else
                 entity = original_entity
               end
-
-              yield(entity)
             end
 
-            def delete_#{name}_attachment(id)
+            def delete_attachments(id)
               entity = find(id)
               yield
-              entity.#{name}_attacher.destroy
-            end
-          RUBY
-        end
-      end
-
-      module Entity
-        def self.attacher(name, attacher)
-          attachment_proxy ||= Class.new
-          attachment_proxy.send(:include, attacher[name])
-          attachment_proxy.class_eval do
-            define_method :initialize do |attributes|
-            end
-
-            define_method :"#{name}_data" do
-              @attachment_data
-            end
-
-            define_method :"#{name}_data=" do |data|
-              @attachment_data = data
+              _attachments.each do |a|
+                entity.send("#{a[:name]}_attacher").destroy
+              end
             end
           end
-          attachment_proxy.new({})
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-shrine
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Paweł Świątkowski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: hanami-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hanami-validations
-  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
@@ -153,4 +153,3 @@ signing_key:
 specification_version: 4
 summary: Support for Shrine gem in Hanami framework
 test_files: []
-has_rdoc: