forge-cli 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: efd5da8c96fee9aa0a2e7d3dea1bbee6988c9177
-  data.tar.gz: c3a9540c79d0385d6d6cff43c1ec9fd7873c1678
-SHA512:
-  metadata.gz: 2b52ab71ca58fe8462f19dc9ba4acb1bdca009719619a9f9d34b997bf43881e25370f10e713bdf58385d0c3b195230963cdf66d7175e2f74a9be1f67ea54cc36
-  data.tar.gz: 87956d82909d5131fa2f5a032e7afe19d17595c05b362903340fc617b63d659c8a768541ae428430bdd16d45cf640590f22977bf491a77a88846b102127c9883
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Y2E0ZmQxYzgyNTY4NjcxYjgyYjI4NjIwYjI1YWQxMDM4ZmY5NWM0MA==
+  data.tar.gz: !binary |-
+    ZmUzNTkyNDFlM2VjZjU5MTEwOGUzZmMwNWFiMjg1NTc1NTFjZTZjYQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OWRkOWQ0Y2U1MmZkMzdhMmIwMDFkODU4NzNiMTQyMGUwMDk3ZDdlOGFlMmVh
+    YjBjMGIxMDcyZjUxMWM2NmQ5ZDFiMTU0MjFlY2JlMjdiNjdlNWJkZDFjZGRj
+    OTE1OGIzZmE3OTU4NmUwM2U0YmYzYWU4Mzg4NTA1M2I2MzhmZWU=
+  data.tar.gz: !binary |-
+    MzhhMDJkOTVjYmJhMzg0N2UwM2QxODE0ZDVmNTNlYTRkOTg4OTA3NmRiNWU3
+    ZDM2YzU1NGIyNGJkZWExODcwMDVkNDNmOWEyYWVmMDZlMjE4NmI5ZDZhNDk4
+    ZmE2OGNiZWMwNjc2ZTBjOTI4MDRjMDVlYjBlYjZiNWMxMTc5MDE=

data/lib/forge-cli/version.rb

@@ -1,3 +1,3 @@
 class ForgeCLI
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/forge/app/controllers/forge/assets_controller.rb

@@ -13,7 +13,8 @@ class Forge::AssetsController < ForgeController
     respond_to do |format|
       format.html { @assets = Asset.paginate(:per_page => 20, :page => params[:page]) }
       format.js {
-        @assets = Asset.where("assets.title LIKE ?", "%#{params[:q]}%")
+        params[:q] ||= ''
+        @assets = Asset.includes(:tags).where("LOWER(assets.title) LIKE ? OR LOWER(tags.name) LIKE ?", "%#{params[:q].downcase}%", "%#{params[:q].downcase}%").references(:tags)
         render :partial => "asset", :collection => @assets
       }
     end

data/lib/forge/app/controllers/forge/banners_controller.rb

@@ -5,7 +5,8 @@ class Forge::BannersController < ForgeController
     respond_to do |format|
       format.html { @banners = Banner.order(:list_order).paginate(:per_page => 10, :page => params[:page]) }
       format.js {
-        @banners = Banner.where("title LIKE ?", "%#{params[:q]}%")
+        params[:q] ||= ''
+        @banners = Banner.where("LOWER(title) LIKE ?", "%#{params[:q].downcase}%")
         render :partial => "banner", :collection => @banners
       }
     end

data/lib/forge/app/controllers/forge/comments_controller.rb

@@ -7,7 +7,8 @@ class Forge::CommentsController < ForgeController
     respond_to do |format|
       format.html { @comments = Comment.where(conditions).paginate(:include => :commentable, :per_page => 10, :page => params[:page]) }
       format.js {
-        @comments = Comment.where("author LIKE ? OR content LIKE ?", "%#{params[:q]}%", "%#{params[:q]}%")
+        params[:q] ||= ''
+        @comments = Comment.where("LOWER(author) LIKE ? OR LOWER(content) LIKE ?", "%#{params[:q].downcase}%", "%#{params[:q].downcase}%")
         render :partial => "comment", :collection => @comments
       }
     end

data/lib/forge/app/controllers/forge/dispatches_controller.rb

@@ -6,7 +6,8 @@ class Forge::DispatchesController < ForgeController
     respond_to do |format|
       format.html { @dispatches = Dispatch.paginate(:per_page => 10, :page => params[:page]) }
       format.js { 
-        @dispatches = Dispatch.where("title LIKE ?", "%#{params[:q]}%")
+        params[:q] ||= ''
+        @dispatches = Dispatch.where("LOWER(subject) LIKE ? OR LOWER(content) LIKE ?", "%#{params[:q].downcase}%", "%#{params[:q].downcase}%")
         render :partial => "dispatch", :collection => @dispatches
       }
     end

data/lib/forge/app/controllers/forge/events_controller.rb

@@ -1,13 +1,13 @@
 class Forge::EventsController < ForgeController
   load_and_authorize_resource
   before_filter :uses_ckeditor, :only => [:edit, :update, :new, :create]
-  
 
   def index
     respond_to do |format|
       format.html { @events = Event.paginate(:per_page => 10, :page => params[:page]) }
       format.js { 
-        @events = Event.where("title LIKE ?", "%#{params[:q]}%")
+        params[:q] ||= ''
+        @events = Event.where("LOWER(title) LIKE ? OR LOWER(location) LIKE ? OR LOWER(description) LIKE ?", "%#{params[:q].downcase}%", "%#{params[:q].downcase}%", "%#{params[:q].downcase}%")
         render :partial => "event", :collection => @events
       }
     end

data/lib/forge/app/controllers/forge/galleries_controller.rb

@@ -5,7 +5,8 @@ class Forge::GalleriesController < ForgeController
     respond_to do |format|
       format.html { @galleries = Gallery.paginate(:per_page => 10, :page => params[:page]) }
       format.js { 
-        @galleries = Gallery.where("title LIKE ?", "%#{params[:q]}%")
+        params[:q] ||= ''
+        @galleries = Gallery.where("LOWER(title) LIKE ?", "%#{params[:q].downcase}%")
         render :partial => "gallery", :collection => @galleries
       }
     end

data/lib/forge/app/controllers/forge/orders_controller.rb

@@ -4,14 +4,15 @@ class Forge::OrdersController < ForgeController
   def index
     conditions = {"fulfill" => '=', "unfulfill" => '<>'}
     unless params[:show].nil?
-      @orders = Order.not_pending.where("state #{conditions[params[:show]]} 'fulfilled'").order("created_at DESC") #note that this safe from injection, any params[:show] that isn't "fulfill" or nil will just return false
+      @orders = Order.not_pending.where("state #{conditions[params[:show]]} 'fulfilled'").order("orders.created_at DESC") #note that this safe from injection, any params[:show] that isn't "fulfill" or nil will just return false
     else
-      @orders = Order.not_pending.order("created_at DESC")
+      @orders = Order.not_pending.order("orders.created_at DESC")
     end
     respond_to do |format|
       format.html { @orders = @orders.paginate(:per_page => 10, :page => params[:page]).includes(:shipping_address, :billing_address) }
       format.js {
-        @orders = @orders.where("orders.id = ? OR orders.state = ? OR addresses.first_name LIKE ? OR addresses.last_name LIKE ? OR addresses.email like ?", params[:q], params[:q], "%#{params[:q]}%", "%#{params[:q]}%", "%#{params[:q]}%").includes(:shipping_address, :billing_address)
+        params[:q] ||= ''
+        @orders = @orders.where("orders.id = ? OR orders.state = ? OR LOWER(addresses.first_name) LIKE ? OR LOWER(addresses.last_name) LIKE ? OR LOWER(addresses.email) LIKE ?", params[:q].to_i, params[:q], "%#{params[:q].downcase}%", "%#{params[:q].downcase}%", "%#{params[:q].downcase}%").includes(:shipping_address, :billing_address)
         render :partial => "order", :collection => @orders
       }
     end

data/lib/forge/app/controllers/forge/post_categories_controller.rb

@@ -6,7 +6,8 @@ class Forge::PostCategoriesController < ForgeController
     respond_to do |format|
       format.html { get_post_categories }
       format.js {
-        @post_categories = PostCategory.where("title LIKE ?", "%#{params[:q]}%")
+        params[:q] ||= ''
+        @post_categories = PostCategory.where("LOWER(title) LIKE ?", "%#{params[:q].downcase}%")
         @post_categories = @post_categories.order(:title)
         render :partial => "post_category", :collection => @post_categories
       }

data/lib/forge/app/controllers/forge/product_categories_controller.rb

@@ -7,10 +7,6 @@ class Forge::ProductCategoriesController < ForgeController
         @product_categories = ProductCategory.paginate(:per_page => 10, :page => params[:page])
         @product_category = ProductCategory.new
       }
-      format.js {
-        @product_categories = ProductCategory.where("title LIKE ?", "%#{params[:q]}%")
-        render :partial => "product_category", :collection => @product_categories
-      }
     end
   end
 

data/lib/forge/app/controllers/forge/products_controller.rb

@@ -3,21 +3,22 @@ class Forge::ProductsController < ForgeController
   before_filter :get_categories, :except => [:destroy, :reorder]
   load_and_authorize_resource :except => [:edit]
 
-  # GET /forge_products
+  # TODO: at the moment, only up to 100 products are shown.  This is so that product reordering can work properly
+  # (it doesn't work well with pagination).  A better solution needs to be put in place for this.
   def index
-    # @categories = ProductCategory.find(:all, :order => "list_order ASC")
-
     respond_to do |format|
-      format.html { @products = Product.limit(20).order("list_order ASC") }
+      format.html { @products = Product.limit(100).order("list_order ASC") }
       format.js  {
-        @products = Product.where("title LIKE :q OR description LIKE :q", {:q => "%#{params[:q]}%"}).limit(20)
+        params[:q] ||= ''
+        @products = Product.where("LOWER(title) LIKE :q OR LOWER(description) LIKE :q", {:q => "%#{params[:q].downcase}%"}).limit(20)
         render :partial => "product_list"
       }
     end
   end
 
   def search
-    @products = Product.find(:all, :order => "title", :conditions => ["title LIKE ? OR description LIKE ?", "%#{params[:search]}%", "%#{params[:search]}%"])
+    params[:search] ||= ''
+    @products = Product.find(:all, :order => "title", :conditions => ["LOWER(title) LIKE ? OR LOWER(description) LIKE ?", "%#{params[:search].downcase}%", "%#{params[:search].downcase}%"])
   end
 
   # GET /forge_products/new

data/lib/forge/app/controllers/forge/sales_controller.rb

@@ -8,7 +8,8 @@ class Forge::SalesController < ForgeController
     respond_to do |format|
       format.html { @sales = Sale.paginate(:per_page => 10, :page => params[:page]) }
       format.js {
-        @sales = Sale.where("title LIKE ?", "%#{params[:q]}%")
+        params[:q] ||= ''
+        @sales = Sale.where("LOWER(title) LIKE ?", "%#{params[:q].downcase}%")
         render :partial => "sale", :collection => @sales
       }
     end
@@ -16,11 +17,13 @@ class Forge::SalesController < ForgeController
 
   def new
     @sale = Sale.new
-    @products = Product.where("title LIKE :q OR description LIKE :q", {:q => "%#{params[:q]}%"})
+    params[:q] ||= ''
+    @products = Product.where("title LIKE :q OR description LIKE :q", {:q => "%#{params[:q].downcase}%"})
   end
 
   def edit
-    @products = Product.where("title LIKE :q OR description LIKE :q", {:q => "%#{params[:q]}%"})
+    params[:q] ||= ''
+    @products = Product.where("title LIKE :q OR description LIKE :q", {:q => "%#{params[:q].downcase}%"})
   end
 
   def create
@@ -53,7 +56,8 @@ class Forge::SalesController < ForgeController
     respond_to do |format|
       format.html { @products = Product.all }
       format.js  {
-        @products = Product.where("title LIKE :q OR description LIKE :q", {:q => "%#{params[:q]}%"})
+        params[:q] ||= ''
+        @products = Product.where("LOWER(title) LIKE :q OR LOWER(description) LIKE :q", {:q => "%#{params[:q].downcase}%"})
         render :partial => "products"
       }
     end

data/lib/forge/app/controllers/forge/subscriber_groups_controller.rb

@@ -8,7 +8,8 @@ class Forge::SubscriberGroupsController < ForgeController
         @subscriber_group = SubscriberGroup.new
       }
       format.js {
-        @subscriber_groups = SubscriberGroup.where("title LIKE ?", "%#{params[:q]}%")
+        params[:q] ||= ''
+        @subscriber_groups = SubscriberGroup.where("LOWER(title) LIKE ?", "%#{params[:q].downcase}%")
         render :partial => "subscriber_group", :collection => @subscriber_groups
       }
     end

data/lib/forge/app/controllers/forge/subscribers_controller.rb

@@ -8,7 +8,8 @@ class Forge::SubscribersController < ForgeController
     respond_to do |format|
       format.html { }
       format.js {
-        @subscribers = Subscriber.where("name LIKE :q OR email LIKE :q", {:q => "%#{params[:q]}%"})
+        params[:q] ||= ''
+        @subscribers = Subscriber.where("LOWER(name) LIKE :q OR LOWER(email) LIKE :q", {:q => "%#{params[:q].downcase}%"})
         render :partial => "subscriber", :collection => @subscribers
       }
     end

data/lib/forge/app/controllers/forge/tax_rates_controller.rb

@@ -5,10 +5,6 @@ class Forge::TaxRatesController < ForgeController
     @tax_rate = TaxRate.new
     respond_to do |format|
       format.html { get_tax_rates }
-      format.js {
-        @tax_rates = TaxRate.where("title LIKE ?", "%#{params[:q]}%")
-        render :partial => "tax_rate", :collection => @tax_rates
-      }
     end
   end
 

data/lib/forge/app/controllers/forge/users_controller.rb

@@ -6,7 +6,8 @@ class Forge::UsersController < ForgeController
     respond_to do |format|
       format.html { @users = User.paginate(:per_page => 10, :page => params[:page]) }
       format.js { 
-        @users = User.where("email LIKE ?", "%#{params[:q]}%")
+        params[:q] ||= ''
+        @users = User.where("LOWER(email) LIKE ?", "%#{params[:q].downcase}%")
         render :partial => "user", :collection => @users
       }
     end

data/lib/forge/app/controllers/forge/videos_controller.rb

@@ -8,7 +8,8 @@ class Forge::VideosController < ForgeController
     respond_to do |format|
       format.html { @videos = Video.paginate(:per_page => 10, :page => params[:page]) }
       format.js {
-        @videos = Video.where("title LIKE ?", "%#{params[:q]}%")
+        params[:q] ||= ''
+        @videos = Video.where("LOWER(title) LIKE ?", "%#{params[:q].downcase}%")
         render :partial => "video", :collection => @videos
       }
     end

data/lib/forge/app/models/asset.rb

@@ -31,7 +31,7 @@ class Asset < ActiveRecord::Base
 
   def self.for_drawer(params)
     unless params[:q].blank?
-      assets = where("assets.title LIKE ? OR tags.name = ?", "%#{params[:q]}%", params[:q]).includes(:taggings => :tag)
+      assets = where("LOWER(assets.title) LIKE ? OR LOWER(tags.name) = ?", "%#{params[:q].downcase}%", params[:q].downcase).includes(:tags).references(:tags)
     else
       case params[:filter]
       when "images"

data/lib/forge/app/views/forge/comments/index.html.haml

@@ -3,6 +3,7 @@
   :javascript
     $( function () {
       FORGE.features.comments.init();
+      $('#quick-search').quickSearch({url: '#{forge_comments_path}'});
     });
 
 %h1 Comments

data/lib/forge/app/views/forge/dispatches/_form.html.haml

@@ -13,7 +13,7 @@
 = error_messages_for :dispatch
 
 = form_for [:forge, @dispatch] do |f|
-  #form-header= title_row(:explanation => "Give your dispatch a title.") { f.text_field :subject, :class => 'title' }
+  #form-header= title_row(:explanation => "Give your dispatch a subject.", :title => "Subject") { f.text_field :subject, :class => 'title' }
 
   .inner-form
     .column.full.last

data/lib/forge/app/views/forge/product_categories/index.html.haml

@@ -12,7 +12,7 @@
 %h1
   Product Categories
   = language_switcher(:product_categories)
-%p.info This is a list of all the product categories in your site.  You can add, edit, and delete product categories here.
+%p.info This is a list of all the product categories in your site.  You can add, edit, delete and reorder product categories here.
 
 
 .inner-form.no-top.with-wide-sidebar

data/lib/forge/app/views/forge/products/index.html.haml

@@ -9,14 +9,15 @@
         $('#quick-search').quickSearch({url: '#{forge_products_path}'});
       });
     
-
 %h1 Your Products
 
-%p.info These are all of the products on your site.
+%p.info
+  These are all of the products on your site.  A maximum of 100 products are displayed.  Use the search to find
+  other products as needed.
 
 = render :partial => "forge/shared/section_header", :locals => {:item => Product}
 %ul#item-list= render :partial => "product", :collection => @products
 #item-list-bottom
   %strong.float-right
-    = "Too many results, only 20 displayed" if @products.size > 19
+    = "Too many results, only 100 displayed" if @products.size > 99
 

data/lib/forge/app/views/forge/subscriber_groups/_subscriber_group.html.haml

@@ -2,11 +2,11 @@
   .item-title
     %strong= subscriber_group.title
   .item-actions
-    .item-action.edit{:style => "width: 50px;"}<
+    .item-action.edit<
       = link_to image_tag('forge/icons/edit.png'), edit_forge_subscriber_group_path(subscriber_group)
       %small= link_to "Edit", edit_forge_subscriber_group_path(subscriber_group)
     .item-action.last<
       = link_to image_tag('forge/icons/delete.png'), forge_subscriber_group_path(subscriber_group), :method => :delete, :confirm => "Are you sure?"
       %small= link_to "Delete", forge_subscriber_group_path(subscriber_group), :method => :delete, :confirm => "Are you sure?"
 
-  .spacer
+  .spacer

data/lib/forge/app/views/posts/index.html.haml

@@ -20,4 +20,4 @@
   .pagination-info= will_paginate @posts, :previous_label => "Previous", :next_label => "Next"
 
 = render "posts/categories"
-= render "posts/archive_months"
+= render "posts/archive_months"

data/lib/forge/lib/assets/stylesheets/forge/forge.ui.css.scss

@@ -38,7 +38,7 @@
 ----------------------------------*/
 
 /* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 998; }
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 120%; z-index: 998; }
 
 
 /*
@@ -382,4 +382,4 @@
     left: -4px; /*must have*/
     width: 200px; /*must have*/
     height: 200px; /*must have*/
-}
+}

data/lib/forge/lib/generators/forge/scaffold/templates/controller.rb

@@ -13,7 +13,8 @@ class Forge::<%= class_name.pluralize %>Controller < ForgeController
     respond_to do |format|
       format.html { @<%= plural_table_name %> = <%= class_name %><%= ".order(:list_order)" unless attributes.select{|a| a.name == "list_order" }.empty? %>.paginate(:per_page => 10, :page => params[:page]) }
       format.js {
-        @<%= plural_table_name %> = <%= class_name %>.where("title LIKE ?", "%#{params[:q]}%")
+        params[:q] ||= ''
+        @<%= plural_table_name %> = <%= class_name %>.where("LOWER(title) LIKE ?", "%#{params[:q].downcase}%")
         render :partial => "<%= file_name %>", :collection => @<%= plural_table_name %>
       }
     end

data/lib/forge/lib/generators/forge/scaffold_small/templates/controller.rb

@@ -16,7 +16,8 @@ class Forge::<%= class_name.pluralize %>Controller < ForgeController
         @<%= singular_name %> = <%= class_name %>.new
       }
       format.js {
-        @<%= plural_table_name %> = <%= class_name %>.where("title LIKE ?", "%#{params[:q]}%")
+        params[:q] ||= ''
+        @<%= plural_table_name %> = <%= class_name %>.where("LOWER(title) LIKE ?", "%#{params[:q].downcase}%")
         render :partial => "<%= file_name %>", :collection => @<%= plural_table_name %>
       }
     end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: forge-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -70,28 +70,28 @@ dependencies:
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -983,12 +983,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -996,5 +996,5 @@ rubyforge_project:
 rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
-summary: 'Forge: A CMS for Rapid Application Development'
+summary: ! 'Forge: A CMS for Rapid Application Development'
 test_files: []