tkh_menus 0.9 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30f5ee35362e91a1a968842739db8203250eddb3
-  data.tar.gz: d8be19c9f491f61e2dbc27ab4a57cdbd4fb5bbed
+  metadata.gz: 9d2db02e4875f038bcec6574c3c5c1763bbd79ca
+  data.tar.gz: b6d887a2de36f34319d32850ea3f6d01618150f9
 SHA512:
-  metadata.gz: 2cf8511c1507d518450ea549f74c927f40d2830ce980db36de8462bec8ec1e4bfb62d6fdf317a1bbb7d013045322ff13cd815af56b476451a8b92cf46813f481
-  data.tar.gz: 16f0ce92d45c8b80bf1cf0f30725331e78344218278823d487564c4735ec4e42b8180ba88cec811277b9154dfffa77623e0ff5b39cb0963a4d42a99e563ef999
+  metadata.gz: 01a27b2b33ebad980aa99801fd7d526d9c641ca326d99502cc0e55d46f0a139c25a0dca5edb09b0ccc81db5d30d467acbabe0f457457f73831b9d0870463642c
+  data.tar.gz: 5f1bbd8980ac83fb2e1e02af6e9d9652a0dc7b03f50a49469eb21d62d652f5a68ba51ba25ca3e45707b5723869491e747e69eda1ac8c84eccef67de702857d64

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 
 
+
+## 0.9.1
+
+* Upgraded to Rails 4
+* Upgraded all dependencies
+
+
 ## 0.3.3
 
 * Turned off browser autocomplete from menu form, parent menu field

data/app/controllers/menus_controller.rb

@@ -1,8 +1,8 @@
 class MenusController < ApplicationController
-  
+
   before_filter :authenticate
   before_filter :authenticate_with_admin
-  
+
   def index
     @menus = Menu.ordered
     switch_to_admin_layout
@@ -19,7 +19,7 @@ class MenusController < ApplicationController
   end
 
   def create
-    @menu = Menu.new(params[:menu])
+    @menu = Menu.new(menu_params)
     if @menu.save
       redirect_to menus_path, notice: t('menus.create.notice')
     else
@@ -29,7 +29,7 @@ class MenusController < ApplicationController
 
   def update
     @menu = Menu.find(params[:id])
-    if @menu.update_attributes(params[:menu])
+    if @menu.update(menu_params)
       redirect_to menus_path, notice: t('menus.update.notice')
     else
       render action: "edit", warning: t('menus.update.warning'), layout: 'admin'
@@ -41,4 +41,11 @@ class MenusController < ApplicationController
     @menu.destroy
     redirect_to menus_url, notice: t('menus.destroy.notice')
   end
+
+  private
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def menu_params
+    params.require(:menu).permit(:name, :path, :parent_id, :parent_menu_name)
+  end
 end

data/app/models/menu.rb

@@ -1,50 +1,50 @@
 # this is needed for now to make mass assignment security compatible with the translation of globalize3
-Globalize::ActiveRecord::Translation.class_eval do
-  attr_accessible :locale
-end
+# Globalize::ActiveRecord::Translation.class_eval do
+#   attr_accessible :locale
+# end
 
 class Menu < ActiveRecord::Base
-  
-  attr_accessible :name, :path, :position, :parent_id, :parent_menu_name
-  
+
+  # attr_accessible :name, :path, :position, :parent_id, :parent_menu_name
+
   validates_presence_of :name, :path
-  
+
   translates :name, :path
-    
+
   def to_param
     name ? "#{id}-#{name.to_url}" : id
   end
-  
-  scope :alphabetical, order('name')
-  scope :ordered, order('position, id')
+
+  scope :alphabetical, -> { order('name') }
+  scope :ordered, -> { order('position, id') }
   # tree scopes
-  scope :orphans, where('parent_id IS ?', nil)
+  scope :orphans,  -> { where('parent_id IS ?', nil) }
   scope :with_parent_id, lambda { |id| where('parent_id = ?', id) }
-  
+
   def orphan?
     parent_id == nil
   end
-  
+
   def has_children?
     Menu.with_parent_id(id).count >= 1
   end
-  
+
   def children
     Menu.with_parent_id(id)
   end
-  
+
   def parent
     Menu.find(parent_id)
   end
-  
+
   def has_siblings?
     Menu.with_parent_id(parent_id).count >= 1
   end
-  
+
   def siblings
     Menu.with_parent_id(parent_id)
   end
-  
+
   ### autocomplete related instance methods
   def parent_menu_name
       parent.try(:name) unless self.orphan?
@@ -57,5 +57,5 @@ class Menu < ActiveRecord::Base
       self.parent_id = nil
     end
   end
-  
+
 end

data/lib/tkh_menus/version.rb

@@ -1,3 +1,3 @@
 module TkhMenus
-  VERSION = "0.9"
+  VERSION = "0.9.1"
 end

data/lib/tkh_menus.rb

@@ -1,7 +1,7 @@
 require "tkh_menus/version"
 require 'simple_form'
 require 'stringex'
-require 'globalize3'
+require 'globalize'
 
 module TkhMenus
   class Engine < ::Rails::Engine

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: tkh_menus
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: 0.9.1
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: stringex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
-  name: simple_form
+  name: globalize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Menu engine for the TKH CMS.