emipair-merb_global 0.0.11 → 0.0.12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    emipair-merb_global (0.0.11)
+    emipair-merb_global (0.0.12)
       gettext (= 2.0.4)
       merb-core (>= 0.9.1)
       treetop (~> 1.2.3)
@@ -35,7 +35,7 @@ GEM
     gettext (2.0.4)
       locale (>= 2.0.4)
     json (1.4.6)
-    locale (2.0.4)
+    locale (2.0.5)
     merb-core (1.1.3)
       bundler
       erubis (>= 2.6.2)

data/lib/merb_global/message_providers/yaml.rb

@@ -70,26 +70,10 @@ module Merb
                 end
               end
             end
-            YAML.dump File.join(Merb::Global::MessageProviders.localedir,
-                                lang_name + '.yaml')
+            YAML.dump File.join(Merb::Global::MessageProviders.localedir, lang_name + '.yaml')
           end
         end
 
-        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.
-          lang[locale] = yaml_data(locale) unless lang.include?(locale)
-          lang[locale].to_json
-        end
-
-        protected
-
-        def get_lang
-          ['development', 'test'].include?(Merb.environment) ? {} : @lang
-        end
-
         def yaml_data(locale)
           files_to_try = ["#{locale}.yaml", "#{locale.language}.yaml"]
           files_to_try.each do |filename|
@@ -98,6 +82,12 @@ module Merb
           end
           nil
         end
+
+        protected
+
+        def get_lang
+          ['development', 'test'].include?(Merb.environment) ? {} : @lang
+        end
       end
     end
   end

data/lib/merb_global/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: emipair-merb_global
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - EMI Engineering
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 -05:00
+date: 2011-01-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency