bel 0.4.0.beta1 → 0.4.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3ec967adaa542f9d53a44d81b392aedf8e83977
-  data.tar.gz: 57befbff871e8d293eaef7b44b0cb928e38e5f45
+  metadata.gz: 068dbd416046633700df1624c0078e11a0dc84f4
+  data.tar.gz: 4c82f900aa4d19f2c484ea7c16fed41b4e4ff30e
 SHA512:
-  metadata.gz: 6598b80261a35fa182cc0e25cd76ff952614e99c7ea6697f09b097e1c1172bd31b30a0907fb31a963d37a8e6f3662247550655752d6835df15961a26644f5ddf
-  data.tar.gz: 1894266854e10a8481b8fe473dd2803dd4fa5d90079d048985236ca27c6466c82af878f7b574c758a273cd42bd56bfbf62d020e2ab3922427b35923fa8da2958
+  metadata.gz: dc79042a9629fb4237a8ecd8981c89bac9a8e60718fd9a234bbd1f6d0aa0f24ffec5fcd7bd8160ee732ba4e326f6e46baf61228502b5cb8c4ea38147da0b7e3a
+  data.tar.gz: bb47d1e8b8b78e31430adeedf362145000ae8de5321680f24983ac11883853807175dc203bb6cc0b2b46eb1c1784cca03e23bc0ae3f8ab137a11f60f7c3e9ea2

data/lib/bel.rb

@@ -17,11 +17,8 @@ require_relative 'bel/libbel.rb'
 require_relative 'bel/parser'
 require_relative 'bel/completion'
 
-include BEL::Language
-include BEL::Namespace
-
 module BEL
-  extend BEL::Translate::ClassMethods
+  extend  BEL::Translate::ClassMethods
 end
 # vim: ts=2 sw=2:
 # encoding: utf-8

data/lib/bel/evidence_model/bel_term.rb

@@ -1,6 +1,8 @@
+require_relative '../language'
 module BEL
   module Model
     class Term
+      include BEL::Language
       include Comparable
       attr_accessor :fx, :arguments, :signature
 
@@ -12,10 +14,10 @@ module BEL
       def initialize(fx, *arguments)
         @fx = case fx
         when String
-          BEL::Language::Function.new(FUNCTIONS[fx.to_sym])
+          Function.new(FUNCTIONS[fx.to_sym])
         when Symbol
-          BEL::Language::Function.new(FUNCTIONS[fx.to_sym])
-        when BEL::Language::Function
+          Function.new(FUNCTIONS[fx.to_sym])
+        when Function
           fx
         when nil
           raise ArgumentError, 'fx must not be nil'

data/lib/bel/language.rb

@@ -1,5 +1,4 @@
 require_relative 'quoting'
-require_relative 'evidence_model'
 module BEL
   module Language
 
@@ -597,21 +596,23 @@ module BEL
       :translocates
     ]
 
-    RELATIONSHIPS.each do |rel|
-      BEL::Model::Term.send(:define_method, rel) do |another|
-        s = BEL::Model::Statement.new self
-        s.relationship = rel
-        s.object = another
-        s
-      end
-    end
-    FUNCTIONS.each do |fx, metadata|
-      func = Function.new(metadata)
-      Language.send(:define_method, fx) do |*args|
-        BEL::Model::Term.new(func, *args)
+    def self.include_bel_dsl
+      RELATIONSHIPS.each do |rel|
+        BEL::Model::Term.send(:define_method, rel) do |another|
+          s = BEL::Model::Statement.new self
+          s.relationship = rel
+          s.object = another
+          s
+        end
       end
-      Language.send(:define_method, metadata[:long_form]) do |*args|
-        BEL::Model::Term.new(func, *args)
+      FUNCTIONS.each do |fx, metadata|
+        func = Function.new(metadata)
+        Language.send(:define_method, fx) do |*args|
+          BEL::Model::Term.new(func, *args)
+        end
+        Language.send(:define_method, metadata[:long_form]) do |*args|
+          BEL::Model::Term.new(func, *args)
+        end
       end
     end
   end

data/lib/bel/version.rb

@@ -1,3 +1,3 @@
 module BEL
-  VERSION = '0.4.0.beta1'
+  VERSION = '0.4.0.beta.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bel
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta1
+  version: 0.4.0.beta.2
 platform: ruby
 authors:
 - Anthony Bargnesi
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi