caboose-store 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTk1OGJkNDlmMmYyZjdiZDk4OTk4NzA3NjFjMzRiYjIzZDVjODAyYw==
+    YzRiY2ZkM2YyMTkwNmVmYWI4ZjMyYzkwNDhjZDk3MTM0ZmE4NzgwZg==
   data.tar.gz: !binary |-
-    OTg4ZTI2NWY0NGM0YzYyYzNjNTc1YTNkY2NiYjM1MGI1NzA1OWE5Yw==
+    NTlmOTFlMGQwZDcxMjYxZTRlYTRiY2UwMDFhOThhYWIwNTUwYTdmMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NThlNTI5M2ZlNDMzMzZhYWI4MWI2OWMwNjViNDAyNmRkYmUwZWM2ZDY3YThk
-    NDJiZWUwOTdmNjQ0MWUwZTAxYTQ0MDQwOGM0MGViZGI1NTllNDQzOGEwNDZi
-    OTg5MzgzZTJlZWExZGE0ODQzOTE0ZGMxN2ZhNjQxNGM4NDRiMDY=
+    OWU3OWM3ZWYzMzBkYzE1MjJmYzdhOTdiMjgwMzFhOTU5ZWUwZmQ4ZjJjODk3
+    YmE4YTU3MDAzYjdjYzRiYWQ3M2I4NjdlMDg2MWI1ZjI4NTQ1NmExODk0N2Zl
+    NGYzNzA0ZDZlY2YyOTdkNDgyNTg5NzVkMTAxNzIyNTNlZTIyYjA=
   data.tar.gz: !binary |-
-    YzNkMzM4OGQzZjE2ZDc3M2UzNmFkMGU4YWZlZWNlNDYyMzM4ZDIyMDU1MTg4
-    ZDhlYzExZTExZWFkMzdhODRhODVjNDQ3N2VhMGIxNGU1ZjI5YjFjNDFjNTM2
-    MDJhOWJlMDg2MmM5NTI0ZjkzOWFiMTFiNzIxYTZiMDI3NDMxNDQ=
+    OTZjNWFlNDE0YzVmOTNjN2JlYTRjYmQ5MTNiNTYyMGQyN2EzNjhmZTFmYjZl
+    YmJiYzAwNzE2ZWI0OTMzMzBlOTlkYjg0Y2I2ZWExNDhlOWJiNzZmZDNkNTIx
+    OGY5NDk5NjdlMWQ4NmJiYjAzM2M0YWFkMTEwYzVkNzAxYTVmYTQ=

data/app/controllers/caboose_store/products_controller.rb

@@ -3,59 +3,52 @@ module CabooseStore
     
     # GET /products/
     def index
-      @category = Category.where(:url => request.fullpath).first
-      @review = Review.new
-          
-      if @category.nil?
-        if params[:id].nil? || !Product.exists?(params[:id])
-          
-          @gen = Caboose::PageBarGenerator.new(params, {
-            'title_like'    => '',
-            'id'            => ''
-          },{
-              'model'       => 'CabooseStore::Product',
-              'sort'        => 'title',
-              'desc'        => false,
-              'base_url'    => '/admin/products'
-          })
-          @products = @gen.items
-          render 'caboose_store/products/search'
-          
-        else
-          
-          @product = Product.find(params[:id])
-          
-          if @product.status == 'Inactive'
-            render 'products/not_available'
-            return
-          end
-          @reviews = Review.where(:product_id => @product.id).limit(10).order("id DESC") || nil
-          @is_logged_in = logged_in?
-          if @is_logged_in
-            #@order.customer_id = logged_in_user.id
-            #@order.save
-            @first_name = logged_in_user.first_name
-            @last_name = logged_in_user.last_name
-          end
-          
-          all_reviews = Review.where(:product_id => @product.id)
-          score = 0
-          count = 0
-          all_reviews.each do |r|
-            if r.rating && r.rating != 0
-              score += r.rating
-              count += 1
-            end
-          end
-          if count > 0
-            @average = score / count
-          else
-            @average = 0
-          end
-          
-          render 'caboose_store/products/details'
+      @category = Category.exists?(:url => request.fullpath) ? Category.where(:url => request.fullpath).first : nil
+      
+      # If looking at single item
+      if @category.nil? && params[:id] && Product.exists?(params[:id])        
+        @product = Product.find(params[:id])
+        
+        if @product.status == 'Inactive'
+          render 'products/not_available'
+          return
         end
+          
+        @review = Review.new                
+        @reviews = Review.where(:product_id => @product.id).limit(10).order("id DESC") || nil
+        @logged_in_user = logged_in_user
+                    
+        render 'caboose_store/products/details'
+        return
       end
+          
+      # Otherwise looking at a category or search parameters
+      @pager = Caboose::Pager.new(params, {      
+          'category_id'       => @category ? @category.id : '',
+          'title_like'        => '',
+          'description_like'  => '',
+          'vendor_id'         => '',
+          'price_gte'         => '',
+          'price_lte'         => '',
+          'sku_like'          => ''
+        },{
+          'model'       => 'CabooseStore::Product',
+          'includes'    => {
+            'category_id' => ['categories' , 'id'    ],
+            'price_gte'   => ['variants'   , 'price' ],
+            'price_lte'   => ['variants'   , 'price' ],
+            'sku_like'    => ['variants'   , 'sku'   ]
+          },
+          'sort'        => 'title',
+          'desc'        => false,
+          'base_url'    => '/products'
+        })
+      @products = @pager.items
+      
+      @filter = SearchFilter.exists?(:url => request.fullpath) ? 
+        SearchFilter.where(:url => request.fullpath).first :
+        SearchFilter.create_from_url(request.fullpath, @pager)
+      
     end
   
     def show

data/app/models/caboose_store/product.rb

@@ -2,12 +2,12 @@ module CabooseStore
   class Product < ActiveRecord::Base
     self.table_name = "store_products"
     
-    belongs_to :vendor
-    has_many :categories, :through => :category_memberships
-    has_many :category_memberships
-    has_many :variants
-    has_many :product_images
-    has_many :reviews
+    belongs_to :vendor, :class_name => 'CabooseStore::Vendor'
+    has_many :categories, :through => :category_memberships, :class_name => 'CabooseStore::Category'
+    has_many :category_memberships , :class_name => 'CabooseStore::CategoryMembership'
+    has_many :variants             , :class_name => 'CabooseStore::Variant'
+    has_many :product_images       , :class_name => 'CabooseStore::ProductImage'
+    has_many :reviews              , :class_name => 'CabooseStore::Review'
   
     attr_accessible :id,
       :title,

data/app/models/caboose_store/schema.rb

@@ -1,6 +1,17 @@
 
 class CabooseStore::Schema < Caboose::Utilities::Schema
-        
+
+  def self.removed_columns
+    {
+      CabooseStore::SearchFilter => [
+        :option1_values,
+        :option2_values,
+        :option3_values,
+        :category
+      ] 
+    }
+  end
+  
   def self.schema
     {  
       CabooseStore::Category => [        
@@ -110,10 +121,20 @@ class CabooseStore::Schema < Caboose::Utilities::Schema
         [ :date_available	       , :datetime  ]
       ],
       CabooseStore::Review => [
-        [ :product_id	           , :integer ],
-        [ :content	             , :string  ],
-        [ :name	                 , :string  ],
-        [ :rating	               , :decimal ] 
+        [ :product_id	           , :integer   ],
+        [ :content	             , :string    ],
+        [ :name	                 , :string    ],
+        [ :rating	               , :decimal   ] 
+      ],      
+      CabooseStore::SearchFilter => [
+        [ :url                   , :string   ],
+        [ :title_like            , :string   ],
+        [ :categories            , :text     ],
+        [ :vendors               , :text     ],
+        [ :option1               , :text     ],
+        [ :option2               , :text     ],
+        [ :option3               , :text     ],        
+        [ :prices                , :text     ] 
       ],
       CabooseStore::Variant => [
         [ :sku	                 , :string   ],

data/app/models/caboose_store/search_filter.rb

@@ -0,0 +1,125 @@
+require 'json'
+
+module CabooseStore
+  class SearchFilter < ActiveRecord::Base
+        
+    self.table_name = "store_search_filters"  
+    attr_accessible :id, 
+      :url,
+      :title_like,
+      :categories,
+      :vendors, 
+      :option1,
+      :option2,
+      :option3,
+      :prices
+
+    before_save :json_encode
+    after_initialize :json_decode
+
+    def json_encode    
+      self.categories = self.categories.to_json if !self.categories.nil?
+      self.vendors    = self.vendors.to_json    if !self.vendors.nil?        
+      self.option1    = self.option1.to_json    if !self.option1.nil? 
+      self.option2    = self.option2.to_json    if !self.option2.nil? 
+      self.option3    = self.option3.to_json    if !self.option3.nil? 
+      self.prices     = self.prices.to_json     if !self.prices.nil?
+    end
+    
+    def json_decode
+      self.categories = JSON.parse(self.categories).collect{ |hash| Caboose::StdClass.new(hash) } if !self.categories.nil?
+      self.vendors    = JSON.parse(self.vendors   ).collect{ |hash| Caboose::StdClass.new(hash) } if !self.vendors.nil?      
+      self.option1    = JSON.parse(self.option1   ) if !self.option1.nil? 
+      self.option2    = JSON.parse(self.option2   ) if !self.option2.nil? 
+      self.option3    = JSON.parse(self.option3   ) if !self.option3.nil? 
+      self.prices     = JSON.parse self.prices     if !self.prices.nil?
+
+      Caboose.log(self.option1)      
+    end
+      
+    def self.create_from_url(url, pager)
+      
+      f = SearchFilter.new
+      f.url = url
+       
+      url2 = url.split("?")[0]
+      f.categories = nil
+      if Category.exists?(:url => url2)
+        parent = Category.where(:url => url2).first
+        if parent.children && parent.children.count > 0
+          f.categories = []  
+          parent.children.each { |cat| f.categories << Caboose::StdClass.new({ 'id' => cat.id, 'name' => cat.name }) }
+        end
+      end
+      
+      vendor_ids = []
+      option1 = Caboose::StdClass.new({ 'name' => [], 'values' => [] })
+      option2 = Caboose::StdClass.new({ 'name' => [], 'values' => [] })
+      option3 = Caboose::StdClass.new({ 'name' => [], 'values' => [] })      
+      min = 0.0
+      max = 1000000.0
+      
+      prices = [
+        [    0,    10],
+        [   10,    25],
+        [   25,    50],
+        [   50,    75],
+        [   75,   100],
+        [  100,   150],
+        [  150,   200],
+        [  200,   250],
+        [  250,   300],
+        [  300,   400],
+        [  400,   500],
+        [  500,  1000],
+        [ 1000,  2000],
+        [ 2000,  3000],
+        [ 4000,  5000],
+        [ 7000,  7500],
+        [ 7500, 10000],
+        [10000, 50000]                
+      ]      
+      price_counts = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+      
+      pager.all_items.each do |p|
+        vendor_ids   << p.vendor_id
+        option1.name << p.option1
+        option2.name << p.option2
+        option3.name << p.option3                
+        p.variants.each do |v|
+          option1.values << v.option1
+          option2.values << v.option2
+          option3.values << v.option3          
+          min = v.price if v.price < min
+          max = v.price if v.price > max
+          prices.each_index do |i|
+            minmax = prices[i]
+            price_counts[i] = price_counts[i] + 1 if v.price > minmax[0] && v.price < minmax[1]
+          end
+        end
+      end
+      
+      vendor_ids = vendor_ids ? vendor_ids.compact.uniq : nil       
+      f.vendors = vendor_ids && vendor_ids.count > 0 ? vendor_ids.collect { |vid| Vendor.find(vid) } : nil       
+      
+      option1.name = option1.name ? option1.name.compact.uniq : nil
+      option2.name = option2.name ? option2.name.compact.uniq : nil
+      option3.name = option3.name ? option3.name.compact.uniq : nil
+      
+      f.option1 = option1.name && option1.name.count == 1 ? Caboose::StdClass.new({ 'name' => option1.name[0], 'values' => option1.values.compact.uniq.sort }) : nil 
+      f.option2 = option2.name && option2.name.count == 1 ? Caboose::StdClass.new({ 'name' => option2.name[0], 'values' => option2.values.compact.uniq.sort }) : nil 
+      f.option3 = option3.name && option3.name.count == 1 ? Caboose::StdClass.new({ 'name' => option3.name[0], 'values' => option3.values.compact.uniq.sort }) : nil       
+      
+      f.prices = []
+      price_counts.each_index do |i| 
+        f.prices << prices[i] if price_counts[i] > 0
+      end
+      f.prices = nil if f.prices.count == 0
+      
+      f.save
+      return f
+      
+    end
+    
+  end
+end

data/lib/caboose-store/version.rb

@@ -1,3 +1,3 @@
 module CabooseStore
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-store
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms
@@ -91,6 +91,7 @@ files:
 - app/models/caboose_store/product_image_variant.rb
 - app/models/caboose_store/review.rb
 - app/models/caboose_store/schema.rb
+- app/models/caboose_store/search_filter.rb
 - app/models/caboose_store/shipping_calculator.rb
 - app/models/caboose_store/states.rb
 - app/models/caboose_store/tax_calculator.rb