lolita-menu 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12f02cc75cb19a53fabd98dcbbf60884a8f90a0c
-  data.tar.gz: b1c00ff233f2e88544dbad136e5d7c3ecf2147fd
+  metadata.gz: 505f225fb1ed4299ce82086783862ce90eec17a1
+  data.tar.gz: 631d0731cd47d52dca9a4d9ec05eb2d187909706
 SHA512:
-  metadata.gz: 3d4f87a3719df14431bf739476f99d79b3788474cee160a4893b88633761eb309ec6e072327e2c0eca36c30a11fb92378cde9e12b0b9ce467dd510883fdfaea3
-  data.tar.gz: 5b10de0d6a8da8b5979a53751d8da873132a77720ddd3e73f3b5988e60946c788297bda52e0687d92e2c12f8fa23a6b35b23ba57227dbd9a2e166873c1652f48
+  metadata.gz: cd594e5a46d9e5d985e8137b13455713cc8f483918fc7e10bf99363b9ffd51a3f5ce62854baa532a24c9b957a911410566b74279e80e7d6fd8bbb543a56a4e76
+  data.tar.gz: c245d054577a989dd095d7d334b0c6ca29407d09c650b876371b98bca249ddebe102602eee505a98e8d602c2d0dd6415a5ed4b97ef7743c2ac6e82dc97a92c55

data/Gemfile

@@ -3,8 +3,8 @@ source 'http://rubygems.org'
 gemspec
 
 group :test do
-  gem 'rails', '~> 3.2.12'
+  gem 'rails', '~> 3.2'
   gem 'sqlite3', '~> 1.3.7'
   gem 'rspec-rails', '~> 2.14'
 	gem 'database_cleaner', '~> 1.0.1'
-end
+end

data/app/models/menu_item.rb

@@ -3,11 +3,10 @@ class MenuItem < ActiveRecord::Base
   include Lolita::Menu::NestedTree
   self.table_name = 'lolita_menu_items'
   
-  belongs_to :menu, :class_name => "Menu"
-  attr_accessible :lft, :rgt, :depth, :parent_id, :menu_id, :url, :name
+  belongs_to :menu, :class_name => "Menu", touch: true
 
   validates :name,:presence => true
-  validates :url, :format => {:with => /^(\/)|(http).*/}, :unless=>:root?
+  validates :url, :format => { :with => /\A(\/)|(http).*/ }, :unless=>:root?
 
   before_save :normalize_url
   

data/config/locales/sv_SE.yml

@@ -0,0 +1,24 @@
+en:
+  lolita:
+    menu:
+      notice: "Menu saved."
+      error: "Couldn't save a menu. Try again."
+      "branch created": "New menu item created."
+      "branch deleted": "Menu item deleted."
+      add_new: "Add new"
+      save_menu: "Save menu"
+    nested_tree:
+      "branch created": "Barnch %{name} created."
+      "branch deleted": "%{name} deleted."
+      notice: "%{name} successfully saved."
+      error: "%{name} failed to save. Try again."
+    menu_item:
+      new: "Ny punkt"
+  activerecord:
+    models:
+      menu_item:
+        one: Menu item
+        other: Menus
+      menu:
+        one: Menu
+        other: Menus

data/lib/lolita-menu/nested_tree.rb

@@ -111,7 +111,7 @@ module Lolita
         end
 
         def update_item(item)
-          self.where(:id => item.value_for(:item_id)).update_all(item.attribute_value_pairs_hash)         
+          self.where(:id => item.value_for(:item_id)).update_all(item.attribute_value_pairs_hash)
         end
 
         def remove_items(ids)
@@ -199,7 +199,7 @@ module Lolita
           self.class.lolita_nested_tree.scope_keys.inject({}) do |result, key|
             result[key] = self.send(key)
             result
-          end         
+          end
         end
 
         private
@@ -213,7 +213,7 @@ module Lolita
         end
 
         def am_i_new_root?
-          #scope_ids.all? && scope_records.all? && 
+          #scope_ids.all? && scope_records.all? &&
           !(self.class.with_tree_scope(self) do
             root
           end)
@@ -230,11 +230,11 @@ module Lolita
         #   scope.constantize.exists?(self.send(scope.foreign_key.to_sym))
         # end
         #end
-        
+
         def put_in_place
           if place==:append
             item = self
-            self.class.with_tree_scope(self) do 
+            self.class.with_tree_scope(self) do
               root.append(item)
             end
           end
@@ -256,7 +256,7 @@ module Lolita
 
         def recalculate_positions_after(action)
           if action==:append
-            self.class.update_all("rgt=#{self.rgt+2}","id=#{self.id}")
+            self.class.where(:id => self.id).update_all(:rgt=> self.rgt+2)
           end
         end
 
@@ -269,7 +269,7 @@ module Lolita
           }
         end
       end
-    
+
     end
   end
 end

data/lolita-menu.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = "lolita-menu"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse", "Arturs Meisters"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.summary = "Menu managing plugin for Lolita."
 
-  s.add_runtime_dependency(%q<lolita>, [">= 3.3.1", "~> 3.3"])
+  s.add_runtime_dependency(%q<lolita>, [">= 3.3"])
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test_orm,spec}/*`.split("\n")
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-menu
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - ITHouse
@@ -9,26 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.3.1
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.3.1
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
 description: Manage public menus for each project inside Lolita.
@@ -39,9 +33,9 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .gitignore
-- .rspec
+- ".document"
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - History.rdoc
 - LICENSE.txt
@@ -71,6 +65,7 @@ files:
 - app/views/components/lolita/menu_item/_display.html.haml
 - config/locales/en.yml
 - config/locales/lv.yml
+- config/locales/sv_SE.yml
 - config/routes.rb
 - lib/generators/lolita/menu/install_generator.rb
 - lib/generators/lolita/menu/templates/lolita-menu-urls.rb
@@ -122,17 +117,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Menu managing plugin for Lolita.