enju_inventory 0.1.12 → 0.2.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ed552474749c9a00c855847a9a7aa1e172c6e9e
-  data.tar.gz: 34e8d592d6ba3ea0b4cc44ec1b3f59bd3cc3d746
+  metadata.gz: 14eac3233a4067892209307731879d6ef9cf0374
+  data.tar.gz: 611476c9dfc325ca22d441121eec20e96ed0e8a4
 SHA512:
-  metadata.gz: 63d869b8be45abdcecf5ba64b6ba85f12b61b808373a678b615deabae71614972e16408e4b63156e902c2fd09d494dca7d8f1451d36025b8c02c741a24144946
-  data.tar.gz: cf77bcf6a5c0a6e46e574759a63722662b906542c6d52becf9cd67c65b84a4d6f49ad1edcb12197ebf24a5655e01b06ee470abc5ed3edb12e74a4de2519e0a48
+  metadata.gz: 78b743ca6bae20540cab2be58a178ab4d725af6e53c48e835cdebdf34728484837b07a632dc5e97962de7554ca88cd76a09cb4d4e1272a4c35af88d91a91f7c2
+  data.tar.gz: 83be83a735656b8f1876451fd035fdf4833ce64828230baebc35b4f5c4bc1c7d22845002cb87d8d084cbf8c1ef408b9198e4c918169c5d890c90b451a9980ecc

data/README.rdoc

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

data/app/controllers/concerns/enju_inventory/controller.rb

@@ -0,0 +1,9 @@
+module EnjuInventory
+  module Controller
+    extend ActiveSupport::Concern
+
+    def get_inventory_file
+      @inventory_file = InventoryFile.find(params[:inventory_file_id]) if params[:inventory_file_id]
+    end
+  end
+end

data/app/controllers/inventories_controller.rb

@@ -1,5 +1,7 @@
 class InventoriesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_inventory, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /inventories
   # GET /inventories.json
   def index
@@ -21,6 +23,15 @@ class InventoriesController < ApplicationController
   end
 
   private
+  def set_inventory
+    @inventory = Inventory.find(params[:id])
+    authorize @inventory
+  end
+
+  def check_policy
+    authorize Inventory
+  end
+
   def inventory_params
     params.require(:inventory).permit(
       :item_id, :inventory_id, :note

data/app/controllers/inventory_files_controller.rb

@@ -1,5 +1,6 @@
 class InventoryFilesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_inventory_file, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /inventory_files
   # GET /inventory_files.json
@@ -96,6 +97,15 @@ class InventoryFilesController < ApplicationController
   end
 
   private
+  def set_inventory_file
+    @inventory_file = InventoryFile.find(params[:id])
+    authorize @inventory_file
+  end
+
+  def check_policy
+    authorize InventoryFile
+  end
+
   def inventory_file_params
     params.require(:inventory_file).permit(:inventory, :note)
   end

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

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

data/app/policies/inventory_file_policy.rb

@@ -0,0 +1,21 @@
+class InventoryFilePolicy < ApplicationPolicy
+  def index?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def update?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def destroy?
+    user.try(:has_role?, 'Librarian')
+  end
+end

data/app/policies/inventory_policy.rb

@@ -0,0 +1,21 @@
+class InventoryPolicy < ApplicationPolicy
+  def index?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    user.try(:has_role?, 'Applicationistrator')
+  end
+
+  def update?
+    user.try(:has_role?, 'Applicationistrator')
+  end
+
+  def destroy?
+    user.try(:has_role?, 'Applicationistrator')
+  end
+end

data/lib/enju_inventory.rb

@@ -1,23 +1,4 @@
 require "enju_inventory/engine"
-require "enju_inventory/item"
 
 module EnjuInventory
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  module ClassMethods
-    def enju_inventory
-      include EnjuInventory::InstanceMethods
-    end
-  end
-
-  module InstanceMethods
-    def get_inventory_file
-      @inventory_file = InventoryFile.find(params[:inventory_file_id]) if params[:inventory_file_id]
-    end
-  end
 end
-
-ActiveRecord::Base.send :include, EnjuInventory::InventoryItem
-ActionController::Base.send(:include, EnjuInventory)

data/lib/enju_inventory/version.rb

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

data/spec/controllers/inventories_controller_spec.rb

@@ -29,7 +29,7 @@ describe InventoriesController do
 
       it "assigns all empty as @inventories" do
         get :index
-        expect(assigns(:inventories)).to be_empty
+        expect(assigns(:inventories)).to be_nil
         expect(response).to be_forbidden
       end
     end
@@ -37,7 +37,7 @@ describe InventoriesController do
     describe "When not logged in" do
       it "assigns all inventories as @inventories" do
         get :index
-        expect(assigns(:inventories)).to be_empty
+        expect(assigns(:inventories)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
     end

data/spec/controllers/inventory_files_controller_spec.rb

@@ -28,7 +28,7 @@ describe InventoryFilesController do
 
       it "assigns empty as @inventory_files" do
         get :index
-        expect(assigns(:inventory_files)).to be_empty
+        expect(assigns(:inventory_files)).to be_nil
         expect(response).to be_forbidden
       end
     end
@@ -36,7 +36,7 @@ describe InventoryFilesController do
     describe "When not logged in" do
       it "assigns empty as @inventory_files" do
         get :index
-        expect(assigns(:inventory_files)).to be_empty
+        expect(assigns(:inventory_files)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -105,7 +105,7 @@ describe InventoryFilesController do
 
       it "should not assign the requested inventory_file as @inventory_file" do
         get :new
-        expect(assigns(:inventory_file)).to_not be_valid
+        expect(assigns(:inventory_file)).to be_nil
         expect(response).to be_forbidden
       end
     end
@@ -113,7 +113,7 @@ describe InventoryFilesController do
     describe "When not logged in" do
       it "should not assign the requested inventory_file as @inventory_file" do
         get :new
-        expect(assigns(:inventory_file)).to_not be_valid
+        expect(assigns(:inventory_file)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
     end

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

@@ -1,6 +1,11 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
-  enju_leaf
-  enju_library
+  include EnjuLeaf::Controller
+  include EnjuLibrary::Controller
+  include EnjuInventory::Controller
+  after_action :verify_authorized
+  before_action :set_paper_trail_whodunnit
+
+  include Pundit
 end

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

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 class User < ActiveRecord::Base
   devise :database_authenticatable, #:registerable,
     :recoverable, :rememberable, :trackable, #, :validatable
     :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
-  enju_leaf_user_model
+  include EnjuLeaf::EnjuUser
 end

data/spec/dummy/config/application.rb

@@ -2,8 +2,9 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-Bundler.require
-require "enju_inventory"
+Bundler.require(*Rails.groups)
+require 'enju_inventory'
+require 'enju_leaf'
 
 module Dummy
   class Application < Rails::Application
@@ -11,16 +12,6 @@ module Dummy
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -29,18 +20,8 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 
-require 'enju_leaf'

data/spec/dummy/config/environments/development.rb

@@ -1,30 +1,41 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
+  # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
 
-  # Do not compress assets
-  config.assets.compress = false
-
-  # Expands the lines which load the assets
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
   config.assets.debug = true
+
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end

data/spec/dummy/config/environments/production.rb

@@ -1,60 +1,79 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Generate digests for assets URLs
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
-  # Defaults to Rails.root.join("public/assets")
-  # config.assets.manifest = YOUR_PATH
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
-  # Specifies the header that your server uses for sending files
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
 
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
 
-  # Use a different cache store in production
-  # config.cache_store = :mem_cache_store
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
 
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
 
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable threaded mode
-  # config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
 end