tolk 1.3.6 → 1.3.7

data/app/assets/javascripts/tolk/application.js

@@ -1,4 +1,4 @@
 //= require tolk/prototype.js
+//= require tolk/effects.js
 //= require tolk/controls.js
 //= require tolk/dragdrop.js
-//= require tolk/effects.js

data/lib/tolk.rb

@@ -5,8 +5,6 @@ require 'tolk/engine'
 require 'tolk/sync'
 require 'tolk/import'
 
-SafeYAML::OPTIONS[:suppress_warnings] = true
-
 module Tolk
   # Setup Tolk
   def self.config(&block)

data/lib/tolk/engine.rb

@@ -2,6 +2,7 @@ require 'rails'
 
 module Tolk
   class Engine < Rails::Engine
+    SafeYAML::OPTIONS[:default_mode] = :safe
     isolate_namespace Tolk
   end
 end

data/lib/tolk/sync.rb

@@ -17,7 +17,7 @@ module Tolk
 
       def read_primary_locale_file
         primary_file = "#{self.locales_config_path}/#{self.primary_locale_name}.yml"
-        File.exists?(primary_file) ? flat_hash(YAML::load(IO.read(primary_file))[self.primary_locale_name]) : {}
+        File.exists?(primary_file) ? flat_hash(YAML::safe_load(IO.read(primary_file))[self.primary_locale_name]) : {}
       end
 
       def flat_hash(data, prefix = '', result = {})

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "1.3.6"
+  VERSION = "1.3.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -37,7 +37,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 description: Tolk is a web interface for doing i18n translations packaged as an engine
   for Rails applications.
 email: david@loudthinking.com