removed submodule

.bundle/config

@@ -1,3 +1,4 @@
-#BUNDLE_DISABLE_SHARED_GEMS: "1"
+--- 
+BUNDLE_DISABLE_SHARED_GEMS: "1"
 BUNDLE_WITHOUT: ""
 BUNDLE_PATH: vendor/bundler_gems

Gemfile

@@ -8,6 +8,8 @@ gem 'sqlite3-ruby', :require => 'sqlite3'
 gem 'em-websocket'
 gem 'daemons'
 gem 'httparty'
+# gem 'remotipart'
+gem 'paperclip'
 
 group :test, :development do
   gem 'rspec'

Gemfile.lock

@@ -78,6 +78,9 @@ GEM
     mime-types (1.16)
     nifty-generators (0.4.0)
     nokogiri (1.4.3.1)
+    paperclip (2.3.3)
+      activerecord
+      activesupport
     pg (0.9.0)
     polyglot (0.3.1)
     rack (1.2.1)
@@ -143,6 +146,7 @@ DEPENDENCIES
   httparty
   machinist (>= 2.0.0.beta1)
   nifty-generators
+  paperclip
   pg
   rails (= 3.0.0.rc)
   rspec

app/controllers/layers_controller.rb

@@ -0,0 +1,83 @@
+class LayersController < ApplicationController
+  # GET /layers
+  # GET /layers.xml
+  def index
+    @layers = Layer.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @layers }
+    end
+  end
+
+  # GET /layers/1
+  # GET /layers/1.xml
+  def show
+    @layer = Layer.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.xml  { render :xml => @layer }
+    end
+  end
+
+  # GET /layers/new
+  # GET /layers/new.xml
+  def new
+    @layer = Layer.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.xml  { render :xml => @layer }
+    end
+  end
+
+  # GET /layers/1/edit
+  def edit
+    @layer = Layer.find(params[:id])
+  end
+
+  # POST /layers
+  # POST /layers.xml
+  def create
+    @layer = Layer.new(params[:layer])
+
+    respond_to do |format|
+      if @layer.save
+        format.html { redirect_to(@layer, :notice => 'Layer was successfully created.') }
+        format.xml  { render :xml => @layer, :status => :created, :location => @layer }
+      else
+        format.html { render :action => "new" }
+        format.xml  { render :xml => @layer.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /layers/1
+  # PUT /layers/1.xml
+  def update
+    @layer = Layer.find(params[:id])
+
+    respond_to do |format|
+      if @layer.update_attributes(params[:layer])
+        format.html { redirect_to(@layer, :notice => 'Layer was successfully updated.') }
+        format.xml  { head :ok }
+      else
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => @layer.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /layers/1
+  # DELETE /layers/1.xml
+  def destroy
+    @layer = Layer.find(params[:id])
+    @layer.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(layers_url) }
+      format.xml  { head :ok }
+    end
+  end
+end

app/helpers/layers_helper.rb

@@ -0,0 +1,2 @@
+module LayersHelper
+end

app/models/layer.rb

@@ -0,0 +1,3 @@
+class Layer < ActiveRecord::Base
+  has_attached_file :raw_data
+end

app/views/layers/_form.html.haml

@@ -0,0 +1,35 @@
+= form_for(@layer, :html => { :multipart => true }) do |f|
+  - if @layer.errors.any?
+    #errorExplanation
+      %h2= "#{pluralize(@layer.errors.count, 'error')} prohibited this user from being saved:"
+      %ul
+      - @layer.errors.full_messages.each do |msg|
+        %li= msg
+
+  .field
+    = f.label :name
+    %br
+    = f.text_field :name
+  .field
+    = f.label :description
+    %br
+    = f.text_area :description
+  .field
+    = f.label "Data file"
+    %br
+    = f.file_field :raw_data
+  .field
+    = f.label :data_format
+    %br
+    = f.text_field :data_format
+  .field
+    = f.label :workspace
+    %br
+    = f.text_field :workspace
+  .field
+    = f.label :category
+    %br
+    = f.text_field :category
+
+  .actions
+    = f.submit

app/views/layers/edit.html.haml

@@ -0,0 +1,6 @@
+.container
+  %h1 Edit Layer
+  %p
+    = link_to 'back', layers_path
+    = link_to 'show', @layer
+  = render 'form'

app/views/layers/index.html.haml

@@ -0,0 +1,27 @@
+.container  
+  %h1= t('.title')
+  %p= link_to t('.new_layer'), new_layer_path
+
+  %table
+    %thead
+      %tr
+        %th= Layer.human_attribute_name :name
+        %th= Layer.human_attribute_name :descriptionion
+        %th= Layer.human_attribute_name :raw_data
+        %th= Layer.human_attribute_name :data_format
+        %th= Layer.human_attribute_name :workspace
+        %th= Layer.human_attribute_name :category
+        %th{:colspan => 3}= t 'actions'
+
+    %tbody
+      - for layer in @layers
+        %tr{ :class => cycle(:odd, :even) }
+          %td= layer.name
+          %td= layer.description
+          %td= link_to "Raw Data", layer.raw_data.url
+          %td= layer.data_format
+          %td= layer.workspace
+          %td= layer.category
+          %td.action= link_to t('show'), layer
+          %td.action= link_to t('edit'), edit_layer_path(layer)
+          %td.action= link_to t('destroy'), layer, :confirm => t('are_you_sure'), :method => :delete

app/views/layers/new.html.haml

@@ -0,0 +1,4 @@
+.container  
+  %h1 New Layer
+  %p= link_to 'back', layers_path
+  = render 'form'

app/views/layers/show.html.haml

@@ -0,0 +1,19 @@
+.container
+  %h1 Show Layer
+  %p
+    = link_to 'back', layers_path
+    = link_to 'edit', edit_layer_path(@layer)
+
+  %dl
+    %dt= Layer.human_attribute_name :name
+    %dd= @layer.name
+    %dt= Layer.human_attribute_name :description
+    %dd= @layer.description
+    %dt= Layer.human_attribute_name :raw_data
+    %dd= link_to "Raw data", @layer.raw_data.url
+    %dt= Layer.human_attribute_name :data_format
+    %dd= @layer.data_format
+    %dt= Layer.human_attribute_name :workspace
+    %dd= @layer.workspace
+    %dt= Layer.human_attribute_name :category
+    %dd= @layer.category

app/views/layouts/application.haml

@@ -20,8 +20,6 @@
     = javascript_include_tag "highcharts"
     = javascript_include_tag 'json2'
     = javascript_include_tag 'inflection'
-    = javascript_include_tag 'jquery.base64'
-    / = javascript_include_tag 'https://getfirebug.com/firebug-lite.js'
     = stylesheet_link_tag '/javascripts/css/uniform.default.css'
 
     / setup websocket includes
@@ -40,6 +38,7 @@
 
     #footer.bp
       #footer_content
+        = yield(:footer)
         #footer_left
           %ul
             %li 
@@ -53,7 +52,6 @@
             %li 
               %a{:href => "/static/docs"} Documentation
             %li 
-              %a{:href => "/static/api"} About
+              %a{:href => "/static/api"} REST API
             %li 
-              %a{:href => "/static/contribute"} Contribute
-
+              %a{:href => "/static/contribute"} Contribute

config/routes.rb

@@ -1,5 +1,7 @@
 ImpactForecast::Application.routes.draw do |map|
 
+  resources :layers
+
   root :to => "application#home"
   match '/sandbox' => "application#sandbox"
   resources :hazards

db/migrate/20100825033757_create_layers.rb

@@ -0,0 +1,17 @@
+class CreateLayers < ActiveRecord::Migration
+  def self.up
+    create_table :layers do |t|
+      t.string :name
+      t.text :description
+      t.string :data_format
+      t.string :workspace
+      t.string :category
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :layers
+  end
+end

db/migrate/20100825035252_add_attachment_raw_data_to_layer.rb

@@ -0,0 +1,15 @@
+class AddAttachmentRawDataToLayer < ActiveRecord::Migration
+  def self.up
+    add_column :layers, :raw_data_file_name, :string
+    add_column :layers, :raw_data_content_type, :string
+    add_column :layers, :raw_data_file_size, :integer
+    add_column :layers, :raw_data_updated_at, :datetime
+  end
+
+  def self.down
+    remove_column :layers, :raw_data_file_name
+    remove_column :layers, :raw_data_content_type
+    remove_column :layers, :raw_data_file_size
+    remove_column :layers, :raw_data_updated_at
+  end
+end

lib/riat_python_api/get_download_url.py

@@ -12,6 +12,6 @@
 c  = coverage.Coverage(wcs_url, layername)
 wcs_url_file =  riat_websocket_root_dir+'/lib/riat_python_api/wcs_url.txt'
 os.system("rm "+wcs_url_file)
-f = open(wcs_url_file, 'w')
+f = open(wcs_url_file, 'w+')
 f.write(c.get_url())
 f.close