enju_inventory 0.2.0 → 0.3.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ee6715fee4b30322df5733fa828817392542a09
-  data.tar.gz: 5274db1378a29864ff961d7946eb89ae1b4cabea
+  metadata.gz: 852e91e67559741b963632202379bb61356be037
+  data.tar.gz: 0f95edd4e3d9eaa23d37237b3a2a9cfceed7ce86
 SHA512:
-  metadata.gz: fcf7e810572409a3488ae72d947385f4cc0a3ac37696e9a2ee06a196438d3d93478002daab9a0782ad809a1a5160c3fa354b2e2c6d51253aa6059f483887b337
-  data.tar.gz: e1ead5ff0152da63943eb54b4b63b4b1f6c5eff7cfc89fd5518140d3104c99f0e0041312a0b20963311e461aeefe086fc286066a527da503bbea9eb4dddf0e9f
+  metadata.gz: 5969ca26ddcb6fd252a3401e115e659080fc746f1bffafa4aaa57af33366a4cb2ffb243d237ce91e5f20b0c95d7f023f1511e23ce2b8e84939570373adb03a09
+  data.tar.gz: 255b316453e7383b1e895b212f59ba68a18c9ee7192eb9b4830df931a8613de34bee14b6210f3bba11a8704dd24cb173645f3983e4ce2d21ea0a99f697b5740c

data/README.rdoc

@@ -1,7 +1,7 @@
 = EnjuInventory
-{<img src="https://travis-ci.org/next-l/enju_inventory.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_inventory]
-{<img src="https://coveralls.io/repos/next-l/enju_inventory/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_inventory?branch=1.2]
-{<img src="https://hakiri.io/github/next-l/enju_inventory/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_inventory/1.2]
+{<img src="https://travis-ci.org/next-l/enju_inventory.svg?branch=1.3" alt="Build Status" />}[https://travis-ci.org/next-l/enju_inventory]
+{<img src="https://coveralls.io/repos/next-l/enju_inventory/badge.svg?branch=1.3&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_inventory?branch=1.3]
+{<img src="https://hakiri.io/github/next-l/enju_inventory/1.3.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_inventory/1.3]
 
 This project rocks and uses MIT-LICENSE.
 

data/Rakefile

@@ -33,4 +33,4 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
     spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
+task default: :spec

data/app/controllers/inventory_files_controller.rb

@@ -9,7 +9,7 @@ class InventoryFilesController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @inventory_files }
+      format.json { render json: @inventory_files }
     end
   end
 
@@ -43,7 +43,7 @@ class InventoryFilesController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @inventory_file }
+      format.json { render json: @inventory_file }
     end
   end
 
@@ -59,13 +59,13 @@ class InventoryFilesController < ApplicationController
 
     respond_to do |format|
       if @inventory_file.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.inventory_file'))
+        flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.inventory_file'))
         @inventory_file.import
         format.html { redirect_to(@inventory_file) }
-        format.json { render :json => @inventory_file, :status => :created, :location => @inventory_file }
+        format.json { render json: @inventory_file, status: :created, location: @inventory_file }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @inventory_file.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @inventory_file.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -75,12 +75,12 @@ class InventoryFilesController < ApplicationController
   def update
     respond_to do |format|
       if @inventory_file.update_attributes(inventory_file_params)
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.inventory_file'))
+        flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.inventory_file'))
         format.html { redirect_to(@inventory_file) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @inventory_file.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @inventory_file.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/models/concerns/enju_inventory/enju_item.rb

@@ -3,10 +3,10 @@ module EnjuInventory
     extend ActiveSupport::Concern
 
     included do
-      has_many :inventories, :dependent => :destroy
-      has_many :inventory_files, :through => :inventories
+      has_many :inventories, dependent: :destroy
+      has_many :inventory_files, through: :inventories
       searchable do
-        integer :inventory_file_ids, :multiple => true
+        integer :inventory_file_ids, multiple: true
       end
 
       def self.inventory_items(inventory_file, mode = 'not_on_shelf')
@@ -14,9 +14,9 @@ module EnjuInventory
         inventory_item_ids = inventory_file.items.pluck('items.id')
         case mode
         when 'not_on_shelf'
-          Item.where(:id => (item_ids - inventory_item_ids))
+          Item.where(id: (item_ids - inventory_item_ids))
         when 'not_in_catalog'
-          Item.where(:id => (inventory_item_ids - item_ids))
+          Item.where(id: (inventory_item_ids - item_ids))
         end
       rescue
         nil

data/app/models/inventory.rb

@@ -4,7 +4,7 @@ class Inventory < ActiveRecord::Base
 
   validates_associated :item, :inventory_file
   validates_presence_of :item, :inventory_file
-  validates_uniqueness_of :item_id, :scope => :inventory_file_id
+  validates_uniqueness_of :item_id, scope: :inventory_file_id
 
   paginates_per 10
 end

data/app/models/inventory_file.rb

@@ -6,12 +6,12 @@ class InventoryFile < ActiveRecord::Base
 
   if ENV['ENJU_STORAGE'] == 's3'
     has_attached_file :inventory, storage: :s3,
-      s3_credentials: {
+                                  s3_credentials: {
         access_key: ENV['AWS_ACCESS_KEY_ID'],
         secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
         bucket: ENV['S3_BUCKET_NAME']
       },
-      s3_permissions: :private
+                                  s3_permissions: :private
   else
     has_attached_file :inventory,
       path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"

data/db/migrate/20081117143156_create_inventory_files.rb

@@ -1,4 +1,4 @@
-class CreateInventoryFiles < ActiveRecord::Migration
+class CreateInventoryFiles < ActiveRecord::Migration[4.2]
   def self.up
     create_table :inventory_files do |t|
       t.string :filename

data/db/migrate/20081117143455_create_inventories.rb

@@ -1,4 +1,4 @@
-class CreateInventories < ActiveRecord::Migration
+class CreateInventories < ActiveRecord::Migration[4.2]
   def self.up
     create_table :inventories do |t|
       t.references :item, index: true

data/db/migrate/20090706125521_add_attachments_inventory_to_inventory_file.rb

@@ -1,4 +1,4 @@
-class AddAttachmentsInventoryToInventoryFile < ActiveRecord::Migration
+class AddAttachmentsInventoryToInventoryFile < ActiveRecord::Migration[4.2]
   def self.up
     add_column :inventory_files, :inventory_file_name, :string
     add_column :inventory_files, :inventory_content_type, :string

data/db/migrate/20120413100431_add_fingerprint_to_inventory_file.rb

@@ -1,4 +1,4 @@
-class AddFingerprintToInventoryFile < ActiveRecord::Migration
+class AddFingerprintToInventoryFile < ActiveRecord::Migration[4.2]
   def change
     add_column :inventory_files, :inventory_fingerprint, :string
   end

data/lib/enju_inventory/version.rb

@@ -1,3 +1,3 @@
 module EnjuInventory
-  VERSION = "0.2.0"
+  VERSION = "0.3.0.beta.1"
 end

data/spec/controllers/inventories_controller_spec.rb

@@ -48,7 +48,7 @@ describe InventoriesController do
       login_fixture_admin
 
       it "assigns the requested inventory as @inventory" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         expect(assigns(:inventory)).to eq(Inventory.find(1))
         expect(response).to be_success
       end
@@ -58,7 +58,7 @@ describe InventoriesController do
       login_fixture_librarian
 
       it "assigns the requested inventory as @inventory" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         expect(assigns(:inventory)).to eq(Inventory.find(1))
         expect(response).to be_success
       end
@@ -68,7 +68,7 @@ describe InventoriesController do
       login_fixture_user
 
       it "assigns the requested inventory as @inventory" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         expect(assigns(:inventory)).to eq(Inventory.find(1))
         expect(response).to be_forbidden
       end
@@ -76,7 +76,7 @@ describe InventoriesController do
 
     describe "When not logged in" do
       it "assigns the requested inventory as @inventory" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         expect(assigns(:inventory)).to eq(Inventory.find(1))
         expect(response).to redirect_to(new_user_session_url)
       end

data/spec/controllers/inventory_files_controller_spec.rb

@@ -46,7 +46,7 @@ describe InventoryFilesController do
       login_fixture_admin
 
       it "assigns the requested inventory_file as @inventory_file" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         expect(assigns(:inventory_file)).to eq(InventoryFile.find(1))
       end
     end
@@ -55,7 +55,7 @@ describe InventoryFilesController do
       login_fixture_librarian
 
       it "assigns the requested inventory_file as @inventory_file" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         expect(assigns(:inventory_file)).to eq(InventoryFile.find(1))
       end
     end
@@ -64,14 +64,14 @@ describe InventoryFilesController do
       login_fixture_user
 
       it "assigns the requested inventory_file as @inventory_file" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         expect(assigns(:inventory_file)).to eq(InventoryFile.find(1))
       end
     end
 
     describe "When not logged in" do
       it "assigns the requested inventory_file as @inventory_file" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         expect(assigns(:inventory_file)).to eq(InventoryFile.find(1))
         expect(response).to redirect_to(new_user_session_url)
       end
@@ -123,7 +123,7 @@ describe InventoryFilesController do
       login_fixture_librarian
 
       it "should create inventory_file" do
-        post :create, :inventory_file => {:inventory => fixture_file_upload("/../../examples/inventory_file_sample.tsv", 'text/csv') }
+        post :create, params: { inventory_file: {inventory: fixture_file_upload("/../../examples/inventory_file_sample.tsv", 'text/csv') } }
         assigns(:inventory_file).save!
         expect(assigns(:inventory_file)).to be_valid
         expect(assigns(:inventory_file).user.username).to eq @user.username
@@ -135,14 +135,14 @@ describe InventoryFilesController do
       login_fixture_user
 
       it "should be forbidden" do
-        post :create, :inventory_file => {:inventory => fixture_file_upload("/../../examples/inventory_file_sample.tsv", 'text/csv') }
+        post :create, params: { inventory_file: {inventory: fixture_file_upload("/../../examples/inventory_file_sample.tsv", 'text/csv') } }
         expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should be redirect to new session url" do
-        post :create, :inventory_file => {:inventory => fixture_file_upload("/../../examples/inventory_file_sample.tsv", 'text/csv') }
+        post :create, params: { inventory_file: {inventory: fixture_file_upload("/../../examples/inventory_file_sample.tsv", 'text/csv') } }
         expect(response).to redirect_to new_user_session_url
       end
     end
@@ -154,7 +154,7 @@ describe InventoryFilesController do
 
       it "assigns the requested inventory_file as @inventory_file" do
         inventory_file = inventory_files(:inventory_file_00001)
-        get :edit, :id => inventory_file.id
+        get :edit, params: { id: inventory_file.id }
         expect(assigns(:inventory_file)).to eq(inventory_file)
       end
     end
@@ -164,7 +164,7 @@ describe InventoryFilesController do
 
       it "assigns the requested inventory_file as @inventory_file" do
         inventory_file = inventory_files(:inventory_file_00001)
-        get :edit, :id => inventory_file.id
+        get :edit, params: { id: inventory_file.id }
         expect(assigns(:inventory_file)).to eq(inventory_file)
       end
     end
@@ -174,7 +174,7 @@ describe InventoryFilesController do
 
       it "assigns the requested inventory_file as @inventory_file" do
         inventory_file = inventory_files(:inventory_file_00001)
-        get :edit, :id => inventory_file.id
+        get :edit, params: { id: inventory_file.id }
         expect(response).to be_forbidden
       end
     end
@@ -182,7 +182,7 @@ describe InventoryFilesController do
     describe "When not logged in" do
       it "should not assign the requested inventory_file as @inventory_file" do
         inventory_file = inventory_files(:inventory_file_00001)
-        get :edit, :id => inventory_file.id
+        get :edit, params: { id: inventory_file.id }
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -193,7 +193,7 @@ describe InventoryFilesController do
       login_fixture_admin
 
       it "should update inventory_file" do
-        put :update, :id => inventory_files(:inventory_file_00003).id, :inventory_file => { note: "test" }
+        put :update, params: { id: inventory_files(:inventory_file_00003).id, inventory_file: { note: "test" } }
         expect(response).to redirect_to inventory_file_url(assigns(:inventory_file))
       end
     end
@@ -202,7 +202,7 @@ describe InventoryFilesController do
       login_fixture_librarian
 
       it "should update inventory_file" do
-        put :update, :id => inventory_files(:inventory_file_00003).id, :inventory_file => { note: "test" }
+        put :update, params: { id: inventory_files(:inventory_file_00003).id, inventory_file: { note: "test" } }
         expect(response).to redirect_to inventory_file_url(assigns(:inventory_file))
       end
     end
@@ -211,14 +211,14 @@ describe InventoryFilesController do
       login_fixture_user
 
       it "should not update inventory_file" do
-        put :update, :id => inventory_files(:inventory_file_00003).id, :inventory_file => { note: "test" }
+        put :update, params: { id: inventory_files(:inventory_file_00003).id, inventory_file: { note: "test" } }
         expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not update inventory_file" do
-        put :update, :id => inventory_files(:inventory_file_00003).id, :inventory_file => { note: "test" }
+        put :update, params: { id: inventory_files(:inventory_file_00003).id, inventory_file: { note: "test" } }
         expect(response).to redirect_to new_user_session_url
       end
     end
@@ -233,11 +233,11 @@ describe InventoryFilesController do
       login_fixture_admin
 
       it "destroys the requested inventory_file" do
-        delete :destroy, :id => @inventory_file.id
+        delete :destroy, params: { id: @inventory_file.id }
       end
 
       it "redirects to the inventory_files list" do
-        delete :destroy, :id => @inventory_file.id
+        delete :destroy, params: { id: @inventory_file.id }
         expect(response).to redirect_to(inventory_files_url)
       end
     end
@@ -246,11 +246,11 @@ describe InventoryFilesController do
       login_fixture_librarian
 
       it "destroys the requested inventory_file" do
-        delete :destroy, :id => @inventory_file.id
+        delete :destroy, params: { id: @inventory_file.id }
       end
 
       it "redirects to the inventory_files list" do
-        delete :destroy, :id => @inventory_file.id
+        delete :destroy, params: { id: @inventory_file.id }
         expect(response).to redirect_to(inventory_files_url)
       end
     end
@@ -259,22 +259,22 @@ describe InventoryFilesController do
       login_fixture_user
 
       it "destroys the requested inventory_file" do
-        delete :destroy, :id => @inventory_file.id
+        delete :destroy, params: { id: @inventory_file.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @inventory_file.id
+        delete :destroy, params: { id: @inventory_file.id }
         expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "destroys the requested inventory_file" do
-        delete :destroy, :id => @inventory_file.id
+        delete :destroy, params: { id: @inventory_file.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @inventory_file.id
+        delete :destroy, params: { id: @inventory_file.id }
         expect(response).to redirect_to(new_user_session_url)
       end
     end

data/spec/controllers/items_controller_spec.rb

@@ -0,0 +1,45 @@
+require 'rails_helper'
+
+describe ItemsController do
+  fixtures :all
+
+  def valid_attributes
+    FactoryBot.attributes_for(:item)
+  end
+
+  describe 'GET index', solr: true do
+    before do
+      Item.reindex
+    end
+
+    describe 'When logged in as Librarian' do
+      login_fixture_librarian
+
+      it 'should not get index with inventory_file_id' do
+        get :index, params: { inventory_file_id: 1 }
+        expect(response).to be_success
+        assigns(:inventory_file).should eq InventoryFile.find(1)
+        expect(assigns(:items)).to eq Item.inventory_items(assigns(:inventory_file), 'not_on_shelf').order('items.id').page(1)
+      end
+    end
+
+    describe 'When logged in as User' do
+      login_fixture_user
+
+      it 'should not get index with inventory_file_id' do
+        get :index, params: { inventory_file_id: 1 }
+        expect(response).to be_forbidden
+      end
+    end
+
+    describe 'When not logged in' do
+
+      it 'should not get index with inventory_file_id' do
+        get :index, params: { inventory_file_id: 1 }
+        expect(response).to redirect_to new_user_session_url
+        assigns(:inventory_file).should_not be_nil
+      end
+    end
+  end
+
+end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,6 +1,7 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
+  include EnjuBiblio::Controller
   include EnjuLibrary::Controller
   include EnjuInventory::Controller
   after_action :verify_authorized

data/spec/dummy/app/models/user.rb

@@ -1,7 +1,9 @@
 class User < ActiveRecord::Base
   devise :database_authenticatable, #:registerable,
-    :recoverable, :rememberable, :trackable, #, :validatable
-    :lockable, :lock_strategy => :none, :unlock_strategy => :none
+    :recoverable, :rememberable, :trackable, # , :validatable
+    :lockable, lock_strategy: :none, unlock_strategy: :none
 
   include EnjuSeed::EnjuUser
 end
+
+Item.include(EnjuInventory::EnjuItem)