conscious_concern 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 559534918c88c4e55b8113dd0dba18daa4e171bd
-  data.tar.gz: b0a7671cd745e860db7c6274261f34d65fb610c5
+  metadata.gz: 38311a8767fe5fb909bcb0df55685ac8537b2039
+  data.tar.gz: 52248dc0fe825eafaf20cb14cbaaaf6e675d9979
 SHA512:
-  metadata.gz: 1642114461e8557f63a3956315b7a88286587f77b05c69c1e336e646d0d351c9ed0b48aba1a41a1dfe0ef555a407dd5118434a53d281e425a1d13cf6a820d599
-  data.tar.gz: aa93ab08efd2cf323d3c5fc02592fad8318d55c14e2fcee2f1ce293e899d26abb8de14a8533a22961ac393067b0d832a8f142a80df91bc5bae1c244439dff5cf
+  metadata.gz: 45059c9c9e8e72666f8a428268d691819ea833c2a0e4317fcb0c1db8b8b376340e616d5ca1d661c3d9d3c71b6cc9b57539d21cb56238a2e29ab5bdee698bc672
+  data.tar.gz: b44c47bcd9af6a5c136c6d93e90261e33dfc773b39609c882a9b40769c30bbccc2287edcec76dd776c69c3f9f90e77e1136d6e0f0e4bdaf54981a0eb1f75d3c1

data/lib/conscious_concern.rb

@@ -52,7 +52,7 @@ module ConsciousConcern
   alias_method :_models, :models
 
   def resources(options = { only: [] }, &resource_routing_block)
-    resource_args = _tables
+    resource_args = _undecorated_table_names
     app_routes_block = resource_routing_block.binding.eval('self')
     app_routes_block.instance_eval do
       resources(*resource_args, options, &resource_routing_block)
@@ -64,6 +64,11 @@ module ConsciousConcern
   end
   alias_method :_tables, :tables
 
+  def undecorated_table_names
+    _models.map { |model| model.try(:send, :undecorated_table_name) }.compact
+  end
+  alias_method :_undecorated_table_names, :undecorated_table_names
+
   def let_controllers(method_args_hash)
     _classes_loaded_callbacks << proc do
       method_args_hash.each do |method, args|

data/lib/conscious_concern/eager_loader.rb

@@ -27,13 +27,15 @@ module ConsciousConcern
     end
 
     def self.load_class_at_path(path)
+      # silence harmless 'already initialized constant' warnings that might
+      # occur due to Rails autoload having previously loaded some constants.
       silence_warnings do
         require path
-        clazz = File.basename(path, '.*').classify.constantize
-        puts "eager loaded class '#{clazz}'" if debug
+        puts "eager loaded class at #{path}" if debug
       end
     rescue LoadError, StandardError => e
-      puts e.message if debug
+      return puts(e.message) if debug
+      raise e unless e.message =~ /(previous definition|define multiple)/
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conscious_concern
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Janosch Müller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -143,3 +143,4 @@ signing_key:
 specification_version: 4
 summary: Enhances ActiveSupport::Concern
 test_files: []
+has_rdoc: