zweikopf 0.0.2 → 0.0.3

data/.gitignore

@@ -16,7 +16,6 @@ test/tmp
 test/version_tmp
 tmp
 /target
-/lib
 /classes
 /checkouts
 pom.xml

data/lib/zweikopf/array.rb

@@ -0,0 +1,13 @@
+java_import "clojure.lang.PersistentVector"
+
+module Zweikopf
+  module Array
+
+    def self.from_ruby(arr)
+      PersistentVector.create(arr.inject([]) do |acc, v|
+                                acc<< Zweikopf::Transformer.from_ruby(v)
+                              end)
+    end # to_persistent_vector
+
+  end # Array
+end # Zweikopf

data/lib/zweikopf/hash.rb

@@ -1,6 +1,5 @@
 java_import "clojure.lang.PersistentHashMap"
 java_import "clojure.lang.PersistentArrayMap"
-java_import "clojure.lang.Keyword"
 java_import "java.util.Map"
 
 module Zweikopf
@@ -9,16 +8,10 @@ module Zweikopf
       PersistentHashMap::EMPTY
     end
 
-    def self.create(hash)
+    def self.from_ruby(hash, &block)
       ret = empty.as_transient
       hash.each do |k, v|
-        if v.is_a?(::Hash)
-          ret = ret.assoc(ruby_to_clj_keyword(k.to_s), self.create(v))
-        elsif block_given?
-          ret = yield(ret, k, v)
-        else
-          ret = ret.assoc(ruby_to_clj_keyword(k.to_s), v)
-        end
+        ret = ret.assoc(Keyword.from_ruby(k.to_s), Zweikopf::Transformer.from_ruby(v, &block))
       end
       ret.persistent
     end
@@ -27,20 +20,13 @@ module Zweikopf
       {}.tap do |ruby_map|
         clj_hash.each do |k, v|
           if v.is_a?(PersistentHashMap) || v.is_a?(PersistentArrayMap)
-            ruby_map[clj_to_ruby_symbol(k)] = self.from_clj(v)
+            ruby_map[Keyword.to_ruby(k)] = self.from_clj(v)
           else
-            ruby_map[clj_to_ruby_symbol(k)] = v
+            ruby_map[Keyword.to_ruby(k)] = v
           end
         end
       end
     end # self.from_clj
 
-    def self.ruby_to_clj_keyword(keyword)
-      Keyword.intern(keyword.to_s)
-    end # self.ruby_to_clj_keyword(keyword)
-
-    def self.clj_to_ruby_symbol(keyword)
-      keyword.to_s.gsub(/:/, "").to_sym
-    end # self.clj_to_ruby_symbol
   end
 end

data/lib/zweikopf/keyword.rb

@@ -0,0 +1,15 @@
+java_import "clojure.lang.Keyword"
+
+module Zweikopf
+  module Keyword
+
+    def self.from_ruby(keyword)
+      ::Keyword.intern(keyword.to_s)
+    end # self.from_ruby
+
+    def self.to_ruby(keyword)
+      keyword.to_s.gsub(/:/, "").to_sym
+    end # self.to_ruby
+
+  end # Keyword
+end # Zweikopf

data/lib/zweikopf/primitive.rb

@@ -0,0 +1,7 @@
+module Zweikopf
+  module Primitive
+    def self.is_primitive_type?(obj)
+      [String, Fixnum, Integer, Float, TrueClass, FalseClass].include?(obj.class)
+    end # self.is_primitive_type?
+  end # Primitive
+end # Zweikopf

data/lib/zweikopf/transformer.rb

@@ -0,0 +1,21 @@
+module Zweikopf
+  module Transformer
+
+    def self.from_ruby(obj, &block)
+      if Primitive.is_primitive_type?(obj)
+        obj
+      elsif obj.is_a?(::Hash)
+        Hash.from_ruby(obj, &block)
+      elsif obj.is_a?(::Array)
+        Array.from_ruby(obj, &block)
+      elsif obj.is_a?(::Symbol)
+        Keyword.from_ruby(obj)
+      elsif !block.nil?
+        from_ruby(yield(obj))
+      else
+        obj
+      end
+    end # self.from_ruby
+
+  end # Transformer
+end # Zweikopf

data/lib/zweikopf/version.rb

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

data/lib/zweikopf.rb

@@ -1,6 +1,12 @@
-require "zweikopf/hash"
 require "zweikopf/version"
 
+require "zweikopf/primitive"
+require "zweikopf/keyword"
+require "zweikopf/hash"
+require "zweikopf/array"
+require "zweikopf/transformer"
+
+
 module Zweikopf
 
 end

data/spec/zweikopf/hash_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-
+java_import 'clojure.lang.Util'
 describe Zweikopf::Hash do
   describe :empty do
     let(:empty_hash) { load_fixture(:empty_hash) }
@@ -25,7 +25,7 @@ describe Zweikopf::Hash do
       #
 
       it "creates a Clojure hash" do
-        Zweikopf::Hash.create({:a => 1, :b => 2}).should eql hash
+        Zweikopf::Hash.from_ruby({:a => 1, :b => 2}).should eql hash
       end
     end
 
@@ -42,7 +42,7 @@ describe Zweikopf::Hash do
       #
 
       it "creates a Clojure hash" do
-        Zweikopf::Hash.create({:a => 1, :b => {:c => 3, :d =>4}}).should eql hash
+        Zweikopf::Hash.from_ruby({:a => 1, :b => {:c => 3, :d =>4}}).should eql hash
       end
     end
 
@@ -61,11 +61,11 @@ describe Zweikopf::Hash do
       let(:hash) { load_fixture(:clj_deep_hash1) }
 
       it "creates a Clojure hash with given block" do
-        Zweikopf::Hash.create({:a => 1, :b => CustomTransformedEntry.new }) do |ret, k, v|
+        Zweikopf::Hash.from_ruby({:a => 1, :b => CustomTransformedEntry.new }) do |v|
           if v.is_a?(CustomTransformedEntry)
-            ret.assoc(Zweikopf::Hash.ruby_to_clj_keyword(k.to_s), Zweikopf::Hash.create(v.serializable_hash))
+            v.serializable_hash
           else
-            ret.assoc(Zweikopf::Hash.ruby_to_clj_keyword(k.to_s), v)
+            v
           end
         end.should eql hash
       end
@@ -121,8 +121,10 @@ describe Zweikopf::Hash do
       #
 
       it "creates a Ruby array" do
-        #
+        Zweikopf::Array.from_ruby([:a, 1, :b, 2, :c, 3]).should eql(clj_array)
       end
     end
+
+
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: zweikopf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
   - Oleksandr Petrov
@@ -53,7 +53,11 @@ files:
   - Rakefile
   - deps/clojure-1.4.0.jar
   - lib/zweikopf.rb
+  - lib/zweikopf/array.rb
   - lib/zweikopf/hash.rb
+  - lib/zweikopf/keyword.rb
+  - lib/zweikopf/primitive.rb
+  - lib/zweikopf/transformer.rb
   - lib/zweikopf/version.rb
   - project.clj
   - spec/fixtures/clj_array1.clj