nginx

b0ddaf8e · Vy Quoc Vu · 4cbbdb6a · 1f9b4365 · b0ddaf8e · b0ddaf8e
Commit b0ddaf8e authored Aug 11, 2015 by Vy Quoc Vu
25 changed files
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,7 @@ gem 'bootstrap-will_paginate', '0.0.10'
 gem 'faker', '1.4.2'
 gem 'solr-ruby'
 gem 'rsolr'
+gem 'unicorn'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.2.3'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,6 +97,7 @@ GEM
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
    json (1.8.3)
+    kgio (2.9.3)
    listen (3.0.3)
      rb-fsevent (>= 0.9.3)
      rb-inotify (>= 0.9)
@@ -163,6 +164,7 @@ GEM
      activesupport (= 4.2.3)
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
+    raindrops (0.15.0)
    rake (10.4.2)
    rb-fsevent (0.9.5)
    rb-inotify (0.9.5)
@@ -204,6 +206,10 @@ GEM
    uglifier (2.7.1)
      execjs (>= 0.3.0)
      json (>= 1.8.0)
+    unicorn (4.9.0)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
    vacuum (1.3.0)
      jeff (~> 1.0)
      multi_xml (~> 0.5.0)
@@ -243,6 +249,7 @@ DEPENDENCIES
  spring
  turbolinks
  uglifier (>= 1.3.0)
+  unicorn
  vacuum
  web-console (~> 2.0)
  will_paginate-bootstrap

--- a/app/controllers/admins/products_controller.rb
+++ b/app/controllers/admins/products_controller.rb
 class Admins::ProductsController < ApplicationController
+  before_action :solr_init, only: [:edit,:create,:destroy]
+  def solr_init
+     @solr = Mysolr.new
+  end
  def new
    if admin_signed_in?
      @product = Product.new
@@ -19,16 +24,14 @@ class Admins::ProductsController < ApplicationController
  def create
    if admin_signed_in?
-      if product_params[:price].to_i >= 0 && params[:category][:id].to_i > 0 &&
+      if validate_product_params?(product_params, params)
-        !product_params[:image].nil? && !product_params[:image].empty? &&
-        !product_params[:price].empty? && !product_params[:name].empty? &&
-        product_params[:price].to_i <= 999999
        product = Product.find_or_create_by(name: product_params[:name]) do |product|
          product.image = product_params[:image]
          product.category_id = params[:category][:id]
          product.price = product_params[:price].to_i*100
          product.description = product_params[:description]
        end
+        @solr.add_product_to_solr(product) if product.save
        flash[:success] = "Success!"
        redirect_to "/products/#{product.id}"
      else
@@ -43,23 +46,24 @@ class Admins::ProductsController < ApplicationController
  def edit
    if admin_signed_in?
-      if product_params[:price].to_i > 0 && params[:category][:id].to_i > 0 &&
+      if validate_product_params?(product_params, params)
-        !product_params[:image].nil? && !product_params[:image].empty? &&
-        !product_params[:price].empty? && !product_params[:name].empty? &&
-        product_params[:price].to_i <= 999999
        product = Product.find(params[:id])
          product.name = product_params[:name]
          product.image = product_params[:image]
          product.category_id = params[:category][:id]
          product.price = product_params[:price].to_i*100
          product.description = product_params[:description]
-          product.save
+        @solr.update_product_on_solr(product) if product.save
        flash[:success] = "Success!"
        redirect_to "/products/#{product.id}"
      else
        flash[:danger] = "Wrong params! Please check name, price and image again."
+        if !product_params
+          redirect_to :action => :index
+        else
          redirect_to :back
        end
+      end
    else
      flash[:danger] = "only admin!"
      redirect_to root_path
@@ -70,6 +74,7 @@ class Admins::ProductsController < ApplicationController
    if admin_signed_in?
      @product = Product.find(params[:id])
      @product.destroy
+      @solr.delete_product_from_solr(params[:id])
      flash[:success] = "Deleted!"
      redirect_to :back
    else
@@ -88,9 +93,16 @@ class Admins::ProductsController < ApplicationController
  private
+  def validate_product_params?(product_params, params)
+        product_params[:price].to_i >= 0 && params[:category][:id].to_i > 0 &&
+        !product_params[:image].nil? && !product_params[:image].empty? &&
+        !product_params[:price].empty? && !product_params[:name].empty? &&
+        product_params[:price].to_i <= 999999
+  end
  def product_params
-    params.require(:product).permit(:name, :price, :description,
+    if params[:product]
-      :image, :id)
+      params.require(:product).permit(:name, :price, :description,:image, :id)
+    end
  end
 end
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
+require 'solr'
+require 'rsolr'
+require 'rubygems'
 class ApplicationController < ActionController::Base
  before_action :call_category , only: [:show, :index]
  before_action :configure_permitted_parameters, if: :devise_controller?
  # Prevent CSRF attacks by raising an exception.
  # For APIs, you may want to use :null_session instead.
  protect_from_forgery with: :exception

--- a/app/controllers/cart_products_controller.rb
+++ b/app/controllers/cart_products_controller.rb
@@ -31,7 +31,6 @@ class CartProductsController < ApplicationController
  end
  def update
-    byebug
    if params[:id].nil?
      flash[:danger] = "Product not found!"
    elsif params[:new_quantity].nil? || params[:new_quantity].to_i <= 0

--- a/app/controllers/carts_controller.rb
+++ b/app/controllers/carts_controller.rb
@@ -30,6 +30,7 @@ class CartsController < ApplicationController
        Emailer.send_email_to(cart_params[:mail].to_s,session[:cart]).deliver
        flash[:success] = "Success!"
        session[:cart] = nil
+        redirect_to :action => "show"
      else
        flash[:danger] = "Your mail, your address, your name"
        redirect_to :back

--- a/app/controllers/products_controller.rb
+++ b/app/controllers/products_controller.rb
@@ -21,17 +21,34 @@ class ProductsController < ApplicationController
    end
  end
+  def check_search_params(search_params)
+    special_characters = ["+", "-", "&", "|", "!", "(", ")", "{", "}", "[", "]", "^", "~", ":",'\\','/']
+    @ok_string = ""
+    search_params.each_char do |key|
+      special_characters.each do |ch|
+        key = "\\#{ch}" if key == ch
+      end
+      @ok_string += key
+    end
+  end
  def search
-    if params[:search]
+    @solr = Solr::Connection.new(Rails.configuration.solr_host.to_s, :autocommit => :on)
-      if !params[:page] || (params[:page].to_i == 0)
+    check_search_params(params["search_params"])
-        params[:page] = 1
+    query = "((name:#{@ok_string}))"
-      else
+    select_obj = Solr::Request::Select.new(nil, {'q' => query})
-        params[:page]
+    results = @solr.send(select_obj).data['response']['docs']
+    @products = Array.new
+    results.each do |result|
+      id = result.to_h['id']
+      product = Product.find(id)
+      @products.insert(-1,product)
    end
-      @products = Product.search(params[:search]).paginate(page: params[:page], :per_page => 50)
+    if @products.empty?
-      flash[:success] = "Success!"
+      flash.now[:danger] = "No result!"
    else
-      flash[:danger] = "Danger!"
+      flash.now[:success] = "All result!"
    end
  end

--- a/app/models/mysolr.rb
+++ b/app/models/mysolr.rb
+class Mysolr < ActiveRecord::Base
+    def initialize
+      @solr = RSolr.connect :url => Rails.configuration.solr_host.to_s
+    end
+    def add_product_to_solr(product)
+      docs = [{:id =>product.id,
+               :price => product.price,
+               :name => product.name,
+               :description => product.description
+              }]
+      @solr.add docs
+      @solr.commit
+      @solr.optimize
+    end
+    def delete_product_from_solr(id)
+      @solr.delete_by_query "id:#{id}"
+      @solr.commit
+      @solr.optimize
+    end
+    def update_product_on_solr(product)
+      docs = [{:id =>product.id,
+               :price => product.price,
+               :name => product.name,
+               :description => product.description
+              }]
+      @solr.delete_by_query "id:#{product.id}"
+      @solr.add docs
+      @solr.commit
+      @solr.optimize
+    end
+end
--- a/app/models/solr.rb
+++ b/app/models/solr.rb
-class Solr < ActiveRecord::Base
-end
--- a/app/views/admins/products/show.html.erb
+++ b/app/views/admins/products/show.html.erb
@@ -11,7 +11,7 @@
      <%= f.label :price %>
      <%= f.number_field :price, value: @product.price/100, class: 'form-control' %>
      <br>
-      <%= f.label :Category %>
+      <%= f.label :Category %><p>   </p>
      <%= collection_select :category, :id, Category.all, :id, :name, :selected => @product.category_id %>
      </br>

--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -6,8 +6,9 @@
    <div class="navbar-header">
      <table>
        <td><a class="navbar-brand" href= "/" > Venshop </a></td>
+        <td></td>
        <form action= "/search" style="padding-left : 100px ; resize: vertical;"  method="get" class="navbar-brand" >
-        <td ><input type="text" name="search" value="" , class="form-control"/></td>
+        <td ><input type="text" name="search_params" value="" , class="form-control"/></td>
        <td style="padding-left : 20px" ><input type="submit" value="Search" style="font-size: 1em;" , class="btn btn-primary"/></td>
        </form>
      </table>

--- a/app/views/products/_admin_products.html.erb
+++ b/app/views/products/_admin_products.html.erb
-<%= will_paginate %>
+<div class="row">
-  <div class="row">
  <% @products.each do |product|  %>
    <div class="col-md-4" style="padding-top : 20px">
      <div>
@@ -15,5 +14,4 @@
      </div>
    </div>
  <% end %>
-  </div>
+</div>
-<%= will_paginate %>
\ No newline at end of file
\ No newline at end of file
--- a/app/views/products/_custom_products.html.erb
+++ b/app/views/products/_custom_products.html.erb
-<%= will_paginate %>
-  <div class="row">
+<div class="row">
  <% @products.each do |product|  %>
    <div class="col-md-4" style="padding-top : 20px">
      <div>
@@ -18,5 +18,4 @@
      </div>
    </div>
  <% end %>
-  </div>
+</div>
-<%= will_paginate %>
\ No newline at end of file
\ No newline at end of file
--- a/app/views/products/index.html.erb
+++ b/app/views/products/index.html.erb
@@ -5,6 +5,8 @@
 </div>
 <div class="col-md-9" >
  <div class="form-group">
+  <%= will_paginate %>
    <%= render 'products/custom_products' %>
+  <%= will_paginate %>
  </div>
 </div>
\ No newline at end of file
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -7,7 +7,9 @@ Rails.application.configure do
  config.cache_classes = false
  # Do not eager load code on boot.
  config.eager_load = false
+  config.solr_host = "http://localhost:8080/solr/core0"
  # Show full error reports and disable caching.
  config.consider_all_requests_local       = true

--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -9,7 +9,7 @@ Rails.application.configure do
  # and those relying on copy on write to perform better.
  # Rake tasks automatically ignore this option for performance.
  config.eager_load = true
+  config.solr_host = "http://localhost:8080/solr/core0"
  # Full error reports are disabled and caching is turned on.
  config.consider_all_requests_local       = false
  config.action_controller.perform_caching = true

--- a/config/unicorn.rb
+++ b/config/unicorn.rb
+app_path = File.expand_path(File.dirname(__FILE__) + '/..')
--- a/db/migrate/20150724033606_devise_create_users.rb
+++ b/db/migrate/20150724033606_devise_create_users.rb
@@ -4,8 +4,7 @@ class DeviseCreateUsers < ActiveRecord::Migration
      ## Database authenticatable
      t.string :email,              null: false, default: ""
      t.string :encrypted_password, null: false, default: ""
-      t.string :name
+      t.string :name , default: "Username"
-      t.string :address
      ## Recoverable
      t.string   :reset_password_token

--- a/db/migrate/20150730041232_devise_create_admins.rb
+++ b/db/migrate/20150730041232_devise_create_admins.rb
@@ -4,6 +4,7 @@ class DeviseCreateAdmins < ActiveRecord::Migration
      ## Database authenticatable
      t.string :email,              null: false, default: ""
      t.string :encrypted_password, null: false, default: ""
+      t.string :name , default: "adminname"
      ## Recoverable
      t.string   :reset_password_token

--- a/db/migrate/20150811025516_create_solrs.rb
+++ b/db/migrate/20150811025516_create_solrs.rb
-class CreateSolrs < ActiveRecord::Migration
+class CreateMysolrs < ActiveRecord::Migration
  def change
-    create_table :solrs do |t|
+    create_table :mysolrs do |t|
      t.timestamps null: false
    end

--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,11 +11,12 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20150730041232) do
+ActiveRecord::Schema.define(version: 20150811034415) do
  create_table "admins", force: :cascade do |t|
    t.string   "email",                  limit: 255, default: "",          null: false
    t.string   "encrypted_password",     limit: 255, default: "",          null: false
+    t.string   "name",                   limit: 255, default: "adminname"
    t.string   "reset_password_token",   limit: 255
    t.datetime "reset_password_sent_at"
    t.datetime "remember_created_at"
@@ -59,6 +60,11 @@ ActiveRecord::Schema.define(version: 20150730041232) do
    t.datetime "updated_at",                null: false
  end
+  create_table "mysolrs", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
  create_table "products", force: :cascade do |t|
    t.string   "name",        limit: 3000,  null: false
    t.string   "image",       limit: 1000,  null: false
@@ -69,9 +75,20 @@ ActiveRecord::Schema.define(version: 20150730041232) do
    t.datetime "updated_at",                null: false
  end
+  create_table "rsorls", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+  create_table "solrs", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
  create_table "users", force: :cascade do |t|
    t.string   "email",                  limit: 255, default: "",         null: false
    t.string   "encrypted_password",     limit: 255, default: "",         null: false
+    t.string   "name",                   limit: 255, default: "Username"
    t.string   "reset_password_token",   limit: 255
    t.datetime "reset_password_sent_at"
    t.datetime "remember_created_at"

--- a/test/fixtures/mysolrs.yml
+++ b/test/fixtures/mysolrs.yml
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+# This model initially had no columns defined.  If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+#  column: value
--- a/test/fixtures/rsorls.yml
+++ b/test/fixtures/rsorls.yml
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+# This model initially had no columns defined.  If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+#  column: value
--- a/test/models/mysolr_test.rb
+++ b/test/models/mysolr_test.rb
+require 'test_helper'
+class MysolrTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
--- a/test/models/rsorl_test.rb
+++ b/test/models/rsorl_test.rb
+require 'test_helper'
+class RsorlTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end