enju_inventory 0.1.11.pre10 → 0.1.11.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85e9adb15d7c764bb35726ef2712ef5869b27e37
-  data.tar.gz: c548a5a5a8a447fab6fc84e9f9c806626dc3b971
+  metadata.gz: 7782a89c54218e1d5d7ae05c185feff459645059
+  data.tar.gz: 349a375293e71197ac9bcb104d10abbb1f739295
 SHA512:
-  metadata.gz: 4e480c7b2328b63134bc3016bb531708c7fd220758102f9e4b85ee8c05e1bde0c2c0850e69e210731200562d8eacda5d6024413ebd7b88759827d6f9deb1ff89
-  data.tar.gz: 94e5b5da6211659c6c8eeafc45202a7aa4499803122b5bedc704712b293629ff2cd6c7efadfafa73b16b00a4e68c045ef1b23ccfc692d7bdb6747288079c740e
+  metadata.gz: 3ac04b9924e66a97e0079fbcf1b24aa86a5a8b56b6dab6250199268671b08de00741efbf9717cbdb617857a7e159695eda3915d3db1398a6e354c147e09b003b
+  data.tar.gz: 07d91952250199a5b5cb730d4cfbf4878a308c04acd5c1375a67396b1cdcf2c0103f2e19ba986b144c22b3cbe80f3d4944571982cb1af43e6e0f30e6d1bb1051

data/README.rdoc

@@ -1,3 +1,10 @@
 = EnjuInventory
+{<img src="https://secure.travis-ci.org/next-l/enju_inventory.png?branch=1.1" alt="Build Status" />}[http://travis-ci.org/next-l/enju_inventory]
+{<img src="https://coveralls.io/repos/next-l/enju_inventory/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/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]
 
-This project rocks and uses MIT-LICENSE.
+This project rocks and uses MIT-LICENSE.
+
+== 製作者・貢献者 (Authors and contributors)
+* {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
+* {Project Next-L}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/app/controllers/inventories_controller.rb

@@ -20,59 +20,10 @@ class InventoriesController < ApplicationController
     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
+  private
+  def inventory_params
+    params.require(:inventory).permit(
+      :item_id, :inventory_id, :note
+    )
   end
 end

data/app/controllers/inventory_files_controller.rb

@@ -39,7 +39,7 @@ class InventoryFilesController < ApplicationController
   # POST /inventory_files
   # POST /inventory_files.json
   def create
-    @inventory_file = InventoryFile.new(params[:inventory_file])
+    @inventory_file = InventoryFile.new(inventory_file_params)
     @inventory_file.user = current_user
 
     respond_to do |format|
@@ -59,7 +59,7 @@ class InventoryFilesController < ApplicationController
   # PUT /inventory_files/1.json
   def update
     respond_to do |format|
-      if @inventory_file.update_attributes(params[:inventory_file])
+      if @inventory_file.update_attributes(inventory_file_params)
         flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.inventory_file'))
         format.html { redirect_to(@inventory_file) }
         format.json { head :no_content }
@@ -80,4 +80,9 @@ class InventoryFilesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def inventory_file_params
+    params.require(:inventory_file).permit(:inventory, :note)
+  end
 end

data/app/models/inventory.rb

@@ -1,5 +1,4 @@
 class Inventory < ActiveRecord::Base
-  attr_accessible :item_id, :inventory_id, :note
   belongs_to :item
   belongs_to :inventory_file
 

data/app/models/inventory_file.rb

@@ -1,18 +1,18 @@
 class InventoryFile < ActiveRecord::Base
-  attr_accessible :inventory, :note
-  has_many :inventories, :dependent => :destroy
-  has_many :items, :through => :inventories
+  has_many :inventories, dependent: :destroy
+  has_many :items, through: :inventories
   belongs_to :user
   validates_presence_of :user
 
   if Setting.uploaded_file.storage == :s3
-    has_attached_file :inventory, :storage => :s3, :s3_credentials => "#{Rails.root.to_s}/config/s3.yml",
-      :s3_permissions => :private
+    has_attached_file :inventory, storage: :s3,
+      s3_credentials: Setting.amazon,
+      s3_permissions: :private
   else
     has_attached_file :inventory,
-      :path => ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
+      path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
   end
-  validates_attachment_content_type :inventory, :content_type => ['text/csv', 'text/plain', 'text/tab-separated-values']
+  validates_attachment_content_type :inventory, content_type: ['text/csv', 'text/plain', 'text/tab-separated-values']
   validates_attachment_presence :inventory
 
   paginates_per 10
@@ -22,9 +22,9 @@ class InventoryFile < ActiveRecord::Base
     file = File.open(self.inventory.path)
     reader = file.read
     reader.split.each do |row|
-      item = Item.where(:item_identifier => row.to_s.strip).first
+      item = Item.where(item_identifier: row.to_s.strip).first
       if item
-        unless self.items.where(:id => item.id).select('items.id').first
+        unless self.items.where(id: item.id).select('items.id').first
           self.items << item
         end
       end

data/config/routes.rb

@@ -1,4 +1,4 @@
 Rails.application.routes.draw do
   resources :inventory_files
-  resources :inventories
+  resources :inventories, only: [:index, :show]
 end

data/lib/enju_inventory/version.rb

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

data/spec/controllers/inventories_controller_spec.rb

@@ -82,84 +82,4 @@ describe InventoriesController do
       end
     end
   end
-
-  describe "GET new" do
-    describe "When logged in as Administrator" do
-      login_fixture_admin
-
-      it "assigns the requested inventory as @inventory" do
-        get :new
-        expect(assigns(:inventory)).not_to be_valid
-        expect(response).to be_success
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_fixture_librarian
-
-      it "should not assign the requested inventory as @inventory" do
-        get :new
-        expect(assigns(:inventory)).not_to be_valid
-        expect(response).to be_success
-      end
-    end
-
-    describe "When logged in as User" do
-      login_fixture_user
-
-      it "should not assign the requested inventory as @inventory" do
-        get :new
-        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
-        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_fixture_admin
-
-      it "assigns the requested inventory as @inventory" do
-        inventory = inventories(:inventory_00001)
-        get :edit, :id => inventory.id
-        expect(assigns(:inventory)).to eq(inventory)
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_fixture_librarian
-
-      it "assigns the requested inventory as @inventory" do
-        inventory = inventories(:inventory_00001)
-        get :edit, :id => inventory.id
-        expect(assigns(:inventory)).to eq(inventory)
-      end
-    end
-
-    describe "When logged in as User" do
-      login_fixture_user
-
-      it "assigns the requested inventory as @inventory" do
-        inventory = inventories(:inventory_00001)
-        get :edit, :id => inventory.id
-        expect(response).to be_forbidden
-      end
-    end
-
-    describe "When not logged in" do
-      it "should not assign the requested inventory as @inventory" do
-        inventory = inventories(:inventory_00001)
-        get :edit, :id => inventory.id
-        expect(response).to redirect_to(new_user_session_url)
-      end
-    end
-  end
 end

data/spec/controllers/inventory_files_controller_spec.rb

@@ -194,7 +194,7 @@ describe InventoryFilesController do
       login_fixture_admin
 
       it "should update inventory_file" do
-        put :update, :id => inventory_files(:inventory_file_00003).id, :inventory_file => { }
+        put :update, :id => inventory_files(:inventory_file_00003).id, :inventory_file => { note: "test" }
         expect(response).to redirect_to inventory_file_url(assigns(:inventory_file))
       end
     end
@@ -203,7 +203,7 @@ describe InventoryFilesController do
       login_fixture_librarian
 
       it "should update inventory_file" do
-        put :update, :id => inventory_files(:inventory_file_00003).id, :inventory_file => { }
+        put :update, :id => inventory_files(:inventory_file_00003).id, :inventory_file => { note: "test" }
         expect(response).to redirect_to inventory_file_url(assigns(:inventory_file))
       end
     end
@@ -212,14 +212,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 => { }
+        put :update, :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 => { }
+        put :update, :id => inventory_files(:inventory_file_00003).id, :inventory_file => { note: "test" }
         expect(response).to redirect_to new_user_session_url
       end
     end

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/spec/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+gemfile = ENV['BUNDLE_GEMFILE'] || File.expand_path('../../../../Gemfile', __FILE__)
 
 if File.exist?(gemfile)
   ENV['BUNDLE_GEMFILE'] = gemfile
@@ -7,4 +7,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/database.yml

@@ -1,25 +1,30 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
+sqlite: &sqlite
   adapter: sqlite3
-  database: db/development.sqlite3
+  database: db/<%= Rails.env %>.sqlite3
+
+mysql: &mysql
+  adapter: mysql2
+  username: root
+  password:
+  database: enju_<%= Rails.env %>
+
+postgresql: &postgresql
+  adapter: postgresql
+  username: postgres
+  password:
+  database: enju_<%= Rails.env %>
+
+defaults: &defaults
   pool: 5
   timeout: 5000
+  host: localhost
+  <<: *<%= ENV['DB'] || "sqlite" %>
+
+development:
+  <<: *defaults
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *defaults
 
 production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *defaults

data/spec/dummy/db/migrate/005_create_manifestations.rb

@@ -13,7 +13,6 @@ class CreateManifestations < ActiveRecord::Migration
       t.string :access_address
       t.integer :language_id, :default => 1, :null => false
       t.integer :carrier_type_id, :default => 1, :null => false
-      t.integer :extent_id, :default => 1, :null => false
       t.integer :start_page
       t.integer :end_page
       t.integer :height

data/spec/dummy/db/migrate/133_create_agent_merges.rb

@@ -0,0 +1,15 @@
+class CreateAgentMerges < ActiveRecord::Migration
+  def self.up
+    create_table :agent_merges do |t|
+      t.integer :agent_id, :agent_merge_list_id, :null => false
+
+      t.timestamps
+    end
+    add_index :agent_merges, :agent_id
+    add_index :agent_merges, :agent_merge_list_id
+  end
+
+  def self.down
+    drop_table :agent_merges
+  end
+end

data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb

@@ -0,0 +1,13 @@
+class CreateAgentMergeLists < ActiveRecord::Migration
+  def self.up
+    create_table :agent_merge_lists do |t|
+      t.string :title
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :agent_merge_lists
+  end
+end