enju_inventory 0.1.11.pre9 → 0.1.11.pre10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c171753db8ecb3be2c070658826980b66c0007f1
-  data.tar.gz: 576651552771d8f1aede61f34a97557e9b13c458
+  metadata.gz: 85e9adb15d7c764bb35726ef2712ef5869b27e37
+  data.tar.gz: c548a5a5a8a447fab6fc84e9f9c806626dc3b971
 SHA512:
-  metadata.gz: 05ba8f8a4403845bc912ec991c0bacbd9ed47391811d02fbde6a8454a7aad9f663da20a434c87b836e6eda66f486b23ada4a9f0839f2aecaf38a6f808d8317eb
-  data.tar.gz: 78656c031e03d9883620bd4ec0d8087801e3cfcb4c130827e7d35383edb576202e84d54201cad577ceac901ff7ecdd221197d75440364dbbdaa6cd853681d81c
+  metadata.gz: 4e480c7b2328b63134bc3016bb531708c7fd220758102f9e4b85ee8c05e1bde0c2c0850e69e210731200562d8eacda5d6024413ebd7b88759827d6f9deb1ff89
+  data.tar.gz: 94e5b5da6211659c6c8eeafc45202a7aa4499803122b5bedc704712b293629ff2cd6c7efadfafa73b16b00a4e68c045ef1b23ccfc692d7bdb6747288079c740e

data/app/controllers/inventories_controller.rb

@@ -1,8 +1,78 @@
-class InventoriesController < InheritedResources::Base
-  respond_to :html, :json
+class InventoriesController < ApplicationController
   load_and_authorize_resource
-
+  # GET /inventories
+  # GET /inventories.json
   def index
     @inventories = Inventory.page(params[:page])
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @inventories }
+    end
+  end
+
+  # GET /inventories/1
+  # GET /inventories/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @inventory }
+    end
+  end
+
+  # GET /inventories/new
+  # GET /inventories/new.json
+  def new
+    @inventory = Inventory.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @inventory }
+    end
+  end
+
+  # GET /inventories/1/edit
+  def edit
+  end
+
+  # POST /inventories
+  # POST /inventories.json
+  def create
+    @inventory = Inventory.new(params[:inventory])
+
+    respond_to do |format|
+      if @inventory.save
+        format.html { redirect_to @inventory, notice:  t('controller.successfully_created', model:  t('activerecord.models.inventory')) }
+        format.json { render json: @inventory, status: :created, location: @inventory }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @inventory.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /inventories/1
+  # PUT /inventories/1.json
+  def update
+    respond_to do |format|
+      if @inventory.update_attributes(params[:inventory])
+        format.html { redirect_to @inventory, notice:  t('controller.successfully_updated', model:  t('activerecord.models.inventory')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @inventory.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /inventories/1
+  # DELETE /inventories/1.json
+  def destroy
+    @inventory.destroy
+
+    respond_to do |format|
+      format.html { redirect_to inventories_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.inventory')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/views/inventories/edit.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.inventory')) -%> </h1>
 <div id="content_list">
 
@@ -25,7 +25,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @inventory -%></li>
     <li><%= link_to t('page.back'), inventories_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.inventory')) -%></h1>
 <div id="content_list">
 
@@ -27,7 +27,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.new', :model => t('activerecord.models.inventory')), new_inventory_path -%></li>
   </ul>

data/app/views/inventories/new.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.inventory')) -%> </h1>
 <div id="content_list">
 
@@ -25,7 +25,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), inventories_path -%></li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.inventory')) -%> </h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -21,7 +21,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_inventory_path(@inventory) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>

data/app/views/inventory_files/edit.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.inventory_file')) -%></h1>
 <div id="content_list">
 
@@ -37,7 +37,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @inventory_file -%></li>
     <li><%= link_to t('page.back'), inventory_files_path -%></li>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.inventory_file')) -%></h1>
 <div id="content_list">
 
@@ -22,7 +22,7 @@
     <td><%= inventory_file.inventory_content_type -%> </td>
     <td><%= inventory_file.inventory_file_size -%> </td>
     <td><%= inventory_file.inventory_fingerprint -%> </td>
-    <td><%= link_to inventory_file.user.username, inventory_file.user -%> </td>
+    <td><%= link_to inventory_file.user.username, inventory_file.user.profile if inventory_file.user.try(:profile) -%> </td>
     <td>
       <%= link_to t('page.edit'), edit_inventory_file_path(inventory_file) -%>
       <%= link_to t('page.destroy'), inventory_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
@@ -35,7 +35,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.new', :model => t('activerecord.models.inventory_file')), new_inventory_file_path -%></li>
   </ul>

data/app/views/inventory_files/new.html.erb

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.inventory_file')) -%> </h1>
 <div id="content_list">
 
@@ -18,7 +18,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), inventory_files_path -%> </li>
   </ul>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.inventory_file')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -25,7 +25,7 @@
 
 <p>
   <strong><%= t('activerecord.models.user') -%> :</strong>
-  <%= link_to @inventory_file.user.username, @inventory_file.user -%>
+  <%= link_to @inventory_file.user.username, @inventory_file.user.profile if @inventory_file.user.try(:profile) -%>
 </p>
 
 <p>
@@ -36,7 +36,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_inventory_file_path(@inventory_file) -%> </li>
     <li><%= back_to_index(flash[:page_info]) -%> </li>

data/lib/enju_inventory/engine.rb

@@ -1,6 +1,5 @@
-require 'enju_seed'
+require 'enju_library'
 require 'paperclip'
-require 'inherited_resources'
 
 module EnjuInventory
   class Engine < ::Rails::Engine

data/lib/enju_inventory/version.rb

@@ -1,3 +1,3 @@
 module EnjuInventory
-  VERSION = "0.1.11.pre9"
+  VERSION = "0.1.11.pre10"
 end

data/spec/controllers/inventories_controller_spec.rb

@@ -5,149 +5,152 @@ describe InventoriesController do
 
   describe "GET index" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all inventories as @inventories" do
         get :index
-        assigns(:inventories).should eq(Inventory.page(1))
-        response.should be_success
+        expect(assigns(:inventories)).to eq(Inventory.page(1))
+        expect(response).to be_success
       end
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all inventories as @inventories" do
         get :index
-        assigns(:inventories).should eq(Inventory.page(1))
-        response.should be_success
+        expect(assigns(:inventories)).to eq(Inventory.page(1))
+        expect(response).to be_success
       end
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns all empty as @inventories" do
         get :index
-        assigns(:inventories).should be_empty
-        response.should be_forbidden
+        expect(assigns(:inventories)).to be_empty
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "assigns all inventories as @inventories" do
         get :index
-        assigns(:inventories).should be_empty
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:inventories)).to be_empty
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested inventory as @inventory" do
         get :show, :id => 1
-        assigns(:inventory).should eq(Inventory.find(1))
+        expect(assigns(:inventory)).to eq(Inventory.find(1))
+        expect(response).to be_success
       end
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested inventory as @inventory" do
         get :show, :id => 1
-        assigns(:inventory).should eq(Inventory.find(1))
+        expect(assigns(:inventory)).to eq(Inventory.find(1))
+        expect(response).to be_success
       end
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested inventory as @inventory" do
         get :show, :id => 1
-        assigns(:inventory).should eq(Inventory.find(1))
+        expect(assigns(:inventory)).to eq(Inventory.find(1))
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "assigns the requested inventory as @inventory" do
         get :show, :id => 1
-        assigns(:inventory).should eq(Inventory.find(1))
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:inventory)).to eq(Inventory.find(1))
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested inventory as @inventory" do
         get :new
-        assigns(:inventory).should_not be_valid
-        response.should be_success
+        expect(assigns(:inventory)).not_to be_valid
+        expect(response).to be_success
       end
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should not assign the requested inventory as @inventory" do
         get :new
-        assigns(:inventory).should_not be_valid
-        response.should be_success
+        expect(assigns(:inventory)).not_to be_valid
+        expect(response).to be_success
       end
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested inventory as @inventory" do
         get :new
-        assigns(:inventory).should_not be_valid
-        response.should be_forbidden
+        expect(assigns(:inventory)).not_to be_valid
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not assign the requested inventory as @inventory" do
         get :new
-        assigns(:inventory).should_not be_valid
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:inventory)).not_to be_valid
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested inventory as @inventory" do
         inventory = inventories(:inventory_00001)
         get :edit, :id => inventory.id
-        assigns(:inventory).should eq(inventory)
+        expect(assigns(:inventory)).to eq(inventory)
       end
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested inventory as @inventory" do
         inventory = inventories(:inventory_00001)
         get :edit, :id => inventory.id
-        assigns(:inventory).should eq(inventory)
+        expect(assigns(:inventory)).to eq(inventory)
       end
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested inventory as @inventory" do
         inventory = inventories(:inventory_00001)
         get :edit, :id => inventory.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -155,7 +158,7 @@ describe InventoriesController do
       it "should not assign the requested inventory as @inventory" do
         inventory = inventories(:inventory_00001)
         get :edit, :id => inventory.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end