opensteam 0.9.0 → 0.9.1

data/lib/opensteam/user_base.rb

@@ -1,3 +1,19 @@
+#	openSteam - http://www.opensteam.net
+#  Copyright (C) 2008  DiamondDogs Webconsulting
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 module Opensteam
 	
 	
@@ -7,12 +23,27 @@ module Opensteam
   #
   # 
   module UserBase
+    
+    
+    module UserAuthenticatedHelper
+      def self.included(base)
+        base.class_eval do
+        end
+      end
+      
+      
+    end
+    
+    
 		
     class Address < ActiveRecord::Base
-      belongs_to :customer
+      belongs_to :customer, :class_name => 'Opensteam::UserBase::Customer'
       has_many :shipping_orders, :class_name => "Order", :foreign_key => "shipping_address_id"
       has_many :payment_orders , :class_name => "Order", :foreign_key => "payment_address_id"
 		
+      has_many :shipments
+      has_many :invoices
+      
       validates_presence_of :city, :postal, :street, :land
 		
 			
@@ -20,146 +51,99 @@ module Opensteam
       def orders
         self.shipping_orders | self.payment_orders
       end
+
+      def zip ; postal ; end
+      
+      def to_a ; [ street, zip, city, land ] ; end
+      
+      def full_address ; to_a * (",") ; end
+      
+      alias :to_s :full_address
 			
     end
-
-		
-
-		
+    
+    
     require 'digest/sha1'
-		
-		
+
     class User < ActiveRecord::Base
-      has_many :addresses
-			
-      validates_length_of :login, :within => 3..20
-      validates_length_of :password, :within => 5..40
-      validates_presence_of :login, :email, :password, :password_confirmation, :salt
-      validates_uniqueness_of :email, :login
-      validates_confirmation_of :password
-      validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :message => "Invalid email" 
-		
-			
-      attr_protected :id, :salt, :type
-      attr_accessor :password, :password_confirmation
-			
-		
-      # authenticate
-      def self.authenticate(login,pass)
-        u = find(:first, :conditions => ["login = ?", login])
-        return nil if u.nil?
-        return u.login if Opensteam::UserBase::User.encrypt(pass, u.salt) == u.hashed_password
-        nil
-      end
-			
-		 
-      #set password
-      def password=(pass)
-        errors.add_to_base("password is empty") if pass.nil? or pass.empty?
-        @password = pass
-        self.salt = Opensteam::UserBase::User.random_string(10) if !self.salt?
-        self.hashed_password = Opensteam::UserBase::User.encrypt(@password, self.salt)
-      end
-			
-			
-      def is_admin?
-        return (self.class == Opensteam::UserBase::Admin ) ? true : false
-      end
-			
-			
-      protected
-      def self.random_string(len)
-        chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
-        newpass = ""
-        1.upto(len) { |i| newpass << chars[rand(chars.size-1)] }
-        return newpass
-      end
-			
-      def self.encrypt(pass, salt)
-        Digest::SHA1.hexdigest(pass+salt)
-      end
-			
-		
-    end
-				
-		
-    class Admin < User
-    end
-		
-		
-		
-    class Customer < ActiveRecord::Base
-      has_many :orders, :class_name => "Opensteam::OrderBase::Order"
-      has_many :addresses, :foreign_key => "user_id"
-			
-      validates_presence_of :email #, :firstname, :lastname
-      validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :message => "Invalid format .." 
-		
-    end
-		
-		
-		
-		
-		
-		
-		
-    # Opensteam::UserBase::Helper
-    #
-    # Helper Methods for a Controller
-    # used for before/after_fileter
-    #
-    #
-    module Helper
-		  
-			
-      # admin_required filter
-      def admin_required
-        if login = session[:user_login]
-          if Opensteam::UserBase::User.find(:first, :conditions => ["login = ?", login]).is_admin?
-            return true
-          end
+      include Authentication
+      include Authentication::ByPassword
+      include Authentication::ByCookieToken
+
+      validates_presence_of     :email
+      validates_length_of       :email,    :within => 6..100 #r@a.wk
+      validates_uniqueness_of   :email,    :case_sensitive => false
+      validates_format_of       :email,    :with => RE_EMAIL_OK, :message => MSG_EMAIL_BAD
+
+      validates_presence_of     :firstname
+      validates_format_of       :firstname, :with => RE_NAME_OK, :message => MSG_NAME_BAD, :allow_nil => false
+      validates_length_of       :firstname, :maximum => 100
+    
+      validates_presence_of     :lastname
+      validates_format_of       :lastname, :with => RE_NAME_OK, :message => MSG_NAME_BAD, :allow_nil => false
+      validates_length_of       :lastname, :maximum => 100
+          
+      attr_accessible :login, :email, :firstname, :lastname, :password, :password_confirmation
+           
+      class << self ;
+              
+        def authenticate(email, password)
+          u = find_by_email(email) # need to get the salt
+          u && u.authenticated?(password) ? u : nil
         end
-        flash[:error] = "you have to be an admin ..."
-        session[:return_to] = request.request_uri
-        redirect_to login_path
-        return false
+      
       end
-		  
-		  
-			
-      # user_required filter
-      def user_required
-        if login = session[:user_login]
-          if Opensteam::UserBase::User.find(:first, :conditions => ["login = ?", login])
-            return true
-          end
+
+      belongs_to :profile, :class_name => 'Opensteam::UserBase::Profile'
+      
+      has_many :orders, :class_name => 'Opensteam::OrderBase::Order', :foreign_key => "customer_id"
+      has_many :addresses, :class_name => 'Opensteam::UserBase::Address', :foreign_key => 'user_id'
+
+      
+      named_scope :by_profile, lambda { |p| { :include => :profile, :conditions => "profiles.name = '#{p.to_s.classify}'" } }
+      
+      
+      
+      after_create :set_profile
+      
+      def set_profile
+        unless self.profile
+          self.profile = Profile.find_or_create_by_name(:name => "Customer" )
+          self.save
         end
-        flash[:error] = "not logged in .."
-        session[:return_to] = request.request_uri
-        redirect_to login_path
-        return false
-      end
-		  
-			
-      # get the current authenticated user
-      def current_user
-        session[:user]
       end
-		
-			
-			
-      # redirect to stored request
-      def redirect_to_stored
-        if return_to = session[:return_to]
-          session[:return_to] = nil
-          redirect_to return_to
-        else
-          redirect_to administration_path
+      
+      
+      def method_missing(method, *args, &block)
+        if method.to_s =~/^is\_(.+)\?$/
+          return self.profile.name.classify.to_sym == $1.classify.to_sym
         end
+        super
       end
-		  
+
+      def old_password ; nil ; end
+      
+      def full_name ; [ firstname, lastname ] * " " ; end
+      alias :to_s :full_name
+      
+      
+      protected
+
     end
-		
+
+    
+    class Profile < ActiveRecord::Base
+      validates_presence_of   :name
+      validates_uniqueness_of :name
+      
+      has_many :users, :class_name => 'Opensteam::UserBase::User'
+      
+    end
+    
+
   end
 	
-end
+end
+
+User = Opensteam::UserBase::User
+

data/lib/opensteam/version.rb

@@ -1,8 +1,24 @@
+#	openSteam - http://www.opensteam.net
+#  Copyright (C) 2008  DiamondDogs Webconsulting
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 module Opensteam #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/opensteam.rb

@@ -1,49 +1,44 @@
+#	openSteam - http://www.opensteam.net
+#  Copyright (C) 2008  DiamondDogs Webconsulting
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 require 'active_record'
 
 module Opensteam #:nodoc:
   
-  def self._logger(args) #:nodoc:
-    logger = ( defined? RAILS_DEFAULT_LOGGER) ? RAILS_DEFAULT_LOGGER :  Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log")
-    logger.info "** [openSteam] #{args}"
-  end
-  
-
-  
-  
-  # load controller specific modules and the inventory_base modules
-  def self.load_opensteam_controller
-    require 'opensteam/user_base'
-    require 'opensteam/shopping_cart'
-    require 'opensteam/checkout'
-    require 'opensteam/inventory_base'
-  
-    Opensteam._logger "loaded!"
-  end
+  def self._logger(*args) ; Opensteam::Initializer._logger( *args ) ; end
   
   
 end
 
+require 'opensteam/initializer'
 
-require 'opensteam/version'
-Opensteam._logger "v#{Opensteam::VERSION::STRING} loading .."
+Opensteam::Initializer.run do |config|
+end
+
+
+
+Order = Opensteam::OrderBase::Order
+Invoice = Opensteam::InvoiceBase::Invoice
+Shipment = Opensteam::ShipmentBase::Shipment
+
+OrderStates = Opensteam::OrderBase::States
+InvoiceStates = Opensteam::InvoiceBase::States
+ShipmentStates = Opensteam::ShipmentBase::States
 
-require 'opensteam/config'
-require 'opensteam/finder'
-require 'opensteam/product_base'
-require 'opensteam/property_base'
-require 'opensteam/base'
-require 'opensteam/order_base'
 
 
-# extend ActiveRecord with the "opensteam" method
-ActiveRecord::Base.send(:include, Opensteam::Base::Extension )
 
-Dir.glob("#{RAILS_ROOT}/app/models/*.rb").collect { |f| require f }
 
-class Rails::Initializer #:nodoc:
-  def after_initialize_with_load_opensteam_controller
-    after_initialize_without_load_opensteam_controller
-    Opensteam.load_opensteam_controller
-  end
-  alias_method_chain :after_initialize, :load_opensteam_controller
-end