vesr 0.1.4 → 0.2.0

data/app/controllers/esr_files_controller.rb

@@ -0,0 +1,2 @@
+class EsrFilesController < AuthorizedController
+end

data/app/models/esr_file.rb

@@ -1,5 +1,7 @@
 class EsrFile < ActiveRecord::Base
-  has_attachment :storage => :file_system
+  # File upload
+  mount_uploader :file, EsrFileUploader
+
   has_many :esr_records, :dependent => :destroy
   
   def to_s(format = :default)
@@ -19,7 +21,7 @@ class EsrFile < ActiveRecord::Base
 
   private
   def create_records
-    File.new(full_filename).each {|line|
+    File.new(file.current_path).each {|line|
       self.esr_records << EsrRecord.new.parse(line) unless line[0..2] == '999'
     }
   end

data/app/models/esr_record.rb

@@ -4,10 +4,10 @@ class EsrRecord < ActiveRecord::Base
   belongs_to :booking, :dependent => :destroy
   belongs_to :invoice
   
-  named_scope :valid, :conditions => "state = 'valid'"
-  named_scope :missing, :conditions => "state = 'missing'"
-  named_scope :bad, :conditions => "state = 'bad'"
-  named_scope :invalid, :conditions => "state != 'valid'"
+  scope :valid, where(:state => 'valid')
+  scope :missing, where(:state => 'missing')
+  scope :bad, where(:state => 'bad')
+  scope :invalid, where(:state => 'valid')
   
   private
   def parse_date(value)

data/app/uploaders/esr_file_uploader.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+class EsrFileUploader < CarrierWave::Uploader::Base
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "system/uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+end

data/app/views/esr_bookings/_form.html.erb

@@ -1,8 +1,13 @@
 <div class="contextual">
-  <%= link_to "VESR Liste", esr_bookings_path, :class => "icon icon-book" %>
+  <%= link_to "VESR Liste", esr_files_path, :class => "icon icon-book" %>
 </div>
 <h2>VESR Datei einlesen</h2>
-<% form_for :esr_file, :url => esr_bookings_path, :html => { :multipart => true } do |esr_file| %>
-  Datei: <%= esr_file.file_field :uploaded_data %>
-  <%= esr_file.submit 'Einlesen' %>
+<% semantic_form_for :esr_file do |esr_file| %>
+  <%= esr_file.inputs do %>
+    <%= esr_file.input :file %>
+    <%= esr_file.input :file_cache, :as => :hidden %>
+  <%- end %>
+  <%= esr_file.buttons do %>
+    <%= esr_file.commit_button %>
+  <%- end %>
 <% end %>

data/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  resources :esr_files
+end

data/db/migrate/2_port_to_carrierwave.rb

@@ -0,0 +1,13 @@
+class PortToCarrierwave < ActiveRecord::Migration
+  def up
+    rename_column :esr_files, :filename, :file
+    remove_column :esr_files, :content_type
+    remove_column :esr_files, :size
+  end
+  
+  def down
+    add_column :esr_files, :size, :integer
+    add_column :esr_files, :content_type, :string
+    rename_column :esr_files, :file, :filename
+  end
+end

data/lib/vesr/prawn/esr_recipe.rb

@@ -1,4 +1,3 @@
-require 'prawn/measurement_extensions'
 require 'action_view/helpers/translation_helper'
 require 'action_view/helpers'
 

data/lib/vesr/version.rb

@@ -1,3 +1,3 @@
 module Vesr
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vesr
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Roman Simecek
@@ -32,9 +32,10 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE.txt
 files: 
-- app/controllers/esr_bookings_controller.rb
+- app/controllers/esr_files_controller.rb
 - app/models/esr_file.rb
 - app/models/esr_record.rb
+- app/uploaders/esr_file_uploader.rb
 - app/views/esr_bookings/_form.html.erb
 - app/views/esr_bookings/_item.html.erb
 - app/views/esr_bookings/_list_footer.html.erb
@@ -44,7 +45,9 @@ files:
 - app/views/esr_bookings/_sidebar.html.erb
 - app/views/esr_bookings/list.html.erb
 - app/views/esr_bookings/show.html.erb
+- config/routes.rb
 - db/migrate/1_create_vesr_tables.rb
+- db/migrate/2_port_to_carrierwave.rb
 - lib/vesr.rb
 - lib/vesr/prawn.rb
 - lib/vesr/prawn/esr_recipe.rb

data/app/controllers/esr_bookings_controller.rb

@@ -1,62 +0,0 @@
-require 'action_controller/test_process.rb'
-
-class EsrBookingsController < ApplicationController
-  # GET /esr_bookings
-  def index
-    @esr_files = EsrFile.paginate(:page => params['page'], :per_page => 20, :order => 'updated_at DESC')
-    
-    respond_to do |format|
-      format.html {
-        render :action => 'list'
-      }
-    end
-  end
-
-  # GET /esr_bookings/new
-  def new
-    @esr_file = EsrFile.new
-
-    respond_to do |format|
-      format.html {
-        render :partial => 'form', :layout => 'application'
-      }
-      format.js { }
-    end
-  end
-
-  # POST /esr_bookings
-  def create
-    # if :filename param is set, file exists
-    if params[:filename]
-      vesr_path = params[:filename]
-      
-      @esr_file = EsrFile.new(:uploaded_data => ActionController::TestUploadedFile.new(vesr_path))
-    else
-      @esr_file = EsrFile.new(params[:esr_file])
-    end
-
-    if @esr_file.save
-      # Delete file if saved as attachment
-      File.delete(vesr_path) if vesr_path
-    end
-    
-    respond_to do |format|
-      format.html {
-        redirect_to :action => 'show', :id => @esr_file
-      }
-      format.js { }
-    end
-  end
-
-  # GET /esr_bookings/1
-  def show
-    @esr_file = EsrFile.find(params[:id])
-    
-    respond_to do |format|
-      format.html {
-        render :action => 'show'
-      }
-      format.js { }
-    end
-  end
-end