masamune 0.17.14 → 0.17.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12cda9508ecb50bf13f5750d645fe67718e51264
-  data.tar.gz: 8d285ef8dfc9370d650852f8063d1925aed943f4
+  metadata.gz: 0ecd8682fd1fc01a49affd8d28d3e299c601c75c
+  data.tar.gz: 45f3801d782a6cb2d2dc07e3a72a2f3286925bdc
 SHA512:
-  metadata.gz: 23a73a59ba63fac580fe66238d760b5097c662d412f06474f2c3916244639e9a8a9dbadf124d7e45b38aa115763151b32fcff73e65fdb9dee446a323d09a57fd
-  data.tar.gz: 34dd1c01933b0a7809fb3101007dcf56d729d197039a77e6275cc67d8e51b3286913826b06ed3cc1087ee0a3b15f3286fa3101f0aebbfa876151b10df3138905
+  metadata.gz: 4f8ee35378be875d5e37154757a471d09f5364375a9330b105744ed2093ec4e1280b0ae1dfe0118b1b656bb18fc797353b438532aa57d97718420b8c72ee1406
+  data.tar.gz: ec1c92befce218f594d0688f4e801f80554f8470895b8dc616e6d4013b93d52cdc6b3005caec0d6ccc9173447cd43cfea12756c74d1ad4e3c16f50e55ef94cb9

data/lib/masamune.rb

@@ -20,6 +20,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+require 'tempfile'
+require 'tmpdir'
 require 'active_support/concern'
 
 module Masamune

data/lib/masamune/environment.rb

@@ -21,7 +21,6 @@
 #  THE SOFTWARE.
 
 require 'thread'
-require 'tmpdir'
 require 'logger'
 
 require 'masamune/version'

data/lib/masamune/schema/column.rb

@@ -287,7 +287,7 @@ module Masamune::Schema
         when Hash
           value
         when String
-          JSON.load(value)
+          JSON.parse(value)
         when nil
           {}
         end

data/lib/masamune/version.rb

@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.17.14'.freeze
+  VERSION = '0.17.15'.freeze
 end

data/spec/masamune/schema/column_spec.rb

@@ -471,13 +471,23 @@ describe Masamune::Schema::Column do
 
       context 'when scalar' do
         let(:value) { '1' }
-        it { is_expected.to eq(1) }
+        it { expect { result }.to raise_error ArgumentError, "Could not coerce '1' into :json for column 'json'" }
       end
 
       context 'when array' do
+        let(:value) { '["1","2","3"]' }
+        it { is_expected.to eq(%w(1 2 3)) }
+      end
+
+      context 'when hash' do
         let(:value) { '{"k":"v"}' }
         it { is_expected.to eq('k' => 'v') }
       end
+
+      context 'when hash with UTF-8' do
+        let(:value) { '{"k":"£340.3m"}' }
+        it { is_expected.to eq('k' => '£340.3m') }
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -23,9 +23,6 @@
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 
-require 'tempfile'
-require 'tmpdir'
-
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 require 'active_support/core_ext/string/strip'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.17.14
+  version: 0.17.15
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor