enju_inventory 0.1.6 → 0.1.7

data/app/models/inventory_file.rb

@@ -3,10 +3,17 @@ class InventoryFile < ActiveRecord::Base
   has_many :inventories, :dependent => :destroy
   has_many :items, :through => :inventories
   belongs_to :user
-  has_attached_file :inventory, :path => ":rails_root/private:url"
+  validates_presence_of :user
+
+  if configatron.uploaded_file.storage == :s3
+    has_attached_file :inventory, :storage => :s3, :s3_credentials => "#{Rails.root.to_s}/config/s3.yml",
+      :s3_permissions => :private
+  else
+    has_attached_file :inventory,
+      :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_presence :inventory
-  validates_presence_of :user
 
   def self.per_page
     10

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

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.inventory')) -%></h1>
 <div id="content_list">
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th><%= t('activerecord.models.inventory_file') -%> </th>
     <th><%= t('activerecord.models.item') -%> </th>

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

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.inventory_file')) -%></h1>
 <div id="content_list">
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th><%= t('activerecord.attributes.inventory_file.inventory_file_name') -%> </th>
     <th><%= t('activerecord.attributes.inventory_file.inventory_content_type') -%> </th>

data/lib/enju_inventory/version.rb

@@ -1,3 +1,3 @@
 module EnjuInventory
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_inventory
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,17 +128,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.pre.120720
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.pre.120720
 description: Inventory management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp