carrierwave-data-uri 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2ebf035e2038b806c9c5853d1739a0409d139c5
-  data.tar.gz: f4c1f3c293d142b8de10a1dd2508a822a00496a4
+  metadata.gz: 6763b9e42a19e7766f8eb11e610dedc2849e5e49
+  data.tar.gz: 8499f9d8ad15cd880ed7bfba07b03a58d1cfe0f3
 SHA512:
-  metadata.gz: 49ed5dace03485cacb061532bea538cbc100d5a17d2ad882ef104b6e81163120daad724ea21e771a1313889579f0a4f07688473ff14564cdc56dd80ea10d5580
-  data.tar.gz: 5057e986f1bfe8731dafc14a04581a63fb47dfbfdcfaefa3dae72d667eaa5cd427a9530adb648152c23691b971b803087c80bd39f257fa5015b0f93412954f08
+  metadata.gz: 4319d0ed174376671fa844abd7092ba414198db1ca2d0f3be136db969cfc9526e7e607247c70091e13163aa988ba2f4019bb58661257e3c72c71fc78b3bfae38
+  data.tar.gz: df9963c6c0dc6f793df5ffb5fa3a97870b8ff7b8f75e2984d276a97684d16fb9730d1e83f0864ffefc1d085f2106480c82cde8bb52d575f3c57fb3c471abcbcd

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+/uploads

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,14 @@
+before_install:
+  - gem install bundler
+
+notifications:
+  email: false
+
+rvm:
+  - 2.0.0
+  - 2.1.2
+  - 2.2.3
+  - 2.3.0
+
+gemfile:
+  - Gemfile

data/README.md

@@ -1,4 +1,4 @@
-# CarrierWave::DataUri
+# 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
 
@@ -34,11 +34,12 @@ user.avatar_data_uri = 'data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP////8AAP///y
 user.save
 ```
 
-Optionally, to customize the file name, specify the `#{column}_data_filename` attribute before the `#{column}_data_uri` attribute.
+Optionally, to customize the file name, specify the `#{column}_data_filename` and `#{column}_data_mimetype` attributes before the `#{column}_data_uri` attribute.
 
 ```ruby
 user = User.find 123
 user.avatar_data_filename = 'somefile.jpg'
+user.avatar_data_mimetype = 'image/jpeg'
 user.avatar_data_uri = 'data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP////8AAP///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=='
 user.save
 ```

data/Rakefile

@@ -1,2 +1,6 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec
 

data/carrierwave-data-uri.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'activerecord'
+  spec.add_development_dependency 'sqlite3'
 end

data/lib/carrierwave_data_uri/mount.rb

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

data/lib/carrierwave_data_uri/parser.rb

@@ -27,6 +27,7 @@ module CarrierWave
           file << binary_data
           file.rewind
           file.original_filename = options[:original_filename]
+          file.content_type = options[:content_type]
           file
         end
       end

data/lib/carrierwave_data_uri/tempfile.rb

@@ -3,11 +3,16 @@ require 'tempfile'
 module CarrierWave
   module DataUri
     class Tempfile < ::Tempfile
-      attr_writer :original_filename
+      attr_writer :original_filename, :content_type
 
       def original_filename
-        @original_filename || File.basename(@tmpname)
+        @original_filename || File.basename(path)
       end
+
+      def content_type
+        @content_type || MIME::Types.type_for(original_filename).first.content_type
+      end
+
     end
   end
 end

data/lib/carrierwave_data_uri/version.rb

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

data/spec/integration_spec.rb

@@ -0,0 +1,59 @@
+RSpec.describe 'Integration' do
+  ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
+  ActiveRecord::Base.raise_in_transactional_callbacks = true
+  ActiveRecord::Migration.verbose = false
+
+  class TestMigration < ActiveRecord::Migration
+    def self.up
+      create_table :images, :force => true do |t|
+        t.column :src, :string
+      end
+    end
+
+    def self.down
+      drop_table :images
+    end
+  end
+
+  class ImageUploader < CarrierWave::Uploader::Base; end
+
+  class Image < ActiveRecord::Base
+    mount_uploader :src, ImageUploader
+  end
+
+  before(:all) { TestMigration.up }
+  after(:all) { TestMigration.down }
+  after { Image.destroy_all }
+
+  let(:gif_data_uri) do
+    'data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP////8AAP///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=='
+  end
+  let(:jpeg_data_uri) do
+    'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEAYABgAAD/4QAWRXhpZgAASUkqAAgAAAAAAAAAAAD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAARCAABAAEDASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAr/xAAUEAEAAAAAAAAAAAAAAAAAAAAA/8QAFAEBAAAAAAAAAAAAAAAAAAAAAP/EABQRAQAAAAAAAAAAAAAAAAAAAAD/2gAMAwEAAhEDEQA/AL+AAf/Z'
+  end
+  let(:image) { Image.new }
+
+  it 'should save image with data_uri' do
+    image.src_data_uri = gif_data_uri
+    image.save!
+
+    expect(image[:src]).to be_present
+    expect(image.src.file.filename).to end_with '.gif'
+  end
+
+  it 'should create image with data_uri' do
+    new_image = Image.create! src_data_uri: gif_data_uri
+
+    expect(new_image[:src]).to be_present
+    expect(new_image.src.file.filename).to end_with '.gif'
+  end
+
+  it 'should update image with data_uri' do
+    image.src_data_uri = gif_data_uri
+    image.save!
+
+    image.update src_data_uri: jpeg_data_uri
+
+    expect(image.src.file.filename).to end_with '.jpeg'
+  end
+end

data/spec/parser_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe CarrierWave::DataUri::Parser do
   let(:data_uri) do
     'data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP////8AAP///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=='
@@ -7,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
+      expect { CarrierWave::DataUri::Parser.new 'invadli_data' }.to raise_error ArgumentError
     end
 
     it 'should parse data on init' do

data/spec/tempfile_spec.rb

@@ -0,0 +1,24 @@
+RSpec.describe CarrierWave::DataUri::Tempfile do
+  let(:options) { {} }
+  let(:data_uri) do
+    'data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP////8AAP///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=='
+  end
+
+  let(:tempfile) do
+    CarrierWave::DataUri::Parser.new(data_uri).to_file(options)
+  end
+
+
+  describe '#content_type' do
+    subject(:content_type) { tempfile.content_type }
+
+    describe 'without a content_type supplied' do
+      specify { expect(content_type).to eq 'image/gif' }
+    end
+
+    describe 'with a specified content_type' do
+      let(:options) { { content_type: 'image/jpeg' } }
+      specify { expect(content_type).to eq 'image/jpeg' }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-data-uri
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tima Maslyuchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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: Carrierwave plugin that allows create image from data uri
 email:
 - insside@gmail.com
@@ -88,6 +102,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -98,8 +114,10 @@ files:
 - lib/carrierwave_data_uri/parser.rb
 - lib/carrierwave_data_uri/tempfile.rb
 - lib/carrierwave_data_uri/version.rb
+- spec/integration_spec.rb
 - spec/parser_spec.rb
 - spec/spec_helper.rb
+- spec/tempfile_spec.rb
 homepage: https://github.com/timsly/carrierwave-data-uri
 licenses:
 - MIT
@@ -120,10 +138,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Carrierwave plugin that allows create image from data uri
 test_files:
+- spec/integration_spec.rb
 - spec/parser_spec.rb
 - spec/spec_helper.rb
+- spec/tempfile_spec.rb