fixed markup

Gemfile

@@ -20,6 +20,8 @@ gem 'jquery-rails'
 gem 'devise'
 gem "nifty-generators"
 gem 'formtastic'
+gem 'sunspot_rails'
+gem 'qrencoder'
 
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'

Gemfile.lock

@@ -33,6 +33,7 @@ GEM
     arel (2.2.1)
     bcrypt-ruby (3.0.1)
     builder (3.0.0)
+    chunky_png (1.2.5)
     coffee-rails (3.1.1)
       coffee-script (>= 2.2.0)
       railties (~> 3.1.0)
@@ -45,6 +46,7 @@ GEM
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
     erubis (2.7.0)
+    escape (0.0.4)
     execjs (1.2.9)
       multi_json (~> 1.0)
     formtastic (2.0.2)
@@ -65,8 +67,12 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.0.3)
     nifty-generators (0.4.6)
+    nokogiri (1.5.0)
     orm_adapter (0.0.5)
     polyglot (0.3.3)
+    pr_geohash (1.0.0)
+    qrencoder (1.4.0)
+      chunky_png (~> 1.1)
     rack (1.3.5)
     rack-cache (1.1)
       rack (>= 0.4)
@@ -94,6 +100,8 @@ GEM
     rake (0.9.2.2)
     rdoc (3.11)
       json (~> 1.4)
+    rsolr (0.12.1)
+      builder (>= 2.1.2)
     sass (3.1.10)
     sass-rails (3.1.4)
       actionpack (~> 3.1.0)
@@ -106,6 +114,13 @@ GEM
       rack (~> 1.0)
       tilt (!= 1.3.0, ~> 1.1)
     sqlite3 (1.3.4)
+    sunspot (1.2.1)
+      escape (= 0.0.4)
+      pr_geohash (~> 1.0)
+      rsolr (= 0.12.1)
+    sunspot_rails (1.2.1)
+      nokogiri
+      sunspot (= 1.2.1)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -130,8 +145,10 @@ DEPENDENCIES
   jquery-rails
   mocha
   nifty-generators
+  qrencoder
   rails (= 3.1.1)
   sass-rails (~> 3.1.4)
   sqlite3
+  sunspot_rails
   turn
   uglifier (>= 1.0.3)

app/assets/javascripts/categories.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/categories.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the categories controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/boxes_controller.rb

@@ -1,24 +1,31 @@
 class BoxesController < ApplicationController
 
-  def index
-    @user_boxes = current_user.warehouses
+  def qrCode
+    Box.find(params[:box_id]).create_qr_code
   end  
 
   def show
-    @box = Box.find params[:box_id]
+    @box = Box.find params[:id]
     @warehouse = Warehouse.find params[:warehouse_id]
+    @items = @box.items
+    @item = Item.new
+    render "items/new"
   end  
 
   def new
     @warehouse = Warehouse.find params[:warehouse_id]
     @box = Box.new
-    @boxes = @warehouse.boxes
+    @search = Box.search do
+        fulltext params[:search]
+      end
+    @boxes = @search.results
   end
 
   def create
     @warehouse = Warehouse.find params[:warehouse_id]
     @boxes = @warehouse.boxes
     @box = Box.new params[:box]
+    @box.warehouse = @warehouse
     if @box.save
       flash[:notice] = "Yey, a box!"
       redirect_to new_warehouse_box_item_path(@warehouse,@box)    

app/controllers/categories_controller.rb

@@ -0,0 +1,7 @@
+class CategoriesController < ApplicationController
+
+  def new
+    @category = Category.new
+  end  
+
+end

app/controllers/items_controller.rb

@@ -1,10 +1,31 @@
 class ItemsController < ApplicationController
 
+  def show
+    @item = Item.find params[:id]
+    @box = Box.find params[:box_id]
+    @warehouse = Warehouse.find params[:warehouse_id]
+  end  
+
   def new
     @box = Box.find params[:box_id]
     @warehouse = Warehouse.find params[:warehouse_id]
     @items = @box.items
-    @item = Item.new
+    @item = Item.new 
+  end  
+
+  def create
+    @box = Box.find params[:box_id]
+    @warehouse = Warehouse.find params[:warehouse_id]
+    @items = @box.items
+    @item = Item.create params[:item]
+    @item.box = @box
+    if @item.save
+      flash[:notice] = "Filling the little boxes"
+      render :new
+    else
+      flash[:error] = "Oh noes!"
+      render :new
+    end    
   end  
 
 end

app/controllers/warehouses_controller.rb

@@ -5,8 +5,16 @@ def index
   end  
 
   def new
-    @warehouse = Warehouse.create
+    @warehouse = Warehouse.create :user => current_user
     flash[:notice] = "Created Warehouse #{@warehouse.id}"
+    redirect_to new_warehouse_box_path(@warehouse)
+  end  
+
+  def show
+    @warehouse = Warehouse.find params[:id]
+    @box = Box.new
+    @boxes = @warehouse.boxes
+    render "boxes/new"
   end  
 
 end

app/helpers/categories_helper.rb

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

app/models/box.rb

@@ -1,7 +1,17 @@
 class Box < ActiveRecord::Base
   belongs_to :warehouse
   has_many :items
-
+    
   validates_presence_of :description
+  validates_length_of :description, :maximum => 140
+
+  searchable do
+    text :description, :boost => 5
+    text :items do items.map(&:name) + items.map(&:description) end
+  end
+
+  def create_qr_code
+    p "Hello"
+  end  
 
 end

app/models/item.rb

@@ -2,4 +2,8 @@ class Item < ActiveRecord::Base
   belongs_to :box
   belongs_to :category
 
+  validates_numericality_of :quantity, 
+      :greater_than_or_equal_to =>0, 
+      :only_integer => true
+
 end

app/views/boxes/new.html.erb

@@ -1,8 +1,13 @@
 <% if user_signed_in? %>
   <h2><%= "Warehouse #{@warehouse.id}" %></h2>
-  <% @boxes.each do |box| %>
-    <%= link_to "Box #{box.id}: #{box.description}", warehouse_box_path(@warehouse,box) %>
-  <% end %>
+  <ul class="boxes-list">
+    <% @boxes.each do |box| %>
+      <li>
+        <span class="box-link"><%= link_to "Box #{box.id}: #{box.description}", warehouse_box_path(@warehouse,box) %></span>
+        <span class="qr-link"><%= link_to "Create QR Code", warehouse_box_qrCode_path(@warehouse,box) %></span>
+      </li>
+    <% end %>
+  </ul>
 
   <%= semantic_form_for @box, :url => warehouse_boxes_path(@warehouse) do |f| %>
     <%= f.inputs do %>
@@ -12,4 +17,13 @@
       <%= f.commit_button %>
     <% end %>
   <% end %>
+
+  <% content_for :sidebar do %>
+    <%= form_tag new_warehouse_box_path(@warehouse), :method => :get do %>
+	  <p>
+	    <%= text_field_tag :search, params[:search] %>
+	    <%= submit_tag "Search", :name => nil %>
+	  </p>
+	<% end %>
+  <% end %>
 <% end %>

app/views/boxes/qrCode.html.erb

@@ -0,0 +1 @@
+HW

app/views/categories/new.html.erb

@@ -0,0 +1,8 @@
+<%= semantic_form_for @category, :url => categories_path do |f| %>
+    <%= f.inputs do %>
+	  <%= f.input :name %>
+    <% end %>
+    <%= f.buttons do %>
+      <%= f.commit_button %>
+    <% end %>
+  <% end %>

app/views/items/new.html.erb

@@ -1,9 +1,11 @@
 <% if user_signed_in? %>
-  <% @items.each do |item| %>
-    <%= "Item #{item.id}: #{item.name}" %>
-  <% end %>
+  <ul class="items-list">
+    <% @items.each do |item| %>
+      <li><%= link_to "Item #{item.id}: #{item.name}", warehouse_box_item_path(@warehouse, @box, item), :method => :get %></li>
+    <% end %>
+  </ul>
 
-  <%= semantic_form_for @item, :url => warehouse_boxes_path(@warehouse,@box) do |f| %>
+  <%= semantic_form_for @item, :url =>  warehouse_box_items_path(@warehouse,@box) do |f| %>
     <%= f.inputs do %>
 	  <%= f.input :name %>
       <%= f.input :description %>
@@ -14,4 +16,9 @@
       <%= f.commit_button %>
     <% end %>
   <% end %>
+
+  <% content_for :sidebar do %>
+    <%= link_to "Boxes", warehouse_path(@warehouse) %>
+    <%= link_to "Category", new_category_path %>
+  <% end %>
 <% end %>

app/views/items/show.html.erb

@@ -0,0 +1,10 @@
+<div class="item">
+  <span class="name"><%= @item.name %></span>
+  <span class="description"><%= @item.description %></span>
+</div>	
+
+<% content_for :sidebar do %>
+  <%= link_to "Boxes", warehouse_path(@warehouse) %>
+  <%= link_to "Items", warehouse_box_path(@warehouse,@box) %>
+  <%= link_to "Category", new_category_path %>
+<% end %>

app/views/layouts/application.html.erb

@@ -10,7 +10,7 @@
   </head>
 
   <body>
-	<div id="wrapper">
+    <div id="wrapper">
       <div id="header">
         <span id="product-name">Boxify</span>
 
@@ -34,7 +34,12 @@
         <div id="main">
           <%= yield %>
         </div>
+
+        <div class="sidebar">
+          <%= link_to "Warehouses", warehouses_path %>
+          <%= yield :sidebar %>
+        </div>	
       </div>
     </div>
   </body>
-</html>
+</html>

app/views/warehouses/index.html.erb

@@ -1,9 +1,7 @@
 <% if user_signed_in? %>
-  <% if @warehouses.empty? %>
-    <%= button_to "Create Warehouse", new_warehouse_path, :method => :get  %>
-  <% else %>
-    <% @warehouses.each do |warehouse| %>
-      <%= link_to "Warehouse #{warehouse.id}", warehouse_path(warehouse)  %>
-    <% end %>
-  <% end %>	
+  <% @warehouses.each do |warehouse| %>
+    <%= link_to "Warehouse #{warehouse.id}", warehouse_path(warehouse)  %>
+  <% end %>
+ 
+  <%= button_to "Create Warehouse", new_warehouse_path, :method => :get  %>
 <% end %>

config/routes.rb

@@ -3,9 +3,12 @@
 
   resources :warehouses do
     resources :boxes do
+      get 'qrCode'
       resources :items
     end  
   end  
+
+  resources :categories
 
   # The priority is based upon order of creation:
   # first created -> highest priority.

config/sunspot.yml

@@ -0,0 +1,17 @@
+production:
+  solr:
+    hostname: localhost
+    port: 8983
+    log_level: WARNING
+
+development:
+  solr:
+    hostname: localhost
+    port: 8982
+    log_level: INFO
+
+test:
+  solr:
+    hostname: localhost
+    port: 8981
+    log_level: WARNING

db/migrate/20111110202456_create_boxes.rb

@@ -1,7 +1,7 @@
 class CreateBoxes < ActiveRecord::Migration
   def up
     create_table :boxes do |t|
-      t.string  :description
+      t.string  :description, :limit => 140
       t.references :warehouse
 
       t.timestamps