spree_core 1.2.5 → 1.3.0.rc1

data/lib/spree/core/controller_helpers.rb

@@ -1,185 +0,0 @@
-# This module exists so that controllers that don't inherit from Spree::BaseController
-# Can still inherit the important bits of functionality and use the Spree layout by default.
-module Spree
-  module Core
-    module ControllerHelpers
-      def self.included(base)
-        base.class_eval do
-          include Spree::Core::CurrentOrder
-          include Spree::Core::RespondWith
-          include SslRequirement
-
-          helper_method :title
-          helper_method :title=
-          helper_method :accurate_title
-          helper_method :current_order
-          helper_method :try_spree_current_user
-
-          before_filter :set_user_language
-          before_filter :set_current_order
-
-          rescue_from CanCan::AccessDenied do |exception|
-            return unauthorized
-          end
-
-          layout :get_layout
-        end
-      end
-      # can be used in views as well as controllers.
-      # e.g. <% self.title = 'This is a custom title for this view' %>
-      attr_writer :title
-
-      # proxy method to *possible* spree_current_user method
-      # Authentication extensions (such as spree_auth_devise) are meant to provide spree_current_user
-      def try_spree_current_user
-        respond_to?(:spree_current_user) ? spree_current_user : nil
-      end
-
-      def title
-        title_string = @title.present? ? @title : accurate_title
-        if title_string.present?
-          if Spree::Config[:always_put_site_name_in_title]
-            [default_title, title_string].join(' - ')
-          else
-            title_string
-          end
-        else
-          default_title
-        end
-      end
-
-      def associate_user
-        @order ||= current_order
-        if try_spree_current_user && @order
-          if @order.user.blank? || @order.email.blank?
-            @order.associate_user!(try_spree_current_user)
-          end
-        end
-
-        # This will trigger any "first order" promotions to be triggered
-        # Assuming of course that this session variable was set correctly in
-        # the authentication provider's registrations controller
-        if session[:spree_user_signup]
-          fire_event('spree.user.signup', :user => try_spree_current_user, :order => current_order(true))
-        end
-
-        session[:guest_token] = nil
-        session[:spree_user_signup] = nil
-      end
-
-      protected
-
-      def set_current_order
-        if user = try_spree_current_user
-          last_incomplete_order = user.last_incomplete_spree_order
-          if session[:order_id].nil? && last_incomplete_order
-            session[:order_id] = last_incomplete_order.id
-          elsif current_order && last_incomplete_order && current_order != last_incomplete_order
-            current_order.merge!(last_incomplete_order)
-          end
-        end
-      end
-
-      # Needs to be overriden so that we use Spree's Ability rather than anyone else's.
-      def current_ability
-        @current_ability ||= Spree::Ability.new(try_spree_current_user)
-      end
-
-      def store_location
-        # disallow return to login, logout, signup pages
-        authentication_routes = [:spree_signup_path, :spree_login_path, :spree_logout_path]
-        disallowed_urls = []
-        authentication_routes.each do |route|
-          if respond_to?(route)
-            disallowed_urls << send(route)
-          end
-        end
-
-        disallowed_urls.map!{ |url| url[/\/\w+$/] }
-        unless disallowed_urls.include?(request.fullpath)
-          session['user_return_to'] = request.fullpath.gsub('//', '/')
-        end
-      end
-      # Redirect as appropriate when an access request fails.  The default action is to redirect to the login screen.
-      # Override this method in your controllers if you want to have special behavior in case the user is not authorized
-      # to access the requested action.  For example, a popup window might simply close itself.
-      def unauthorized
-        respond_to do |format|
-          format.html do
-            if try_spree_current_user
-              flash.now[:error] = t(:authorization_failure)
-              render 'spree/shared/unauthorized', :layout => Spree::Config[:layout], :status => 401
-            else
-              store_location
-              url = respond_to?(:spree_login_path) ? spree_login_path : root_path
-              redirect_to url
-            end
-          end
-          format.xml do
-            request_http_basic_authentication 'Web Password'
-          end
-          format.json do
-            render :text => "Not Authorized \n", :status => 401
-          end
-        end
-      end
-
-
-      def default_title
-        Spree::Config[:site_name]
-      end
-
-      # this is a hook for subclasses to provide title
-      def accurate_title
-        Spree::Config[:default_seo_title]
-      end
-
-      def render_404(exception = nil)
-        respond_to do |type|
-          type.html { render :status => :not_found, :file    => "#{::Rails.root}/public/404", :formats => [:html], :layout => nil}
-          type.all  { render :status => :not_found, :nothing => true }
-        end
-      end
-
-      # Convenience method for firing instrumentation events with the default payload hash
-      def fire_event(name, extra_payload = {})
-        ActiveSupport::Notifications.instrument(name, default_notification_payload.merge(extra_payload))
-      end
-
-      # Creates the hash that is sent as the payload for all notifications. Specific notifications will
-      # add additional keys as appropriate. Override this method if you need additional data when
-      # responding to a notification
-      def default_notification_payload
-        {:user => try_spree_current_user, :order => current_order}
-      end
-
-      private
-
-      def redirect_back_or_default(default)
-        redirect_to(session["user_return_to"] || default)
-        session["user_return_to"] = nil
-      end
-
-      def set_user_language
-        locale = session[:locale]
-        locale ||= Spree::Config[:default_locale] unless Spree::Config[:default_locale].blank?
-        locale ||= Rails.application.config.i18n.default_locale
-        locale ||= I18n.default_locale unless I18n.available_locales.map(&:to_s).include?(locale)
-        I18n.locale = locale
-      end
-
-      # Returns which layout to render.
-      # 
-      # You can set the layout you want to render inside your Spree configuration with the +:layout+ option.
-      # 
-      # Default layout is: +app/views/spree/layouts/spree_application+
-      # 
-      def get_layout
-        layout ||= Spree::Config[:layout]
-      end
-
-
-    end
-  end
-end
-

data/lib/spree/core/current_order.rb

@@ -1,38 +0,0 @@
-module Spree
-  module Core
-    module CurrentOrder
-      def self.included(base)
-        base.class_eval do
-          helper_method :current_order
-        end
-      end
-
-      # This should be overridden by an auth-related extension which would then have the
-      # opportunity to associate the new order with the # current user before saving.
-      def before_save_new_order
-      end
-
-      # This should be overridden by an auth-related extension which would then have the
-      # opporutnity to store tokens, etc. in the session # after saving.
-      def after_save_new_order
-      end
-
-      # The current incomplete order from the session for use in cart and during checkout
-      def current_order(create_order_if_necessary = false)
-        return @current_order if @current_order
-        if session[:order_id]
-          current_order = Spree::Order.find_by_id(session[:order_id], :include => :adjustments)
-          @current_order = current_order unless current_order.try(:completed?)
-        end
-        if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
-          @current_order = Spree::Order.new
-          before_save_new_order
-          @current_order.save!
-          after_save_new_order
-        end
-        session[:order_id] = @current_order ? @current_order.id : nil
-        @current_order
-      end
-    end
-  end
-end

data/lib/spree/core/file_utilz.rb

@@ -1,74 +0,0 @@
-require 'fileutils'
-
-module Spree
-  module Core
-    class FileUtilz
-      # A general purpose method to mirror a directory (+source+) into a destination
-      # directory, including all files and subdirectories. Files will not be mirrored
-      # if they are identical already (checked via FileUtils#identical?).
-      #
-      # Copyright (c) 2008 James Adam (The MIT License)
-
-      # added: do mirroring with backup saving turned on
-      def self.mirror_with_backup(source, destination)
-        self.mirror_files(source, destination, true)
-      end
-
-      def self.mirror_files(source, destination, create_backups = false)
-        # TODO: use Rake::FileList#pathmap?
-        if File.directory?(source)
-          source_files  = Dir[source + "/**/*"]
-          source_dirs   = source_files.select { |d| File.directory?(d) }
-          source_files -= source_dirs
-        elsif File.exist? source
-          source_dirs   = []
-          source_files  = [source]
-          source        = File.dirname source
-        else
-          puts "Could not mirror #{source} - entity does not exist"
-          return
-        end
-
-        unless source_files.empty?
-          base_target_dir = File.join(destination)
-          base_target_dir = File.dirname base_target_dir unless File.directory? base_target_dir
-          FileUtils.mkdir_p(base_target_dir)
-        end
-
-        base_target_dir ||= File.join(destination)
-
-        source_dirs.each do |dir|
-          # strip down these paths so we have simple, relative paths we can
-          # add to the destination
-          target_dir = File.join(base_target_dir, dir.gsub(source, ''))
-          begin
-            FileUtils.mkdir_p(target_dir)
-          rescue Exception => e
-            raise "Could not create directory #{target_dir}: \n" + e
-          end
-        end
-
-        source_files.each do |file|
-          begin
-            target = File.join(base_target_dir, file.gsub(source, ''))
-            unless File.exist?(target) && self.same_contents(file, target)
-              # WAS FileUtils.identical?(file, target), but we want to test contents too
-              if create_backups && File.exist?(target)
-                File.rename(target, target + '~')
-              end
-              FileUtils.cp(file, target)
-            end
-          rescue Exception => e
-            raise "Could not copy #{file} to #{target}: \n" + e
-          end
-        end
-      end
-
-      # for windows users...
-      def self.same_contents(source,destination)
-        File.read(source) == File.read(destination)
-      end
-
-    end
-  end
-end

data/lib/tasks/assets.rake

@@ -1,58 +0,0 @@
-namespace :spree do
-  namespace :assets do
-    desc "Relocates files from public/assets directory"
-    task :relocate_images => :environment do
-      require 'fileutils'
-
-      %w{products taxons}.each do |directory|
-        depracated_assets_path = Rails.root.join("public/assets/", directory)
-
-        if depracated_assets_path.exist?
-          new_assets_path = Rails.root.join("public/spree/", directory)
-
-          unless File.exists? new_assets_path
-            puts "Creating new #{directory} images path at: #{new_assets_path}"
-            FileUtils.mkdir_p(new_assets_path.to_s)
-          end
-
-          puts "Syncing files from: #{depracated_assets_path} to: #{new_assets_path}"
-          Spree::Core::FileUtilz.mirror_files(depracated_assets_path.to_s, new_assets_path.to_s)
-
-
-          puts "Deleting original files from: #{depracated_assets_path}"
-          FileUtils.rm_rf(depracated_assets_path.to_s)
-        else
-          puts "No files located at: #{depracated_assets_path}"
-        end
-
-      end
-
-      if File.exists? Rails.root.join("public/assets")
-        if Dir[Rails.root.join("public/assets/*").to_s].empty?
-          puts "Deleting empty public/assets directory"
-          FileUtils.rm_rf(Rails.root.join("public/assets").to_s)
-        end
-      end
-
-    end
-
-    desc "Copies images from all app/assets directories into public/assets"
-    task :sync_images => :environment do
-      image_paths = Rails.application.assets.paths.select {|path| path.ends_with? "/images" }
-
-      image_paths.reverse.each do |path|
-        path << '/'
-
-        Dir.glob(File.join(path, "**/*")) do |file|
-          next if File.directory? file
-          cache_name = Rails.root.join('public/assets', file.to_s.sub(path, ''))
-
-          FileUtils.mkdir_p cache_name.dirname
-          FileUtils.cp file, cache_name.to_s
-        end
-      end
-    end
-
-
-  end
-end

data/vendor/assets/stylesheets/html5reset.css

@@ -1,177 +0,0 @@
-/*
-	HTML5 Reset :: style.css
-	----------------------------------------------------------
-	We have learned much from/been inspired by/taken code where offered from:
-	
-	Eric Meyer					:: http://ericmeyer.com
-	HTML5 Doctor				:: http://html5doctor.com
-	and the HTML5 Boilerplate	:: http://html5boilerplate.com
-	
--------------------------------------------------------------------------------*/
-
-/* Let's default this puppy out
--------------------------------------------------------------------------------*/
-
-html, body, body div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, figure, footer, header, hgroup, menu, nav, section, time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	font-size: 100%;
-	vertical-align: baseline;
-	background: transparent;
-}									
-
-article, aside, figure, footer, header, hgroup, nav, section {display: block;}
-
-/* Responsive images and other embedded objects
-   Note: keeping IMG here will cause problems if you're using foreground images as sprites.
-   If this default setting for images is causing issues, you might want to replace it with a .responsive class instead. */
-img,
-object,
-embed {max-width: 100%;}
-
-/* force a vertical scrollbar to prevent a jumpy page */
-html {overflow-y: scroll;}
-
-/* we use a lot of ULs that aren't bulleted. 
-	don't forget to restore the bullets within content. */
-ul {list-style: none;}
-
-blockquote, q {quotes: none;}
-
-blockquote:before, 
-blockquote:after, 
-q:before, 
-q:after {content: ''; content: none;}
-
-a {margin: 0; padding: 0; font-size: 100%; vertical-align: baseline; background: transparent;}
-
-del {text-decoration: line-through;}
-
-abbr[title], dfn[title] {border-bottom: 1px dotted #000; cursor: help;}
-
-/* tables still need cellspacing="0" in the markup */
-table {border-collapse: collapse; border-spacing: 0;}
-th {font-weight: bold; vertical-align: bottom;}
-td {font-weight: normal; vertical-align: top;}
-
-hr {display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0;}
-
-input, select {vertical-align: middle;}
-
-pre {
-	white-space: pre; /* CSS2 */
-	white-space: pre-wrap; /* CSS 2.1 */
-	white-space: pre-line; /* CSS 3 (and 2.1 as well, actually) */
-	word-wrap: break-word; /* IE */
-}
-
-input[type="radio"] {vertical-align: text-bottom;}
-input[type="checkbox"] {vertical-align: bottom; *vertical-align: baseline;}
-.ie6 input {vertical-align: text-bottom;}
-
-select, input, textarea {font: 99% sans-serif;}
-
-table {font-size: inherit; font: 100%;}
- 
-/* Accessible focus treatment
-	people.opera.com/patrickl/experiments/keyboard/test */
-a:hover, a:active {outline: none;}
-
-small {font-size: 85%;}
-
-strong, th {font-weight: bold;}
-
-td, td img {vertical-align: top;} 
-
-/* Make sure sup and sub don't screw with your line-heights
-	gist.github.com/413930 */
-sub, sup {font-size: 75%; line-height: 0; position: relative;}
-sup {top: -0.5em;}
-sub {bottom: -0.25em;}
-
-/* standardize any monospaced elements */
-pre, code, kbd, samp {font-family: monospace, sans-serif;}
-
-/* hand cursor on clickable elements */
-.clickable,
-label, 
-input[type=button], 
-input[type=submit], 
-button {cursor: pointer;}
-
-/* Webkit browsers add a 2px margin outside the chrome of form elements */
-button, input, select, textarea {margin: 0;}
-
-/* make buttons play nice in IE */
-button {width: auto; overflow: visible;}
- 
-/* scale images in IE7 more attractively */
-.ie7 img {-ms-interpolation-mode: bicubic;}
-
-/* prevent BG image flicker upon hover */
-.ie6 html {filter: expression(document.execCommand("BackgroundImageCache", false, true));}
-
-/* let's clear some floats */
-.clearfix:before, .clearfix:after { content: "\0020"; display: block; height: 0; overflow: hidden; }  
-.clearfix:after { clear: both; }  
-.clearfix { zoom: 1; }  
-
-
-
-/* Ok, this is where the fun starts.
--------------------------------------------------------------------------------*/
-
-/* new Linux- and Windows-friendly sans-serif font stack: http://mky.be/fontstack */
-body {font: 13px Helmet, Freesans, sans-serif;}
-
-/* using local fonts? make sure to read up on Paul Irish's 
-	Bulletproof @font-face syntax: http://mky.be/font-face/bulletproof/ */
-
-/* we like off-black for text */
-body, select, input, textarea {color: #333;}
-
-a {color: #03f;}
-a:hover {color: #69f;}
-
-/* Custom text-selection colors (remove any text shadows: twitter.com/miketaylr/status/12228805301) */
-::-moz-selection{background: #fcd700; color: #fff; text-shadow: none;}
-::selection {background: #fcd700; color: #fff; text-shadow: none;} 
-
-/*	j.mp/webkit-tap-highlight-color */
-a:link {-webkit-tap-highlight-color: #fcd700;} 
-
-ins {background-color: #fcd700; color: #000; text-decoration: none;}
-mark {background-color: #fcd700; color: #000; font-style: italic; font-weight: bold;}
-
-
-
-
-
-/* Print styles!
--------------------------------------------------------------------------------*/
-@media print {
-
-
-
-}
-
-
-/* Media queries!
--------------------------------------------------------------------------------*/
-
-/* Consider this: www.cloudfour.com/css-media-query-for-mobile-is-fools-gold/ */
-@media screen and (max-device-width: 480px) {
-	
-		
-}
-
-@media all and (orientation: portrait) {
-	
-}
-
-@media all and (orientation: landscape) {
-	
-}
-