zweikopf 0.0.3 → 0.0.4

data/.rvmrc

@@ -0,0 +1 @@
+rvm use jruby-1.6.7.2

data/.travis.yml

@@ -1,6 +1,5 @@
 rvm:
   - jruby
 jdk:
-  - openjdk6
   - openjdk7
 script: "rake && lein2 test"

data/lib/zweikopf/array.rb

@@ -9,5 +9,13 @@ module Zweikopf
                               end)
     end # to_persistent_vector
 
+    def self.from_clj(clj_arr)
+      [].tap do |ruby_arr|
+        clj_arr.each do |v|
+          ruby_arr<< Zweikopf::Transformer.from_clj(v);
+        end
+      end
+    end # self.from_clj
+
   end # Array
 end # Zweikopf

data/lib/zweikopf/hash.rb

@@ -16,14 +16,10 @@ module Zweikopf
       ret.persistent
     end
 
-    def self.from_clj(clj_hash)
+    def self.from_clj(clj_hash, &block)
       {}.tap do |ruby_map|
         clj_hash.each do |k, v|
-          if v.is_a?(PersistentHashMap) || v.is_a?(PersistentArrayMap)
-            ruby_map[Keyword.to_ruby(k)] = self.from_clj(v)
-          else
-            ruby_map[Keyword.to_ruby(k)] = v
-          end
+          ruby_map[Keyword.from_clj(k)] = Zweikopf::Transformer.from_clj(v, &block);
         end
       end
     end # self.from_clj

data/lib/zweikopf/keyword.rb

@@ -7,9 +7,9 @@ module Zweikopf
       ::Keyword.intern(keyword.to_s)
     end # self.from_ruby
 
-    def self.to_ruby(keyword)
+    def self.from_clj(keyword)
       keyword.to_s.gsub(/:/, "").to_sym
-    end # self.to_ruby
+    end # self.from_clj
 
   end # Keyword
 end # Zweikopf

data/lib/zweikopf/transformer.rb

@@ -1,3 +1,8 @@
+java_import "clojure.lang.IPersistentMap"
+java_import "clojure.lang.IPersistentVector"
+java_import "clojure.lang.IPersistentList"
+java_import "clojure.lang.Keyword"
+
 module Zweikopf
   module Transformer
 
@@ -17,5 +22,21 @@ module Zweikopf
       end
     end # self.from_ruby
 
+    def self.from_clj(obj, &block)
+      if Primitive.is_primitive_type?(obj)
+        obj
+      elsif obj.is_a?(IPersistentMap)
+        Hash.from_clj(obj, &block)
+      elsif obj.is_a?(IPersistentVector || IPersistentList)
+        Array.from_clj(obj, &block)
+      elsif obj.is_a?(::Keyword)
+        Keyword.from_clj(obj)
+      elsif !block.nil?
+        from_clj(yield(obj))
+      else
+        obj
+      end
+    end # self.from_clj
+
   end # Transformer
 end # Zweikopf

data/lib/zweikopf/version.rb

@@ -1,3 +1,3 @@
 module Zweikopf
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/fixtures/complex_hash.clj

@@ -0,0 +1 @@
+{:a  1 :b  [2 3 4]}

data/spec/spec_helper.rb

@@ -1,15 +1,10 @@
-puts RUBY_PLATFORM
-
-require 'java'
-
-
 deps = File.join(File.dirname(__FILE__), "..", "deps")
 
-# Dir["#{deps}/\*.jar"].each do |jar|
-require "/Users/alexp/p/zweikopf/deps/clojure-1.4.0.jar" # jar
-# end
-
+Dir["#{deps}/\*.jar"].each do |jar|
+  require jar
+end
 
+require 'java'
 java_import "clojure.lang.RT"
 
 require 'zweikopf'

data/spec/zweikopf/performance_spec.rb

@@ -1,11 +1,30 @@
 require 'spec_helper'
 
 describe :performance do
-  it "this spec simply shows performance" do
+
+  #
+  # Environment
+  #
+
+  let(:clj_hash) { load_fixture(:clj_hash1) }
+
+  #
+  # Examples
+  #
+
+  it "this spec simply shows performance, very roughly, please do your testing depending on your needs" do
+    time_before = Time.now.to_f
+    100000.times do |i|
+      Zweikopf::Transformer.from_ruby({:a => i, :b => i})
+    end
+    puts "Ruby to Clojure, time elapsed: #{Time.now.to_f - time_before} seconds"
+
     time_before = Time.now.to_f
     100000.times do |i|
-      Zweikopf::Hash.create({:a => i, :b => i})
+      Zweikopf::Transformer.from_clj(clj_hash)
     end
-    puts "Time elapsed: #{Time.now.to_f - time_before} seconds"
+
+    puts "Clojure to Ruby, time elapsed: #{Time.now.to_f - time_before} seconds"
   end
+
 end

data/spec/zweikopf/transformer_clojure_to_ruby_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+java_import 'clojure.lang.Util'
+
+describe Zweikopf do
+  context "when given a non-recursive hash structure" do
+
+    #
+    # Environment
+    #
+
+    let(:hash) { load_fixture(:clj_hash1) }
+
+    #
+    # Examples
+    #
+
+    it "creates a Clojure hash" do
+      Zweikopf::Transformer.from_clj(hash).should eql({:a => 1, :b => 2})
+    end
+  end
+
+  context "when given a recursive hash structure" do
+
+    #
+    # Environment
+    #
+
+    let(:hash) { load_fixture(:clj_deep_hash1) }
+
+    #
+    # Examples
+    #
+
+    it "creates a Clojure hash" do
+      Zweikopf::Transformer.from_clj(hash).should eql({:a => 1, :b => {:c => 3, :d =>4}})
+    end
+  end
+
+  context "when given a clojure array" do
+
+    #
+    # Environment
+    #
+
+    let(:clj_array) { load_fixture(:clj_array1) }
+
+    #
+    # Examples
+    #
+
+    it "creates a Ruby array" do
+      Zweikopf::Transformer.from_clj(clj_array).should eql([:a, 1, :b, 2, :c, 3])
+    end
+  end
+
+
+  context "when given a hash that contains array that has a hash as an item" do
+
+    #
+    # Environment
+    #
+
+    let(:complex_hash) { load_fixture(:complex_hash) }
+
+    #
+    # Examples
+    #
+
+    it "creates a Ruby array" do
+      Zweikopf::Transformer.from_clj(complex_hash).should eql({:a => 1, :b => [2, 3, 4]})
+    end
+  end
+
+end

data/spec/zweikopf/transformer_ruby_to_clojure_spec.rb

@@ -0,0 +1,108 @@
+require 'spec_helper'
+java_import 'clojure.lang.Util'
+
+describe Zweikopf do
+  describe :empty do
+    let(:empty_hash) { load_fixture(:empty_hash) }
+
+    it "returns empty clojure hash" do
+      Zweikopf::Hash.empty.should eql empty_hash
+    end
+  end
+
+  context "when given a non-recursive hash structure" do
+
+    #
+    # Environment
+    #
+
+    let(:hash) { load_fixture(:clj_hash1) }
+
+    #
+    # Examples
+    #
+
+    it "creates a Clojure hash" do
+      Zweikopf::Transformer.from_ruby({:a => 1, :b => 2}).should eql hash
+    end
+  end
+
+  context "when given a recursive hash structure" do
+
+    #
+    # Environment
+    #
+
+    let(:hash) { load_fixture(:clj_deep_hash1) }
+
+    #
+    # Examples
+    #
+
+    it "creates a Clojure hash" do
+      Zweikopf::Transformer.from_ruby({:a => 1, :b => {:c => 3, :d =>4}}).should eql hash
+    end
+  end
+
+  context "given a data structure that requires custom transformations" do
+
+    #
+    # Environment
+    #
+
+    class CustomTransformedEntry
+      def serializable_hash
+        {:c => 3, :d => 4}
+      end
+    end
+
+    let(:hash) { load_fixture(:clj_deep_hash1) }
+
+    it "creates a Clojure hash with given block" do
+      Zweikopf::Transformer.from_ruby({:a => 1, :b => CustomTransformedEntry.new }) do |v|
+        if v.is_a?(CustomTransformedEntry)
+          v.serializable_hash
+        else
+          v
+        end
+      end.should eql hash
+    end
+
+  end
+
+  context "when given a clojure array" do
+
+    #
+    # Environment
+    #
+
+    let(:clj_array) { load_fixture(:clj_array1) }
+
+    #
+    # Examples
+    #
+
+    it "creates a Ruby array" do
+      Zweikopf::Transformer.from_ruby([:a, 1, :b, 2, :c, 3]).should eql(clj_array)
+    end
+  end
+
+
+  context "when given a hash that contains array that has a hash as an item" do
+
+    #
+    # Environment
+    #
+
+    let(:complex_hash) { load_fixture(:complex_hash) }
+
+    #
+    # Examples
+    #
+
+    it "creates a Ruby array" do
+      Zweikopf::Transformer.from_ruby({:a => 1, :b => [2, 3, 4]}).should eql(complex_hash)
+    end
+  end
+
+end

metadata

@@ -2,7 +2,7 @@
 name: zweikopf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
   - Oleksandr Petrov
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-18 00:00:00 Z
+date: 2012-09-07 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake
@@ -46,6 +46,7 @@ extra_rdoc_files: []
 files: 
   - .gitignore
   - .rspec
+  - .rvmrc
   - .travis.yml
   - Gemfile
   - LICENSE
@@ -63,11 +64,13 @@ files:
   - spec/fixtures/clj_array1.clj
   - spec/fixtures/clj_deep_hash1.clj
   - spec/fixtures/clj_hash1.clj
+  - spec/fixtures/complex_hash.clj
   - spec/fixtures/empty_hash.clj
   - spec/spec_helper.rb
   - spec/support/loader.rb
-  - spec/zweikopf/hash_spec.rb
   - spec/zweikopf/performance_spec.rb
+  - spec/zweikopf/transformer_clojure_to_ruby_spec.rb
+  - spec/zweikopf/transformer_ruby_to_clojure_spec.rb
   - src/zweikopf/core.clj
   - test/zweikopf/core_test.clj
   - zweikopf.gemspec
@@ -102,10 +105,11 @@ test_files:
   - spec/fixtures/clj_array1.clj
   - spec/fixtures/clj_deep_hash1.clj
   - spec/fixtures/clj_hash1.clj
+  - spec/fixtures/complex_hash.clj
   - spec/fixtures/empty_hash.clj
   - spec/spec_helper.rb
   - spec/support/loader.rb
-  - spec/zweikopf/hash_spec.rb
   - spec/zweikopf/performance_spec.rb
+  - spec/zweikopf/transformer_clojure_to_ruby_spec.rb
+  - spec/zweikopf/transformer_ruby_to_clojure_spec.rb
   - test/zweikopf/core_test.clj
-has_rdoc: 

data/spec/zweikopf/hash_spec.rb

@@ -1,130 +0,0 @@
-require 'spec_helper'
-java_import 'clojure.lang.Util'
-describe Zweikopf::Hash do
-  describe :empty do
-    let(:empty_hash) { load_fixture(:empty_hash) }
-
-    it "returns empty clojure hash" do
-      Zweikopf::Hash.empty.should eql empty_hash
-    end
-  end
-
-  describe :create do
-
-
-    context "when given a non-recursive hash structure" do
-
-      #
-      # Environment
-      #
-
-      let(:hash) { load_fixture(:clj_hash1) }
-
-      #
-      # Examples
-      #
-
-      it "creates a Clojure hash" do
-        Zweikopf::Hash.from_ruby({:a => 1, :b => 2}).should eql hash
-      end
-    end
-
-    context "when given a recursive hash structure" do
-
-      #
-      # Environment
-      #
-
-      let(:hash) { load_fixture(:clj_deep_hash1) }
-
-      #
-      # Examples
-      #
-
-      it "creates a Clojure hash" do
-        Zweikopf::Hash.from_ruby({:a => 1, :b => {:c => 3, :d =>4}}).should eql hash
-      end
-    end
-
-    context "given a data structure that requires custom transformations" do
-
-      #
-      # Environment
-      #
-
-      class CustomTransformedEntry
-        def serializable_hash
-          {:c => 3, :d => 4}
-        end
-      end
-
-      let(:hash) { load_fixture(:clj_deep_hash1) }
-
-      it "creates a Clojure hash with given block" do
-        Zweikopf::Hash.from_ruby({:a => 1, :b => CustomTransformedEntry.new }) do |v|
-          if v.is_a?(CustomTransformedEntry)
-            v.serializable_hash
-          else
-            v
-          end
-        end.should eql hash
-      end
-
-    end
-  end
-
-  describe :from_clj do
-    context "given a non-recursive clojure hash structure" do
-
-      #
-      # Environment
-      #
-
-      let(:clj_hash) { load_fixture(:clj_hash1) }
-
-      #
-      # Examples
-      #
-
-      it "creates a Ruby hash" do
-        Zweikopf::Hash.from_clj(clj_hash).should eql({:a => 1, :b => 2})
-      end
-    end
-
-    context "when given a recursive hash structure" do
-
-      #
-      # Environment
-      #
-
-      let(:clj_hash) { load_fixture(:clj_deep_hash1) }
-
-      #
-      # Examples
-      #
-
-      it "creates a Clojure hash" do
-        Zweikopf::Hash.from_clj(clj_hash).should eql({:a => 1, :b => {:c => 3, :d =>4}})
-      end
-    end
-
-    context "when given a clojure array" do
-
-      #
-      # Environment
-      #
-
-      let(:clj_array) { load_fixture(:clj_array1) }
-
-      #
-      # Examples
-      #
-
-      it "creates a Ruby array" do
-        Zweikopf::Array.from_ruby([:a, 1, :b, 2, :c, 3]).should eql(clj_array)
-      end
-    end
-
-
-  end
-end