From e50f66b8756d642e99d702e607b525d8c0791477 Mon Sep 17 00:00:00 2001
From: drexin <dario.rexin@r3-tech.de>
Date: Fri, 21 Jan 2011 11:07:08 +0100
Subject: [PATCH 1/2] added support for agents

---
 .gitignore                                 |   5 +
 Rakefile                                   |   4 +-
 examples/agents.rb                         |  13 ++
 lib/cloby_ext.jar                          | Bin 4688 -> 10788 bytes
 src/org/jruby/clojure/ClojureAgent.java    | 110 ++++++++++
 src/org/jruby/clojure/ClojureFunction.java | 240 +++++++++++++++++++++
 src/org/jruby/clojure/ClojureLibrary.java  |   1 +
 7 files changed, 371 insertions(+), 2 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 examples/agents.rb
 create mode 100644 src/org/jruby/clojure/ClojureAgent.java
 create mode 100644 src/org/jruby/clojure/ClojureFunction.java

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0f46c00
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.DS_Store
+pkg
+doc
+*.gem
+build
diff --git a/Rakefile b/Rakefile
index a00aa4d..08e2b7e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -12,12 +12,12 @@ desc "Compile the extension"
 task :compile => "pkg/classes" do |t|
   ant.javac :srcdir => "src", :destdir => t.prerequisites.first,
     :source => "1.5", :target => "1.5", :debug => true,
-    :classpath => "${java.class.path}:${sun.boot.class.path}:lib/clojure-1.2.0.jar"
+    :classpath => "${java.class.path}:${sun.boot.class.path}:javalib/clojure-1.2.0.jar"
 end
 
 desc "Build the jar"
 task :jar => :compile do
-  ant.jar :basedir => "pkg/classes", :destfile => "javalib/cloby_ext.jar", :includes => "**/*.class"
+  ant.jar :basedir => "pkg/classes", :destfile => "lib/cloby_ext.jar", :includes => "**/*.class"
 end
  
 task :package => :jar
diff --git a/examples/agents.rb b/examples/agents.rb
new file mode 100644
index 0000000..f522446
--- /dev/null
+++ b/examples/agents.rb
@@ -0,0 +1,13 @@
+require 'cloby'
+
+ag = Agent.new 42
+
+puts ag.deref # => 42
+
+ag.dispatch 19 do |a,b|
+  a-b
+end
+
+puts ag.deref # => 23
+
+Agent.shutdown # IMPORTANT! program will not exit if agents are not shutdown
\ No newline at end of file
diff --git a/lib/cloby_ext.jar b/lib/cloby_ext.jar
index 0141f4a2056746c97880a4f4080296b9fe2528b3..71f04820f121d0b643265bd562a6055c6b1598f9 100644
GIT binary patch
literal 10788
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
MzKpjT%3uEd53sEcv;Y7A

delta 3583
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
X0=dv&Au1|z06Bo_*G?kTzlnbV*^871

diff --git a/src/org/jruby/clojure/ClojureAgent.java b/src/org/jruby/clojure/ClojureAgent.java
new file mode 100644
index 0000000..6628e8c
--- /dev/null
+++ b/src/org/jruby/clojure/ClojureAgent.java
@@ -0,0 +1,110 @@
+package org.jruby.clojure;
+
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyModule;
+import org.jruby.RubyObject;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.anno.JRubyClass;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import clojure.lang.Agent;
+import clojure.lang.ISeq;
+import clojure.lang.RT;
+import clojure.lang.ArraySeq;
+import org.jruby.javasupport.JavaUtil;
+import org.jruby.runtime.Block;
+import org.jruby.RubyBoolean;
+import static org.jruby.runtime.Visibility.*;
+
+@JRubyClass(name = "Agent")
+public class ClojureAgent extends RubyObject {
+
+  public static RubyClass createAgentClass(Ruby runtime) {
+    RubyClass agentc = runtime.defineClass("Agent", runtime.getObject(), AGENT_ALLOCATOR);
+      agentc.setReifiedClass(ClojureAgent.class);
+      agentc.kindOf = new RubyModule.KindOf() {
+        @Override
+        public boolean isKindOf(IRubyObject obj, RubyModule type) {
+          return obj instanceof ClojureAgent;
+        }
+      };
+      agentc.defineAnnotatedMethods(ClojureAgent.class);
+      return agentc;
+    }
+
+    private static ObjectAllocator AGENT_ALLOCATOR = new ObjectAllocator() {
+      public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+        return new ClojureAgent(runtime, klass);
+      }
+    };
+
+  Ruby ruby;
+  Agent agent;
+
+  ClojureAgent(Ruby runtime, RubyClass klass) {
+    super(runtime, klass);
+    ruby = null;
+    agent = null;
+  }
+
+  @JRubyMethod(name = "shutdown", meta = true)
+  public static IRubyObject shutdown(ThreadContext context, IRubyObject recv) {
+    Agent.shutdown();
+    return context.getRuntime().getNil();
+  }
+  
+  @JRubyMethod(visibility = PRIVATE)
+  public IRubyObject initialize(final ThreadContext context, final IRubyObject state, Block block) {
+    ruby = context.getRuntime();
+    try {
+      agent = new Agent(state);
+      this.setErrorHandler(context, block);
+    } catch (Exception e) {
+      throw ruby.newConcurrencyError(e.getLocalizedMessage());
+    }
+    return this;
+  }
+
+  @JRubyMethod(name = "dispatch", rest = true)
+  public IRubyObject dispatch(final ThreadContext context, final IRubyObject[] args, final Block block) {
+    agent.dispatch( new ClojureFunction(context, block), ArraySeq.create((Object[])args), true);
+    return ruby.getNil();
+  }
+
+  @JRubyMethod
+  public Object deref(final ThreadContext context) {
+    try {
+      return agent.deref();
+    } catch (Exception e) {
+      throw context.getRuntime().newConcurrencyError(e.getLocalizedMessage());
+    }
+  }
+
+  @JRubyMethod(name = "get_error")
+  public Object getError(final ThreadContext context) {
+    return agent.getError();
+  }
+
+  @JRubyMethod
+  public Object restart(final ThreadContext context, final IRubyObject newState) {
+    return restart(context, newState, new RubyBoolean(context.getRuntime(), true));
+  }
+
+  @JRubyMethod
+  public Object restart(final ThreadContext context, final IRubyObject newState, final IRubyObject clearActions) {
+    try {
+      return agent.restart(newState, clearActions.isTrue());
+    } catch (Exception e) {
+      throw context.getRuntime().newConcurrencyError(e.getLocalizedMessage());
+    }
+  }
+
+  @JRubyMethod(name = "set_error_handler")
+  public IRubyObject setErrorHandler(final ThreadContext context, final Block block) {
+    agent.setErrorHandler(new ClojureFunction(context, block));
+    return context.getRuntime().getNil();
+  }
+}
\ No newline at end of file
diff --git a/src/org/jruby/clojure/ClojureFunction.java b/src/org/jruby/clojure/ClojureFunction.java
new file mode 100644
index 0000000..4df265f
--- /dev/null
+++ b/src/org/jruby/clojure/ClojureFunction.java
@@ -0,0 +1,240 @@
+package org.jruby.clojure;
+
+import org.jruby.Ruby;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.ThreadContext;
+import clojure.lang.IFn;
+import clojure.lang.ISeq;
+import clojure.lang.RT;
+import org.jruby.javasupport.JavaUtil;
+
+public class ClojureFunction implements IFn {
+
+  final Block block;
+  final Ruby ruby;
+
+  public ClojureFunction(final ThreadContext context, final Block block) {
+    this.block = block;
+    this.ruby = context.getRuntime();
+  }
+
+  @Override
+  public Object call() throws Exception {
+    return invoke();
+  }
+
+  public void run() {
+    try {
+      invoke();
+    } catch(Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+  
+  public Object invoke() throws Exception {
+    return block.call(ruby.getCurrentContext());
+  }
+
+  public Object invoke(Object arg1) throws Exception {
+    return block.call(ruby.getCurrentContext(),
+      JavaUtil.convertJavaToRuby(ruby,arg1)
+    );
+  }
+
+  public Object invoke(Object arg1, Object arg2) throws Exception {
+    return block.call(ruby.getCurrentContext(),
+      JavaUtil.convertJavaToRuby(ruby,arg1),
+      JavaUtil.convertJavaToRuby(ruby,arg2)
+    );
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3) throws Exception {
+    return block.call(ruby.getCurrentContext(),
+      JavaUtil.convertJavaToRuby(ruby,arg1),
+      JavaUtil.convertJavaToRuby(ruby,arg2),
+      JavaUtil.convertJavaToRuby(ruby,arg3)
+    );
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4) throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5, arg6
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7)
+                      throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5, arg6, arg7
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+                      Object arg8) throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+      arg8
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+                      Object arg8, Object arg9) throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+      arg8, arg9
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+                      Object arg8, Object arg9, Object arg10) throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+      arg8, arg9, arg10
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+                      Object arg8, Object arg9, Object arg10, Object arg11) throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+      arg8, arg9, arg10, arg11
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+                      Object arg8, Object arg9, Object arg10, Object arg11, Object arg12) throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+      arg8, arg9, arg10, arg11, arg12
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+                      Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13) throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+      arg8, arg9, arg10, arg11, arg12, arg13
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+                      Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14)
+                      throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+      arg8, arg9, arg10, arg11, arg12, arg13, arg14
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+                      Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
+                      Object arg15) throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+      arg8, arg9, arg10, arg11, arg12, arg13, arg14,
+      arg15
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+                      Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
+                      Object arg15, Object arg16) throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+      arg8, arg9, arg10, arg11, arg12, arg13, arg14,
+      arg15, arg16
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+                      Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
+                      Object arg15, Object arg16, Object arg17) throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+      arg8, arg9, arg10, arg11, arg12, arg13, arg14,
+      arg15, arg16, arg17
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+                      Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
+                      Object arg15, Object arg16, Object arg17, Object arg18) throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+      arg8, arg9, arg10, arg11, arg12, arg13, arg14,
+      arg15, arg16, arg17, arg18
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+                      Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
+                      Object arg15, Object arg16, Object arg17, Object arg18, Object arg19) throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+      arg8, arg9, arg10, arg11, arg12, arg13, arg14,
+      arg15, arg16, arg17, arg18, arg19
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+                      Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
+                      Object arg15, Object arg16, Object arg17, Object arg18, Object arg19, Object arg20)
+                      throws Exception {
+    Object[] args = {
+      arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+      arg8, arg9, arg10, arg11, arg12, arg13, arg14,
+      arg15, arg16, arg17, arg18, arg19, arg20
+    };
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, args));
+  }
+
+  public Object invoke(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+                      Object arg8, Object arg9, Object arg10, Object arg11, Object arg12, Object arg13, Object arg14,
+                      Object arg15, Object arg16, Object arg17, Object arg18, Object arg19, Object arg20,
+                      Object... args) throws Exception {
+    Object[] args1 = {
+      arg1, arg2, arg3, arg4, arg5, arg6, arg7,
+      arg8, arg9, arg10, arg11, arg12, arg13, arg14,
+      arg15, arg16, arg17, arg18, arg19, arg20
+    };
+    
+    Object[] conArgs = new Object[args1.length+args.length];
+    System.arraycopy(args1, 0, conArgs, 0, args1.length);
+    System.arraycopy(args, 0, conArgs, 0, args.length);
+    
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby,conArgs));
+  }
+  
+  @Override
+  public Object applyTo(final ISeq arglist) throws Exception{
+    return block.call(ruby.getCurrentContext(), JavaUtil.convertJavaArrayToRuby(ruby, RT.seqToArray(arglist)));
+  }
+}
\ No newline at end of file
diff --git a/src/org/jruby/clojure/ClojureLibrary.java b/src/org/jruby/clojure/ClojureLibrary.java
index 26e48f1..4195c2b 100644
--- a/src/org/jruby/clojure/ClojureLibrary.java
+++ b/src/org/jruby/clojure/ClojureLibrary.java
@@ -23,6 +23,7 @@ public void load(Ruby runtime, boolean wrap) throws IOException {
         runtime.defineClassUnder("Object", runtime.getObject(), new ClojureObjectAllocator(), cljModule);
 
         runtime.getKernel().defineAnnotatedMethods(ClojureDosync.class);
+        ClojureAgent.createAgentClass(runtime);
     }
 
     public static class ClojureObjectAllocator implements ObjectAllocator {

From c6c7547b85bd7c1865084741ebeb0b845a3cb963 Mon Sep 17 00:00:00 2001
From: drexin <dario.rexin@r3-tech.de>
Date: Mon, 31 Jan 2011 01:57:31 +0100
Subject: [PATCH 2/2] added support for atoms

---
 examples/atoms.rb                         |  18 ++++
 lib/cloby_ext.jar                         | Bin 10788 -> 13991 bytes
 src/org/jruby/clojure/ClojureAgent.java   |   4 +-
 src/org/jruby/clojure/ClojureAtom.java    | 115 ++++++++++++++++++++++
 src/org/jruby/clojure/ClojureLibrary.java |   1 +
 5 files changed, 135 insertions(+), 3 deletions(-)
 create mode 100644 examples/atoms.rb
 create mode 100644 src/org/jruby/clojure/ClojureAtom.java

diff --git a/examples/atoms.rb b/examples/atoms.rb
new file mode 100644
index 0000000..30ec1c1
--- /dev/null
+++ b/examples/atoms.rb
@@ -0,0 +1,18 @@
+require 'cloby'
+
+atom = Atom.new 5
+
+atom.swap{|a| a + 6}
+puts atom.deref # => 11
+
+puts atom.compare_and_set(42, 11) # => false
+puts atom.deref # => 11
+
+puts atom.compare_and_set(11, 42) # => true
+puts atom.deref # => 42
+
+puts atom.swap(1,2,3) {|a,b,c,d| a+b+c+d} # => 48
+
+atom.reset 13
+
+puts atom.deref # => 13
\ No newline at end of file
diff --git a/lib/cloby_ext.jar b/lib/cloby_ext.jar
index 71f04820f121d0b643265bd562a6055c6b1598f9..cc6a223375ce56e4bff9691f155caba5a029a107 100644
GIT binary patch
delta 9492
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

delta 6469
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

diff --git a/src/org/jruby/clojure/ClojureAgent.java b/src/org/jruby/clojure/ClojureAgent.java
index 6628e8c..b7afc20 100644
--- a/src/org/jruby/clojure/ClojureAgent.java
+++ b/src/org/jruby/clojure/ClojureAgent.java
@@ -11,8 +11,6 @@
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import clojure.lang.Agent;
-import clojure.lang.ISeq;
-import clojure.lang.RT;
 import clojure.lang.ArraySeq;
 import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.Block;
@@ -90,7 +88,7 @@ public Object getError(final ThreadContext context) {
 
   @JRubyMethod
   public Object restart(final ThreadContext context, final IRubyObject newState) {
-    return restart(context, newState, new RubyBoolean(context.getRuntime(), true));
+    return restart(context, newState, context.getRuntime().getTrue());
   }
 
   @JRubyMethod
diff --git a/src/org/jruby/clojure/ClojureAtom.java b/src/org/jruby/clojure/ClojureAtom.java
new file mode 100644
index 0000000..4cc02f0
--- /dev/null
+++ b/src/org/jruby/clojure/ClojureAtom.java
@@ -0,0 +1,115 @@
+package org.jruby.clojure;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyModule;
+import org.jruby.RubyObject;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.anno.JRubyClass;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.Block;
+import clojure.lang.Atom;
+import clojure.lang.ArraySeq;
+import static org.jruby.runtime.Visibility.*;
+
+@JRubyClass(name = "Atom")
+public class ClojureAtom extends RubyObject {
+
+  public static RubyClass createAtomClass(final Ruby runtime) {
+    RubyClass atomc = runtime.defineClass("Atom", runtime.getObject(), ATOM_ALLOCATOR);
+    atomc.setReifiedClass(ClojureAtom.class);
+    atomc.kindOf = new RubyModule.KindOf() {
+      @Override
+      public boolean isKindOf(IRubyObject obj, RubyModule type) {
+        return obj instanceof ClojureAtom;
+      }
+    };
+    atomc.defineAnnotatedMethods(ClojureAtom.class);
+    return atomc;
+  }
+  
+  Atom atom;
+
+  private static ObjectAllocator ATOM_ALLOCATOR = new ObjectAllocator() {
+    public IRubyObject allocate(final Ruby runtime, final RubyClass klass) {
+      return new ClojureAtom(runtime, klass);
+    }
+  };
+
+  public ClojureAtom(final Ruby runtime, final RubyClass klass) {
+    super(runtime, klass);
+    atom = null;
+  }
+  
+  @JRubyMethod(visibility = PRIVATE)
+  public IRubyObject initialize(final ThreadContext context, final IRubyObject state) {
+    try {
+      atom = new Atom(state);
+    } catch (Exception e) {
+      throw context.getRuntime().newConcurrencyError(e.getLocalizedMessage());
+    }
+    return this;
+  }
+  
+  @JRubyMethod
+  public Object swap(final ThreadContext context, final Block block) {
+    try {
+      return atom.swap(new ClojureFunction(context, block));
+    } catch (Exception e) {
+      throw context.getRuntime().newConcurrencyError(e.getLocalizedMessage());
+    }
+  }
+  
+  @JRubyMethod
+  public Object swap(final ThreadContext context, final IRubyObject arg0, final Block block) {
+    try {
+      return atom.swap(new ClojureFunction(context, block), arg0);
+    } catch (Exception e) {
+      throw context.getRuntime().newConcurrencyError(e.getLocalizedMessage());
+    }
+  }
+  
+  @JRubyMethod
+  public Object swap(final ThreadContext context, final IRubyObject arg0, final IRubyObject arg1, final Block block) {
+    try {
+      return atom.swap(new ClojureFunction(context, block), arg0, arg1);
+    } catch (Exception e) {
+      throw context.getRuntime().newConcurrencyError(e.getLocalizedMessage());
+    }
+  }
+  
+  @JRubyMethod(rest = true)
+  public Object swap(final ThreadContext context, final IRubyObject[] args, final Block block) {
+    ArraySeq seq = ArraySeq.create((Object[])args);
+    Object arg0 = seq.get(0);
+    Object arg1 = seq.get(1);
+    
+    try {
+      return atom.swap(new ClojureFunction(context, block), arg0, arg1, seq.next().next());
+    } catch (Exception e) {
+      throw context.getRuntime().newConcurrencyError(e.getLocalizedMessage());
+    }
+  }
+  
+  @JRubyMethod(name = "compare_and_set")
+  public IRubyObject compareAndSet(ThreadContext context, IRubyObject oldv, IRubyObject newv){
+    return atom.compareAndSet(oldv, newv) ? context.getRuntime().getTrue() : context.getRuntime().getFalse();
+  }
+  
+  @JRubyMethod
+  public Object reset(final ThreadContext context, final IRubyObject newVal) {
+    return atom.reset(newVal);
+  }
+  
+  @JRubyMethod
+  public Object deref(final ThreadContext context) {
+    try {
+      return atom.deref();
+    } catch (Exception e) {
+      throw context.getRuntime().newConcurrencyError(e.getLocalizedMessage());
+    }
+  }
+  
+}
\ No newline at end of file
diff --git a/src/org/jruby/clojure/ClojureLibrary.java b/src/org/jruby/clojure/ClojureLibrary.java
index 4195c2b..54a3a36 100644
--- a/src/org/jruby/clojure/ClojureLibrary.java
+++ b/src/org/jruby/clojure/ClojureLibrary.java
@@ -24,6 +24,7 @@ public void load(Ruby runtime, boolean wrap) throws IOException {
 
         runtime.getKernel().defineAnnotatedMethods(ClojureDosync.class);
         ClojureAgent.createAgentClass(runtime);
+        ClojureAtom.createAtomClass(runtime);
     }
 
     public static class ClojureObjectAllocator implements ObjectAllocator {