grape-reload 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90005752e374515209acc7d30cf36d3e458645bd
-  data.tar.gz: 54b9b236aaaadcd77d0a313a54c015730f81e648
+  metadata.gz: d23fb6507e6ffdadf978ae7cafa32ad6a49b7b09
+  data.tar.gz: 4cdb689e50c6f760afb8ea2fe660b3c4d3971cea
 SHA512:
-  metadata.gz: 31c279a890f45ccf696a7ee25eaa7bafdea50cb99a8134aced2d3dd85a2d188b970444a5077068687bdcdf9a6c0111bd7789cdd946ff39f74e85e97dbc7ba94b
-  data.tar.gz: 033a629434a32aae7503e27307ea69548d3b1ee7ce8b61e6de370c98c6f4894e9262ae8cba0b4aec4eaa107f9104f39d0b6681467017dd736661a67404ba91a9
+  metadata.gz: ee472baaa8f3a405e193940073a8ea0734501179432b18f33e6d625e58728d06cf884e318430581f720c6d2598d7ea5811b089a1fc5e650a62fef5d79fa5e846
+  data.tar.gz: e6d6ce030ee2f4f6aff852817276cb3597fb852cbf0c178505a069b622aa5cbf662049450e20e356cb66555288817d1be149d5b618da21fe586a87a647172b60

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/AlexYankee/grape-reload.svg?branch=master)](https://travis-ci.org/AlexYankee/grape-reload)
+[![Gem Version](https://badge.fury.io/rb/grape-reload.svg)](http://badge.fury.io/rb/grape-reload)
 # Grape::Reload
 
 Expiremental approach for providing reloading of Grape-based rack applications in dev environment.  

data/Rakefile

@@ -4,7 +4,7 @@ require 'bundler/gem_tasks'
 # Default directory to look in is `/specs`
 # Run with `rake spec`
 RSpec::Core::RakeTask.new(:spec) do |task|
-  task.rspec_opts = ['--color', '--format', 'nested']
+  task.rspec_opts = ['--color', '--format', 'progress']
 end
 
 task :default => :spec

data/lib/core_ext/string/colorize.rb

@@ -0,0 +1,62 @@
+# Ruby color support for Windows
+# If you want colorize on Windows with Ruby 1.9, please use ansicon:
+#   https://github.com/adoxa/ansicon
+# Other ways, add `gem 'win32console'` to your Gemfile.
+if RUBY_PLATFORM =~ /mswin|mingw/ && RUBY_VERSION < '2.0' && ENV['ANSICON'].nil?
+  begin
+    require 'win32console'
+  rescue LoadError
+  end
+end
+
+##
+# Add colors
+#
+class String
+  # colorize(:red)
+  def colorize(args)
+    case args
+      when Symbol
+        Colorizer.send(args, self)
+      when Hash
+        Colorizer.send(args[:color], self, args[:mode])
+    end
+  end
+
+  # Used to colorize strings for the shell
+  class Colorizer
+    # Returns colors integer mapping
+    def self.colors
+      @_colors ||= {
+          :default => 9,
+          :black   => 30,
+          :red     => 31,
+          :green   => 32,
+          :yellow  => 33,
+          :blue    => 34,
+          :magenta => 35,
+          :cyan    => 36,
+          :white   => 37
+      }
+    end
+
+    # Returns modes integer mapping
+    def self.modes
+      @_modes ||= {
+          :default => 0,
+          :bold    => 1
+      }
+    end
+
+    # Defines class level color methods
+    # i.e  Colorizer.red("hello")
+    class << self
+      Colorizer.colors.each do |color, value|
+        define_method(color) do |target, mode_name = :default|
+          mode = modes[mode_name] || modes[:default]
+          "\e[#{mode};#{value}m" << target << "\e[0m"
+        end
+      end
+    end
+  end
+end

data/lib/grape/reload.rb

@@ -1,2 +1,4 @@
 require "grape/reload/version"
-require "grape/reload/rack_builder"
+require 'core_ext/string/colorize'
+require 'core_ext/object_space'
+require "grape/reload/rack_builder"

data/lib/grape/reload/dependency_map.rb

@@ -2,6 +2,11 @@ require_relative '../../ripper/extract_constants'
 
 module Grape
   module Reload
+    class UnresolvedDependenciesError < RuntimeError
+      def message; 'One or more unresolved dependencies found' end
+    end
+
+
     class DependencyMap
       extend Forwardable
       include TSort
@@ -32,11 +37,12 @@ module Grape
 
       def dependent_classes(loaded_file)
         classes = []
+        sorted = sorted_files
         cycle_classes = ->(file, visited_files = []){
           return if visited_files.include?(file)
           visited_files ||= []
           visited_files << file
-          classes |= map[file][:declared] if file != loaded_file
+          classes |= map[file][:declared]
           map[file][:declared].map{|klass|
             file_class = map.each_pair
                 .sort{|a1, a2|
@@ -110,6 +116,8 @@ module Grape
         unresolved_classes.each_pair do |klass, filenames|
           filenames.each {|filename| Grape::RackBuilder.logger.error("Unresolved const reference #{klass} from: #{filename}".colorize(:red)) }
         end
+
+        raise UnresolvedDependenciesError if unresolved_classes.any?
       end
     end
 

data/lib/grape/reload/grape_api.rb

@@ -17,7 +17,7 @@ CLASS
     end
 
     def initialize(app)
-      @app_klass = app.to_s
+      @app_klass = app
     end
 
     def call(*args)
@@ -48,12 +48,17 @@ METHOD
       def reinit!
         declaration = class_declaration.dup
         @class_decl = []
+        endpoints.each { |e| e.options[:app].reinit! if e.options[:app] }
         reset!
         declaration.each {|decl|
           send(decl[0],*deep_reconstantize.call(decl[1]),&decl[2])
         }
         change!
       end
+
+      def recursive_!
+
+      end
     private
       def class_declaration
         @class_decl ||= []

data/lib/grape/reload/rack_builder.rb

@@ -12,7 +12,7 @@ module Grape
       class << self
         [:error, :debug, :exception, :info, :devel].each do |level|
           define_method(level){|*args|
-            puts level.to_s.upcase+": "+args.map{|a| a.to_s}.join(' ')+"\n"
+            # Silence all reloader output by default with stub
           }
         end
       end
@@ -75,10 +75,11 @@ module Grape
             if environment == 'development'
               r = Rack::Builder.new
               r.use Grape::ReloadMiddleware[reload_threshold]
-              r.run m.app_class.constantize
+              r.run m.app_class
               map(m.mount_root) { run r }
             else
-              map(m.mount_root) { run m.app_class.constantize }
+              app_klass = m.app_class.constantize
+              map(m.mount_root) { run app_klass }
             end
           end
         end

data/lib/grape/reload/storage.rb

@@ -1,4 +1,4 @@
-require_relative '../../../lib/core_ext/object_space'
+
 
 module Grape
   module Reload

data/lib/grape/reload/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Reload
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/grape/reload/watcher.rb

@@ -14,12 +14,10 @@ module Grape
         def logger; Grape::RackBuilder.logger end
 
         def safe_load(file, options={})
-          began_at = Time.now
           return unless options[:force] || file_changed?(file)
-          # return require(file) if feature_excluded?(file)
 
           Storage.prepare(file) # might call #safe_load recursively
-          logger.devel((file_new?(file) ? "loading" : "reloading") + "#{file}" )
+          logger.debug((file_new?(file) ? "loading" : "reloading") + "#{file}" )
           begin
             with_silence{ require(file) }
             Storage.commit(file)

data/lib/ripper/extract_constants.rb

@@ -102,23 +102,13 @@ class TraversingResult
       !variants.find{|v| result[:declared].include?(v) }.nil?
     }
 
-    used = self.used.reject {|variants|
-      !variants.find{|v| result[:declared].include?(v) }.nil?
-    }
-
-    if namespace
-      ns_variants = [namespace+'::']
-      full_namespace[0..-2].reverse.each{|ns| ns_variants << ns + '::' + ns_variants.last}
-      used.each do |variants|
-        # variants = variants.reject{ |v|
-        #   !ns_variants.find{|ns_part| v.start_with?(ns_part) }.nil?
-        # }
-        result[:used] = result[:used] << variants
-      end
-    else
-      result[:used] = result[:used].concat(used)
+    used = self.used.reject {|variants| !variants.find{|v| result[:declared].include?(v) }.nil? }
+    if namespace.nil?
+      used = used.map {|variants| variants.map{|v| (v.start_with?('::') ? '' : (namespace || '') + '::') + v }}
     end
 
+    result[:used] = result[:used].concat(used)
+
     result
   end
 end
@@ -299,6 +289,7 @@ class ASTModule < ASTEntity
     }
   end
   def collect_constants(result, context)
+    result.declare_const(@module_name)
     result = result.nest(@module_name)
     context.module << @module_name
     super(result, context)

data/spec/fixtures/app2/mounts/mount.rb

@@ -1,5 +1,7 @@
 module Test
   class Mount2 < Grape::API
-
+    get :test do
+      'test'
+    end
   end
 end

data/spec/fixtures/app2/test2.rb

@@ -1,12 +1,9 @@
 module Test
   class App2 < Grape::API
     format :txt
-    mount Test::Mount2 => '/mounted'
-    # mount Test::Mount10 => '/mounted2'
-    mount Test::LibMount2 => '/lib_mounted'
-    #changed: mount Test::LibMount2 => '/lib_mounted'
+    mount Test::Mount2 => '/mounted' #changed: mount Test::Mount2 => '/mounted2'
     get :test do
-      'test2 response' #changed: 'test2 response changed'
+      'test2 response changed'
     end
   end
 end

data/spec/grape/reload/dependency_map_spec.rb

@@ -10,11 +10,27 @@ describe Grape::Reload::DependencyMap do
         },
         'file2' => {
             declared: ['::Class2'],
-            used: ['::Class1','::Class3'],
+            used: [['::Class1'],['::Class3']],
         },
         'file3' => {
             declared: ['::Class3'],
-            used: ['::Class2'],
+            used: [['::Class1']],
+        },
+    }
+  }
+  let!(:wrong_class_map) {
+    {
+        'file1' => {
+            declared: ['::Class1'],
+            used: [],
+        },
+        'file2' => {
+            declared: ['::Class2'],
+            used: [['::Class1'],['::Class3']],
+        },
+        'file3' => {
+            declared: ['::Class3'],
+            used: [['::Class5']],
         },
     }
   }
@@ -22,9 +38,13 @@ describe Grape::Reload::DependencyMap do
 
   it 'resolves dependent classes properly' do
     allow(dm).to receive(:map).and_return(file_class_map)
-    # map = instance_double(Grape::Reload::DependencyMap)
-    # allow(map).to receive(:map).and_return(file_class_map)
+    dm.resolve_dependencies!
 
     expect(dm.dependent_classes('file1')).to include('::Class2','::Class3')
   end
+
+  it "raises error if dependencies can't be resolved" do
+    allow(dm).to receive(:map).and_return(wrong_class_map)
+    expect { dm.resolve_dependencies! }.to raise_error(Grape::Reload::UnresolvedDependenciesError)
+  end
 end

data/spec/grape/reload/watcher_spec.rb

@@ -6,6 +6,7 @@ describe Grape::Reload::Watcher do
   before(:example) do
     @app =
         Grape::RackBuilder.setup do
+          add_source_path File.expand_path('**.rb', APP_ROOT)
           add_source_path File.expand_path('**/*.rb', APP_ROOT)
           environment 'development'
           reload_threshold 0
@@ -42,6 +43,20 @@ describe Grape::Reload::Watcher do
     end
   end
 
+  it 'remounts class on different root' do
+    get '/test2/mounted/test'
+    expect(last_response).to succeed
+    expect(last_response.body).to eq('test')
+
+    with_changed_fixture 'app2/test2.rb' do
+      get '/test2/mounted/test'
+      expect(last_response).to_not succeed
+
+      get '/test2/mounted2/test'
+      expect(last_response).to succeed
+    end
+  end
+
   it 'reloads library file and reinits all affected APIs' do
     with_changed_fixture 'app1/test1.rb' do
       get '/test1/lib_mounted/lib_string'

data/spec/ripper/extract_constants_spec.rb

@@ -53,6 +53,13 @@ CODE
         'test2 response'
       end
     end
+    module EmptyModule
+    end
+  end
+  class WithoutModule
+    def use_top_level
+      TopLevel.new
+    end
   end
 CODE
   }
@@ -83,15 +90,16 @@ CODE
   it 'extract consts from code2 correctly' do
     consts = Ripper.extract_constants(code2)
     expect(consts[:declared].flatten).to include(
-                '::Test::App2'
+                '::Test::App2',
+                '::Test::EmptyModule'
             )
 
     expect(consts[:used].flatten).to include(
                 '::Test::Mount2',
                 '::Test::Mount10',
                 '::Test::SomeAnotherEntity',
-                '::SomeClass'
+                '::SomeClass',
+                '::TopLevel'
             )
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-reload
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - AMar4enko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -208,6 +208,7 @@ files:
 - Rakefile
 - grape-reload.gemspec
 - lib/core_ext/object_space.rb
+- lib/core_ext/string/colorize.rb
 - lib/grape/reload.rb
 - lib/grape/reload/dependency_map.rb
 - lib/grape/reload/grape_api.rb