dynamic_menu 3.0.1 → 3.0.2

data/lib/dynamic_menu/base.rb

@@ -21,7 +21,7 @@ module DynamicMenu
       #@menuLinks ||= AdvancedHash::AdvancedHash.new
       file = Rails.root.to_s+"/app/menus/#{params[:controller]}/#{menu_name}.rb"
       load file
-      links_obj = "#{menu_name}Menu".classify.constantize.new(@parent)
+      links_obj = "#{menu_name}_menu".camelize.classify.constantize.new(@parent)
       @menuLinks.concat(links_obj.get_menu_links)
     end
     

data/lib/dynamic_menu/inheritable_menus.rb

@@ -5,28 +5,23 @@ module DynamicMenu
     def get_current_menu
       path = Rails.root.join('app/menus')
       full_path = path + "#{params[:controller]}/#{params[:action]}.rb"
+      second_chance = path + "#{params[:controller]}/#{try_again? params[:action]}.rb"
+      logger.debug("Dynamic Menu:\n\r\tFirst Chance: #{params[:action]}\n\r\tSecond Chance: #{try_again? params[:action]}")
       if File.exists?(full_path)
         load full_path
-        "#{params[:action]}Menu".classify.constantize.new(self)
-      else
-      #Depending on the action (for example edit) it should look for a relationship (:create=:new or :update=:edit)
-      end
-    end
-
-    def dynamic_menu_file_loader controller, action
-      path = Rails.root.join('app/menus')
-      full_path += "#{controller}/#{action}.rb"
-      try_again_des = try_again? action
-      if !try_again_des.nil?
-        dynamic_menu_file_loader controller, try_again_des
+        "#{params[:action]}_menu".classify.constantize.new(self)
+      elsif File.exists?(second_chance)
+      #Depending on the action (for example edit) it should look for a relationship (:create=:new or :update=:edit
+        load second_chance
+        "#{try_again? params[:action]}_menu".classify.constantize.new(self)
       end
     end
 
     def try_again? action
-      if action == :create
-         return :new
-       elsif action == :update
-         return :edit
+      if action == "create"
+         return "new"
+       elsif action == "update"
+         return "edit"
       end
     end
 

data/lib/dynamic_menu/version.rb

@@ -1,3 +1,3 @@
 module DynamicMenu
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/lib/generators/dynamic_menu/templates/menu.rb

@@ -1,4 +1,4 @@
-class <%= @menu_name.capitalize %>Menu < DynamicMenu::Base
+class <%= "#{@menu_name}_menu".classify %>< DynamicMenu::Base
 	def build_menu
     add link_to "Change me","#" if can? :read, All #change this line and add lines using add
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_menu
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -215,3 +215,4 @@ test_files:
 - test/dummy/tmp/cache/assets/development/sprockets/fb73ad3c1bb98bc69153c7f8a81f41aa
 - test/dynamic_menu_test.rb
 - test/test_helper.rb
+has_rdoc: