spree_multi_share 1.3.3 → 2.2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03c0eb94fc4d549732689a78740a0874f067887c
-  data.tar.gz: ef2280f3ad58b4297e0085d4ba70bc7cfe80b39e
+  metadata.gz: ba7fa6350bccbd28623800dda64538bd7e3aa315
+  data.tar.gz: 99560f30eacf5c6c1ef0aefc3f620d563b238a7c
 SHA512:
-  metadata.gz: c64a24c18048f4993c0de745dbef51752ea7cd169c96e9807e2dbf5b7c4263aaecbeeb9d915522b44092421e2d369042820d1564767cc6cd15572ff365d7ce6c
-  data.tar.gz: 801985194d8365c1b59e809d62941cd233c12e1de3f2a46b80f21b07f141be39ab083b9ea13b3ec65aa7656758df3336f8c19d0808b05855d4f5b754655ba99b
+  metadata.gz: 784194f286e40be69d460e860f7ee93ff2058446205b86a4e77c7e46f5071dce51d8568ab90da801fc49c41b389d56fdb3155479eccab98a6bfeab4ddfdbf3a7
+  data.tar.gz: f0f3888a497cb68e667623dfb73bbfb432a3ddaa92aa2e078998d61304706f86cb9724daf54c29810f0ae8439436a2ae66b9a3c55cc60342e8676dbf861702d3

data/README.md

@@ -1,4 +1,15 @@
 spree_multi_share
 =================
 
-Extension for Spree that allows customers to share products with their cloud friends for store credit. Powered by CloudSponge.
+Extension for Spree that allows customers to share products with contacts from any of the popular cloud services (MSN, AOL, Google, Outlook, and OSX). Powered by <a href='http://www.cloudsponge.com'>CloudSponge</a>.
+
+Installation
+=================
+
+Add the following to your <code>Gemfile</code>
+
+    gem 'spree_multi_share'
+
+Run
+
+    bundle install

data/app/controllers/spree/cloud_sender_controller.rb

@@ -159,18 +159,21 @@ class Spree::CloudSenderController < Spree::BaseController
         Spree::CloudMailer.mail_to_cloud(object,@temp_mail_to_cloud).deliver
       end
     end
-  
-    def find_object
-      class_name = "Spree::#{(params[:type].titleize)}".constantize
-      return false if params[:id].blank?
-      @object = class_name.find_by_id(params[:id])
-      if class_name.respond_to?('find_by_permalink')
-        @object ||= class_name.find_by_permalink(params[:id])
-      end
-      if class_name.respond_to?('get_by_param')
-        @object ||= class_name.get_by_param(params[:id])
-      end
-      # Display 404 page if object is not found.
-      raise ActiveRecord::RecordNotFound if @object.nil?
+
+  def find_object
+    class_name = "Spree::#{(params[:type].titleize)}".constantize
+    return false if params[:id].blank?
+    @object = class_name.find_by_slug(params[:id])
+    if class_name.respond_to?('find_by_permalink')
+      @object ||= class_name.find_by_permalink(params[:id])
     end
+    if class_name.respond_to?('get_by_param')
+      @object ||= class_name.get_by_param(params[:id])
+    end
+    if class_name.respond_to?('get_by_slug')
+      @object ||= class_name.get_by_slug(params[:id])
+    end
+
+    logger.info "\n\n\n @object = #{@object.inspect} \n\n\n"
+  end
 end

data/app/models/spree/mail_to_cloud.rb

@@ -1,20 +1,21 @@
 class Spree::MailToCloud
   include ActiveModel::Validations
   include ActiveModel::Conversion
-  attr_accessor :host, :subject, :sender_name, :sender_email, :recipient_name, :recipient_email, :message, :recipients, :invalid_recipients, :hide_recipients
+  attr_accessor :subject, :sender_name, :sender_email, :recipient_name, :recipient_email, :message, :recipients, :invalid_recipients, :hide_recipients
 
-  EMAILREGEX = /^[-a-z0-9_+\.]+\@([-a-z0-9]+\.)+[a-z0-9]{2,8}$/i
+  EMAILREGEX = /[-a-z0-9_+\.]+\@([-a-z0-9]+\.)+[a-z0-9]{2,8}/i
 
   validates :subject, :presence => true
   validates :sender_name, :presence => true
+  validates :recipient_name, :presence => true, :unless => :is_multi
   validates :sender_email, :format => { :with => EMAILREGEX }
   validates :recipients, :length => {:minimum => 1, :message => "must contain at least one valid email address"}
   validates :invalid_recipients, :length => {:maximum => 0, :message => "must be removed"}
 
   def initialize(opts = {})
+    @subject      = opts[:subject]      || I18n.t('email_to_friend.you_would_like_this')
     @sender_email = opts[:sender_email] || ' '
     @sender_name  = opts[:sender_name]  || @sender_email.split('@', 2)[0].titleize
-    @subject      = opts[:subject]      || I18n.t('email_to_friend.you_would_like_this', :sender_name => @sender_name, :site => Spree::Config[:site_url])
 
     @recipients = []
     @invalid_recipients = []
@@ -22,12 +23,15 @@ class Spree::MailToCloud
     @recipient_email = (opts[:recipient_email] || '').gsub(';', ',').gsub(/\s/ , '')
     @recipient_email.split(',').each do |address|
       if address =~ EMAILREGEX
-         @recipients << address
+        @recipients << address
       else
         @invalid_recipients << address
       end
     end
 
+    @recipient_name = opts[:recipient_name]
+    @recipient_name ||= @recipients[0].split('@', 2)[0].titleize unless @recipients.empty?
+
     @hide_recipients = opts[:hide_recipients] || false
     @message = opts[:message]
   end

data/config/routes.rb

@@ -1,15 +1,15 @@
-Spree::Core::Engine.routes.prepend do
+Spree::Core::Engine.routes.append do
   
-  match "/email_to_cloud/:type/:id" => 'cloud_sender#send_mail', :as => :email_to_cloud
+  get "/email_to_cloud/:type/:id", :to => 'cloud_sender#send_mail', :as => :email_to_cloud
 
-  match '/importGmail', :to => 'cloud_sender#importGmail'
-  match '/importOutlook', :to => 'cloud_sender#importOutlook'
-  match '/importOSX', :to => 'cloud_sender#importOSX'
-  match '/importAOL', :to => 'cloud_sender#importAOL'
-  match '/importCheck/:id', :to => 'cloud_sender#importCheck'
-  match '/importContacts/:id', :to => 'cloud_sender#importContacts'
+  get '/importGmail', :to => 'cloud_sender#importGmail'
+  get '/importOutlook', :to => 'cloud_sender#importOutlook'
+  get '/importOSX', :to => 'cloud_sender#importOSX'
+  get '/importAOL', :to => 'cloud_sender#importAOL'
+  get '/importCheck/:id', :to => 'cloud_sender#importCheck'
+  get '/importContacts/:id', :to => 'cloud_sender#importContacts'
   
-  match '/cloudsponge_proxy', :to => 'cloud_sender#cloudsponge_proxy'
+  get '/cloudsponge_proxy', :to => 'cloud_sender#cloudsponge_proxy'
   
   namespace :admin do
     resource :cloudsponge_settings

data/spree_multi_share.gemspec

@@ -2,10 +2,10 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_multi_share'
-  s.version     = '1.3.3'
+  s.version     = '2.2.2.1'
   s.summary     = 'Extension for Spree that allows customers to share products for store credit.'
   s.description = 'Extension for Spree that allows customers to share products with their cloud friends for store credit. Powered by CloudSponge.'
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = '>= 2.0.0'
 
   s.author    = 'Derek Sweet'
   s.email     = 'derek@arizonabay.com'
@@ -16,15 +16,15 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 1.3.1'
+  s.add_dependency 'spree_core'
   s.add_dependency 'httpclient'
   s.add_dependency 'cloudsponge'
 
-  s.add_development_dependency 'capybara', '~> 1.1.2'
+  s.add_development_dependency 'capybara'
   s.add_development_dependency 'coffee-rails'
-  s.add_development_dependency 'factory_girl', '~> 2.6.4'
+  s.add_development_dependency 'factory_girl'
   s.add_development_dependency 'ffaker'
-  s.add_development_dependency 'rspec-rails',  '~> 2.9'
+  s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'sqlite3'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: spree_multi_share
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 2.2.2.1
 platform: ruby
 authors:
 - Derek Sweet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.6.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.6.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -220,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Extension for Spree that allows customers to share products for store credit.