spree_core 1.1.6 → 1.2.0.rc1

data/app/views/spree/admin/taxons/remove.html.erb

@@ -1 +0,0 @@
-<%= render :partial => 'taxon_table', :locals => { :taxons => @taxons } %>

data/app/views/spree/admin/taxons/select.js.erb

@@ -1,2 +0,0 @@
-$("#selected-taxons").html("<%= escape_javascript(render(:partial => 'taxon_table', :locals => { :taxons => @taxons })) %>");
-$("#<%= dom_id @taxon, :sel %>").hide();

data/app/views/spree/admin/taxons/selected.html.erb

@@ -1,42 +0,0 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
-<%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Taxons' } %>
-<div id="selected-taxons" data-hook>
-  <%= render :partial => 'taxon_table', :locals => { :taxons => @taxons } %>
-</div>
-
-<%= form_tag '#' do %>
-  <%= label_tag nil, t(:search) %>:
-  <input id="searchtext" size="25">
-<% end %>
-
-<%= javascript_tag do %>
-  function search_for_taxons(){
-    $.ajax({
-     data: {q: $("#searchtext").val() },
-     dataType: 'html',
-     success: function(request){
-       jQuery('#search_hits').html(request);
-     },
-     type: 'POST',
-     url: '<%= available_admin_product_taxons_url(@product, :format => 'js') %>'
-    });
-  }
-
-  $("#searchtext").keypress(function (e) {
-    if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) {
-      search_for_taxons();
-
-      return false;
-    } else {
-       return true;
-    }
-  });
-
-  $("#searchtext").delayedObserver(function() {
-    search_for_taxons();
-  }, 0.75);
-<% end %>
-<br />
-<div id="search_hits" data-hook></div>
-

data/app/views/spree/admin/users/_form.html.erb

@@ -1,19 +0,0 @@
-<div data-hook="admin_user_form_fields">
-  <%= f.field_container :email do %>
-    <%= f.label :email, t(:email) %><br />
-    <%= f.email_field :email %>
-    <%= error_message_on :user, :email %>
-  <% end %>
-
-  <%= f.field_container :password do %>
-    <%= f.label :password, t(:password) %><br />
-    <%= f.password_field :password %>
-    <%= f.error_message_on :password %>
-  <% end %>
-
-  <%= f.field_container :password do %>
-    <%= f.label :password_confirmation, t(:confirm_password) %><br />
-    <%= f.password_field :password_confirmation %>
-    <%= f.error_message_on :password_confirmation %>
-  <% end %>
-</div>

data/app/views/spree/admin/users/edit.html.erb

@@ -1,14 +0,0 @@
-<div data-hook="admin_user_edit_form_header">
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
-  <h1><%= t(:editing_user) %></h1>
-</div>
-
-<div data-hook="admin_user_edit_form">
-  <%= form_for [:admin, @user] do |f| %>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-
-    <div data-hook="admin_user_edit_form_button">
-      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
-    </div>
-  <% end %>
-</div>

data/app/views/spree/admin/users/index.html.erb

@@ -1,48 +0,0 @@
-<div class="toolbar" data-hook="toolbar">
-  <ul class="actions">
-    <li>
-      <p><%= button_link_to t(:new_user), new_object_url, :icon => 'add', :id => 'admin_new_user_link' %></p>
-    </li>
-  </ul>
-  <br class="clear" />
-</div>
-
-<h1><%= t(:listing_users) %></h1>
-
-<table class="index" id="listing_users" data-hook>
-  <thead>
-    <tr data-hook="admin_users_index_headers">
-      <th><%= sort_link @search,:email, t(:user), {}, {:title => 'users_email_title'} %></th>
-      <th data-hook="admin_users_index_header_actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @users.each do |user|%>
-      <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
-        <td width="350px" class='user_email'><%=link_to user.email, object_url(user) %></td>
-        <td data-hook="admin_users_index_row_actions">
-          <%= link_to_edit user, :class => 'edit' %> &nbsp;
-          <%= link_to_delete user %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<%= paginate @users %>
-
-
-<% content_for :sidebar do %>
-  <div class="box" data-hook="admin_users_index_search">
-    <h3><%= t(:search) %></h3>
-    <%= search_form_for [:admin, @search] do |f| %>
-      <p>
-        <%= t(:email) %><br />
-        <%= f.text_field :email_cont, :size =>18 %>
-      </p>
-      <div data-hook="admin_users_index_search_buttons">
-        <p><%= button t(:search) %></p>
-      </div>
-    <% end %>
-  </div>
-<% end %>

data/app/views/spree/admin/users/new.html.erb

@@ -1,14 +0,0 @@
-<div data-hook="admin_user_new_form_header">
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
-  <h1><%= t(:new_user) %></h1>
-</div>
-
-<div data-hook="admin_user_new_form">
-  <%= form_for [:admin, @user] do |f| %>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-
-    <div data-hook="admin_user_new_form_buttons">
-      <%= render :partial => 'spree/admin/shared/new_resource_links' %>
-    </div>
-  <% end %>
-</div>

data/app/views/spree/admin/users/show.html.erb

@@ -1,21 +0,0 @@
-<h1><%= t(:user_account) %></h1>
-
-<table>
-  <tr data-hook="email">
-    <th><%= t(:email) %></th>
-    <td>
-      <%= @user.email %>
-    </td>
-  </tr>
-  <tr data-hook="roles">
-    <th><%= t(:roles) %></th>
-    <td>
-      <%= list_roles(@user) %>
-    </td>
-  </tr>
-</table>
-
-<p>
-  <%= link_to_edit @user, :class => 'edit_user' %> <%= t(:or) %>
-  <%= link_to t(:back), collection_url %>
-</p>

data/app/views/spree/shared/_store_menu.html.erb

@@ -1,2 +0,0 @@
-<li id="home-link" data-hook><%= link_to t(:home), root_path %></li>
-<li id="link-to-cart" data-hook><%= link_to_cart %></li>

data/config/initializers/rails_5868.rb

@@ -1,8 +0,0 @@
-# Temporary fix for
-# NoMethodError: undefined method `gsub' for #<Arel::Nodes::Ascending:...>
-# See https://github.com/rails/rails/issues/5868
-class Arel::Nodes::Ordering
-  def gsub(*a, &b)
-    to_sql.gsub(*a, &b)
-  end
-end

data/db/migrate/20120605211305_make_users_email_index_unique.rb

@@ -1,10 +0,0 @@
-class MakeUsersEmailIndexUnique < ActiveRecord::Migration
-  def up
-    add_index "spree_users", ["email"], :name => "email_idx_unique", :unique => true
-  end
-
-  def down
-    remove_index "spree_users", :name => "email_idx_unique"
-    add_index "spree_users", ["email"], :name => "email_idx_unique"
-  end
-end

data/db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb

@@ -1,11 +0,0 @@
-class RemoveNotNullConstraintFromProductsOnHand < ActiveRecord::Migration
-  def up
-    change_column :spree_products, :count_on_hand, :integer, :null => true
-    change_column :spree_variants, :count_on_hand, :integer, :null => true
-  end
-
-  def down
-    change_column :spree_products, :count_on_hand, :integer, :null => false
-    change_column :spree_variants, :count_on_hand, :integer, :null => false
-  end
-end

data/db/sample/users.rb

@@ -1,61 +0,0 @@
-# # HACK - need to add all sample users to the 'user' role (can't do this in sample fixtures because user role is seed data)
-# user_role = Spree::Role.find_by_name "user"
-# if user_role
-#   User.all.each { |u| u.roles << user_role unless u.has_role?("user") }
-# end
-#
-# # see last line where we create an admin if there is none, asking for email and password
-#
-# def prompt_for_admin_password
-#   password = ask('Password [spree]: ', String) do |q|
-#     q.echo = false
-#     q.validate = /^(|.{5,40})$/
-#     q.responses[:not_valid] = "Invalid password. Must be at least 5 characters long."
-#     q.whitespace = :strip
-#   end
-#   password = "spree" if password.blank?
-#   password
-# end
-#
-# def prompt_for_admin_email
-#   email = ask('Email [spree@example.com]: ', String) do |q|
-#     q.echo = true
-#     q.whitespace = :strip
-#   end
-#   email = "spree@example.com" if email.blank?
-#   email
-# end
-#
-# def create_admin_user
-#   if ENV['AUTO_ACCEPT']
-#     password =  "spree"
-#     email =  "spree@example.com"
-#   else
-#     require 'highline/import'
-#     puts "Create the admin user (press enter for defaults)."
-#     #name = prompt_for_admin_name unless name
-#     email = prompt_for_admin_email
-#     password = prompt_for_admin_password
-#   end
-#   attributes = {
-#     :password => password,
-#     :password_confirmation => password,
-#     :email => email,
-#     :login => email
-#   }
-#
-#   load 'user.rb'
-#
-#   if User.find_by_login(email)
-#     say "\nWARNING: There is already a user with the email: #{email}, so no account changes were made.  If you wish to create an additional admin user, please run rake db:admin:create again with a different email.\n\n"
-#   else
-#     admin = User.create(attributes)
-#     # create an admin role and and assign the admin user to that role
-#     role = Spree::Role.find_or_create_by_name "admin"
-#     admin.roles << role
-#     admin.save
-#   end
-# end
-#
-# create_admin_user unless User.first(:include => :roles, :conditions => ["roles.name = 'admin'"])
-#

data/lib/generators/spree/sandbox/sandbox_generator.rb

@@ -1,36 +0,0 @@
-require "rails/generators/rails/app/app_generator"
-
-module Spree
-  class SandboxGenerator < Spree::DummyGenerator
-    desc "Creates blank Rails application, installs Spree and all sample data"
-
-    def self.source_paths
-      paths = self.superclass.source_paths
-      paths.unshift File.expand_path('../templates', __FILE__)
-      paths.flatten
-    end
-
-    def drop_database
-      say "dropping database"
-      inside dummy_path do
-        quietly do
-          rake 'db:drop -f sandbox/Rakefile'
-        end
-      end
-    end
-
-    protected
-    def dummy_path
-      'sandbox'
-    end
-
-    def gemfile_path
-      '../../../Gemfile'
-    end
-
-    def module_name
-      'Sandbox'
-    end
-
-  end
-end

data/lib/generators/spree/sandbox/templates/rails/routes.rb

@@ -1,7 +0,0 @@
-Rails.application.routes.draw do
-  mount Spree::Auth::Engine => "/"
-  mount Spree::Api::Engine => "/"
-  mount Spree::Promo::Engine => "/"
-  mount Spree::Dash::Engine => "/"
-  mount Spree::Core::Engine => "/"
-end

data/lib/spree/core/ext/array.rb

@@ -1,14 +0,0 @@
-# RAILS3 TODO (likely not needed - it was commented out before rails3 branch)
-# module Spree::Core::Ext::Array
-#   def to_hash_keys(&block)
-#     Hash[*self.collect { |v|
-#       [v, block.call(v)]
-#     }.flatten]
-#   end
-#
-#   def to_hash_values(&block)
-#     Hash[*self.collect { |v|
-#       [block.call(v), v]
-#     }.flatten]
-#   end
-# end

data/lib/spree/core/ext/hash.rb

@@ -1,75 +0,0 @@
-#
-# = Hash Recursive Merge
-#
-# Merges a Ruby Hash recursively, Also known as deep merge.
-# Recursive version of Hash#merge and Hash#merge!.
-#
-# Category::    Ruby
-# Package::     Hash
-# Author::      Simone Carletti <weppos@weppos.net>
-# Copyright::   2007-2008 The Authors
-# License::     MIT License
-# Link::        http://www.simonecarletti.com/
-# Source::      http://gist.github.com/gists/6391/
-#
-module HashRecursiveMerge
-
-  #
-  # Recursive version of Hash#merge!
-  #
-  # Adds the contents of +other_hash+ to +hsh+,
-  # merging entries in +hsh+ with duplicate keys with those from +other_hash+.
-  #
-  # Compared with Hash#merge!, this method supports nested hashes.
-  # When both +hsh+ and +other_hash+ contains an entry with the same key,
-  # it merges and returns the values from both arrays.
-  #
-  #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
-  #    h2 = {"b" => 254, "c" => 300, "c" => {"c1" => 16, "c3" => 94}}
-  #    h1.rmerge!(h2)   #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}}
-  #
-  # Simply using Hash#merge! would return
-  #
-  #    h1.merge!(h2)    #=> {"a" => 100, "b" = >254, "c" => {"c1" => 16, "c3" => 94}}
-  #
-  def rmerge!(other_hash)
-    merge!(other_hash) do |key, oldval, newval|
-        oldval.class == self.class ? oldval.rmerge!(newval) : newval
-    end
-  end
-
-  #
-  # Recursive version of Hash#merge
-  #
-  # Compared with Hash#merge!, this method supports nested hashes.
-  # When both +hsh+ and +other_hash+ contains an entry with the same key,
-  # it merges and returns the values from both arrays.
-  #
-  # Compared with Hash#merge, this method provides a different approch
-  # for merging nasted hashes.
-  # If the value of a given key is an Hash and both +other_hash+ abd +hsh
-  # includes the same key, the value is merged instead replaced with
-  # +other_hash+ value.
-  #
-  #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
-  #    h2 = {"b" => 254, "c" => 300, "c" => {"c1" => 16, "c3" => 94}}
-  #    h1.rmerge(h2)    #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}}
-  #
-  # Simply using Hash#merge would return
-  #
-  #    h1.merge(h2)     #=> {"a" => 100, "b" = >254, "c" => {"c1" => 16, "c3" => 94}}
-  #
-  def rmerge(other_hash)
-    r = {}
-    merge(other_hash)  do |key, oldval, newval|
-      r[key] = oldval.class == self.class ? oldval.rmerge(newval) : newval
-    end
-  end
-
-end
-
-
-class Hash
-  include HashRecursiveMerge
-end
-

data/lib/spree/core/ext/string.rb

@@ -1,10 +0,0 @@
-module Spree::Core::Ext::String
-  def is_integer?
-    begin
-      Integer(self.to_s)
-      return true
-    rescue ArgumentError
-      return false
-    end
-  end
-end

data/lib/tasks/install.rake

@@ -1,18 +0,0 @@
-namespace :spree_core do
-  task_warning = "[WARNING] This task has been removed, please run Rails default task: rake railties:install:migrations"
-  task :install do
-    puts task_warning
-  end
-
-  namespace :install do
-
-    task :migrations do
-      puts task_warning
-    end
-
-    task :assets do
-      puts "[WARNING] This task is no longer required, and has been replaced with standard Rails 3.1 asset pipeline" 
-    end
-
-  end
-end