lolita-menu 0.0.15 → 0.1.0

data/Gemfile

@@ -1,7 +1,6 @@
 source "http://rubygems.org"
 
-gem 'lolita','~>3.1.6'
-gem 'haml', :require=>true
+gem 'lolita','~>3.2.0.rc1'
 
 group :development, :test do
   gem 'rspec', '~>2.6.0'

data/History.rdoc

@@ -1,3 +1,7 @@
+=== Version 0.1.0 / 
+* Changes
+  * Works with lolita 3.2.0 and rails 3.1.0
+  
 === Version 0.0.15 / 2011-08-24
 * Bug fixes
   * require problem in generate_urls fixed
@@ -5,9 +9,11 @@
 === Version 0.0.14 / 2011-08-24
 * Bug fixes
   * reading form files fixed for autcomplete
+
 === Version 0.0.13 / 2011-08-24
 * Bug fixes
   * Fixed rake task environment loading problem.
+  
 === Version 0.0.12 / 2011-08-23
 * Enhancements
   * Autocomplete for url added

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.1.0

data/app/controllers/menu_items_controller.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 class MenuItemsController < ActionController::Base
   include Lolita::Controllers::UserHelpers
+  include Lolita::Controllers::InternalHelpers
 
   before_filter :authenticate_lolita_user!
   
@@ -13,7 +14,7 @@ class MenuItemsController < ActionController::Base
     menu=Menu.find_by_id(params[:menu_id])
     item=MenuItem.create!(:name=>"new item",:url=>"/",:menu_id => params[:menu_id])
     menu.append(item)
-    response.headers["Lolita-Notice"] = I18n.t("lolita.menu.branch created")
+    notice(I18n.t("lolita.menu.branch created"))
     render_component "lolita/menu_items", :row, :item => item, :menu => menu
   end
 
@@ -31,9 +32,9 @@ class MenuItemsController < ActionController::Base
     menu=Menu.find_by_id(params[:menu_id])
 
     if menu && menu.update_whole_tree(params[:items])
-      response.headers["Lolita-Notice"] = I18n.t("lolita.menu.notice")
+      notice I18n.t("lolita.menu.notice")
     else
-      response.headers["Lolita-Error"] = I18n.t("lolita.menu.error")
+      error I18n.t("lolita.menu.error")
     end
 
     render :nothing=>true
@@ -42,7 +43,11 @@ class MenuItemsController < ActionController::Base
   def destroy
     item=MenuItem.find_by_id(params[:id])
     item.destroy
-    response.headers["Lolita-Notice"] = I18n.t("lolita.menu.branch deleted")
+    notice I18n.t("lolita.menu.branch deleted")
     render :json=>{:id=>item.id}
   end
+
+  def is_lolita_resource?
+    true
+  end 
 end

data/app/views/components/lolita/menu/_columns_body.html.haml

@@ -1,7 +1,6 @@
 %tbody
   - page.each_with_index do |record,index| 
     %tr{:class => "#{index % 2 == 0 ? "even" : "odd"} openable-row",:"data-id"=>record.id}
-      = render_component columns,:first,:record=>record
       - columns.each do |column|
         %td
           = column.formatter.with(record.send(column.name.to_sym),record).to_s

data/lib/generators/lolita_menu/install_generator.rb

@@ -6,7 +6,7 @@ module LolitaMenu
       include Rails::Generators::Migration
 
       source_root File.expand_path("../templates", __FILE__)
-      desc "Copy assets and create migrations. "
+      desc "Create migrations. "
 
       def self.next_migration_number(dirname)
        if ActiveRecord::Base.timestamped_migrations
@@ -16,10 +16,6 @@ module LolitaMenu
        end
      end
 
-      def copy_assets
-        generate("lolita_menu:assets")
-      end
-
       def create_menu_migrations
         begin
           migration_template "migrations/create_menus.rb", "db/migrate/create_lolita_menus.rb" 
@@ -35,4 +31,4 @@ module LolitaMenu
 
     end
   end
-end
+end

data/lolita-menu.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{lolita-menu}
-  s.version = "0.0.15"
+  s.name = "lolita-menu"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{ITHouse}, %q{Arturs Meisters}]
-  s.date = %q{2011-08-24}
-  s.description = %q{Manage public menus for each project inside Lolita.}
-  s.email = %q{support@ithouse.lv}
+  s.authors = ["ITHouse", "Arturs Meisters"]
+  s.date = "2011-09-05"
+  s.description = "Manage public menus for each project inside Lolita."
+  s.email = "support@ithouse.lv"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -24,6 +24,27 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "app/assets/images/lolita-menu/delete.png",
+    "app/assets/images/lolita-menu/move.png",
+    "app/assets/javascripts/autocomplete-rails.js",
+    "app/assets/javascripts/jquery-ui-nested-sortables.js",
+    "app/assets/javascripts/lolita/menu-items.js",
+    "app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png",
+    "app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_flat_0_eeeeee_40x100.png",
+    "app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_flat_55_c0402a_40x100.png",
+    "app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_flat_55_eeeeee_40x100.png",
+    "app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png",
+    "app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_glass_35_dddddd_1x400.png",
+    "app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_glass_60_eeeeee_1x400.png",
+    "app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_inset-hard_75_999999_1x100.png",
+    "app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png",
+    "app/assets/stylesheets/jquery-ui/overcast/images/ui-icons_3383bb_256x240.png",
+    "app/assets/stylesheets/jquery-ui/overcast/images/ui-icons_454545_256x240.png",
+    "app/assets/stylesheets/jquery-ui/overcast/images/ui-icons_70b2e1_256x240.png",
+    "app/assets/stylesheets/jquery-ui/overcast/images/ui-icons_999999_256x240.png",
+    "app/assets/stylesheets/jquery-ui/overcast/images/ui-icons_fbc856_256x240.png",
+    "app/assets/stylesheets/jquery-ui/overcast/jquery-ui-1.8.16.custom.css",
+    "app/assets/stylesheets/lolita/menu/style.css",
     "app/controllers/menu_items_controller.rb",
     "app/models/menu.rb",
     "app/models/menu_item.rb",
@@ -36,7 +57,6 @@ Gem::Specification.new do |s|
     "config/locales/en.yml",
     "config/locales/lv.yml",
     "config/routes.rb",
-    "lib/generators/lolita_menu/assets_generator.rb",
     "lib/generators/lolita_menu/install_generator.rb",
     "lib/generators/lolita_menu/templates/lolita-menu-urls.rb",
     "lib/generators/lolita_menu/templates/migrations/create_menu_items.rb",
@@ -50,27 +70,6 @@ Gem::Specification.new do |s|
     "lib/lolita-menu/railtie.rb",
     "lib/tasks/lolita-menu.rake",
     "lolita-menu.gemspec",
-    "public/images/lolita-menu/delete.png",
-    "public/images/lolita-menu/move.png",
-    "public/javascripts/autocomplete-rails.js",
-    "public/javascripts/jquery-ui-nested-sortables.js",
-    "public/javascripts/lolita/menu-items.js",
-    "public/stylesheets/jquery-ui/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png",
-    "public/stylesheets/jquery-ui/overcast/images/ui-bg_flat_0_eeeeee_40x100.png",
-    "public/stylesheets/jquery-ui/overcast/images/ui-bg_flat_55_c0402a_40x100.png",
-    "public/stylesheets/jquery-ui/overcast/images/ui-bg_flat_55_eeeeee_40x100.png",
-    "public/stylesheets/jquery-ui/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png",
-    "public/stylesheets/jquery-ui/overcast/images/ui-bg_glass_35_dddddd_1x400.png",
-    "public/stylesheets/jquery-ui/overcast/images/ui-bg_glass_60_eeeeee_1x400.png",
-    "public/stylesheets/jquery-ui/overcast/images/ui-bg_inset-hard_75_999999_1x100.png",
-    "public/stylesheets/jquery-ui/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png",
-    "public/stylesheets/jquery-ui/overcast/images/ui-icons_3383bb_256x240.png",
-    "public/stylesheets/jquery-ui/overcast/images/ui-icons_454545_256x240.png",
-    "public/stylesheets/jquery-ui/overcast/images/ui-icons_70b2e1_256x240.png",
-    "public/stylesheets/jquery-ui/overcast/images/ui-icons_999999_256x240.png",
-    "public/stylesheets/jquery-ui/overcast/images/ui-icons_fbc856_256x240.png",
-    "public/stylesheets/jquery-ui/overcast/jquery-ui-1.8.16.custom.css",
-    "public/stylesheets/lolita/menu/style.css",
     "spec/controllers/menu_items_controller_spec.rb",
     "spec/models/menu_item_spec.rb",
     "spec/models/menu_spec.rb",
@@ -83,11 +82,11 @@ Gem::Specification.new do |s|
     "test_orm/rails/config/application.rb",
     "test_orm/rails/config/enviroment.rb"
   ]
-  s.homepage = %q{http://github.com/ithouse/lolita-menu}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.8}
-  s.summary = %q{Menu managing plugin for Lolita.}
+  s.homepage = "http://github.com/ithouse/lolita-menu"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Menu managing plugin for Lolita."
   s.test_files = [
     "spec/controllers/menu_items_controller_spec.rb",
     "spec/models/menu_item_spec.rb",
@@ -99,8 +98,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<lolita>, ["~> 3.1.6"])
-      s.add_runtime_dependency(%q<haml>, [">= 0"])
+      s.add_runtime_dependency(%q<lolita>, ["~> 3.2.0.rc1"])
       s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.6.0"])
@@ -110,8 +108,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<lolita>, ["~> 3.1.6"])
-      s.add_dependency(%q<haml>, [">= 0"])
+      s.add_dependency(%q<lolita>, ["~> 3.2.0.rc1"])
       s.add_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.6.0"])
@@ -122,8 +119,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<lolita>, ["~> 3.1.6"])
-    s.add_dependency(%q<haml>, [">= 0"])
+    s.add_dependency(%q<lolita>, ["~> 3.2.0.rc1"])
     s.add_dependency(%q<rspec>, ["~> 2.6.0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.6.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-menu
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,33 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-24 00:00:00.000000000Z
+date: 2011-09-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
-  requirement: &85196560 !ruby/object:Gem::Requirement
+  requirement: &76685050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.2.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *85196560
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &85195860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *85195860
+  version_requirements: *76685050
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &85195220 !ruby/object:Gem::Requirement
+  requirement: &76684500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +33,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *85195220
+  version_requirements: *76684500
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &85194740 !ruby/object:Gem::Requirement
+  requirement: &76684140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85194740
+  version_requirements: *76684140
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &85194260 !ruby/object:Gem::Requirement
+  requirement: &76683850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +55,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *85194260
+  version_requirements: *76683850
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &85193830 !ruby/object:Gem::Requirement
+  requirement: &76683590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85193830
+  version_requirements: *76683590
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &85193310 !ruby/object:Gem::Requirement
+  requirement: &76683240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85193310
+  version_requirements: *76683240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &85192830 !ruby/object:Gem::Requirement
+  requirement: &76682860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +88,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *85192830
+  version_requirements: *76682860
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &85192320 !ruby/object:Gem::Requirement
+  requirement: &76682520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +99,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *85192320
+  version_requirements: *76682520
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &85191630 !ruby/object:Gem::Requirement
+  requirement: &76556460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85191630
+  version_requirements: *76556460
 description: Manage public menus for each project inside Lolita.
 email: support@ithouse.lv
 executables: []
@@ -137,6 +126,27 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/assets/images/lolita-menu/delete.png
+- app/assets/images/lolita-menu/move.png
+- app/assets/javascripts/autocomplete-rails.js
+- app/assets/javascripts/jquery-ui-nested-sortables.js
+- app/assets/javascripts/lolita/menu-items.js
+- app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png
+- app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_flat_0_eeeeee_40x100.png
+- app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_flat_55_c0402a_40x100.png
+- app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_flat_55_eeeeee_40x100.png
+- app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png
+- app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_glass_35_dddddd_1x400.png
+- app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_glass_60_eeeeee_1x400.png
+- app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_inset-hard_75_999999_1x100.png
+- app/assets/stylesheets/jquery-ui/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png
+- app/assets/stylesheets/jquery-ui/overcast/images/ui-icons_3383bb_256x240.png
+- app/assets/stylesheets/jquery-ui/overcast/images/ui-icons_454545_256x240.png
+- app/assets/stylesheets/jquery-ui/overcast/images/ui-icons_70b2e1_256x240.png
+- app/assets/stylesheets/jquery-ui/overcast/images/ui-icons_999999_256x240.png
+- app/assets/stylesheets/jquery-ui/overcast/images/ui-icons_fbc856_256x240.png
+- app/assets/stylesheets/jquery-ui/overcast/jquery-ui-1.8.16.custom.css
+- app/assets/stylesheets/lolita/menu/style.css
 - app/controllers/menu_items_controller.rb
 - app/models/menu.rb
 - app/models/menu_item.rb
@@ -149,7 +159,6 @@ files:
 - config/locales/en.yml
 - config/locales/lv.yml
 - config/routes.rb
-- lib/generators/lolita_menu/assets_generator.rb
 - lib/generators/lolita_menu/install_generator.rb
 - lib/generators/lolita_menu/templates/lolita-menu-urls.rb
 - lib/generators/lolita_menu/templates/migrations/create_menu_items.rb
@@ -163,27 +172,6 @@ files:
 - lib/lolita-menu/railtie.rb
 - lib/tasks/lolita-menu.rake
 - lolita-menu.gemspec
-- public/images/lolita-menu/delete.png
-- public/images/lolita-menu/move.png
-- public/javascripts/autocomplete-rails.js
-- public/javascripts/jquery-ui-nested-sortables.js
-- public/javascripts/lolita/menu-items.js
-- public/stylesheets/jquery-ui/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png
-- public/stylesheets/jquery-ui/overcast/images/ui-bg_flat_0_eeeeee_40x100.png
-- public/stylesheets/jquery-ui/overcast/images/ui-bg_flat_55_c0402a_40x100.png
-- public/stylesheets/jquery-ui/overcast/images/ui-bg_flat_55_eeeeee_40x100.png
-- public/stylesheets/jquery-ui/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png
-- public/stylesheets/jquery-ui/overcast/images/ui-bg_glass_35_dddddd_1x400.png
-- public/stylesheets/jquery-ui/overcast/images/ui-bg_glass_60_eeeeee_1x400.png
-- public/stylesheets/jquery-ui/overcast/images/ui-bg_inset-hard_75_999999_1x100.png
-- public/stylesheets/jquery-ui/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png
-- public/stylesheets/jquery-ui/overcast/images/ui-icons_3383bb_256x240.png
-- public/stylesheets/jquery-ui/overcast/images/ui-icons_454545_256x240.png
-- public/stylesheets/jquery-ui/overcast/images/ui-icons_70b2e1_256x240.png
-- public/stylesheets/jquery-ui/overcast/images/ui-icons_999999_256x240.png
-- public/stylesheets/jquery-ui/overcast/images/ui-icons_fbc856_256x240.png
-- public/stylesheets/jquery-ui/overcast/jquery-ui-1.8.16.custom.css
-- public/stylesheets/lolita/menu/style.css
 - spec/controllers/menu_items_controller_spec.rb
 - spec/models/menu_item_spec.rb
 - spec/models/menu_spec.rb
@@ -210,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 229476659
+      hash: -1058457811
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -219,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Menu managing plugin for Lolita.

data/lib/generators/lolita_menu/assets_generator.rb

@@ -1,13 +0,0 @@
-require 'generators/helpers/file_helper'
-module LolitaMenu
-  module Generators
-    class AssetsGenerator < Rails::Generators::Base
-      include Lolita::Generators::FileHelper
-      desc "Copy all from public directory to project public directory."
-      def copy_all
-        root=File.expand_path("../../../../",__FILE__)
-        copy_dir("public",:root=>root)
-      end      
-    end
-  end
-end