carrierwave-data-uri 0.0.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6763b9e42a19e7766f8eb11e610dedc2849e5e49
-  data.tar.gz: 8499f9d8ad15cd880ed7bfba07b03a58d1cfe0f3
+  metadata.gz: f0960317b08eac242c66685efc83c7eeb4864867
+  data.tar.gz: 2f2ed1296b4c0c41cfb93bdb68746d590e86781c
 SHA512:
-  metadata.gz: 4319d0ed174376671fa844abd7092ba414198db1ca2d0f3be136db969cfc9526e7e607247c70091e13163aa988ba2f4019bb58661257e3c72c71fc78b3bfae38
-  data.tar.gz: df9963c6c0dc6f793df5ffb5fa3a97870b8ff7b8f75e2984d276a97684d16fb9730d1e83f0864ffefc1d085f2106480c82cde8bb52d575f3c57fb3c471abcbcd
+  metadata.gz: 38f25bcfd8ae51506b2025202fff28f20ae9539d5724dd381659180a5404967976696c885c61f13d0320c53d621ea2f99a69a53de6e1a812ee9f2aa348e8a3d1
+  data.tar.gz: 4638f4f9a4ab5f862407869e078d9e228e8097a32e6bd52293b11e5734c640fd408de3751419818a95e4f9e16e1b15598887c86c28c82b38c30950e67dc2d873

data/README.md

@@ -1,7 +1,11 @@
-# CarrierWave::DataUri [![Build Status](https://travis-ci.org/timsly/carrierwave-data-uri.svg)](https://travis-ci.org/timsly/carrierwave-data-uri)
+# CarrierWave::DataUri
+
+[![Build Status](https://travis-ci.org/timsly/carrierwave-data-uri.svg)](https://travis-ci.org/timsly/carrierwave-data-uri)
 
 Carrierwave plugin that allows create image from data uri
 
+:warning: Please read the [migration notes](#migration-notes) before upgrading to a new major version.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -34,6 +38,20 @@ user.avatar_data_uri = 'data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP////8AAP///y
 user.save
 ```
 
+and then retrieve passed data
+
+```
+user.avatar_data_uri # => data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP////8AAP///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==
+```
+
+In case emtpy/invalid data error won't be raised.
+Loud version should be used instead to raise an error on emtpy/invalid data:
+
+```
+user = User.find 123
+user.avatar_data_uri_loud = '' # will raise `CarrierWave::DataUri::InvalidData` error
+```
+
 Optionally, to customize the file name, specify the `#{column}_data_filename` and `#{column}_data_mimetype` attributes before the `#{column}_data_uri` attribute.
 
 ```ruby
@@ -44,6 +62,12 @@ user.avatar_data_uri = 'data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP////8AAP///y
 user.save
 ```
 
+## Migration Notes
+
+#### Version 0.2.0
+
+- Assigning empty data is not raising an error now. Use loud version(`model.field_data_uri_loud =`) instead.
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/carrierwave-data-uri/fork )

data/carrierwave-data-uri.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'carrierwave'
+  spec.add_dependency 'data_uri'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/carrierwave_data_uri/mount.rb

@@ -8,10 +8,20 @@ module CarrierWave
         super
 
         class_eval <<-RUBY, __FILE__, __LINE__+1
+          attr_reader :#{column}_data_uri
           attr_accessor :#{column}_data_filename, :#{column}_data_mimetype
 
+          def #{column}_data_uri_loud=(data)
+            self.#{column} = Parser.new(data).to_file(
+              original_filename: self.#{column}_data_filename,
+              content_type: self.#{column}_data_mimetype
+            )
+          end
+
           def #{column}_data_uri=(data)
-            self.#{column} = Parser.new(data).to_file original_filename: self.#{column}_data_filename, content_type: self.#{column}_data_mimetype
+            @#{column}_data_uri = data
+            self.#{column}_data_uri_loud = data
+          rescue CarrierWave::DataUri::InvalidData
           end
         RUBY
       end

data/lib/carrierwave_data_uri/parser.rb

@@ -1,4 +1,4 @@
-require 'base64'
+require 'data_uri'
 
 module CarrierWave
   module DataUri
@@ -6,18 +6,16 @@ module CarrierWave
       attr_reader :type, :encoder, :data, :extension
 
       def initialize(data_uri)
-        if data_uri.match /^data:(.*?);(.*?),(.*)$/
-          @type = $1
-          @encoder = $2
-          @data = $3
-          @extension = $1.split('/')[1]
-        else
-          raise ArgumentError, 'Cannot parse data'
-        end
+        uri = URI::Data.new data_uri
+        @type = uri.content_type
+        @extension = @type.split('/')[1]
+        @data = uri.data
+      rescue URI::InvalidURIError
+        raise InvalidData, 'Cannot parse data'
       end
 
       def binary_data
-        @binary_data ||= Base64.decode64 data
+        @data
       end
 
       def to_file(options = {})
@@ -32,5 +30,7 @@ module CarrierWave
         end
       end
     end
+
+    class InvalidData < StandardError; end
   end
 end

data/lib/carrierwave_data_uri/version.rb

@@ -1,7 +1,7 @@
 module Carrierwave
   module Data
     module Uri
-      VERSION = '0.0.3'
+      VERSION = '0.2.0'
     end
   end
 end

data/spec/integration_spec.rb

@@ -56,4 +56,27 @@ RSpec.describe 'Integration' do
 
     expect(image.src.file.filename).to end_with '.jpeg'
   end
+
+  it 'should allow to retrieve passed data' do
+    image.src_data_uri = gif_data_uri
+
+    expect(image.src_data_uri).to eql gif_data_uri
+  end
+
+  it 'should not raise an error on assignig empty string' do
+    expect{image.src_data_uri = ''}.not_to raise_error
+  end
+
+  it 'should allow to assign data to the loud version of setter but disallow to retrieve passed data' do
+    image.src_data_uri_loud = gif_data_uri
+    image.save!
+
+    expect(image[:src]).to be_present
+    expect(image.src.file.filename).to end_with '.gif'
+    expect(image.src_data_uri).to be_nil
+  end
+
+  it 'should raise an error on assignig empty string to the loud version' do
+    expect{image.src_data_uri_loud = ''}.to raise_error CarrierWave::DataUri::InvalidData
+  end
 end

data/spec/parser_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe CarrierWave::DataUri::Parser do
 
   describe 'initialization' do
     it 'should raise error when data is invalid' do
-      expect { CarrierWave::DataUri::Parser.new 'invadli_data' }.to raise_error ArgumentError
+      expect { CarrierWave::DataUri::Parser.new 'invadli_data' }.to raise_error CarrierWave::DataUri::InvalidData
     end
 
     it 'should parse data on init' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-data-uri
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Tima Maslyuchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: data_uri
+  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