eleetscript 0.0.16a → 0.0.17a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ef24ae2818394b93651ed51262ec957f5fe97f8
-  data.tar.gz: 67cc1c841aedb8a1b5dcfbbe076701722773181f
+  metadata.gz: cda030af5d597bad4202bfb153eb6fd35b7d0d79
+  data.tar.gz: 5ca3d822978e7008a672f46c302ea3ff0aee8666
 SHA512:
-  metadata.gz: 6ad3c89f4776d0049f6be9633e2aad9bc8aabdcc772e7410b8da6831c844f7de5ba983a98ab25d26e7cbc30b68cd96704c42f5da6a30d29d5e7664bca4af2edd
-  data.tar.gz: a7a8e5fef48ad2dd389a56f2d4556d5e56fa90dbc3cf779072898402acacb4afc1752eacf25fc8ddd80e77e6742fd9eef5146ab9fc64a83d7a2a428ae3207723
+  metadata.gz: 50172cc578133afd458336c3a81b10f276531c2ed91fc1f946e9e5ce0a972c8bfef67d6d3e315bdd84688a0f5b7666add153e6c901284df70bb4a3fa2eb88453
+  data.tar.gz: 87c7676cf9c776dfce85a64d467e2a9f6987d8549bc908603e5783b71f5405755e8c3830f6a19b45b6ec42e3dd72d4e9f5c14e942d40342d34bb62187a86c621

data/lib/engine/ruby_to_eleet_wrapper.rb

@@ -7,6 +7,9 @@ module EleetScript
       if @options[:lock]
         @options[:lock] = [@options[:lock]] unless @options[:lock].kind_of?(Array)
       end
+      if @options[:allow]
+        @options[:allow] = [@options[:allow]] unless @options[:allow].kind_of?(Array)
+      end
     end
 
     def call(method_name, args = [])
@@ -41,12 +44,44 @@ module EleetScript
 
     def can_call_method?(method_name)
       method_name = method_name.to_sym
-      return false if @options[:lock] && @options[:lock].include?(method_name)
+      # Check our options first, they can override class defined locks/allows.
+      if @options[:allow]
+        if @options[:allow].include?(method_name)
+          return true
+        else
+          return false
+        end
+      end
+      if @options[:lock]
+        if @options[:lock].include?(method_name)
+          return false
+        else
+          return true
+        end
+      end
+      # Check the Whitelist
+      if @ruby_obj.respond_to?(:eleetscript_allow_methods)
+        val = @ruby_obj.eleetscript_allow_methods
+        return false if val == :none
+        return true if val == :all
+        if val.kind_of?(Array) && val.include?(method_name)
+          return true
+        else
+          return false
+        end
+      end
+      # Check the Blacklist
       if @ruby_obj.respond_to?(:eleetscript_lock_methods)
         val = @ruby_obj.eleetscript_lock_methods
+        return true if val == :none
         return false if val == :all
-        return false if val.kind_of?(Array) && val.include?(method_name)
+        if val.kind_of?(Array) && val.include?(method_name)
+          return false
+        else
+          return true
+        end
       end
+      # If not specifically allowed/denied, then it can be accessed.
       true
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eleetscript
 version: !ruby/object:Gem::Version
-  version: 0.0.16a
+  version: 0.0.17a
 platform: ruby
 authors:
 - Brandon Buck
@@ -17,6 +17,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/eleet
 - lib/eleetscript.rb
 - lib/engine/eleet_to_ruby_wrapper.rb
 - lib/engine/engine.rb
@@ -65,7 +66,6 @@ files:
 - lib/lang/runtime/ruby/string_methods.rb
 - lib/lang/runtime/ruby/symbol_methods.rb
 - lib/util/processed_key_hash.rb
-- bin/eleet
 homepage: http://github.com/bbuck/eleetscript
 licenses:
 - MIT
@@ -76,17 +76,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: EleetScript Engine