grape-reload 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf764d2710409ccf448fb1a9b1878611ae510b28
-  data.tar.gz: 74bb786cd48bd89ac78e95e955680bb695e30846
+  metadata.gz: da9b9fe811b2d7cba4c719a8bc5046cbc2fb97a3
+  data.tar.gz: 5698e1ff3994a6982222643bce5b3bbfc2dbbd21
 SHA512:
-  metadata.gz: 9b918ce662a102851066936b2bb1c3a534af0dfbee84a900e0692f80095ef67905bdf47c8c7773c26619a6b64c8e826403bad8bfe184734cde1c8c035fc96b36
-  data.tar.gz: 21a8509583dc86cb23b3747536c32090fb88deeb415bb44ff277797193a95f6368d181ae51865e43d9f96fb4a72d4d92766cb6ca82e83ef2caf93844983d4291
+  metadata.gz: 3e63acc751942a9d1c39439d608f2e65d7508c9f34aae731a7bb5157b6569a1113bac0b8f635c33cd022bd284d0daba18c29151e48a3f980702aa224af377bde
+  data.tar.gz: ee0f36a0cd76bd6c317cec13bf94afcc5d417e4841d7970c10d0201aa717af25e068aa8145ab6b6b68335a0be14b1e2da700d2a0d72af796e47959e8c126ea88

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
   - jruby
   - 2.0.0
   - 2.1.2
+  - 2.2.0
 
 script: 'bundle exec rake'
 

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in grape-reload.gemspec
-gemspec
+gemspec

data/grape-reload.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "grape", "~> 0.9"
+  spec.add_runtime_dependency "grape", "~> 0.10.1"
   spec.add_runtime_dependency "rack", "~> 1.5.2"
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/lib/grape/reload/dependency_map.rb

@@ -24,7 +24,14 @@ module Grape
       def initialize(sources)
         @sources = sources
         files = @sources.map{|p| Dir[p]}.flatten.uniq
-        @map = Hash[files.zip(files.map{|file| Ripper.extract_constants(File.read(file))})]
+        @map = Hash[files.zip(files.map do |file|
+                                begin
+                                  Ripper.extract_constants(File.read(file))
+                                rescue
+                                  Grape::RackBuilder.logger.error("Theres is an error while parsing #{file}")
+                                  []
+                                end
+                              end)]
       end
 
       def sorted_files

data/lib/grape/reload/grape_api.rb

@@ -35,6 +35,12 @@ end
 
 module Grape
   module Reload
+    module EndpointPatch
+      def clear_inheritable_settings!
+        @inheritable_settings.clear
+      end
+    end
+
     module AutoreloadInterceptor
       extend ActiveSupport::Concern
 
@@ -63,17 +69,33 @@ module Grape
 METHOD
         end
 
-        def reinit!
-          declaration = class_declaration.dup
+        def fire_definitions!
+          @declaration_cache.each {|decl|
+            send(decl[0],*deep_reconstantize.call(decl[1]),&decl[2])
+          }
+
+          endpoints.each { |e|
+            if e.options[:app].respond_to?('fire_definitions!')
+              e.options[:app].inheritable_setting.inherit_from(e.options[:app].inheritable_setting.parent)
+              e.options[:app].fire_definitions!
+            end
+
+          }
+        end
+
+        def reinit!(root = true)
+          @declaration_cache = class_declaration.dup
           @class_decl = []
           endpoints_cache = endpoints
           reset!
-          endpoints_cache.each { |e| e.options[:app].reinit! if e.options[:app].respond_to?('reinit!') }
-
-          declaration.each {|decl|
-            send(decl[0],*deep_reconstantize.call(decl[1]),&decl[2])
+          inheritable_setting.clear!
+          top_level_setting.clear!
+          endpoints_cache.each { |e|
+            e.inheritable_setting.clear!
+            e.options[:app].reinit!(false) if e.options[:app].respond_to?('reinit!')
           }
           change!
+          fire_definitions! if root
         end
 
         def recursive_!
@@ -103,9 +125,28 @@ METHOD
   end
 end
 
+module Grape
+  module Util
+    class InheritableSetting
+      def clear!
+        self.route = {}
+        self.api_class = {}
+        self.namespace = InheritableValues.new # only inheritable from a parent when
+        # used with a mount, or should every API::Class be a seperate namespace by default?
+        self.namespace_inheritable = InheritableValues.new
+        self.namespace_stackable = StackableValues.new
+
+        self.point_in_time_copies = []
+
+        # self.parent = nil
+      end
+    end
+  end
+end
+
+
 Grape::API.singleton_class.class_eval do
   alias_method :inherited_shadowed, :inherited
-  alias_method :settings_shadowed, :settings
   def inherited(*args)
     inherited_shadowed(*args)
     args.first.class_eval do

data/lib/grape/reload/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Reload
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

data/lib/grape/reload/watcher.rb

@@ -7,7 +7,7 @@ module Grape
     module Watcher
       class << self
         MTIMES = {}
-        # include Padrino::Reloader
+
         attr_reader :sources
         def rack_builder; Grape::RackBuilder end
 

data/lib/ripper/extract_constants.rb

@@ -197,7 +197,7 @@ end
 class ASTBody < ASTEntity
   def self.ripper_id; :bodystmt end
   def initialize(*args)
-    @body = args.first.map{ |node| ASTEntity.node_for(node) }
+    @body = args.reject(&:nil?).map{ |node| ASTEntity.node_for(node) }
   end
   def collect_constants(result, context)
     context[:variable_assignment] = false
@@ -350,9 +350,7 @@ class ASTModule < ASTEntity
   def self.ripper_id; :module end
   def initialize(*args)
     @module_name = args.find{|a| a.first == :const_ref}.last[1]
-    @body = args.find{|a| a.first == :bodystmt}[1].map{|node|
-      ASTEntity.node_for(node)
-    }
+    @body = [ASTEntity.node_for(args.find{|a| a.first == :bodystmt})]
   end
   def collect_constants(result, context)
     result.declare_const(@module_name)
@@ -387,9 +385,30 @@ class ASTLambda < ASTEntity
   end
 end
 
+class ASTStatementsAdd < ASTEntity
+  def self.ripper_id; :stmts_add end
+  def initialize(*args)
+    super(*args)
+  end
+end
+
+class ASTStatementsNew < ASTEntity
+  def self.ripper_id; :stmts_new end
+  def initialize(*args)
+    super(*args)
+  end
+end
+
+class ASTStatementsProgram < ASTEntity
+  def self.ripper_id; :program end
+  def initialize(*args)
+    super(args.first)
+  end
+end
+
 class Ripper
   def self.extract_constants(code)
-    ast = Ripper.sexp(code)
+    ast = Ripper.sexp_raw(code)
     result = ASTEntity.node_for(ast).collect_constants(TraversingResult.new)
     consts = result.extract_consts
     consts[:declared].flatten!

data/spec/ripper/extract_constants_spec.rb

@@ -28,7 +28,7 @@ module Test
   CONST_DEF2 = Test3::AnotherClass
   CONST_DEF3 = SomeExternalClass
   class Test < Superclass
-    test_class_method {params: SomeClass}
+    test_class_method({params: SomeClass})
 
     def test_method
       SomeClass1.call_method

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-reload
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - AMar4enko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -252,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Grape autoreload gem