motion_blender 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f62586a884e6abf4b6c8ae93a1d655764f28ad8
-  data.tar.gz: 4e7a196e3652339c6dc76a35a0b5fd8b78d7b4e7
+  metadata.gz: be3d49bb1ba40b2cde3d4fa5bea800c1764ae21f
+  data.tar.gz: c09c5e5c2d743614f290936de33a8ecc84c5761a
 SHA512:
-  metadata.gz: dcd57b42e5243744ae42c1f968c22c6b507d9a4240e5011a5e66bd19e20638c6768158c09c6afa09482f7680b38ed6d04739e97be15c5c4311b87c3c5c0cc9d7
-  data.tar.gz: 1cb179e24b2989a47e0c9b27dbc14f4e32895e6b52dcd33a4c1aee37b8acafa95c6d878c70a3c2b225192f330b3b84e26a3f43cd88cfa6b2f149088bb7dbe873
+  metadata.gz: e3a6dcb4522f542645e24f58e60f8623588303a6c86271b029d573b5c899b8cdb5a4528f9b95f1a3a8dd04ca62be4743d3d9967985449258a594e26d5b5060da
+  data.tar.gz: ac31ed89248e5adeab0b8ead925d030f9870b481d54ccb1def31f955994c4aba585fae1a37039a976ce73593d2124d1c5223d322ad9e3ee4a94222ef83cb8953

data/README.md

@@ -92,13 +92,17 @@ The argument must be a string or an eval-able expression:
 require 'something'
 require File.join('path', 'to', 'feature')
 require File.expand_path('../otherthing', __FILE__) # __FILE__ works properly
+```
 
-# Bad
-# analyzer does not eval outside of require method
+Wrapped in outer loop, works fine:
+
+```ruby
+# Good
 Dir.glob('lib/**/*.rb').each { |path| require path }
+Dir[File.dirname(__FILE__) + '/lib/*.rb'].each { |file| require file }
 ```
 
-And required files must exist:
+Required Files must exist:
 
 ```ruby
 # Bad

data/lib/motion_blender/analyzer/evaluator.rb

@@ -0,0 +1,36 @@
+module MotionBlender
+  class Analyzer
+    class Evaluator
+      attr_reader :file, :ast, :stack
+
+      def initialize file, ast, stack = [], method = nil
+        @file = file
+        @ast = ast
+        @stack = stack
+        @method = method || @ast.children[1]
+      end
+
+      def parse_args
+        extractor = create_extractor
+        extractor.instance_eval(@ast.loc.expression.source, @file)
+        extractor.instance_eval { @args }
+      rescue
+        if stack.any?
+          Evaluator.new(@file, stack.last, stack[0..-2], @method).parse_args
+        else
+          exp = @ast.loc.expression.source
+          raise LoadError, "failed to parse `#{exp}'"
+        end
+      end
+
+      def create_extractor
+        obj = Object.new
+        obj.define_singleton_method @method do |arg|
+          @args ||= []
+          @args << arg
+        end
+        obj
+      end
+    end
+  end
+end

data/lib/motion_blender/analyzer/parser.rb

@@ -1,6 +1,8 @@
 require 'parser/current'
 require 'pathname'
 
+require 'motion_blender/analyzer/evaluator'
+
 module MotionBlender
   class Analyzer
     class Parser
@@ -20,17 +22,19 @@ module MotionBlender
         traverse ast
       end
 
-      def traverse ast
+      def traverse ast, stack = []
         if ast && ast.type == :send && require_command?(ast)
           @last_trace = trace_for ast
-          req = parse_arg ast
-          req.file = resolve_path req.method, req.arg
-          req.trace = @last_trace
-          @requires << req
+          Evaluator.new(@file, ast, stack).parse_args.each do |arg|
+            req = Require.new(@file, ast.children[1], arg)
+            req.file = resolve_path req.method, req.arg
+            req.trace = @last_trace
+            @requires << req
+          end
         elsif ast
           ast.children
             .select { |node| node.is_a?(::Parser::AST::Node) }
-            .each { |node| traverse node }
+            .each { |node| traverse node, [*stack, ast] }
         end
       end
 
@@ -38,23 +42,10 @@ module MotionBlender
         REQUIREMENT_TOKENS.include?(ast.children[1])
       end
 
-      def parse_arg ast
-        arg_ast = ast.children[2]
-        arg = eval arg_ast.loc.expression.source, clean_binding, @file
-        Require.new(@file, ast.children[1], arg)
-      rescue
-        exp = ast.loc.expression.source
-        raise LoadError, "failed to parse `#{exp}'"
-      end
-
       def trace_for ast
         "#{@file}:#{ast.loc.line}:in `#{ast.children[1]}'"
       end
 
-      def clean_binding
-        binding
-      end
-
       def resolve_path method, arg
         if %i(motion_require require_relative).include? method
           arg = Pathname.new(@file).dirname.join(arg).to_s

data/lib/motion_blender/version.rb

@@ -1,3 +1,3 @@
 module MotionBlender
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/motion_blender.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rubocop'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-gem-profile'
+  spec.add_development_dependency 'activesupport', '~> 4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion_blender
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - kayhide
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 description: MotionBlender loads ruby gems for RubyMotion
 email:
 - kayhide@gmail.com
@@ -213,6 +227,7 @@ files:
 - bin/setup
 - lib/motion_blender.rb
 - lib/motion_blender/analyzer.rb
+- lib/motion_blender/analyzer/evaluator.rb
 - lib/motion_blender/analyzer/hooker.rb
 - lib/motion_blender/analyzer/parser.rb
 - lib/motion_blender/rake_tasks.rb