godmin 0.12.2 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bb2915931cb75703a3b3bffc12bb57a9b29cc97
-  data.tar.gz: 6c7247808002572bd0fe122615c82dde755be974
+  metadata.gz: 7ca2bcb850c5153d711926873311e9bcd6b097cc
+  data.tar.gz: dd1743579d7a139f5d46fe46fc9ba531d9944a45
 SHA512:
-  metadata.gz: 93690b6ab331b871865ebd7a9af79626e7bec7d4f066476c6118c42769855e10da4d83ddaf3d38bc89b10c34f2cc6798231d0c5b6b9d8769271cdc7aee9239d9
-  data.tar.gz: 9f7fe59b58bc5032c4734cf9f0e734e4b9b301c76edf9ad0b52b92e55943b98b44c427ce0ba41624a88a8e01431a56a788197744726597dd1c47e55e7ea71b15
+  metadata.gz: a1631d2deb602e75080c84ede97d5b8a019f50730679102fc9f254410c66e0d9d161796bad023618771d1b568662fab72ee920512cc4e5c9aa04fce482bb6d38
+  data.tar.gz: b3e86c7325e55d74cab0e5b54c1f9eb63c88cf27a7591c61da97f50f8b9dd6c9bac83870920f50da8c8e6afb253ceabf2eb2e548ffc7e7eb6bfc8b5800d23bb2

data/.gitignore

@@ -24,4 +24,4 @@ config/initializers/secret_token.rb
 /test/dummy/tmp/*
 /test/dummy/db/*.sqlite3
 Gemfile.lock
-tags
+.tags

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 0.12.3 - 2015-09-18
+Bug fixes
+- Adds support for plural engines (https://github.com/varvet/godmin/pull/128)
+- Remove turbolinks from application.js if present (https://github.com/varvet/godmin/issues/129)
+
 ### 0.12.2 - 2015-09-07
 Bug fixes
 - Fixes broken sign in page

data/lib/generators/godmin/install/install_generator.rb

@@ -22,9 +22,13 @@ class Godmin::InstallGenerator < Godmin::Generators::Base
   end
 
   def modify_application_js
-    inject_into_file File.join("app/assets/javascripts", namespaced_path, "application.js"), before: "//= require_tree ." do
+    application_js = File.join("app/assets/javascripts", namespaced_path, "application.js")
+
+    inject_into_file application_js, before: "//= require_tree ." do
       "//= require godmin\n"
     end
+
+    gsub_file application_js, /\/\/= require turbolinks\n/, ""
   end
 
   def modify_application_css

data/lib/godmin/engine_wrapper.rb

@@ -17,7 +17,7 @@ module Godmin
     def namespaced_path
       @namespaced_path ||= begin
         if namespaced?
-          namespace.name.classify.split("::").map(&:underscore)
+          namespace.name.split("::").map(&:underscore)
         else
           []
         end

data/lib/godmin/generators/base.rb

@@ -22,7 +22,7 @@ module Godmin
       def namespaced_path
         @namespaced_path ||= begin
           if namespaced?
-            namespace.name.classify.split("::").map(&:underscore)
+            namespace.name.split("::").map(&:underscore)
           else
             []
           end

data/lib/godmin/version.rb

@@ -1,3 +1,3 @@
 module Godmin
-  VERSION = "0.12.2"
+  VERSION = "0.12.3"
 end

data/test/lib/godmin/engine_wrapper_test.rb

@@ -10,6 +10,14 @@ module Godmin
       class Controller < ActionController::Base; end
     end
 
+    module Admins
+      class Engine < Rails::Engine
+        isolate_namespace Admins
+      end
+
+      class Controller < ActionController::Base; end
+    end
+
     class Controller < ActionController::Base; end
 
     def test_default_namespace
@@ -47,6 +55,11 @@ module Godmin
       assert_equal ["godmin", "engine_wrapper_test", "admin"], engine_wrapper.namespaced_path
     end
 
+    def test_plural_engine_namespaced_path
+      engine_wrapper = EngineWrapper.new(Admins::Controller)
+      assert_equal ["godmin", "engine_wrapper_test", "admins"], engine_wrapper.namespaced_path
+    end
+
     def test_engine_root
       engine_wrapper = EngineWrapper.new(Admin::Controller)
       assert_equal Admin::Engine.root, engine_wrapper.root

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: godmin
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Jens Ljungblad
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt