asir 1.2.0 → 1.2.1

data/ChangeLog

@@ -1,10 +1,11 @@
 2012-12-29  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
-	* v1.2.0: New version: API changes.
+	* v1.2.1: New version: API changes.
 	* Message::State: internal object encapsulates state between #send_message, #receive_message, #send_result, #receive_result.
 	* Callbacks: most callbacks take a MessageResult object instead of Message and/or Result objects.
 	* UUID: Added new_uuid, process_uuid, counter_uuid, thread_uuid as mixin methods.
 	* Identity: Removed deprecated #client, #server attributes, use additional_data.
+	* JSON: Moved ASIR::Coder::JSON to gem asir_json.
 
 2012-12-28  Kurt A. Stephens  <ks.github@kurtstephens.com>
 	* v1.1.12: New version.

data/README.textile

@@ -38,7 +38,7 @@ h3. Features
 * Support for multiple encodings:
 ** Marshal.
 ** XML. (gem asir_xml)
-** JSON.
+** JSON. (gem asir_json)
 ** YAML.
 ** Base64.
 ** ZLib.

data/asir.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
   end
   s.add_dependency "httpclient", "~> 2.3.0"
   s.add_dependency "rack", "~> 1.4.1"
-  s.add_dependency "json", ">= 1.5.3"
 
   s.add_development_dependency 'rake', '>= 0.9.0'
   s.add_development_dependency 'rspec', '~> 2.12.0'

data/lib/asir/version.rb

@@ -1,3 +1,3 @@
 module ASIR
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/debug_helper.rb

@@ -1,9 +1,3 @@
 require 'rubygems'
-case (RUBY_PLATFORM rescue 'UNKNOWN')
-when /java/
-  gem 'json_pure'
-else
-  gem 'json'
-  gem 'simplecov'
-end
+gem 'simplecov'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asir
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -59,22 +59,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.1
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +186,6 @@ files:
 - lib/asir/coder/chain.rb
 - lib/asir/coder/database.rb
 - lib/asir/coder/identity.rb
-- lib/asir/coder/json.rb
 - lib/asir/coder/marshal.rb
 - lib/asir/coder/null.rb
 - lib/asir/coder/proc.rb
@@ -258,7 +241,6 @@ files:
 - spec/debug_helper.rb
 - spec/demux_spec.rb
 - spec/example_spec.rb
-- spec/json_spec.rb
 - spec/message_spec.rb
 - spec/performance_spec.rb
 - spec/spec_helper.rb
@@ -298,7 +280,6 @@ test_files:
 - spec/debug_helper.rb
 - spec/demux_spec.rb
 - spec/example_spec.rb
-- spec/json_spec.rb
 - spec/message_spec.rb
 - spec/performance_spec.rb
 - spec/spec_helper.rb

data/lib/asir/coder/json.rb

@@ -1,29 +0,0 @@
-require 'asir'
-
-module ASIR
-  class Coder
-    # !SLIDE
-    # JSON Coder
-    #
-    # Note: Symbols are not handled.
-    # The actual JSON expression is wrapped with an Array.
-    class JSON < self
-      def _encode obj
-        [ obj ].to_json
-      end
-
-      def _decode obj
-        ::JSON.parser.new(obj).
-          parse.first
-      end
-    end
-    # !SLIDE END
-  end
-end
-
-if RUBY_PLATFORM =~ /java/
-require 'json'
-else
-require 'json/ext'
-end
-

data/spec/json_spec.rb

@@ -1,140 +0,0 @@
-require File.expand_path('../spec_helper', __FILE__)
-require 'asir/coder/json'
-
-describe "ASIR::Coder::JSON" do
-  before(:each) do 
-    @enc = ASIR::Coder::JSON.new
-    @dec = @enc.dup
-  end
-
-  basic_objs = [ ]
-
-  [
-   [ nil, 'null' ],
-   true,
-   false,
-  ].each do | x |
-    x, str = *x
-    str ||= x.inspect
-    str = "[#{str}]"
-    basic_objs << [ x, str ]
-    it "should handle #{x.inspect}" do
-      out = @enc.prepare.encode(x)
-      out.should == str
-      @dec.prepare.decode(out).should == x
-    end
-  end
-
-  [
-   1234,
-   1.234,
-   [ :symbol, '"symbol"' ],
-  ].each do | x |
-    x, str = *x
-    str ||= x.inspect
-    str = "[#{str}]"
-    basic_objs << [ x, str ]
-    it "should handle #{x.inspect}" do
-      out = @enc.prepare.encode(x)
-      out.should == str
-      y = @dec.prepare.decode(out)
-      y = y.to_sym if Symbol === x
-      y.should == x
-    end
-  end
-
-  [
-   'String',
-  ].each do | x |
-    x, str = *x
-    str ||= x.inspect
-    str = "[#{str}]"
-    basic_objs << [ x, str ]
-    it "should handle #{x.inspect}" do
-      out = @enc.prepare.encode(x)
-      out.should == str
-      y = @dec.prepare.decode(out)
-      y.should == x
-    end
-  end
-
-  it "should handle empty Array" do
-    x = [ ]
-    out = @enc.prepare.encode(x)
-    out.should == "[[]]"
-    @dec.prepare.decode(out).should == x
-  end
-
-  it "should handle Array" do
-    x = basic_objs.map{|e| e[0]}
-    out = @enc.encode(x)
-    out.should == "[[null,true,false,1234,1.234,\"symbol\",\"String\"]]"
-    y = @dec.decode(out)
-    y.should == x.map{|e| Symbol === e ? e.to_s : e }
-  end
-
-  it "should handle empty Hash" do
-    x = { }
-    out = @enc.encode(x)
-    out.should == "[{}]"
-    @dec.decode(out).should == x
-  end
-
-  it "should handle Hash" do
-    x = Hash[ *basic_objs.flatten.reverse ]
-    out = @enc.prepare.encode(x)
-    out.should =~ %r{\A\[\{}
-    out.should =~ %r{\}\]\Z}
-    basic_objs.each do | v, str |
-      # out.should =~ %r{#{k.inspect}:}
-      out.should =~ %r{#{str}}
-    end
-    y = @dec.prepare.decode(out)
-    y.should == x.inject({}){|h, (k, v)| h[k] = Symbol === v ? v.to_s : v; h }
-  end
-
-  module ASIR::Coder::Test
-    class Object
-      attr_accessor :a, :h, :o
-    end
-  end
-
-  it "should handle deep objects" do
-    x = ASIR::Coder::Test::Object.new
-    x.a = [ *basic_objs.map{|a| a[0]} ]
-    x.h = Hash[ *basic_objs.flatten.reverse ]
-    x.o = ASIR::Coder::Test::Object.new
-    x.o.a = 123
-    out = @enc.prepare.encode(x)
-    if out =~ %r{#<ASIR::Coder::Test::Object}
-      out.should =~ %r{\A\[\"#<ASIR::Coder::Test::Object:[^>]+>\"\]\Z}
-    else
-      out.should =~ %r{"a":\[null,true,false,1234,1.234,"symbol","String"\]}
-      out.should =~ %r{"h":\{}
-      out.should =~ %r{"\[1234\]":1234}
-      out.should =~ %r{"\[1.234\]":1.234}
-      out.should =~ %r{"\[null\]":null}
-      out.should =~ %r{"\[\\"String\\"\]":"String"}
-      out.should =~ %r{"\[\\"symbol\\"\]":"symbol"}
-      out.should =~ %r{"\[null\]":null}
-      out.should =~ %r{"\[true\]":true}
-      out.should =~ %r{"\[null\]":null}
-    end
-
-    # FIXME:
-    #out.should =~ %r{<#{x.class.name.gsub('::', '.')} id=\"#{x.object_id}\" >}
-    #out.should =~ %r{</#{x.class.name.gsub('::', '.')}>}
-    y = @dec.prepare.decode(out)
-    (String === y).should == true
-=begin
-FIXME:
-    y.a.should == x.a
-    y.h.should == x.h
-    y.o.class.should == ASIR::Coder::Test::Object
-    y.o.a.should == x.o.a
-    x.instance_variables.sort { | a, b | a.to_s <=> b.to_s }.should == 
-      y.instance_variables.sort { | a, b | a.to_s <=> b.to_s }
-=end
-  end
-end
-