malachite 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c81db104c04d28b06832166c2402793f552a433
-  data.tar.gz: 662092aba1aed2ef10960947908bd56ed5a26e79
+  metadata.gz: 73c222a1089089b9c0b127a5cd17f2bd071a5d81
+  data.tar.gz: 18a92267b8d4d60d73a582c62fddefd7ee124f72
 SHA512:
-  metadata.gz: a84ee6b7cf5811fa101781f9358cf6d6606569ab6b7af7fe296fac6ca37d859d1c746cfa94e2dc8263182b44bd097893f7fdb5a2696ed60c027f03246e616d01
-  data.tar.gz: 3bc5bc648382e248c9d3ebb159338157089ec5823f6262fe9b6e124ac8442f5f60aa1a323371780b6d24f04fee36c836bb92dcd48f5cf791a1cc6860dd57f30d
+  metadata.gz: b29d404e2a0c6644372bd27ecc3c822596bad20d7ebe14c9f52c7d33c12b067f4e28bf273ad6b639a33480252419f6e5351e3f2cf83dc9e0b2c6ab50f5ca1f75
+  data.tar.gz: 726df1464886ee70ce8fba545593ec88790b404293e88bbb7b46fb2783afa39727ed9b55c21b31618e39b0c8e6b808374aa98b7bdfabe9c78fa7df6360cac4ae

data/lib/malachite/client.rb

@@ -3,29 +3,30 @@ require 'tempfile'
 
 module Malachite
   class Client
-    def initialize(file_path)
-      @file_path = file_path
-      @name = library_name
-      @func = Fiddle::Function.new(open_dlib['call'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_VOIDP)
+    def initialize
+      @dylib = open_dlib
     end
 
-    def call(args)
+    def call_method(name, args)
+      method_name = "call#{name.to_s.camelize}"
+      @func = Fiddle::Function.new(@dylib[method_name], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_VOIDP)
       ptr = @func.call(Malachite.dump_json(args))
       Malachite.load_json(ptr.to_s)
     end
 
+    # Malachite::Client.upcase(["foo", "bar"])
+    def self.method_missing(name, args)
+      new.call_method(name, args)
+    end
+
     private
 
     def open_dlib
       Fiddle.dlopen(shared_object_path)
     end
 
-    def library_name
-      File.basename(@file_path, '.go')
-    end
-
     def shared_object_path
-      Malachite::Compiler.new(@file_path, @name).compile
+      Malachite::Compiler.new.compile
     end
   end
 end

data/lib/malachite/compiler.rb

@@ -1,13 +1,11 @@
 module Malachite
   class Compiler
-    def initialize(file_path, name)
-      @file_path = file_path
-      @go_file = path_to_go_file
-      @name = name
+    def initialize
+      @compiled_file = path_to_compiled_file
     end
 
     def compile
-      return path_to_tmp_file if File.exist?(path_to_tmp_file)
+      return @compiled_file if File.exist?(@compiled_file)
       compile!
     end
 
@@ -15,35 +13,58 @@ module Malachite
 
     def compile!
       copy_boilerplate_to_tmp
-      unless system('go', 'build', '-buildmode=c-shared', '-o', path_to_tmp_file.to_s, @go_file.to_s)
-        fail Malachite::ConfigError, "Unable to Build Shared Library for #{@file_path}"
+      go_files = Dir["#{Rails.root.join('tmp')}/*.go"]
+      unless system('go', 'build', '-buildmode=c-shared', '-o', @compiled_file, *go_files)
+        fail Malachite::ConfigError, 'Unable to Build Shared Library'
       end
-      path_to_tmp_file
+      path_to_compiled_file
     end
 
     def copy_boilerplate_to_tmp
-      File.open(@go_file, 'w') do |file|
-        file.puts "package main\n"
-        file.puts "import \"encoding/json\"\n"
-        file.puts "import \"C\"\n"
-        file.puts munged_source
-        file.puts munged_boilerplate
+      source_files = Dir["#{Rails.root.join('app', 'go')}/*.go"].reject { |f| f['test'] }
+      source_files.each do |f|
+        File.open(path_to_tmp_file(f), 'w') do |file|
+          file.puts 'package main'
+          file.puts "import \"C\""
+          file.puts source_file(f)
+          file.puts exporter_boilerplate(f)
+          file.close
+        end
       end
+      File.open(Rails.root.join('tmp', 'main.go').to_s, 'w') do |file|
+        file.puts main_boilerplate
+        file.close
+      end
+    end
+
+    def source_file(f)
+      source = File.read(f)
+      source.gsub(/package main/, '')
+    end
+
+    def main_boilerplate
+      File.read(File.expand_path('../main.go.tmpl', __FILE__))
+    end
+
+    def exporter_boilerplate(file)
+      exporter = File.read(File.expand_path('../exporter.go.tmpl', __FILE__))
+      method_name, method_type = extract_method_and_type(file)
+      exporter.gsub(/YYYYYY/, "#{method_type}{}").gsub(/XXXXXX/, method_name)
     end
 
-    def munged_boilerplate
-      boiler = File.read(File.expand_path('../boilerplate.go.tmpl', __FILE__))
-      boiler.gsub(/XXXXXX/, "#{handler_type(munged_source)}{}")
+    def extract_method_and_type(source_file_path)
+      handler_code = File.read(source_file_path)
+      match = /^func Handle(.*?)\(\w+ (.*?)\)/.match(handler_code)
+      [match[1], match[2]]
     end
 
-    def munged_source
-      source_go = File.read(@file_path)
-      source_go.gsub(/package main/, '')
+    def path_to_tmp_file(file)
+      basename = File.basename(file, '.go')
+      Rails.root.join('tmp', "#{basename}.go").to_s
     end
 
-    def handler_type(handler_code)
-      match = /^func handler\(\w+ (.*?)\)/.match(handler_code)
-      match[1]
+    def path_to_compiled_file
+      Rails.root.join('tmp', 'malachite.so').to_s
     end
   end
 end

data/lib/malachite/{rails.rb → railtie.rb}

@@ -1,20 +1,8 @@
 module Malachite
-  class Compiler
-    def path_to_tmp_file
-      Rails.root.join('tmp', "#{@name}.so").to_s
-    end
-
-    def path_to_go_file
-      Rails.root.join('tmp', "#{@name}.go").to_s
-    end
-  end
-  class Client
-    def self.method_missing(name, args)
-      path_to_source = Rails.root.join('app', 'go', "#{name}.go")
-      new(path_to_source).call(args)
-    end
-  end
   class MalachiteRailtie < Rails::Railtie
+    rake_tasks do
+      load 'malachite/tasks/malachite.rake'
+    end
     initializer 'malachite.configure_rails_initialization' do
       Dir.glob(Rails.root.join('tmp', '*.so')).each do |file|
         File.delete(file)
@@ -25,6 +13,9 @@ module Malachite
       Dir.glob(Rails.root.join('tmp', '*.h')).each do |file|
         File.delete(file)
       end
+      rake_tasks do
+        load 'malachite/tasks/malachite.rake'
+      end
     end
   end
 end

data/lib/malachite/tasks.rb

@@ -0,0 +1,3 @@
+Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].each do |task|
+  load task
+end

data/lib/malachite/version.rb

@@ -1,3 +1,3 @@
 module Malachite
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/malachite.rb

@@ -19,7 +19,7 @@ module Malachite
 end
 
 if defined?(::Rails::Engine)
-  require 'malachite/rails'
+  require 'malachite/railtie'
 else
-  require 'malachite/ruby'
+  fail "Malachite #{Malachite::VERSION} is a Rails-only Gem"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malachite
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Zack Hubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -65,8 +65,8 @@ files:
 - lib/malachite/client.rb
 - lib/malachite/compiler.rb
 - lib/malachite/errors.rb
-- lib/malachite/rails.rb
-- lib/malachite/ruby.rb
+- lib/malachite/railtie.rb
+- lib/malachite/tasks.rb
 - lib/malachite/version.rb
 homepage: http://www.zhubert.com
 licenses:

data/lib/malachite/ruby.rb

@@ -1,16 +0,0 @@
-module Malachite
-  class Compiler
-    def path_to_tmp_file
-      Tempfile.new([@name, 'so']).path
-    end
-
-    def path_to_go_file
-      Tempfile.new([@name, 'go']).path
-    end
-  end
-  class Client
-    def self.method_missing(name, args)
-      new("#{name}.go").call(args)
-    end
-  end
-end