emipair-merb_global 0.0.10 → 0.0.11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    emipair-merb_global (0.0.10)
+    emipair-merb_global (0.0.11)
       gettext (= 2.0.4)
       merb-core (>= 0.9.1)
       treetop (~> 1.2.3)
@@ -34,6 +34,7 @@ GEM
     extlib (0.9.15)
     gettext (2.0.4)
       locale (>= 2.0.4)
+    json (1.4.6)
     locale (2.0.4)
     merb-core (1.1.3)
       bundler
@@ -67,6 +68,7 @@ DEPENDENCIES
   do_sqlite3 (= 0.9.11)
   emipair-merb_global!
   gettext (= 2.0.4)
+  json
   merb-core (>= 0.9.1)
   mocha (= 0.9.8)
   rcov

data/HISTORY

@@ -1,3 +1,6 @@
+=== 0.0.11
+ * fixes bug in MerbGlobal::Provider::Yaml#to_json so that it handles nil properly.
+
 === 0.0.10
  * Add gettext v2.0.4 as a dependency
 

data/emipair-merb_global.gemspec

@@ -41,4 +41,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('sequel', '2.9.0')
   s.add_development_dependency('sqlite3-ruby', '1.3.2')
+
+  s.add_development_dependency('json')
 end

data/lib/merb_global/message_providers/yaml.rb

@@ -75,7 +75,8 @@ module Merb
           end
         end
 
-        def to_json(locale = Locale.new('en'))
+        def to_json(locale = nil)
+          locale ||= Locale.new('en')
           lang = get_lang
 
           # Extracted yaml_data from this method to support looking through several yaml files.

data/lib/merb_global/version.rb

@@ -1,5 +1,5 @@
 module Merb
   module Global
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: emipair-merb_global
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
+  hash: 9
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - EMI Engineering
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -08:00
+date: 2011-01-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -240,6 +240,20 @@ dependencies:
         version: 1.3.2
   type: :development
   version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id015
 description: Localization (L10n) and Internationalization (i18n) support for the Merb MVC Framework
 email: platform-ops@emimusic.com
 executables: []
@@ -383,7 +397,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: merb-global
-rubygems_version: 1.4.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Localization (L10n) and Internationalization (i18n) support for the Merb MVC Framework