enju_library 0.1.2 → 0.2.0.beta.1

data/app/views/picture_files/_index_shelf.html.erb

@@ -17,7 +17,7 @@
   <%- @picture_files.each do |picture_file| -%>
     <tr class="line<%= cycle("0", "1") -%>">
       <td>
-        <%- if can? :update, picture_file -%>
+        <%- if policy(picture_file).update? -%>
           <%= move_position(picture_file) -%>
         <%- end -%>
       </td>
@@ -29,10 +29,10 @@
       <td><%= link_to picture_file.picture_file_name, picture_file_path(picture_file, format: :download, size: 'original') -%></td>
       <td>
         <%= link_to t('page.show'), picture_file -%>
-        <%- if can? :update, picture_file -%>
+        <%- if policy(picture_file).update? -%>
           <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
         <% end %>
-        <%- if can? :delete, picture_file -%>
+        <%- if policy(picture_file).destroy? -%>
           <%= link_to t('page.destroy'), picture_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>
@@ -45,7 +45,7 @@
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
-  <%- if can? :create, PictureFile -%>
+  <%- if policy(PictureFile).create? -%>
     <ul>
       <li><%= link_to t('page.new', model: t('activerecord.models.picture_file')), new_picture_file_path(shelf_id: shelf.id) -%></li>
       <li><%= link_to t('picture_file.all_picture'), picture_files_path -%></li>

data/app/views/request_status_types/index.html.erb

@@ -13,17 +13,17 @@
 <%- @request_status_types.each do |request_status_type| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, request_status_type -%>
+      <%- if policy(request_status_type).update? -%>
         <%= move_position(request_status_type) -%>
       <%- end -%>
     </td>
     <td><%= link_to request_status_type.name, request_status_type -%></td>
     <td><%= link_to request_status_type.display_name.localize, request_status_type -%></td>
     <td>
-      <%- if can? :update, request_status_type -%>
+      <%- if policy(request_status_type).update? -%>
         <%= link_to t('page.edit'), edit_request_status_type_path(request_status_type) -%>
       <% end %>
-      <%- if can? :delete, request_status_type -%>
+      <%- if policy(request_status_type).destroy? -%>
         <%= link_to t('page.destroy'), request_status_type, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <% end %>
     </td>
@@ -35,6 +35,8 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', model: t('activerecord.models.request_status_type')), new_request_status_type_path -%></li>
+    <% policy(RequestStatusType).create? %>
+      <li><%= link_to t('page.new', model: t('activerecord.models.request_status_type')), new_request_status_type_path -%></li>
+    <% end %>
   </ul>
 </div>

data/app/views/request_status_types/show.html.erb

@@ -24,6 +24,6 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_request_status_type_path(@request_status_type) -%></li>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
+    <li><%= link_to t('page.back'), :back -%></li>
   </ul>
 </div>

data/app/views/request_types/index.html.erb

@@ -13,17 +13,17 @@
 <%- @request_types.each do |request_type| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, request_type -%>
+      <%- if policy(request_type).update? -%>
         <%= move_position(request_type) -%>
       <%- end -%>
     </td>
     <td><%= link_to request_type.name, request_type -%></td>
     <td><%= link_to request_type.display_name.localize, request_type -%></td>
     <td>
-      <%- if can? :update, request_type -%>
+      <%- if policy(request_type).update? -%>
         <%= link_to t('page.edit'), edit_request_type_path(request_type) -%>
       <% end %>
-      <%- if can? :delete, request_type -%>
+      <%- if policy(request_type).destroy? -%>
         <%= link_to t('page.destroy'), request_type, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <% end %>
     </td>
@@ -35,6 +35,8 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', model: t('activerecord.models.request_type')), new_request_type_path -%></li>
+    <% policy(RequestStatusType).create? %>
+      <li><%= link_to t('page.new', model: t('activerecord.models.request_type')), new_request_type_path -%></li>
+    <% end %>
   </ul>
 </div>

data/app/views/request_types/show.html.erb

@@ -24,6 +24,6 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_request_type_path(@request_type) -%></li>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
+    <li><%= link_to t('page.back'), :back -%></li>
   </ul>
 </div>

data/app/views/search_engines/index.html.erb

@@ -14,7 +14,7 @@
 <%- @search_engines.each do |search_engine| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :update, search_engine -%>
+      <%- if policy(search_engine).update? -%>
         <%= move_position(search_engine) -%>
       <%- end -%>
     </td>
@@ -22,10 +22,10 @@
     <td><%= search_engine.note -%></td>
     <td><%= link_to t('page.show'), search_engine -%></td>
     <td>
-      <%- if can? :update, search_engine -%>
+      <%- if policy(search_engine).update? -%>
         <%= link_to t('page.edit'), edit_search_engine_path(search_engine) -%>
       <% end %>
-      <%- if can? :delete, search_engine -%>
+      <%- if policy(search_engine).destroy? -%>
         <%= link_to t('page.destroy'), search_engine, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -38,7 +38,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :create, SearchEngine -%>
+    <%- if policy(SearchEngine).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.search_engine')), new_search_engine_path -%></li>
     <%- end -%>
   </ul>

data/app/views/search_engines/show.html.erb

@@ -43,9 +43,9 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :update, @search_engine -%>
+    <%- if policy(@search_engine).update? -%>
       <li><%= link_to t('page.edit'), edit_search_engine_path(@search_engine) -%></li>
     <%- end -%>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
+    <li><%= link_to t('page.back'), :back -%></li>
   </ul>
 </div>

data/app/views/shelves/_library_facet.html.erb

@@ -4,6 +4,6 @@
     <%= library_shelf_facet(@library, facet) %>
   <%- end -%>
   <%- if params[:library_id] -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(library_id: nil, page: nil, only_path: true)) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.permit.merge(library_id: nil, page: nil, only_path: true)) -%></li>
   <%- end -%>
 </ul>

data/app/views/shelves/index.html.erb

@@ -29,7 +29,7 @@
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
       <% if @library and params[:query].blank? and params[:order].blank? %>
-        <%- if can? :update, shelf -%>
+        <%- if policy(shelf).update? -%>
           <%= move_position(shelf) -%>
         <%- end -%>
       <% end %>
@@ -48,10 +48,10 @@
       <%= shelf.library.name if current_user.try(:has_role?, 'Librarian') %>
     </td>
     <td>
-      <%- if can? :update, shelf -%>
+      <%- if policy(shelf).update? -%>
         <%= link_to t('page.edit'), edit_shelf_path(shelf) -%>
       <% end %>
-      <%- if can? :delete, shelf -%>
+      <%- if policy(shelf).destroy? -%>
         <%= link_to t('page.destroy'), shelf, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
@@ -66,7 +66,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%= render 'library_facet' %>
   <ul>
-    <%- if can? :create, Shelf -%>
+    <%- if policy(Shelf).create? -%>
       <li><%= link_to t('page.new', model: t('activerecord.models.shelf')), new_shelf_path -%></li>
     <%- end -%>
   </ul>

data/app/views/shelves/show.html.erb

@@ -47,19 +47,19 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <% if can? :create, Shelf %>
+    <% if policy(Shelf).create? %>
       <%- if @library -%>
         <li><%= link_to t('page.new', model: t('activerecord.models.shelf')), new_shelf_path(library_id: @library.id) -%></li>
       <%- else -%>
         <li><%= link_to t('page.new', model: t('activerecord.models.shelf')), new_shelf_path -%></li>
       <%- end -%>
     <% end %>
-    <% if can? :update, @shelf %>
+    <% if policy(@shelf).update? %>
       <li><%= link_to t('page.edit'), edit_shelf_path(@shelf) -%></li>
       <li><%= link_to t('page.listing', model: t('activerecord.models.picture_file')), picture_files_path(shelf_id: @shelf.id) -%></li>
     <% end %>
     <li>
-      <%= back_to_index(flash[:page_info]) -%>
+      <%= link_to t('page.back'), :back -%>
     </li>
   </ul>
 </div>

data/app/views/subscriptions/index.html.erb

@@ -14,8 +14,10 @@
     <td><%= link_to subscription.title, subscription -%></td>
     <td><%= subscription.works.size -%></td>
     <td>
-      <% if can? :delete, subscription %>
+      <% if policy(subscription).update? %>
         <%= link_to t('page.edit'), edit_subscription_path(subscription) -%>
+      <% end %>
+      <% if policy(subscription).destroy? %>
         <%= link_to t('page.destroy'), subscription, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <% end %>
     </td>

data/app/views/subscriptions/show.html.erb

@@ -35,6 +35,6 @@
   <ul>
     <li><%= link_to t('page.edit'), edit_subscription_path(@subscription) -%></li>
     <li><%= link_to t('work.add'), subscription_manifestations_path(@subscription) -%></li>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
+    <li><%= link_to t('page.back'), :back -%></li>
   </ul>
 </div>

data/app/views/withdraws/index.html.erb

@@ -29,7 +29,7 @@
         <% end %>
       </td>
       <td>
-        <%- if can? :delete, withdraw -%>
+        <%- if policy(withdraw).destroy? -%>
           <%= link_to t('page.destroy'), withdraw, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>

data/app/views/withdraws/show.html.erb

@@ -26,6 +26,6 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
+    <li><%= link_to t('page.back'), :back -%></li>
   </ul>
 </div>

data/config/locales/translation_en.yml

@@ -2,7 +2,7 @@ en:
   activerecord:
     models:
       library: Library
-      library_group: Library Group
+      library_group: System configuration
       shelf: Shelf
       accept: Accept
       budget_type: Budget type
@@ -52,6 +52,7 @@ en:
         admin_networks: Admin networks
         note: Note
         login_banner: Login banner
+        footer_banner: Footer banner
         post_to_union_catalog: Post to union catalog
         url: URL
         color: Color

data/config/locales/translation_ja.yml

@@ -2,7 +2,7 @@ ja:
   activerecord:
     models:
       library: 図書館
-      library_group: 図書館全体の設定
+      library_group: システム全体の設定
       shelf: 本棚
       accept: 検収
       budget_type: 予算種別
@@ -52,6 +52,7 @@ ja:
         admin_networks: 管理用として扱うネットワーク
         note: 注記
         login_banner: ログイン画面でのメッセージ
+        footer_banner: フッターのメッセージ
         post_to_union_catalog: 総合目録に登録する
         url: URL
         color: 色

data/db/migrate/20151213070943_add_translation_table_to_library_group.rb

@@ -0,0 +1,13 @@
+class AddTranslationTableToLibraryGroup < ActiveRecord::Migration
+  def up
+    LibraryGroup.create_translation_table!({
+      login_banner: :text
+    }, {
+      migrate_data: true
+    })
+  end
+
+  def down
+    LibraryGroup.drop_translation_table! migrate_data: true
+  end
+end

data/db/migrate/20151213072705_add_footer_banner_to_library_group.rb

@@ -0,0 +1,9 @@
+class AddFooterBannerToLibraryGroup < ActiveRecord::Migration
+  def up
+    LibraryGroup.add_translation_fields! footer_banner: :text
+  end
+
+  def down
+    remove_column :library_group_translations, :footer_banner
+  end
+end

data/lib/enju_library/engine.rb

@@ -1,4 +1,7 @@
+require 'enju_biblio'
 require 'geocoder'
+require 'globalize'
+require 'globalize-accessors'
 require 'ipaddr'
 
 module EnjuLibrary

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.1.2"
+  VERSION = "0.2.0.beta.1"
 end

data/lib/enju_library.rb

@@ -1,45 +1,4 @@
 require "enju_library/engine"
-require "enju_library/item"
 
 module EnjuLibrary
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  module ClassMethods
-    def enju_library
-      include EnjuLibrary::InstanceMethods
-    end
-  end
-
-  module InstanceMethods
-    private
-
-    def get_library_group
-      @library_group = LibraryGroup.site_config
-    end
-
-    def get_shelf
-      @shelf = Shelf.includes(:library).find(params[:shelf_id]) if params[:shelf_id]
-    end
-
-    def get_library
-      @library = Library.find(params[:library_id]) if params[:library_id]
-    end
-
-    def get_libraries
-      @libraries = Library.all_cache
-    end
-
-    def get_bookstore
-      @bookstore = Bookstore.find(params[:bookstore_id]) if params[:bookstore_id]
-    end
-
-    def get_subscription
-      @subscription = Subscription.find(params[:subscription_id]) if params[:subscription_id]
-    end
-  end
 end
-
-ActiveRecord::Base.send :include, EnjuLibrary::LibraryItem
-ActionController::Base.send(:include, EnjuLibrary)

data/lib/generators/enju_library/setup/setup_generator.rb

@@ -5,5 +5,7 @@ class EnjuLibrary::SetupGenerator < Rails::Generators::Base
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_library")
     return if file == 'fixture'
+    inject_into_file 'app/controllers/application_controller.rb',
+      "  include EnjuLibrary::Controller\n", after: "include EnjuLeaf::Controller\n"
   end
 end

data/lib/generators/enju_library/setup/templates/db/fixtures/library_group/translations.yml

@@ -0,0 +1,10 @@
+library_group_00001_translations_ja:
+  locale: ja
+  footer_banner: "[Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), オープンソース統合図書館システム | [このシステムについて](/page/about) | [不具合を報告する](https://github.com/next-l/enju_leaf/issues) | [マニュアル](http://next-l.github.io/manual/1.2/)<br/>\r\n\
+    Developed by [Kosuke Tanabe](https://github.com/nabeta) and [Project Next-L](http://next-l.jp)."
+  library_group_id: 1
+library_group_00001_translations_en:
+  locale: en
+  footer_banner: "[Next-L Enju Leaf __VERSION__](https://github.com/next-l/enju_leaf), an open source integrated library system | [About this system](/page/about) | [Report bugs](https://github.com/next-l/enju_leaf/issues) | [Manual](http://next-l.github.io/manual/1.2/)<br/>\r\n\
+    Developed by [Kosuke Tanabe](https://github.com/nabeta) and [Project Next-L](http://next-l.jp)."
+  library_group_id: 1

data/lib/tasks/enju_library_tasks.rake

@@ -4,8 +4,12 @@ require 'tasks/color'
 desc "create initial records for enju_library"
 namespace :enju_library do
   task :setup => :environment do
-    Dir.glob(Rails.root.to_s + '/db/fixtures/enju_library/*.yml').each do |file|
-      ActiveRecord::Fixtures.create_fixtures('db/fixtures/enju_library', File.basename(file, '.*'))
+    Dir.glob(Rails.root.to_s + '/db/fixtures/enju_library/**/*.yml').each do |file|
+      dirname = File.basename(File.dirname file)
+      dirname = nil if dirname == "enju_library"
+      basename = [ dirname, File.basename(file, ".*") ].compact
+      basename = File.join(*basename)
+      ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_library', basename)
     end
   end
 

data/spec/controllers/accepts_controller_spec.rb

@@ -123,7 +123,7 @@ describe AcceptsController do
 
       it "should not assign the requested accept as @accept" do
         get :new
-        assigns(:accept).should_not be_valid
+        assigns(:accept).should be_nil
         response.should be_forbidden
       end
     end
@@ -131,7 +131,7 @@ describe AcceptsController do
     describe "When not logged in" do
       it "should not assign the requested accept as @accept" do
         get :new
-        assigns(:accept).should_not be_valid
+        assigns(:accept).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -149,7 +149,7 @@ describe AcceptsController do
       describe "with valid params" do
         it "assigns a newly created accept as @accept" do
           post :create, :accept => @attrs
-          assigns(:accept).should_not be_valid
+          assigns(:accept).should be_nil
         end
 
         it "should not create a new accept without basket_id" do
@@ -169,7 +169,7 @@ describe AcceptsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved accept as @accept" do
           post :create, :accept => @invalid_attrs
-          assigns(:accept).should_not be_valid
+          assigns(:accept).should be_nil
         end
 
         it "should be forbidden" do
@@ -191,7 +191,7 @@ describe AcceptsController do
       describe "with valid params" do
         it "assigns a newly created accept as @accept" do
           post :create, :accept => @attrs
-          assigns(:accept).should_not be_valid
+          assigns(:accept).should be_nil
         end
 
         it "should not create a new accept without basket_id" do
@@ -207,7 +207,7 @@ describe AcceptsController do
       describe "with valid params" do
         it "assigns a newly created accept as @accept" do
           post :create, :accept => @attrs
-          assigns(:accept).should_not be_valid
+          assigns(:accept).should be_nil
         end
 
         it "should be forbidden" do

data/spec/controllers/baskets_controller_spec.rb

@@ -34,7 +34,7 @@ describe BasketsController do
 
       it "assigns all baskets as @baskets" do
         get :index, :user_id => users(:user1).username
-        assigns(:baskets).should be_empty
+        assigns(:baskets).should be_nil
         response.should be_forbidden
       end
     end
@@ -42,7 +42,7 @@ describe BasketsController do
     describe "When not logged in" do
       it "assigns all baskets as @baskets" do
         get :index, :user_id => users(:user1).username
-        assigns(:baskets).should be_empty
+        assigns(:baskets).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -110,7 +110,7 @@ describe BasketsController do
 
       it "should not assign the requested basket as @basket" do
         get :new
-        assigns(:basket).should_not be_valid
+        assigns(:basket).should be_nil
         response.should be_forbidden
       end
     end
@@ -118,7 +118,7 @@ describe BasketsController do
     describe "When not logged in" do
       it "should not assign the requested basket as @basket" do
         get :new
-        assigns(:basket).should_not be_valid
+        assigns(:basket).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -269,7 +269,7 @@ describe BasketsController do
       describe "with valid params" do
         it "assigns a newly created basket as @basket" do
           post :create, :basket => {:user_number => users(:user1).profile.user_number }
-          assigns(:basket).should_not be_valid
+          assigns(:basket).should be_nil
         end
 
         it "should be forbidden" do
@@ -288,12 +288,12 @@ describe BasketsController do
       describe "with blank params" do
         it "assigns a newly created basket as @basket" do
           post :create, :basket => { note: 'test' }
-          assigns(:basket).should_not be_valid
+          assigns(:basket).should be_nil
         end
 
         it "should be redirected to new_user_session_url" do
           post :create, :basket => { note: 'test' }
-          assigns(:basket).should_not be_valid
+          assigns(:basket).should be_nil
           assert_response :redirect
           response.should redirect_to new_user_session_url
         end

data/spec/controllers/bookstores_controller_spec.rb

@@ -37,7 +37,7 @@ describe BookstoresController do
 
       it "assigns all bookstores as @bookstores" do
         get :index
-        assigns(:bookstores).should be_empty
+        assigns(:bookstores).should be_nil
         response.should be_forbidden
       end
     end
@@ -45,7 +45,7 @@ describe BookstoresController do
     describe "When not logged in" do
       it "assigns all bookstores as @bookstores" do
         get :index
-        assigns(:bookstores).should be_empty
+        assigns(:bookstores).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -107,7 +107,7 @@ describe BookstoresController do
 
       it "should not assign the requested bookstore as @bookstore" do
         get :new
-        assigns(:bookstore).should_not be_valid
+        assigns(:bookstore).should be_nil
         response.should be_forbidden
       end
     end
@@ -117,7 +117,7 @@ describe BookstoresController do
 
       it "should not assign the requested bookstore as @bookstore" do
         get :new
-        assigns(:bookstore).should_not be_valid
+        assigns(:bookstore).should be_nil
         response.should be_forbidden
       end
     end
@@ -125,7 +125,7 @@ describe BookstoresController do
     describe "When not logged in" do
       it "should not assign the requested bookstore as @bookstore" do
         get :new
-        assigns(:bookstore).should_not be_valid
+        assigns(:bookstore).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -211,7 +211,7 @@ describe BookstoresController do
       describe "with valid params" do
         it "assigns a newly created bookstore as @bookstore" do
           post :create, :bookstore => @attrs
-          assigns(:bookstore).should be_valid
+          assigns(:bookstore).should be_nil
         end
 
         it "should be forbidden" do
@@ -223,7 +223,7 @@ describe BookstoresController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved bookstore as @bookstore" do
           post :create, :bookstore => @invalid_attrs
-          assigns(:bookstore).should_not be_valid
+          assigns(:bookstore).should be_nil
         end
 
         it "should be forbidden" do
@@ -239,7 +239,7 @@ describe BookstoresController do
       describe "with valid params" do
         it "assigns a newly created bookstore as @bookstore" do
           post :create, :bookstore => @attrs
-          assigns(:bookstore).should be_valid
+          assigns(:bookstore).should be_nil
         end
 
         it "should be forbidden" do
@@ -251,7 +251,7 @@ describe BookstoresController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved bookstore as @bookstore" do
           post :create, :bookstore => @invalid_attrs
-          assigns(:bookstore).should_not be_valid
+          assigns(:bookstore).should be_nil
         end
 
         it "should be forbidden" do
@@ -265,7 +265,7 @@ describe BookstoresController do
       describe "with valid params" do
         it "assigns a newly created bookstore as @bookstore" do
           post :create, :bookstore => @attrs
-          assigns(:bookstore).should be_valid
+          assigns(:bookstore).should be_nil
         end
 
         it "should be forbidden" do
@@ -277,7 +277,7 @@ describe BookstoresController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved bookstore as @bookstore" do
           post :create, :bookstore => @invalid_attrs
-          assigns(:bookstore).should_not be_valid
+          assigns(:bookstore).should be_nil
         end
 
         it "should be forbidden" do

data/spec/controllers/budget_types_controller_spec.rb

@@ -33,7 +33,7 @@ describe BudgetTypesController do
     it "assigns all budget_types as @budget_types" do
       budget_type = BudgetType.create! valid_attributes
       get :index
-      assigns(:budget_types).should eq(BudgetType.all)
+      assigns(:budget_types).should eq(BudgetType.order(:position))
     end
   end