malachite 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 926d38044dda1a9e4c467ed3538e03cb58aaeb44
-  data.tar.gz: 7e720cad471a0a7039b7d0817ae6a3681d364d12
+  metadata.gz: c98f3940a23926e32f06eec874ec4ac63e14b4c6
+  data.tar.gz: 65d45419c6d50ab9ade97f966d1994645683a844
 SHA512:
-  metadata.gz: 75aca51ffd362de4e8f32282d71efd9b201fa248ae839e91c796bf70ba58ba59d75bce93800a8d0e36e2edf4c508003a5a2bfa705428f49fe0616b747fa15336
-  data.tar.gz: d0c72131ebfc6256fc76b9ce5475ce6eb3f324b7d5dd97898854c8964879691a5354f3d1da3ff774a2d9e4d013dab371dcefc72f51d2981db1a72d599158029f
+  metadata.gz: 2d12dd1b59b31bced169bba5330107d9a3af9fb18cd78eac1df6305db07ba92215b7a038afe4099b7c7eb66685fe7503b75a2b188c7632e6e30a59476a87c77d
+  data.tar.gz: a0ec6db840c2a26d80223b8695b50bdb3ccaffb8554f41991bb32b715a249db8710acff918b8eb986cef47f42c35afe9f21b91875df4e88e58596458827dac1b

data/lib/malachite/client.rb

@@ -14,7 +14,6 @@ module Malachite
       Malachite.load_json(ptr.to_s)
     end
 
-    # Malachite::Client.upcase(["foo", "bar"])
     def self.method_missing(name, args)
       new.call_method(name, args)
     end
@@ -23,6 +22,8 @@ module Malachite
 
     def open_dlib
       Fiddle.dlopen(shared_object_path)
+    rescue Fiddle::DLError
+      raise Malachite::DLError
     end
 
     def shared_object_path

data/lib/malachite/compiler.rb

@@ -12,24 +12,16 @@ module Malachite
     private
 
     def compile!
-      copy_boilerplate_to_tmp
-      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'
+      modify_source_files_in_tmp
+      unless system('go', 'build', '-buildmode=c-shared', '-o', @compiled_file, *modified_go_files)
+        fail Malachite::BuildError, 'Unable to Build Shared Library'
       end
       path_to_compiled_file
     end
 
-    def copy_boilerplate_to_tmp
-      source_files = Dir["#{Rails.root.join('app', 'go')}/*.go"].reject { |f| f['test'] }
+    def modify_source_files_in_tmp
       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
+        Malachite::FileCompiler.new(f).compile
       end
       File.open(Rails.root.join('tmp', 'main.go').to_s, 'w') do |file|
         file.puts main_boilerplate
@@ -37,30 +29,16 @@ module Malachite
       end
     end
 
-    def source_file(f)
-      source = File.read(f)
-      source.gsub(/package main/, '')
+    def modified_go_files
+      Dir["#{Rails.root.join('tmp')}/*.go"]
     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)
+    def source_files
+      Dir["#{Rails.root.join('app', 'go')}/*.go"].reject { |f| f['test'] }
     end
 
-    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 path_to_tmp_file(file)
-      basename = File.basename(file, '.go')
-      Rails.root.join('tmp', "#{basename}.go").to_s
+    def main_boilerplate
+      File.read(File.expand_path('../main.go.tmpl', __FILE__))
     end
 
     def path_to_compiled_file

data/lib/malachite/errors.rb

@@ -1,3 +1,4 @@
 module Malachite
-  class ConfigError < StandardError; end
+  class BuildError < StandardError; end
+  class DLError < StandardError; end
 end

data/lib/malachite/file_compiler.rb

@@ -0,0 +1,41 @@
+module Malachite
+  class FileCompiler
+    def initialize(file)
+      @file = file
+    end
+
+    def compile
+      File.open(path_to_tmp_file(@file), 'w') do |file|
+        file.puts 'package main'
+        file.puts "import \"C\""
+        file.puts source_file(@file)
+        file.puts exporter_boilerplate(@file)
+        file.close
+      end
+    end
+
+    private
+
+    def source_file(f)
+      source = File.read(f)
+      source.gsub(/package main/, '')
+    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 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 path_to_tmp_file(file)
+      basename = File.basename(file, '.go')
+      Rails.root.join('tmp', "#{basename}.go").to_s
+    end
+  end
+end

data/lib/malachite/tasks/malachite.rake

@@ -1,5 +1,5 @@
 namespace :malachite do
-  desc 'run Go tests'
+  desc 'runs all Go tests in app/go'
   task :test do
     test_files = Dir["#{Rails.root.join('app', 'go')}/*.go"]
     system('go', 'test', *test_files)

data/lib/malachite/version.rb

@@ -1,3 +1,3 @@
 module Malachite
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/malachite.rb

@@ -21,5 +21,5 @@ end
 if defined?(::Rails::Engine)
   require 'malachite/railtie'
 else
-  fail "Malachite #{Malachite::VERSION} is a Rails-only Gem"
+  fail "Malachite #{Malachite::VERSION} requires Rails"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: malachite
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Zack Hubert
@@ -68,6 +68,7 @@ files:
 - lib/malachite/compiler.rb
 - lib/malachite/errors.rb
 - lib/malachite/exporter.go.tmpl
+- lib/malachite/file_compiler.rb
 - lib/malachite/main.go.tmpl
 - lib/malachite/railtie.rb
 - lib/malachite/tasks.rb