rightnow_oms 0.0.4 → 0.1.1

data/CHANGELOG

@@ -0,0 +1,21 @@
+*Rightnow OMS 0.1.1 (Mon 18:35, Feb 13, 2012)*
+
+* Validate that cart items are cartable
+* Migrate the database to PostgreSQL
+
+*Rightnow OMS 0.1.0 (Mon 11:31, Feb 13, 2012)*
+
+* Provide a helper method to load the cart in controllers
+* Return the cartable_id and cartable_type of cart items
+* Distinguish cart items by cartable and parent_id
+* Create an acts_as_cartable method to provide the features of a cartable model.
+
+*Rightnow OMS 0.0.4 (Thu 14:29, Feb 9, 2012)*
+
+* Factory not registered error fixed
+
+*Rightnow OMS 0.0.3 (Thu 11:16, Feb 9, 2012)*
+
+* Can't add items with children bug fixed
+* Reorder the architecture
+* Add more tips in README

data/README.md

@@ -0,0 +1,163 @@
+# RightnowOms
+
+## Description
+
+A common gem for managing your carts and orders. RightnowOms is a rails mountable engine. It gets a lot of benifits from [Ember.JS](http://emberjs.com)
+
+## Requirements
+
+Add the following gems to your Gemfile:
+
+```ruby
+  gem 'jquery-rails'
+  gem 'ember-rails'
+  gem 'acts_as_api'
+  gem 'haml-rails'
+
+  group :assets do
+    gem 'uglifier'
+    gem 'coffee-rails'
+    gem 'sass-rails'
+  end
+```
+
+## Installation
+
+Make sure that all requirements are met and add RightnowOms to your Gemfile.
+
+```ruby
+  gem 'rightnow_oms'
+```
+
+and run `bundle install`
+
+## Usage
+
+Mount RightnowOms to your application.
+
+```ruby
+  # config/routes.rb
+  mount RightnowOms::Engine => "rightnow_oms"
+```
+
+Create the migrations with:
+
+```bash
+  rake rightnow_oms:install:migrations
+  rake db:migrate
+```
+
+Run `bundle install` and require ember and ember-data in your `app/assets/javascripts/application.js`:
+
+```
+  = require rightnow_oms/vendor/ember
+  = require rightnow_oms/vendor/ember-data
+```
+
+Add the following line to your `app/assets/javascripts/application.js`:
+
+```
+  = require rightnow_oms/application
+```
+
+Add the stylesheets to your `app/assets/stylesheets/application.css`:
+
+```
+  = require rightnow_oms/application
+```
+
+Create a layout for your detailed cart view like:
+
+```haml
+  # app/views/layouts/rightnow_oms/cart.html.haml
+  !!!
+  %html
+    %head
+      %title RightnowOms
+      = stylesheet_link_tag    "application"
+      = javascript_include_tag "application"
+      = csrf_meta_tags
+
+    %body
+      = yield
+```
+
+Add before filters to your controllers which need to use the cart:
+
+```ruby
+  # This before filter will create an instance variable @cart
+  before_filter :load_or_create_cart
+```
+
+Create cartable models in your application:
+
+```ruby
+class Product < ActiveRecord::Base
+  acts_as_cartable
+end
+```
+
+By default, Cart loads the name and price of cartable models by
+attributes named name and price. You can customize these attributes:
+
+```ruby
+  acts_as_cartable { name: :your_name_attr, price: :your_price_attr }
+```
+
+Add a place holder for your cart in your views:
+
+```html
+  <div id="rightnow-oms">
+    <script type="text/x-handlebars">
+      {{ view RightnowOms.ShowCartView }}
+    </script>
+  </div>
+```
+
+and load your cart in the view:
+
+```javascript
+  $(function() {
+    RightnowOms.cartController.load(#{@cart.as_api_response(:default).to_json.html_safe});
+  });
+```
+
+You can add cartables to the cart by:
+
+```javascript
+  RightnowOms.cartController.addCartItem({
+    cartable_id: 1,
+    cartable_type: 'Product'
+
+    // if the item is a child, you need to set the parent id.
+    // parent_id: 2
+  })
+```
+
+Now you have all things done. Wish you have a good day.
+
+## Development
+
+RightnowOms is developed with Ruby 1.9.3-p0 and Rails 3.1.3
+
+First of all, you need to create a database config for RightnowOms.
+There are already some useful templates for you under
+`spec/dummy/config/`. RightnowOms use PostgreSQL by default. If you want
+to setup other databases, for example mysql, you need to modify the
+Gemfile by yourself.
+
+```bash
+  bundle install
+  bundle exec rake app:db:migrate
+  bundle exec rake app:db:seed
+
+  # Run the tests. Please make sure you have firefox installed
+  bundle exec rake app:db:test:prepare
+  rspec
+
+  # Start the dummy application
+  rails s
+```
+
+## Copyright
+Copyright 2011-2012 Beijing Menglifang Network Technology and Science Co.,Ltd. All rights reserved.

data/Rakefile

@@ -4,23 +4,13 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
 
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'RightnowOms'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.rdoc_files.include('app/**/*.rb')
+require 'yard'
+YARD::Rake::YardocTask.new do |t|
+  t.options = ['--markup', 'markdown'] # optional
 end
 
+
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 

data/app/assets/javascripts/rightnow_oms/app/app.js.coffee

@@ -1,5 +1,5 @@
 window.RightnowOms = Ember.Application.create
-  rootElement: '#cart-wrapper'
+  rootElement: '#rightnow-oms'
 
 window.RightnowOms.store = DS.Store.create
   adapter:

data/app/assets/javascripts/rightnow_oms/app/controllers/cart.js.coffee

@@ -20,9 +20,18 @@ RightnowOms.cartController = Ember.Object.create
     @store.commit()
 
   decreaseCartItem: (id) ->
-    @get('content').decreaseCartItem(id)
-    @store.commit()
+    cartItem = RightnowOms.CartItem.findById(id)
 
-  removeCartItem: (id) ->
-    @get('content').removeCartItem(id)
-    @store.commit()
+    if cartItem.get('isDecreasable')
+      @get('content').decreaseCartItem(id)
+      @store.commit()
+    else
+      @removeCartItem(id)
+
+  removeCartItem: (id, silent) ->
+    remove = true
+    remove = confirm('您确定要删除该商品吗？') unless silent
+
+    if remove
+      @get('content').removeCartItem(id)
+      @store.commit()

data/app/assets/javascripts/rightnow_oms/app/models/cart.js.coffee

@@ -20,7 +20,7 @@ RightnowOms.Cart = DS.Model.extend
   ).property("cartableCount")
 
   addCartItem: (item) ->
-    cartItem = RightnowOms.CartItem.findByName(item.name)
+    cartItem = RightnowOms.CartItem.findByCartableAndParentId(item.cartable_id, item.cartable_type, item.parent_id)
 
     if cartItem?
       cartItem.increase() unless cartItem.get('parent')?
@@ -46,7 +46,6 @@ RightnowOms.Cart = DS.Model.extend
     cartItem = RightnowOms.CartItem.findById(id)
 
     cartItem.decrease()
-    #removeCartItem(id) if cartItem.get('quantity') <= 0
     cartItem
 
 RightnowOms.Cart.reopenClass

data/app/assets/javascripts/rightnow_oms/app/models/cart_item.js.coffee

@@ -28,6 +28,10 @@ RightnowOms.CartItem = DS.Model.extend
     @get('parent_id')?
   ).property('parent_id')
 
+  isDecreasable: (->
+    @get('quantity') > 1
+  ).property('quantity')
+
   increase: ->
     @get('children').forEach((child) ->
       child.increase()
@@ -53,8 +57,17 @@ RightnowOms.CartItem.reopenClass
   all: ->
     RightnowOms.store.findAll(RightnowOms.CartItem)
 
+  findById: (id) ->
+    @all().filterProperty('id', id).get('firstObject')
+
   findByName: (name) ->
     @all().filterProperty('name', name).get('firstObject')
 
-  findById: (id) ->
-    @all().filterProperty('id', id).get('firstObject')
+  findByCartableAndParentId: (cartableId, cartableType, parentId) ->
+    @all().filter((item) ->
+      if item.get('cartable_id') == cartableId && item.get('cartable_type') == cartableType
+        if parentId?
+          return true if item.get('parent_id') == parentId
+        else
+          return true
+    ).get('firstObject')

data/app/assets/javascripts/rightnow_oms/app/templates/cart_items/show.hjs

@@ -1,7 +1,7 @@
 {{#with cartItem }}
-  <td>{{ name }}</td>
-  <td class='price'>{{ price }}x{{ quantity }}</td>
-  <td>
+  <td class="name">{{ name }}</td>
+  <td class="price r-money">￥{{ price }}x{{ quantity }}</td>
+  <td class="delete">
     {{#unless hasParent }}
       <a href="#" {{ action "deleteRecord" }}>删除</a>
     {{/unless}}

data/app/assets/javascripts/rightnow_oms/app/templates/cart_items/show_in_detail.hjs

@@ -1,15 +1,19 @@
 {{#with cartItem}}
-  <td>{{ name }}</td>
+  <td class="name">{{ name }}</td>
   <td class="price">￥{{ price }}</td>
   <td class="quantity">
     {{#if hasParent }}
-      {{ quantity }}
+      <span class="quantity-only">{{ quantity }}</span>
     {{else}}
-      <a href="#" {{ action "decrease" }}>-</a>
-      <span> {{ quantity }} </span>
-      <a href="#" {{ action "increase" }}>+</a>
+      <span class="decrease"><a href="#" {{ action "decrease" }}>-</a></span>
+      <span class="quantity"> {{ quantity }} </span>
+      <span class="increase"><a href="#" {{ action "increase" }}>+</a></span>
     {{/if}}
   </td>
-  <td class="subtotal">￥{{ subtotal }}</td>
-  <td><a href="#" {{ action "deleteRecord" }}>删除</a></td>
+  <td class="subtotal r-money">￥{{ subtotal }}</td>
+  <td class="delete">
+    {{#unless hasParent }}
+      <a href="#" {{ action "deleteRecord" }}>删除</a>
+    {{/unless}}
+  </td>
 {{/with}}

data/app/assets/javascripts/rightnow_oms/app/templates/carts/show.hjs

@@ -1,14 +1,14 @@
-<div class="cart-bar">
-  <span>购物车 {{ cart.cartableCount }} 件</span>
-  <span><a href='/rightnow_oms/cart'>去结算 >></a></span>
+<div class="r-cart-bar">
+  {{ view RightnowOms.ShowCartableCountView cartableCountBinding="cart.cartableCount" }}
 </div>
-
-<div class="cart-items">
+<div class="r-cart-items">
   <table>
   {{#each cart.cartItems}}
     {{ view RightnowOms.ShowCartItemView cartItemBinding="this" }}
   {{/each}}
-    <tr><td colspan="3">总计：￥{{ cart.total }}</td></tr>
   </table>
+  <div class="r-bottom-bar">
+    <span>总计：<span class="r-money">￥{{ cart.total }}</span></span>
+    <span><a href="/rightnow_oms/cart">查看我的购物车</a></span>
+  </div>
 </div>
-

data/app/assets/javascripts/rightnow_oms/app/templates/carts/show_cartable_count.hjs

@@ -0,0 +1 @@
+<a href="/rightnow_oms/cart">购物车 {{ cartableCount }} 件</a>

data/app/assets/javascripts/rightnow_oms/app/templates/carts/show_in_detail.hjs

@@ -1,21 +1,30 @@
 <h2>我的购物车</h2>
-<table>
-  <tr>
-    <td>商品名称</td>
-    <td>商品价格</td>
-    <td>商品数量</td>
-    <td>商品总价</td>
-    <td>删除商品</td>
-  </tr>
-  </tr>
-  {{#each cart.cartItems}}
-    {{ view RightnowOms.ShowCartItemInDetailView cartItemBinding="this" }}
-  {{/each}}
-  <tr>
-    <td colspan="4">总价：<span class="total-price">￥{{ cart.total }}</span></td>
-    <td></td>
-  </tr>
-</table>
-
-<a href="/"><< 继续购物</a>
-<a href="#">去结算 >></a>
+<div class="r-cart-items">
+  <table>
+    <thead>
+      <tr>
+        <th>名称</th>
+        <th>价格</th>
+        <th>数量</th>
+        <th>总价</th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+    {{#each cart.cartItems}}
+      {{ view RightnowOms.ShowCartItemInDetailView cartItemBinding="this" }}
+    {{/each}}
+    </tbody>
+    <tfoot>
+    <tr>
+      <td colspan="4"></td>
+      <td></td>
+    </tr>
+    </tfoot>
+  </table>
+</div>
+<div class="r-bottom-bar">
+  <span>总价：<span class="r-money">￥{{ cart.total }}</span></span>
+  <span><a href="/"><< 继续购物</a></span>
+  <span><a href="#">去结算 >></a></span>
+</div>

data/app/assets/javascripts/rightnow_oms/app/views/cart_items/show.js.coffee

@@ -4,4 +4,4 @@ RightnowOms.ShowCartItemView = Ember.View.extend
 
   deleteRecord: ->
     item = this.get('cartItem')
-    RightnowOms.cartController.removeCartItem(item.get('id'))
+    RightnowOms.cartController.removeCartItem(item.get('id'), true)

data/app/assets/javascripts/rightnow_oms/app/views/carts/show.js.coffee

@@ -1,4 +1,8 @@
 RightnowOms.ShowCartView = Ember.View.extend
+  classNames: ['r-mini-cart']
   templateName: 'rightnow_oms/app/templates/carts/show'
 
   cartBinding: 'RightnowOms.cartController.content'
+
+  mouseLeave: (e) ->
+    $('.r-cart-items').hide()

data/app/assets/javascripts/rightnow_oms/app/views/carts/show_cartable_count.js.coffee

@@ -0,0 +1,6 @@
+RightnowOms.ShowCartableCountView = Ember.View.extend
+  classNames: ['r-cart-cartable-count']
+  templateName: 'rightnow_oms/app/templates/carts/show_cartable_count'
+
+  mouseEnter: (e) ->
+    $('.r-cart-items').show()

data/app/assets/javascripts/rightnow_oms/app/views/carts/show_in_detail.js.coffee

@@ -1,5 +1,4 @@
 RightnowOms.ShowCartInDetailView = Ember.View.extend
-  classNames: ["detailed-cart"]
   templateName: 'rightnow_oms/app/templates/carts/show_in_detail'
 
   cartBinding: 'RightnowOms.cartController.content'

data/app/assets/stylesheets/rightnow_oms/carts.css.scss

@@ -1,21 +1,144 @@
-.detailed-cart {
+.r-links {
+  a {
+    color: black;
+    text-decoration: none;
+    &:hover { text-decoration: underline; }
+  }
+}
+.r-clear { clear: both; }
+.r-money { color: red; }
+.r-mini-cart {
+  @extend .r-links;
+  position: relative;
+  color: black;
+  font-size: 12px;
+  .r-cart-cartable-count {
+    a {
+      background: url('cart.png') no-repeat left center;
+      padding-left: 20px;
+      line-height: 16px;
+    }
+    padding: 5px 10px;
+    width: 100px;
+    text-align: center;
+    border: 1px solid #ccc;
+  }
+  .r-cart-items {
+    position: absolute;
+    top: 28px;
+    right: 0px;
+    float: left;
+    width: 285px;
+    margin-top: -1px;
+    border: 1px solid #ccc;
+    background-color: white;
+    display: none;
+    table {
+      td {
+        padding: 5px;
+        text-align: right;
+      }
+      td.name {
+        width: 175px;
+        text-align: left;
+        overflow: hidden;
+      }
+      td.money { @extend .money }
+      td.delete {
+        a {
+          color: #BF0000;
+        }
+      }
+    }
+  }
+  .r-bottom-bar {
+    float: right;
+    padding: 5px 10px;
+    span { margin: 2px; }
+  }
+}
+.r-detailed-cart {
+  @extend .r-links;
+  position: relative;
+  width: 100%;
+  max-width: 940px;
+  margin: 0 auto;
+  font-size: 12px;
+  background-color: white;
+  h2 {
+    font-size: 24px;
+    line-height: 36px;
+  }
   table {
-    .subtotal {
-      text-align: right;
-      color: red;
+    display: table;
+    width: 100%;
+    margin-bottom: 18px;
+    border-collapse: collapse;
+    border-spacing: 0;
+    vertical-align: middle;
+    tr:nth-child(odd) {
+      td { background-color: #F9F9F9; }
     }
-    .total-price {
-      text-align: right;
-      color: red;
+
+    th, td {
+      padding: 8px;
+      line-height: 18px;
+      text-align: left;
+      display: table-cell;
     }
-    .price {
-      color: red;
+    thead {
+      display: table-header-group;
+      tr {
+        display: table-row;
+        th {
+          border-top: 0;
+          font-weight: bold;
+          vertical-align: bottom;
+        }
+      }
     }
-    .quantity {
-      text-align: center;
+    tbody {
+      display: table-row-group;
+      tr {
+        display: table-row;
+        td {
+          border-top: 1px solid #DDD;
+          vertical-align: top;
+        }
+        td.price    { width: 80px; }
+        td.quantity {
+          width: 100px;
+          span {
+            float: left;
+            text-align: center;
+            min-width: 12px;
+            border: 1px solid #CCC;
+            background-color: white;
+          }
+          span.quantity-only { width: 56px; }
+          span.quantity { width: 30px; }
+          span.increase {
+            margin-left: -1px;
+            a { text-decoration: none }
+          }
+          span.decrease {
+            margin-right: -1px;
+            a { text-decoration: none }
+          }
+        }
+        td.subtotal { width: 80px; }
+        td.delete   { width: 50px; }
+      }
     }
-    a {
-      text-decoration: none;
+    tfoot { display: none; }
+  }
+  .r-bottom-bar {
+    position: relative;
+    float: right;
+    font-size: 20px;
+    line-height: 36px;
+    span {
+      padding: 8px;
     }
   }
 }

data/app/controllers/rightnow_oms/application_controller.rb

@@ -1,17 +1,4 @@
 module RightnowOms
   class ApplicationController < ActionController::Base
-    before_filter :set_null_to_nil
-
-    protected
-    def load_cart
-      @cart = Cart.find_by_id(session[:cart_id]) || Cart.new
-    end
-
-    def set_null_to_nil(data = params)
-      data.each do |k, v|
-        set_null_to_nil(v) if v.is_a? Hash
-        data[k] = nil if v == 'null'
-      end
-    end
   end
 end

data/app/controllers/rightnow_oms/cart_items_controller.rb

@@ -1,6 +1,7 @@
 module RightnowOms
   class CartItemsController < ApplicationController
-    before_filter :load_cart, only: [:index, :create]
+    before_filter :remove_null_params
+    before_filter :load_or_create_cart, only: [:index, :create]
     before_filter :load_cart_item, only: [:update, :destroy]
 
     # TODO Unit test needed
@@ -18,7 +19,7 @@ module RightnowOms
       cart_item = @cart.add_item(find_cartable, params[:cart_item])
 
       respond_to do |format|
-        if cart_item.save
+        if cart_item.valid?
           format.json { render_for_api :default, json: cart_item, root: :cart_item, status: :created }
         else
           format.json { render json: cart_item.errors, status: :unprocessable_entity }
@@ -53,7 +54,7 @@ module RightnowOms
     end
 
     def load_cart_item
-      @cart_item = CartItem.find(params[:id])
+      @cart_item = RightnowOms::CartItem.find(params[:id])
     end
   end
 end

data/app/controllers/rightnow_oms/carts_controller.rb

@@ -1,16 +1,17 @@
 module RightnowOms
   class CartsController < ApplicationController
-    before_filter :load_cart, only: [:show, :destroy]
+    before_filter :load_or_create_cart, only: :show
+    before_filter :load_cart, only: :destroy
 
     def show
       respond_to do |format|
-        format.html
+        format.html { render :show, layout: 'rightnow_oms/cart' }
         format.json { render_for_api :default, json: @cart, root: :cart, status: :ok }
       end
     end
 
     def destroy
-      @cart.destroy
+      @cart.destroy if has_cart?
 
       head :ok
     end

data/app/models/rightnow_oms/cart.rb

@@ -14,6 +14,10 @@ module RightnowOms
       cart_items.map.sum(&:total_price) || 0
     end
 
+    def cartable_count
+      cart_items.map.sum(&:quantity)
+    end
+
     def add_item(cartable, opts = { quantity: 1 })
       quantity = opts[:quantity]
       group = opts[:group]
@@ -26,10 +30,10 @@ module RightnowOms
           quantity: cart_item.quantity + quantity.to_i
         )
       else
-        cart_item = cart_items.create!(
+        cart_item = cart_items.create(
           cartable: cartable,
-          name: cartable.name,
-          price: cartable.price,
+          name: cartable.cartable_name,
+          price: cartable.cartable_price,
           quantity: quantity,
           group: group,
           parent_id: parent_id

data/app/models/rightnow_oms/cart_item.rb

@@ -7,6 +7,7 @@ module RightnowOms
     belongs_to :parent, class_name: 'RightnowOms::CartItem', foreign_key: :parent_id
     has_many :children, class_name: 'RightnowOms::CartItem', foreign_key: :parent_id, dependent: :destroy
 
+    validates :cartable, presence: true, cartable: true
     validates :cart, presence: true
     validates :name, presence: true
     validates :price, presence: true, numericality: { greater_than_or_equal_to: 0 }
@@ -15,12 +16,16 @@ module RightnowOms
     api_accessible :default do |t|
       t.add :id
       t.add :parent_id
+      t.add :cartable_id
+      t.add :cartable_type
       t.add :name
       t.add :price
       t.add :quantity
       t.add :group
     end
 
+    default_scope order("id ASC")
+
     def total_price
       price * quantity
     end

data/app/views/rightnow_oms/carts/show.html.haml

@@ -1,4 +1,4 @@
-#cart-wrapper
+#rightnow-oms{ class: 'r-detailed-cart' }
   %script{ type: 'text/x-handlebars'}
     {{ view RightnowOms.ShowCartInDetailView }}
 

data/lib/rightnow_oms.rb

@@ -1,6 +1,9 @@
 require "acts_as_api"
 
 require "rightnow_oms/engine"
+require "rightnow_oms/cartable_validator"
+require "rightnow_oms/acts_as_cartable"
+require "rightnow_oms/controller_helpers"
 
-module RightnowOms
-end
+ActiveRecord::Base.extend(RightnowOms::ActsAsCartable)
+ActionController::Base.send(:include, RightnowOms::ControllerHelpers)

data/lib/rightnow_oms/acts_as_cartable.rb

@@ -0,0 +1,36 @@
+module RightnowOms
+  module ActsAsCartable
+    def acts_as_cartable?
+      false
+    end
+
+    def acts_as_cartable(opts = { name: :name, price: :price })
+      cartable_config.update(opts) if opts.is_a? Hash
+
+      class_eval do
+        include RightnowOms::ActsAsCartable::InstanceMethods
+        extend  RightnowOms::ActsAsCartable::ClassMethods
+      end
+    end
+
+    def cartable_config
+      @cartable_config ||= { name: :name, price: :price }
+    end
+
+    module ClassMethods
+      def acts_as_cartable?
+        self.included_modules.include?(InstanceMethods)
+      end
+    end
+
+    module InstanceMethods
+      def cartable_name
+        self.send(self.class.cartable_config[:name])
+      end
+
+      def cartable_price
+        self.send(self.class.cartable_config[:price])
+      end
+    end
+  end
+end

data/lib/rightnow_oms/cartable_validator.rb

@@ -0,0 +1,5 @@
+class CartableValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    record.errors[attribute] << "must act as cartable" unless value && value.class.acts_as_cartable?
+  end
+end

data/lib/rightnow_oms/controller_helpers.rb

@@ -0,0 +1,28 @@
+module RightnowOms
+  module ControllerHelpers
+    extend ActiveSupport::Concern
+
+    def has_cart?
+      !@cart.nil?
+    end
+
+    def load_or_create_cart
+      load_cart
+
+      unless has_cart?
+        @cart = RightnowOms::Cart.create! and session[:cart_id] = @cart.id
+      end
+    end
+
+    def load_cart
+      @cart = RightnowOms::Cart.find_by_id(session[:cart_id])
+    end
+
+    def remove_null_params(data = params)
+      data.each do |k, v|
+        remove_null_params(v) if v.is_a? Hash
+        data.delete(k) if v == 'null'
+      end
+    end
+  end
+end

data/lib/rightnow_oms/version.rb

@@ -1,3 +1,3 @@
 module RightnowOms
-  VERSION = "0.0.4"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rightnow_oms
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
+date: 2012-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &17425100 !ruby/object:Gem::Requirement
+  requirement: &10801820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17425100
+  version_requirements: *10801820
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &17423860 !ruby/object:Gem::Requirement
+  requirement: &10800840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17423860
+  version_requirements: *10800840
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &17422380 !ruby/object:Gem::Requirement
+  requirement: &10799660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17422380
+  version_requirements: *10799660
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &17456900 !ruby/object:Gem::Requirement
+  requirement: &10813400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17456900
+  version_requirements: *10813400
 - !ruby/object:Gem::Dependency
   name: acts_as_api
-  requirement: &17454900 !ruby/object:Gem::Requirement
+  requirement: &10811620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17454900
+  version_requirements: *10811620
 - !ruby/object:Gem::Dependency
   name: ember-rails
-  requirement: &17454240 !ruby/object:Gem::Requirement
+  requirement: &10810480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17454240
+  version_requirements: *10810480
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &17453040 !ruby/object:Gem::Requirement
+  requirement: &10809240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,18 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17453040
-- !ruby/object:Gem::Dependency
-  name: factory_girl_rails
-  requirement: &17450640 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *17450640
+  version_requirements: *10809240
 description: A common mountable engine can be used to manage the orders.
 email:
 - towerhe@gmail.com
@@ -111,12 +100,9 @@ files:
 - app/controllers/rightnow_oms/application_controller.rb
 - app/models/rightnow_oms/cart.rb
 - app/models/rightnow_oms/cart_item.rb
-- app/helpers/rightnow_oms/carts_helper.rb
-- app/helpers/rightnow_oms/application_helper.rb
-- app/helpers/rightnow_oms/cart_items_helper.rb
 - app/assets/stylesheets/rightnow_oms/carts.css.scss
-- app/assets/stylesheets/rightnow_oms/cart_items.css
 - app/assets/stylesheets/rightnow_oms/application.css
+- app/assets/images/rightnow_oms/cart.png
 - app/assets/javascripts/rightnow_oms/application.js
 - app/assets/javascripts/rightnow_oms/vendor/ember-data.min.js
 - app/assets/javascripts/rightnow_oms/vendor/ember-data.js
@@ -128,6 +114,7 @@ files:
 - app/assets/javascripts/rightnow_oms/app/templates/cart_items/show.hjs
 - app/assets/javascripts/rightnow_oms/app/templates/cart_items/show_in_detail.hjs
 - app/assets/javascripts/rightnow_oms/app/templates/carts/show.hjs
+- app/assets/javascripts/rightnow_oms/app/templates/carts/show_cartable_count.hjs
 - app/assets/javascripts/rightnow_oms/app/templates/carts/show_in_detail.hjs
 - app/assets/javascripts/rightnow_oms/app/app.js.coffee
 - app/assets/javascripts/rightnow_oms/app/controllers/cart.js.coffee
@@ -137,6 +124,7 @@ files:
 - app/assets/javascripts/rightnow_oms/app/views/cart_items/show.js.coffee
 - app/assets/javascripts/rightnow_oms/app/views/carts/show_in_detail.js.coffee
 - app/assets/javascripts/rightnow_oms/app/views/carts/show.js.coffee
+- app/assets/javascripts/rightnow_oms/app/views/carts/show_cartable_count.js.coffee
 - app/views/rightnow_oms/carts/show.html.haml
 - config/routes.rb
 - db/migrate/20120202104431_create_rightnow_oms_carts.rb
@@ -144,11 +132,15 @@ files:
 - db/migrate/20120207095146_add_parent_id_to_rightnow_oms_cart_items.rb
 - db/migrate/20120203045059_create_rightnow_oms_cart_items.rb
 - lib/rightnow_oms.rb
+- lib/rightnow_oms/controller_helpers.rb
+- lib/rightnow_oms/acts_as_cartable.rb
 - lib/rightnow_oms/engine.rb
 - lib/rightnow_oms/version.rb
+- lib/rightnow_oms/cartable_validator.rb
 - lib/tasks/rightnow_oms_tasks.rake
 - Rakefile
-- README.rdoc
+- README.md
+- CHANGELOG
 homepage: http://hetao.im
 licenses: []
 post_install_message: 
@@ -163,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4343013466019004784
+      hash: -375847056207753837
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4343013466019004784
+      hash: -375847056207753837
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -180,3 +172,4 @@ signing_key:
 specification_version: 3
 summary: Manage the orders.
 test_files: []
+has_rdoc: 

data/README.rdoc

@@ -1,84 +0,0 @@
-= RightnowOms
-
-== Description
-
-A common gem for managing your carts and orders. RightnowOms is a rails mountable engine. It gets a lot of benifits from Ember.JS[http://emberjs.com]
-
-== Requirements
-
-Add the following gems to your Gemfile:
-
-* jquery-rails
-* ember-rails
-* haml-rails
-* coffee-rails
-* sass-rails
-* acts_as_api
-
-== Installation
-
-Make sure that all requirements are met and add RightnowOms to your Gemfile.
-
-  gem 'rightnow_oms'
-
-Mount RightnowOms to your application.
-
-  # config/routes.rb
-  mount RightnowOms::Engine => "rightnow_oms"
-
-Create the migrations with:
-
-  rake rightnow_oms:install:migrations
-  rake db:migrate
-
-Run +bundle install+ and require ember and ember-data in your +app/assets/javascripts/application.js+:
-
-  = require rightnow_oms/vendor/ember
-  = require rightnow_oms/vendor/ember-data
-
-Add the following line to your +app/assets/javascripts/application.js+:
-
-  = require rightnow_oms/application
-
-Add the stylesheets to your +app/assets/stylesheets/application.css+:
-
-  = require rightnow_oms/application
-
-Create a layout for your detailed cart view:
-
-  # app/views/layouts/rightnow_oms/application.html.haml
-  !!!
-  %html
-    %head
-      %title Dummy
-      = stylesheet_link_tag    "application"
-      = javascript_include_tag "application"
-      = csrf_meta_tags
-
-    %body
-      = yield
-
-Add a place holder for your cart in your views:
-
-  <div id="cart-wrapper">
-    <script type="text/x-handlebars">
-      {{ view RightnowOms.ShowCartView }}
-    </script>
-  </div>
-
-== Development
-
-RightnowOms is developed with Ruby 1.9.3-p0 and Rails 3.1.3
-
-  bundle install
-  bundle exec rake app:db:migrate
-  bundle exec rake app:db:seed
-
-  # Run the tests
-  bundle exec rake app:db:test:prepare
-  rspec
-
-  # Start the dummy application
-  rails s
-
-Copyright 2011-2012 Beijing Menglifang Network Technology and Science Co.,Ltd. All rights reserved.

data/app/assets/stylesheets/rightnow_oms/cart_items.css

@@ -1,12 +0,0 @@
-.cart-items {
-  text-align: right;
-  overflow: auto;
-}
-
-.cart-items table {
-  float: right;
-}
-
-.cart-items table .price {
-  color: red;
-}

data/app/helpers/rightnow_oms/application_helper.rb

@@ -1,4 +0,0 @@
-module RightnowOms
-  module ApplicationHelper
-  end
-end

data/app/helpers/rightnow_oms/cart_items_helper.rb

@@ -1,4 +0,0 @@
-module RightnowOms
-  module CartItemsHelper
-  end
-end

data/app/helpers/rightnow_oms/carts_helper.rb

@@ -1,4 +0,0 @@
-module RightnowOms
-  module CartsHelper
-  end
-end