opensteam 0.9.1 → 0.9.2

data/generators/opensteam/templates/db/migrate/20080804152615_create_filter_entries.rb

@@ -0,0 +1,16 @@
+class CreateFilterEntries < ActiveRecord::Migration
+  def self.up
+    create_table :filter_entries do |t|
+      t.string :model, :null => false
+      t.string :key, :null => false
+      t.string :val, :null => false
+      t.string :op, :default => "LIKE"
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :filter_entries
+  end
+end

data/generators/opensteam/templates/public/stylesheets/opensteam_white.css

@@ -9,33 +9,32 @@ body {
 }
 
 #menu {
-	float:right;
+    float:right;
 }
 
 #page {
-	margin-top:30px;
-	margin-left:50px;
-	margin-right:50px;
+    margin-top:30px;
+    margin-left:50px;
+    margin-right:50px;
 }
 
 
 #header {
-	padding-left:30px;
-	padding-top:30px;
-	padding-bottom:10px;
-
+    padding-left:30px;
+    padding-top:30px;
+    padding-bottom:10px;
+    
     border-bottom:1px solid black;
 }
 
 #content_box {
-	clear:both;
+    clear:both;
 }
 
 #content_box div {
-	border-left: 1px solid #aaa;
-	padding:10px;
-	float:left
-	;
+    padding:10px;
+    float:left
+    ;
 }
 
 #content_box div * {
@@ -49,20 +48,21 @@ body {
 
 
 #content_box div div {
-	border:none;
-	padding:10px;
-	clear:both;
+    border:none;
+    padding:10px;
+    clear:both;
 }
 
 #sidebar {
 }
 
 #content {
+    border-left: 1px solid #aaa ;
 }
 
 #footer {
-	border-top: 1px solid black;
-	clear:both;
+    border-top: 1px solid black;
+    clear:both;
 }
 
 #cart {
@@ -79,19 +79,19 @@ body {
 }
 
 .configured_table table {
-	border-collapse: collapse ;
-	border-spacing: 1px;
-	font-size:8pt;
+    border-collapse: collapse ;
+    border-spacing: 1px;
+    font-size:8pt;
 }
 
 .configured_table table th a {
-	width:100%;
-	color:black;
-	text-decoration:none;
+    width:100%;
+    color:black;
+    text-decoration:none;
 }
 
 .configured_table table th a:hover {
-	background-color:#eee;
+    background-color:#eee;
 }
 
 .configured_table table td {

data/generators/opensteam_product/templates/controllers/product_controller.rb

@@ -1,5 +1,5 @@
 ## TEMPLATE ##
-class Admin<%= class_name.pluralize %>Controller < AdminController
+class Admin::<%= class_name.pluralize %>Controller < AdminController
   include Opensteam::Finder
   
   # GET /<%= table_name %>

data/lib/opensteam/extension_base.rb

@@ -41,6 +41,7 @@ module Opensteam
       
       
       
+      
       def active? ; active == 0 ? false : true ; end
       
       # activate the extension

data/lib/opensteam/helpers/config_table_helper.rb

@@ -0,0 +1,139 @@
+module Opensteam::Helpers
+  
+  
+  module ConfigTableHelper
+    
+    def self.included(base)
+      base.extend(ClassMethods)
+      base.class_eval do
+        include InstanceMethods
+        
+        
+        
+        
+        
+      end
+      
+    end
+    
+    module ClassMethods
+      
+      def opensteam_filter(name, *args, &block )
+        @osteam_configtable = Opensteam::Helpers::ConfigTableHelper::Base.new( name, *args )
+        @osteam_configtable.instance_eval(&block) if block_given?
+        
+        class << self ; attr_accessor :osteam_configtable ; end
+     
+      end
+      
+    end
+    
+    module InstanceMethods
+    end
+    
+    
+    
+    class Base < ActionView::Base
+      
+      include ActionView::Helpers::TagHelper
+      include ActionView::Helpers::FormTagHelper
+      
+      attr_accessor :name, :default_include, :columns, :order_column
+      
+      def initialize( name, *args )
+        #  args = args.first if args.is_a?(Array)
+        @name = name
+        @default_include = [] #args[:default_include] || []
+        @columns = []
+      end
+      
+      def include_associations(arr)
+        @default_include = arr
+      end
+      
+      def column(id, *args)
+        @columns << Column.new( id, *args )
+      end
+      
+      def default_order_column(id)
+        @order_column = id
+      end
+      
+      def [](id)
+        @columns.find { |s| s.id.to_s == id.to_s }
+      end
+      
+      def table_header( &block )
+        html_options = {}
+        content_tag( :thead, {} ) do
+          content_tag( :tr, html_options ) do
+            @columns.collect do |c|
+              content_tag( :th, {} ) do
+                block.call( c )
+              end
+              
+            end
+          end
+        end
+      end
+      
+    
+        
+        
+
+    end
+    
+    class Column
+      attr_accessor :name, :order, :sql, :id
+      def initialize(id, *args )
+        @args = args.is_a?( Array ) ? args.first : args
+        @id = id
+        @order = @args[:order] || @args[:sql]
+        @sql = @args[:sql] || @args[:order]
+        @name = @args[:name]
+        @method = @args[:method]
+      end
+      
+      def sort
+        if @method
+          return Proc.new { |a,b| a.__send__( @id ).__send__(@method) <=> b.__send__( @id ).__send__( @method ) }
+        end
+        return @order
+      end
+      
+      
+      
+    end
+    
+    
+    module HelperMethods
+      
+      def osteam_sort_table( mdl, opts = {}, &block )
+        mdl = mdl.to_s.classify.constantize unless mdl.is_a?( Class )
+        config_table = mdl.osteam_configtable
+        
+        content = capture( config_table, &block )
+
+        html_options = opts[:html] || {}
+        
+        concat( 
+          content_tag( :div, { :class => 'configured_table_containter' } ) do
+            content_tag( :table, html_options ) do
+              content
+            end
+          end, block.binding )
+        
+      end
+      
+    end
+    
+  end
+      
+      
+      
+      
+      
+    
+    
+
+end

data/lib/opensteam/initializer.rb

@@ -35,6 +35,8 @@ module Opensteam
       
       def require_opensteam_after_initialize
         require 'opensteam/user_base' ## AuthenticatedMethods include !!!
+        
+        require 'opensteam/helpers/config_table_helper'
 
         _logger "loaded!"
       end
@@ -97,9 +99,7 @@ module Opensteam
       require 'opensteam/cart_base'
       require 'opensteam/checkout'
       require 'opensteam/inventory_base'
-    
-    
-      require 'opensteam/helper/configurable_table'
+   
     
     
     end

data/lib/opensteam/invoice_base.rb

@@ -41,6 +41,10 @@ module Opensteam
       has_many :order_items, :class_name => 'Opensteam::OrderBase::OrderItem'
       
       
+      named_scope :by_order, lambda { |order_id| { :include => :order, :conditions => { :order_id => order_id } } }
+      named_scope :order_by, lambda { |by| { :include => Invoice.osteam_configtable.default_include, :order => Array(by).join(",") , :conditions => "orders.id = orders.id" } }
+      
+      
       def initialize(*args)
         super(*args)
         if order

data/lib/opensteam/order_base.rb

@@ -46,9 +46,11 @@ module Opensteam
     # Order Model
     class Order < ActiveRecord::Base
       include Opensteam::StateMachine
-
-      include Opensteam::UUIDHelper
-
+    #   include Opensteam::UUIDHelper
+      
+      named_scope :order_by, lambda { |by| { :include => Order.osteam_configtable.default_include, :order => Array(by).join(",") , :conditions => "users.id = users.id" } }
+      named_scope :by_user, lambda { |user_id| { :include => [:customer ], :conditions => { :customer_id => user_id } } }
+      
       # associations
       
       has_many :order_items, :class_name => 'Opensteam::OrderBase::OrderItem', :extend => OrderItemsExtension

data/lib/opensteam/shipment_base.rb

@@ -38,6 +38,12 @@ module Opensteam
 
       has_many :order_items, :class_name => 'Opensteam::OrderBase::OrderItem'
       
+            
+      named_scope :by_order, lambda { |order_id| { :include => :order, :conditions => { :order_id => order_id } } }
+      named_scope :order_by, lambda { |by| { :include => Shipment.osteam_configtable.default_include, :order => Array(by).join(",") , :conditions => "orders.id = orders.id" } }
+      
+      
+      
       def initialize(*args)
         super(*args)
 

data/lib/opensteam/user_base.rb

@@ -101,6 +101,7 @@ module Opensteam
 
       
       named_scope :by_profile, lambda { |p| { :include => :profile, :conditions => "profiles.name = '#{p.to_s.classify}'" } }
+      named_scope :order_by, lambda { |by| { :include => Opensteam::UserBase::User.osteam_configtable.default_include, :order => by, :conditions => "profiles.id = profiles.id" } }
       
       
       

data/lib/opensteam/version.rb

@@ -18,7 +18,7 @@ module Opensteam #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: opensteam
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Michael Schaerfer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-01 00:00:00 +02:00
+date: 2008-08-07 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -43,7 +43,7 @@ files:
 - lib/opensteam/inventory_base.rb
 - lib/opensteam/initializer.rb
 - lib/opensteam/history.rb
-- lib/opensteam/helper/configurable_table.rb
+- lib/opensteam/helpers/config_table_helper.rb
 - lib/opensteam/finder.rb
 - lib/opensteam/extension_base.rb
 - lib/opensteam/config.rb
@@ -122,6 +122,7 @@ files:
 - generators/opensteam/templates/lib/authentication/by_password.rb
 - generators/opensteam/templates/lib/authentication/by_cookie_token.rb
 - generators/opensteam/templates/lib/authenticated_system.rb
+- generators/opensteam/templates/db/migrate/20080804152615_create_filter_entries.rb
 - generators/opensteam/templates/db/migrate/20080714131650_create_shipments.rb
 - generators/opensteam/templates/db/migrate/20080714131513_create_invoices.rb
 - generators/opensteam/templates/db/migrate/20080630114155_create_state_histories.rb
@@ -228,10 +229,14 @@ files:
 - generators/opensteam/templates/app/views/admin/inventories/index.html.erb
 - generators/opensteam/templates/app/views/admin/inventories/edit.html.erb
 - generators/opensteam/templates/app/views/admin/index.html.erb
+- generators/opensteam/templates/app/views/admin/filters/_filter_fields.html.erb
+- generators/opensteam/templates/app/views/admin/filters/_filter_entry.html.erb
+- generators/opensteam/templates/app/views/admin/filters/_filter.html.erb
 - generators/opensteam/templates/app/views/admin/catalog.html.erb
 - generators/opensteam/templates/app/views/admin/_nav.html.erb
 - generators/opensteam/templates/app/views/admin/_address.html.erb
 - generators/opensteam/templates/app/models/search.rb
+- generators/opensteam/templates/app/models/filter_entry.rb
 - generators/opensteam/templates/app/helpers/webshop_helper.rb
 - generators/opensteam/templates/app/helpers/users_helper.rb
 - generators/opensteam/templates/app/helpers/admin_helper.rb

data/lib/opensteam/helper/configurable_table.rb

@@ -1,228 +0,0 @@
-module Opensteam
-  
-  module Helper
-    
-    
-    # ConfigurableTable
-    #
-    # Module to Configure, Search and Sort a table, depending on a model-collection
-    #
-    module ConfigurableTableController
-      
-      def self.included(base)
-        # base.extend( ClassMethods )
-        
-        base.class_eval do
-          include InstanceMethods
-          before_filter :set_sort_column
-          private :sort_model, :set_sort_column
-        end
-      end
-      
-      
-      module InstanceMethods
-      
-        # before_filter:
-        # if params[:sort] is set, it gets the current sort-column from the
-        # configured_table class variable
-        #
-        def set_sort_column
-          if params[:sort]
-            model = params[:model].demodulize.classify.constantize rescue nil
-            @sort_column = model.configured_table.get_column( params[:sort] ) || model.configured_table.default_sort
-          end
-        end
-      
-        def sort
-          if params[:sort]
-            self.class.to_s =~ /^(.+)Controller/
-            model = $1.demodulize.classify.constantize rescue nil
-            @result = sort_model( model, @sort_column )
-          end
-          render :action => :sort
-          
-        end
-      
-        # sort the current model by column
-        # finds all entries for current model (including all associations)
-        # sort entries either by "ORDER" SQL or by a ruby sort-block (depending on
-        # the configuration or wether the column is an association)
-        #
-        def sort_model( model, column, conditions = nil, includes = nil )
-          finder_args = {}
-          finder_args[:conditions] = conditions if conditions
-          finder_args[:include] = includes if includes
-          
-          if column.order_ruby?
-            result = model.find( :all, finder_args )
-            result.sort!(&column.order)
-          else
-            finder_args[:order] = column.order
-            result = model.find(:all, finder_args )
-          end
-          toggle_sorted( model.to_s.demodulize )
-          result.reverse! if sorted?( model.to_s.demodulize )
-          result
-        end
-        
-        # if model is currently sorted ascending
-        def sorted?(model)
-          session["#{model}_sorted".to_sym] ? true : false ;
-        end
-        
-        
-        # toggle the sorted-sesssion variable for the given model
-        def toggle_sorted(model)
-          session["#{model}_sorted".to_sym] = session["#{model}_sorted".to_sym] ? false : true
-        end
-      end
-    end
-    
-      
-
-
-    module ConfigurableTable
-      
-      def self.included(base)
-        base.extend(ClassMethods)
-        
-      end
-       
-
-      module ClassMethods
-        # configure a table
-        # takes a block, like:
-        #   configure_table :order do
-        #     column :id, :name => "ID"
-        #   end
-        #
-        def configure_table( mdl, &block )
-          mdl = mdl.to_s.classify.constantize unless mdl.is_a?( Class )
-
-
-          mdl.class_eval do
-            @configured_table = ConfigTable.new( self )
-            @configured_table.instance_eval( &block )
-            
-            class << self ; attr_accessor :configured_table ; end
-          end
-
-        end
-      end
-      
-      
-    
-      
-      
-      # ConfigTable
-      # Holds all the Columns defined fot the Configurable-Table
-      #
-      class ConfigTable
-        
-        attr_accessor :columns, :model, :assocs, :assoc_names, :table_id
-        
-        def initialize(mdl)
-          @columns = []
-          @model = mdl
-          @table_id = "#{@model.table_name}_configured_table"
-          @assocs = mdl.reflect_on_all_associations
-          @assoc_names = @assocs.collect(&:name)
-        end
-        
-        
-        def default_sort_col( id )
-          @default_sort = id.to_sym
-        end
-        
-        def column( id, *args )
-          @columns << Column.new( id.to_sym, self, *args )
-        end
-        
-        def get_column(id) 
-          @columns.find { |s| s.id.to_sym == id.to_sym }
-        end
-        
-        def default_sort ; get_column( @default_sort ) ; end
-        
-      end
-      
-      class Column
-        attr_accessor :id, :name, :opts, :order, :config_table, :method, :table_name, :sql_query
-        
-        
-        # initialize a column
-        # if column is an association of the current model, the entries
-        # are sorted either by a ruby-block (if a :method is defined to call on the
-        # association-object), by :size (ruby-block, if its a _has_many_ association) or
-        # simply by the id (ORDER-SQL statement)
-        # if columns is not an association, the entries are sorted by an ORDER-SQL statement.
-        #
-        def initialize( id, config_table, *args )
-          @id = id
-          @opts = *args || Hash.new(nil)
-          @method = @opts[:method]
-          @name = @opts[:name] || @id.to_s
-          @config_table = config_table
-          
-          @assoc = @config_table.assocs.find { |s| s.name.to_sym == @id.to_sym }
-          
-          @order = @opts[:sort]
-         
-          
-          
-          unless @order
-            if is_assoc?
-              if @method
-                @order = Proc.new { |a,b|
-                  a.__send__( @id ).__send__( @method ).to_s <=> b.__send__( @id ).__send__( @method ).to_s
-                }
-                # @order = "`#{assoc_table_name}`.`#{@method}`"
-              else
-                @order = is_has_many_assoc? ? Proc.new { |a,b| a.__send__(@method).size <=> b.__send__(@method).size } :
-                  "`#{assoc_table_name}`.`id`"
-              end
-            else
-              @order = "`#{@config_table.model.table_name}`.`#{@id}`"
-            end
-          end
-
-        end
-        
-        def sql_query
-          is_assoc? ? "`#{table_name}`.`#{@method =~ /size/ ? 'id' : @method}`" : 
-            "`#{table_name}`.`#{@id}`" ;
-        end
-        
-        def table_name
-          is_assoc? ? assoc_table_name : @config_table.model.table_name ;
-        end
-        
-        def is_assoc? #:nodoc:
-          @assoc ? true : false
-        end
-        
-        def is_has_many_assoc? #:nodoc:
-          @assoc.macro =~ /has_many/
-        end
-        
-        def assoc_table_name #:nodoc:
-          @assoc.options.include?( :class_name ) ?
-            @assoc.options[:class_name].constantize.table_name :
-            @id.to_s.tableize
-        end
-
-        
-        def order_ruby? #:nodoc:
-          @order.is_a?( Proc )
-        end
-      end
-        
-    end
-    
-  end
-      
-      
-      
-      
-      
-end