shrine-reform 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08b9c930726419a6f65bf00450411a0224398f57
-  data.tar.gz: f2f39944d224330eec594426049cfc477ff3444b
+  metadata.gz: 27a8fdd87a1f63696f2738360f6ba77862db4f3e
+  data.tar.gz: de85b092c1111cc8ef4df702eef64658adff38b3
 SHA512:
-  metadata.gz: 2f5810e424842367f891f37aea4d82c7fce1b108ba095f2442cf6d86565e0188d79ba8929362e22d18bf2984d53b3358d1a428d8ea347b677697b224c13a3117
-  data.tar.gz: 4095900e4e5bf8069bc43e1816cea0b825a69c3a40ae3a88d7e3170b42e55c2811cf435417e4017a1ec5a90d000f0aa276f5c0433885be9f72a7adbf9a453f8e
+  metadata.gz: 223536a013b503893ec801748763725d2f3804b889a9ceee87da3672ab173650ffbfafea8f0eaa9065c963febf77a7adc015d0494107592ada5634e109605f20
+  data.tar.gz: 76edc07d55be8e16517e6c84ce3d174d2537681ebd2d47f2e5fbfec2418fccbac1c6456d7260df644425e301d6fdeb61fbe962e800e96a0780a0b5e19945bbb4

data/README.md

@@ -11,7 +11,7 @@ gem "shrine", github: "janko-m/shrine"
 
 ## Usage
 
-The reform plugin can be loaded globally alongside the activerecord plugin.
+The reform plugin can be loaded globally alongside activerecord plugin.
 
 ```rb
 Shrine.plugin :activerecord
@@ -24,13 +24,10 @@ end
 ```
 ```rb
 class PostForm < Reform::Form
-  prepend ImageUploader[:image]
+  include ImageUploader[:image]
 end
 ```
 
-Notice that the only difference from ActiveRecord is that a Reform attachment
-module has to be *prepended* instead of included.
-
 ## License
 
 [MIT](LICENSE.txt)

data/lib/shrine/plugins/reform.rb

@@ -8,11 +8,19 @@ class Shrine
           super
         end
 
-        def prepended(form)
+        def included(form)
           super
 
           return unless form < ::Reform::Form
 
+          properties = [
+            :"#{@name}",
+            :"#{@name}_remote_url",
+            :"#{@name}_data_uri",
+            :"remove_#{@name}",
+            :"cached_#{@name}_data",
+          ]
+
           module_eval <<-RUBY, __FILE__, __LINE__ + 1
             def prepopulate!(*)
               super
@@ -26,7 +34,11 @@ class Shrine
           RUBY
 
           form.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            property :#{@name}, virtual: true
+            def self.create_accessors(name, definition)
+              return if #{properties}.include?(name)
+              super
+            end
+
             attr_accessor :#{@name}_data
 
             validate do
@@ -36,15 +48,9 @@ class Shrine
             end
           RUBY
 
-          form.send(:property, :"#{@name}_remote_url", virtual: true) if instance_methods.include?(:"#{@name}_remote_url")
-          form.send(:property, :"#{@name}_data_uri", virtual: true) if instance_methods.include?(:"#{@name}_data_uri")
-          form.send(:property, :"remove_#{@name}", virtual: true) if instance_methods.include?(:"remove_#{@name}")
-          form.send(:property, :"cached_#{@name}_data", virtual: true) if instance_methods.include?(:"cached_#{@name}_data")
-        end
-
-        def included(form)
-          super
-          raise Error, "Reform attachment modules have to be prepended instead of included" if form < ::Reform::Form
+          (properties & instance_methods).each do |name|
+            form.send(:property, name, virtual: true)
+          end
         end
       end
     end

data/shrine-reform.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-reform"
-  gem.version       = "0.1.0"
+  gem.version       = "0.1.1"
 
   gem.required_ruby_version = ">= 2.1"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shrine-reform
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Janko Marohnić