ernie 0.3.5 → 0.4.0

data/History.txt

@@ -0,0 +1,3 @@
+= 0.4.0 / 2009-10-08
+  * Major changes
+    * Convert to use BERT gem.

data/Rakefile

@@ -11,8 +11,9 @@ begin
     gem.authors = ["Tom Preston-Werner"]
     gem.files.include(["ext"])
     gem.extensions << 'ext/extconf.rb'
-    gem.add_dependency('erlectricity', '>= 1.0.1')
-    gem.add_dependency('bertrpc', '>= 0.3.4')
+    gem.add_dependency('erlectricity', '>= 1.1.0')
+    gem.add_dependency('bert', '>= 0.1.0')
+    gem.add_dependency('bertrpc', '>= 0.4.0')
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 5
+:patch: 0
 :major: 0
-:minor: 3
+:minor: 4

data/ernie.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{ernie}
-  s.version = "0.3.5"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-09-25}
+  s.date = %q{2009-10-08}
   s.default_executable = %q{ernie}
   s.email = %q{tom@mojombo.com}
   s.executables = ["ernie"]
@@ -18,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "History.txt",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -62,14 +66,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<erlectricity>, [">= 1.0.1"])
-      s.add_runtime_dependency(%q<bertrpc>, [">= 0.3.4"])
+      s.add_runtime_dependency(%q<erlectricity>, [">= 1.1.0"])
+      s.add_runtime_dependency(%q<bert>, [">= 0.1.0"])
+      s.add_runtime_dependency(%q<bertrpc>, [">= 0.4.0"])
     else
-      s.add_dependency(%q<erlectricity>, [">= 1.0.1"])
-      s.add_dependency(%q<bertrpc>, [">= 0.3.4"])
+      s.add_dependency(%q<erlectricity>, [">= 1.1.0"])
+      s.add_dependency(%q<bert>, [">= 0.1.0"])
+      s.add_dependency(%q<bertrpc>, [">= 0.4.0"])
     end
   else
-    s.add_dependency(%q<erlectricity>, [">= 1.0.1"])
-    s.add_dependency(%q<bertrpc>, [">= 0.3.4"])
+    s.add_dependency(%q<erlectricity>, [">= 1.1.0"])
+    s.add_dependency(%q<bert>, [">= 0.1.0"])
+    s.add_dependency(%q<bertrpc>, [">= 0.4.0"])
   end
 end

data/lib/ernie.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'erlectricity'
+require 'bert'
 require 'logger'
 
 class Ernie
@@ -30,39 +30,13 @@ class Ernie
     self.logger.info(text) if self.logger
   end
 
-  def self.convert(item)
-    if item.instance_of?(Hash)
-      a = [:dict]
-      item.each_pair { |k, v| a << [convert(k), convert(v)] }
-      a
-    elsif item.instance_of?(Array)
-      item.map { |x| convert(x) }
-    else
-      item
-    end
-  end
-
-  def self.deconvert(item)
-    if item.instance_of?(Array)
-      if item.first == :dict
-        item[1..-1].inject({}) do |acc, x|
-          acc[deconvert(x[0])] = deconvert(x[1]); acc
-        end
-      else
-        item.map { |x| deconvert(x) }
-      end
-    else
-      item
-    end
-  end
-
   def self.dispatch(mod, fun, args)
-    xargs = deconvert(args)
+    xargs = BERT::Decoder.convert(args)
     self.log("-- " + [mod, fun, xargs].inspect)
     self.mods[mod] || raise(ServerError.new("No such module '#{mod}'"))
     self.mods[mod].funs[fun] || raise(ServerError.new("No such function '#{mod}:#{fun}'"))
     res = self.mods[mod].funs[fun].call(*xargs)
-    convert(res)
+    BERT::Encoder.convert(res)
   end
 
   def self.start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ernie
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-25 00:00:00 -07:00
+date: 2009-10-08 00:00:00 -07:00
 default_executable: ernie
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        version: 1.1.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: bert
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: bertrpc
@@ -30,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.4
+        version: 0.4.0
     version: 
 description: 
 email: tom@mojombo.com
@@ -44,6 +54,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- History.txt
 - LICENSE
 - README.md
 - Rakefile