carrierwave-base64_image_content 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 792d4946b4a48c18628dcde7e067e7da5f42538f53c1e144eeed1c5d0e6552e2
-  data.tar.gz: 88bf0825547250a6de26a187130c4ec3108089c6a0f70e7e14a4b9d07b61331e
+  metadata.gz: 7329dc9fc5e24b1fc41ce692f773eb4e8395134b5aec9f00beed563ebadfff52
+  data.tar.gz: 8ea03a38e8472e3b57d8d3aeb7854d0fe73795b1af48d9b13f68ee907e08d33e
 SHA512:
-  metadata.gz: f143fc46ff04cecb065d5868c20b6269fbeeb47878596a132387e9766e78635847848f272b371f74ceacd48bd1fb43f5e5fc139015cd7894f738f93007d1620a
-  data.tar.gz: f973ee25fc29c9242614abf6c0f006954c1b2038afce0e06fab9bd9e2d266c4d607d0875574af304ceba16a5b873a494cf5cd827cb43c3b5a800b70430253ccc
+  metadata.gz: 222b615740c10a8e0024dc97ba4797e2064936171dc52638027106587c18e58dfff9c18df86c087a97587a62d8f7de86cf63b2626436fbbabdf4fe2349d25ac1
+  data.tar.gz: 44f4b66d3d1810ec27511501c52e97aab85cdffafb24d0e0af158dfc17d70d2b283528df21116ef2558988d82c19580e360f9b8f3d01420d91a325cac8b08e72

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    carrierwave-base64_image_content (0.1.0)
+    carrierwave-base64_image_content (1.0.0)
       activerecord (>= 4.2)
       carrierwave (>= 1.2)
       rails (>= 4.2)
@@ -58,7 +58,7 @@ GEM
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
     coderay (1.1.2)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     crass (1.0.4)
     diff-lcs (1.3)
     docile (1.3.1)

data/README.md

@@ -31,20 +31,20 @@ The prerequisite for this gem is a model with an existing [multiple file
 uploads
 field](https://github.com/carrierwaveuploader/carrierwave#multiple-file-uploads).
 
-1. Include the module `CarrierWave::Base64ImageContent::Store`
-1. Call `base64_image_content_store` with the following two parameters:
+1. Include the module `CarrierWave::Base64ImageContent`
+1. Call `base64_image_content` with the following two parameters:
   * The model's content attribute, which is the actual database field that
     stores the content
-  * The images attribute, which uses CarrierWave to store the files
+  * The model's images attribute, which uses CarrierWave to store the files
 
 
 ```ruby
 class Note < ActiveRecord::Base
-  include CarrierWave::Base64ImageContent::Store
+  include CarrierWave::Base64ImageContent
 
   mount_uploaders :images, ImageUploader
 
-  base64_image_content_store content: :text_content, images: :images
+  base64_image_content content: :text_content, images: :images
 end
 ```
 

data/lib/carrierwave/base64_image_content.rb

@@ -7,10 +7,114 @@ require 'carrierwave/orm/activerecord'
 
 require 'carrierwave/base64_image_content/base64_string_io'
 require 'carrierwave/base64_image_content/base64_file'
-require 'carrierwave/base64_image_content/store'
 require 'carrierwave/base64_image_content/version'
 
 module CarrierWave
   module Base64ImageContent
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      attr_reader :base64_image_content_content_attribute
+      attr_reader :base64_image_content_images_attribute
+
+      def base64_image_content(content: :text_content, images: :images)
+        @base64_image_content_content_attribute = content
+        @base64_image_content_images_attribute = images
+      end
+    end
+
+    def content=(content)
+      content, new_image_files = extract_image_files_from_content(content)
+
+      remove_obsolete_files!(new_image_files)
+      add_new_files!(new_image_files)
+
+      # FIXME: https://github.com/carrierwaveuploader/carrierwave/issues/1990
+      self[self.class.base64_image_content_images_attribute] =
+        read_images_attribute.map(&:file).map(&:original_filename)
+
+      write_content_attribute(content)
+    end
+
+    def content
+      return unless read_content_attribute
+
+      content = read_content_attribute.dup
+
+      read_images_attribute.map do |image|
+        base64_file = Base64File.new(image.file)
+        content = replace_placeholder_by_data(content, base64_file)
+      end
+
+      content
+    end
+
+    private
+
+    def replace_placeholder_by_data(content, base64_file)
+      content.gsub(
+        /
+        (<img.*? src=['"])
+        (#{base64_file.filename_without_extension})
+        (['"].*?>)
+        /x,
+        "\\1#{base64_file.data_url}\\3"
+      )
+    end
+
+    def extract_image_files_from_content(content)
+      matches = content
+        .scan(%r{<img.*? src=['"](data:image/[^;]+;base64,[^'"]+)['"].*?>})
+        .flatten
+
+      image_files = matches.uniq.map do |match|
+        Base64StringIO.new(match).tap do |file|
+          content = content.sub(match, file.file_name)
+        end
+      end
+
+      [content, image_files]
+    end
+
+    def remove_obsolete_files!(new_image_files)
+      new_names = new_image_files.map(&:original_filename)
+
+      read_images_attribute
+        .reject { |image| new_names.include?(image.file.original_filename) }
+        .each do |image|
+          read_images_attribute.delete(image)
+          image.remove!
+        end
+    end
+
+    def add_new_files!(new_image_files)
+      old_file_names =
+        read_images_attribute.map(&:file).map(&:original_filename)
+
+      new_image_files
+        .reject { |image| old_file_names.include?(image.original_filename) }
+        .each do |image|
+        write_images_attribute(read_images_attribute + [image])
+      end
+    end
+
+    def read_content_attribute
+      self[self.class.base64_image_content_content_attribute]
+    end
+
+    def write_content_attribute(content)
+      self[self.class.base64_image_content_content_attribute] = content
+    end
+
+    def read_images_attribute
+      public_send(self.class.base64_image_content_images_attribute)
+    end
+
+    def write_images_attribute(images)
+      public_send(
+        "#{self.class.base64_image_content_images_attribute}=",
+        images
+      )
+    end
   end
 end

data/lib/carrierwave/base64_image_content/version.rb

@@ -2,6 +2,6 @@
 
 module CarrierWave
   module Base64ImageContent
-    VERSION = '0.1.0'
+    VERSION = '1.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-base64_image_content
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Alexis Reigel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-15 00:00:00.000000000 Z
+date: 2018-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -194,7 +194,6 @@ files:
 - lib/carrierwave/base64_image_content.rb
 - lib/carrierwave/base64_image_content/base64_file.rb
 - lib/carrierwave/base64_image_content/base64_string_io.rb
-- lib/carrierwave/base64_image_content/store.rb
 - lib/carrierwave/base64_image_content/version.rb
 homepage: https://github.com/panter/carrierwave-base64_image_content
 licenses: []

data/lib/carrierwave/base64_image_content/store.rb

@@ -1,113 +0,0 @@
-# frozen_string_literal: true
-
-module CarrierWave
-  module Base64ImageContent
-    module Store
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        attr_reader :base64_image_content_content_attribute
-        attr_reader :base64_image_content_images_attribute
-
-        def base64_image_content_store(content: :text_content, images: :images)
-          @base64_image_content_content_attribute = content
-          @base64_image_content_images_attribute = images
-        end
-      end
-
-      def content=(content)
-        content, new_image_files = extract_image_files_from_content(content)
-
-        remove_obsolete_files!(new_image_files)
-        add_new_files!(new_image_files)
-
-        # FIXME: https://github.com/carrierwaveuploader/carrierwave/issues/1990
-        self[self.class.base64_image_content_images_attribute] =
-          read_images_attribute.map(&:file).map(&:original_filename)
-
-        write_content_attribute(content)
-      end
-
-      def content
-        return unless read_content_attribute
-
-        content = read_content_attribute.dup
-
-        read_images_attribute.map do |image|
-          base64_file = Base64File.new(image.file)
-          content = replace_placeholder_by_data(content, base64_file)
-        end
-
-        content
-      end
-
-      private
-
-      def replace_placeholder_by_data(content, base64_file)
-        content.gsub(
-          /
-          (<img.*? src=['"])
-          (#{base64_file.filename_without_extension})
-          (['"].*?>)
-          /x,
-          "\\1#{base64_file.data_url}\\3"
-        )
-      end
-
-      def extract_image_files_from_content(content)
-        matches = content
-          .scan(%r{<img.*? src=['"](data:image/[^;]+;base64,[^'"]+)['"].*?>})
-          .flatten
-
-        image_files = matches.uniq.map do |match|
-          Base64StringIO.new(match).tap do |file|
-            content = content.sub(match, file.file_name)
-          end
-        end
-
-        [content, image_files]
-      end
-
-      def remove_obsolete_files!(new_image_files)
-        new_names = new_image_files.map(&:original_filename)
-
-        read_images_attribute
-          .reject { |image| new_names.include?(image.file.original_filename) }
-          .each do |image|
-            read_images_attribute.delete(image)
-            image.remove!
-          end
-      end
-
-      def add_new_files!(new_image_files)
-        old_file_names =
-          read_images_attribute.map(&:file).map(&:original_filename)
-
-        new_image_files
-          .reject { |image| old_file_names.include?(image.original_filename) }
-          .each do |image|
-          write_images_attribute(read_images_attribute + [image])
-        end
-      end
-
-      def read_content_attribute
-        self[self.class.base64_image_content_content_attribute]
-      end
-
-      def write_content_attribute(content)
-        self[self.class.base64_image_content_content_attribute] = content
-      end
-
-      def read_images_attribute
-        public_send(self.class.base64_image_content_images_attribute)
-      end
-
-      def write_images_attribute(images)
-        public_send(
-          "#{self.class.base64_image_content_images_attribute}=",
-          images
-        )
-      end
-    end
-  end
-end