malachite 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff11dd59ffe0df5b7eae8be219e16a80cb1b9cb9
-  data.tar.gz: 2144f93b6a19ccf95aee1ed03fb7eaf5ea8ef695
+  metadata.gz: 5052dfabfaf3ab568017e5dca181503e42aa32ef
+  data.tar.gz: 3e54fe1a9525ff6568127cfe0d94ee86daf31851
 SHA512:
-  metadata.gz: fe530d87de0f816e1521b9bd1f88fec25b365718ac6d245699d920ff1daebb191258001855919bcc2d3ccc548723cb6ead49c585f37f4706d34edb1840b666ba
-  data.tar.gz: fc702af8ebe46dc39be318d12edee7b00aacbd57b106df2e911c00179924651b1826709dea6a287500b3c6d8f4fea001a76e4e54f6578b063b66d96e2c1885f0
+  metadata.gz: a43b53c157f009ef74ae837dd005be597c8c292eaa1c4d7fbb95d1748fb157f4a259fd01b93be2e27806ad81d07939dab3e6fc73401aee403248339840d3c72e
+  data.tar.gz: 5034fd9f28ad91b68d74fe1e9438644c111d03bcf14591814b4ab7859874f6a7f8978491210b04290249cd763ff4c2789e83bbf68356755646684db8742e3734

data/.gitignore

@@ -6,7 +6,7 @@ tags
 *.gem
 dump.db
 .rbx
-coverage/
-vendor/
 .bundle/
-tmp/
+test/dummy/tmp/*.go
+test/dummy/tmp/*.so
+test/dummy/tmp/*.h

data/Rakefile

@@ -1 +1,8 @@
 require 'bundler/gem_tasks'
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.pattern = 'test/*_test.rb'
+end
+
+task default: :test

data/lib/malachite/exporter.go.tmpl

@@ -1,3 +1,4 @@
+
 //export callXXXXXX
 func callXXXXXX(data *C.char) C.VALUE {
 	things := YYYYYY

data/lib/malachite/file_compiler.rb

@@ -25,8 +25,7 @@ module Malachite
     end
 
     def source_file(f)
-      source = File.read(f)
-      source.gsub(/package main/, '')
+      File.readlines(f).drop(1)
     end
 
     def exporter_boilerplate(file)
@@ -38,7 +37,7 @@ module Malachite
     def file_has_handle_function?(f)
       source = File.read(f)
       match = /^func Handle(.*?)\(\w+ (.*?)\)/.match(source)
-      match.present?
+      match != nil
     end
 
     def extract_method_and_type(source_file_path)

data/lib/malachite/function_cache.rb

@@ -9,7 +9,7 @@ module Malachite
 
   def self.from_function_cache(method_name)
     existing_function = Malachite.function_cache[method_name]
-    return existing_function if existing_function.present?
+    return existing_function if existing_function != nil
     Malachite.add_to_function_cache(method_name)
   end
 

data/lib/malachite/version.rb

@@ -1,3 +1,3 @@
 module Malachite
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/malachite.rb

@@ -3,6 +3,7 @@ fail "Malachite #{Malachite::VERSION} does not support Ruby < 2.0.0" if RUBY_VER
 
 require 'json'
 require 'fiddle'
+require 'active_support/all'
 
 require 'malachite/errors'
 require 'malachite/function_cache'

data/malachite.gemspec

@@ -18,4 +18,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json', '~> 1.0'
   spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'minitest', '~> 5'
+  spec.add_development_dependency 'activesupport', '~> 4'
 end

data/test/client_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class ClientTest < MiniTest::Unit::TestCase
+  def setup
+    @client = Malachite::Client.new('upcase', ['foo'])
+  end
+
+  def test_confirm_compilation_matches_fixture
+    assert_equal @client.call, ['FOO']
+  end
+end

data/test/dummy/app/go/upcase.go

@@ -0,0 +1,12 @@
+package main
+
+import (
+	"strings"
+)
+
+func HandleUpcase(things []string) (upperCased []string) {
+	for _, thing := range things {
+		upperCased = append(upperCased, strings.ToUpper(thing))
+	}
+	return
+}

data/test/file_compiler_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class FileCompilerTest < MiniTest::Unit::TestCase
+  def setup
+    @source = Malachite::FileCompiler.new(Rails.root.join('app', 'go', 'upcase.go')).compile
+  end
+
+  def test_confirm_compilation_matches_fixture
+    compiled = File.read(Rails.root.join('tmp', 'upcase.go')).to_s
+    valid = File.read(File.expand_path('../fixtures/valid_upcase.go', __FILE__)).gsub(/HEADER/, RbConfig::CONFIG['rubyhdrdir']).gsub(/ARCH/, RbConfig::CONFIG['rubyarchhdrdir'])
+    assert_equal compiled, valid
+  end
+end

data/test/fixtures/valid_upcase.go

@@ -0,0 +1,34 @@
+package main
+
+// #cgo darwin LDFLAGS: -Wl,-undefined -Wl,dynamic_lookup
+// #cgo !darwin LDFLAGS: -Wl,-unresolved-symbols=ignore-all
+// #cgo CFLAGS: -IHEADER/ -IARCH/
+// #include <stdlib.h>
+// #include "ruby/ruby.h"
+import "C"
+
+import (
+	"strings"
+)
+
+func HandleUpcase(things []string) (upperCased []string) {
+	for _, thing := range things {
+		upperCased = append(upperCased, strings.ToUpper(thing))
+	}
+	return
+}
+
+//export callUpcase
+func callUpcase(data *C.char) C.VALUE {
+	things := []string{}
+	err := Unmarshal(C.GoString(data), &things)
+	if err != nil {
+		str := err.Error()
+		cstr := GOSTRING_PTR(str)
+		return C.rb_utf8_str_new(cstr, C.long(len(str)))
+	} else {
+		str := Marshal(HandleUpcase(things))
+		cstr := GOSTRING_PTR(str)
+		return C.rb_utf8_str_new(cstr, C.long(len(str)))
+	}
+}

data/test/rails_stub.rb

@@ -0,0 +1,12 @@
+require 'pathname'
+module Rails
+  Engine = {}
+  def self.root
+    Pathname.new(File.join(Dir.pwd, 'test', 'dummy'))
+  end
+  class Railtie
+    def self.rake_tasks; end
+
+    def self.initializer(_); end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+require 'rails_stub'
+require 'malachite'
+require 'minitest/autorun'
+require 'minitest/pride'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malachite
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Zack Hubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: A RubyGem which enables calling Go code from Rails.
 email:
 - zhubert@gmail.com
@@ -78,6 +106,12 @@ files:
 - lib/malachite/tasks/malachite.rake
 - lib/malachite/version.rb
 - malachite.gemspec
+- test/client_test.rb
+- test/dummy/app/go/upcase.go
+- test/file_compiler_test.rb
+- test/fixtures/valid_upcase.go
+- test/rails_stub.rb
+- test/test_helper.rb
 homepage: http://www.zhubert.com
 licenses:
 - MIT