nimbleshop_core 0.0.5 → 0.0.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (95) hide show
  1. data/app/assets/javascripts/admin.js +6 -4
  2. data/app/assets/javascripts/admin/payment_method.js.coffee +26 -0
  3. data/app/assets/javascripts/{product-group-condition.js.coffee → admin/product-group-condition.js.coffee} +0 -0
  4. data/app/assets/javascripts/admin/products/edit.js.coffee +26 -13
  5. data/app/assets/javascripts/admin/shipit.js.coffee +10 -0
  6. data/app/assets/javascripts/{fadeout_success.js.coffee → admin/utils/fadeout_success.js.coffee} +0 -0
  7. data/app/assets/stylesheets/admin_custom.css +4 -4
  8. data/app/controllers/admin_controller.rb +1 -5
  9. data/app/models/order.rb +11 -6
  10. data/app/{observers/order_observer.rb → models/order/payment_transitions.rb} +7 -4
  11. data/app/views/admin/shipping_zones/_form.html.erb +1 -1
  12. data/app/views/mailer/shipment_notification_to_buyer.text.erb +1 -1
  13. data/config/routes.rb +4 -1
  14. data/db/migrate/{20111107035350_create_creditcard_transactions.rb → 20111107035350_create_payment_transactions.rb} +1 -1
  15. data/lib/generators/nimbleshop/app/install_generator.rb +1 -0
  16. data/lib/generators/nimbleshop/app/templates/config/initializers/001_load_nimbleshop_config.rb +10 -0
  17. data/lib/generators/nimbleshop/app/templates/config/initializers/setup_email.rb +2 -2
  18. data/lib/generators/nimbleshop/app/templates/config/nimbleshop.yml +2 -1
  19. data/lib/nimbleshop/engine.rb +5 -4
  20. data/lib/nimbleshop/nimbleshop/util.rb +63 -0
  21. data/lib/nimbleshop/processor/base.rb +9 -2
  22. data/lib/nimbleshop/sampledata/data.rb +14 -12
  23. data/lib/nimbleshop/version.rb +2 -2
  24. data/lib/nimbleshop_core.rb +3 -0
  25. data/test/factories/address_factory.rb +10 -10
  26. data/test/fixtures/payment_methods.yml +5 -5
  27. data/{config/initializers/001_settings_application.rb → test/myshop/config/initializers/001_load_nimbleshop_config.rb} +1 -1
  28. data/test/myshop/config/initializers/carrierwave.rb +2 -3
  29. data/test/myshop/config/initializers/secret_token.rb +1 -1
  30. data/test/myshop/config/initializers/setup_email.rb +4 -13
  31. data/test/myshop/config/nimbleshop.yml +14 -17
  32. data/test/myshop/db/development.sqlite3 +0 -0
  33. data/test/myshop/db/migrate/{20120707041905_create_product_groups.nimbleshop_core.rb → 20120717095234_create_product_groups.nimbleshop_core.rb} +0 -0
  34. data/test/myshop/db/migrate/{20120707041906_create_products.nimbleshop_core.rb → 20120717095235_create_products.nimbleshop_core.rb} +0 -0
  35. data/test/myshop/db/migrate/{20120707041907_create_orders.nimbleshop_core.rb → 20120717095236_create_orders.nimbleshop_core.rb} +0 -0
  36. data/test/myshop/db/migrate/{20120707041908_create_line_items.nimbleshop_core.rb → 20120717095237_create_line_items.nimbleshop_core.rb} +0 -0
  37. data/test/myshop/db/migrate/{20120707041909_create_shops.nimbleshop_core.rb → 20120717095238_create_shops.nimbleshop_core.rb} +0 -0
  38. data/test/myshop/db/migrate/{20120707041910_create_link_groups.nimbleshop_core.rb → 20120717095239_create_link_groups.nimbleshop_core.rb} +0 -0
  39. data/test/myshop/db/migrate/{20120707041911_create_navigations.nimbleshop_core.rb → 20120717095240_create_navigations.nimbleshop_core.rb} +0 -0
  40. data/test/myshop/db/migrate/{20120707041912_create_links.nimbleshop_core.rb → 20120717095241_create_links.nimbleshop_core.rb} +0 -0
  41. data/test/myshop/db/migrate/{20120707041913_create_custom_fields.nimbleshop_core.rb → 20120717095242_create_custom_fields.nimbleshop_core.rb} +0 -0
  42. data/test/myshop/db/migrate/{20120707041914_create_custom_field_answers.nimbleshop_core.rb → 20120717095243_create_custom_field_answers.nimbleshop_core.rb} +0 -0
  43. data/test/myshop/db/migrate/{20120707041915_create_product_group_conditions.nimbleshop_core.rb → 20120717095244_create_product_group_conditions.nimbleshop_core.rb} +0 -0
  44. data/test/myshop/db/migrate/{20120707041916_create_creditcard_transactions.nimbleshop_core.rb → 20120717095245_create_creditcard_transactions.nimbleshop_core.rb} +0 -0
  45. data/test/myshop/db/migrate/{20120707041917_create_addresses.nimbleshop_core.rb → 20120717095246_create_addresses.nimbleshop_core.rb} +0 -0
  46. data/test/myshop/db/migrate/{20120707041918_create_pictures.nimbleshop_core.rb → 20120717095247_create_pictures.nimbleshop_core.rb} +0 -0
  47. data/test/myshop/db/migrate/{20120707041919_create_shipping_methods.nimbleshop_core.rb → 20120717095248_create_shipping_methods.nimbleshop_core.rb} +0 -0
  48. data/test/myshop/db/migrate/{20120707041920_create_shipping_zones.nimbleshop_core.rb → 20120717095249_create_shipping_zones.nimbleshop_core.rb} +0 -0
  49. data/test/myshop/db/migrate/{20120707041921_create_payment_methods.nimbleshop_core.rb → 20120717095250_create_payment_methods.nimbleshop_core.rb} +0 -0
  50. data/test/myshop/db/migrate/{20120707041922_create_preferences.nimbleshop_core.rb → 20120717095251_create_preferences.nimbleshop_core.rb} +0 -0
  51. data/test/myshop/db/migrate/{20120707041923_create_shipments.nimbleshop_core.rb → 20120717095252_create_shipments.nimbleshop_core.rb} +0 -0
  52. data/test/myshop/db/migrate/{20120707041924_create_shipment_carriers.nimbleshop_core.rb → 20120717095253_create_shipment_carriers.nimbleshop_core.rb} +0 -0
  53. data/test/myshop/db/migrate/{20120707041925_create_delayed_jobs.nimbleshop_core.rb → 20120717095254_create_delayed_jobs.nimbleshop_core.rb} +0 -0
  54. data/test/myshop/db/schema.rb +1 -1
  55. data/test/myshop/db/test.sqlite3 +0 -0
  56. data/test/myshop/log/development.log +3 -0
  57. data/test/support/shipping_method_test_helper.rb +1 -1
  58. data/test/test_helper.rb +1 -1
  59. metadata +85 -136
  60. data/app/assets/javascripts/payment_method.js.coffee +0 -19
  61. data/app/assets/javascripts/remove_deletion_of_product_pictures.js.coffee +0 -5
  62. data/app/assets/javascripts/shipit.js.coffee +0 -10
  63. data/app/mailers/mailer.rb +0 -31
  64. data/config/initializers/strip_and_nullify.rb +0 -13
  65. data/lib/nimbleshop/util.rb +0 -60
  66. data/test/integration/checkout/cart_acceptance_test.rb +0 -113
  67. data/test/integration/checkout/payment_confirmation_acceptance_test.rb +0 -24
  68. data/test/integration/checkout/paypal_acceptance_test.rb +0 -34
  69. data/test/integration/checkout/shipping_address_acceptance_test.rb +0 -91
  70. data/test/integration/checkout/shipping_method_acceptance_test.rb +0 -51
  71. data/test/integration/homepage_acceptance_test.rb +0 -24
  72. data/test/integration/products_acceptance_test.rb +0 -12
  73. data/test/integration/static_pages_acceptance_test.rb +0 -13
  74. data/test/mailers/mailer_test.rb +0 -25
  75. data/test/unit/payment_method/authorizedotnet_test.rb +0 -21
  76. data/test/unit/payment_method/paypalwp_test.rb +0 -17
  77. data/test/unit/payment_method/splitable_test.rb +0 -18
  78. data/test/unit/processor/authorize_net_test.rb +0 -236
  79. data/test/unit/processor/paypal_test.rb +0 -40
  80. data/test/unit/processor/splitable_test.rb +0 -123
  81. data/test/vcr_cassettes/authorize_net/authorize-failure.yml +0 -38
  82. data/test/vcr_cassettes/authorize_net/authorize-success.yml +0 -38
  83. data/test/vcr_cassettes/authorize_net/capture-failure.yml +0 -38
  84. data/test/vcr_cassettes/authorize_net/capture-success.yml +0 -38
  85. data/test/vcr_cassettes/authorize_net/purchase-failure.yml +0 -38
  86. data/test/vcr_cassettes/authorize_net/purchase-success.yml +0 -38
  87. data/test/vcr_cassettes/authorize_net/refund-failure.yml +0 -38
  88. data/test/vcr_cassettes/authorize_net/refund-success.yml +0 -38
  89. data/test/vcr_cassettes/authorize_net/void-authorize.yml +0 -38
  90. data/test/vcr_cassettes/authorize_net/void-failure.yml +0 -38
  91. data/test/vcr_cassettes/authorize_net/void-success.yml +0 -38
  92. data/test/vcr_cassettes/splitable/split-create-failure.yml +0 -48
  93. data/test/vcr_cassettes/splitable/split-create-success.yml +0 -50
  94. data/test/vcr_cassettes/splitable/split-draft-create-failure.yml +0 -50
  95. data/test/vcr_cassettes/splitable/split-draft-create-success.yml +0 -50
@@ -2,7 +2,7 @@ module Nimbleshop
2
2
  class Version
3
3
  @major = 0
4
4
  @minor = 0
5
- @tiny = 5
5
+ @tiny = 7
6
6
  @build = nil
7
7
 
8
8
  class << self
@@ -14,5 +14,5 @@ module Nimbleshop
14
14
  end
15
15
  end
16
16
 
17
- RailsVersion = '= 3.2.6'
17
+ RailsVersion = '= 3.2.8'
18
18
  end
@@ -1,4 +1,6 @@
1
1
  require 'nimbleshop/engine'
2
+
3
+ require 'nimbleshop/nimbleshop/util'
2
4
  require 'generators/nimbleshop/app/install_generator'
3
5
 
4
6
  # Why do we need to require all the gems individually ?
@@ -21,3 +23,4 @@ require 'strong_parameters'
21
23
  require 'valid_email'
22
24
  require 'custom_error_message'
23
25
  require 'american_date'
26
+
@@ -5,27 +5,27 @@ FactoryGirl.define do
5
5
  state_name 'Florida'
6
6
 
7
7
  trait :good do
8
- city { Faker::Address.city }
9
- first_name { Faker::Name.first_name }
10
- last_name { Faker::Name.last_name }
11
- address1 { Faker::Address.street_address }
8
+ city { Faker::Address.city }
9
+ first_name { Faker::Name.first_name }
10
+ last_name { Faker::Name.last_name }
11
+ address1 { Faker::Address.street_address }
12
12
  end
13
13
 
14
14
  trait :bad do
15
- city nil
16
- first_name nil
15
+ city nil
16
+ first_name nil
17
17
  last_name nil
18
- address1 nil
18
+ address1 nil
19
19
  end
20
20
 
21
- zipcode { Faker::Address.zip_code }
21
+ zipcode { Faker::Address.zip_code }
22
22
 
23
23
  factory :address, class: Address, parent: :base_address, traits: [:good]
24
24
  factory :shipping_address, class: ShippingAddress, parent: :base_address, traits: [:good], aliases: [:good_shipping_address]
25
25
 
26
26
  factory :billing_address, class: BillingAddress, parent: :base_address, traits: [:good], aliases: [:good_billing_address]
27
27
 
28
- factory :bad_shipping_address, class: ShippingAddress, parent: :base_address, traits: [:bad]
29
- factory :bad_billing_address, class: BillingAddress, parent: :base_address, traits: [:bad]
28
+ factory :bad_shipping_address, class: ShippingAddress, parent: :base_address, traits: [:bad]
29
+ factory :bad_billing_address, class: BillingAddress, parent: :base_address, traits: [:bad]
30
30
  end
31
31
  end
@@ -1,5 +1,5 @@
1
- ---
2
- payment_methods_001:
1
+ ---
2
+ payment_methods_001:
3
3
  id: "1"
4
4
  name: Splitable
5
5
  description: <p> Splitable helps split the cost of product with friends and family. </p> <p> <a href="http://splitable.com"> more information </a> </p>
@@ -13,7 +13,7 @@ payment_methods_001:
13
13
  :api_key: edb5fd7b39652986\n"
14
14
  created_at: 2012-04-05 01:42:00.092168
15
15
  updated_at: 2012-04-05 01:42:00.095526
16
- payment_methods_002:
16
+ payment_methods_002:
17
17
  id: "2"
18
18
  name: Paypal website payments standard
19
19
  description: <p> Paypal website payments standard is a payment solution provided by paypal which allows merchant to accept credit card and paypal payments. There is no monthly fee and no setup fee by paypal for this account. </p> <p> <a href='https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content&content_ID=merchant/wp_standard&nav=2.1.0'> more information </a> </p>
@@ -24,7 +24,7 @@ payment_methods_002:
24
24
  :merchant_email: seller_1323037155_biz@bigbinary.com\n"
25
25
  created_at: 2012-04-05 01:42:00.13064
26
26
  updated_at: 2012-04-05 01:42:00.133581
27
- payment_methods_003:
27
+ payment_methods_003:
28
28
  id: "3"
29
29
  name: Authorize.net
30
30
  description: <p> Authorize.Net is a payment gateway service provider allowing merchants to accept credit card and electronic checks paymentsn. Authorize.Net claims a user base of over 305,000 merchants, which would make them the Internet's largest payment gateway service provider. </p> <p> It also provides an instant test account which you can use while your application is being processed. </p>
@@ -34,6 +34,6 @@ payment_methods_003:
34
34
  :login_id: 26Daqx7Jtw7R\n\
35
35
  :mode: test\n\
36
36
  :transaction_key: 66JWf57KKc82W9y6\n\
37
- :company_name_on_creditcard_statement: Nimbleshop LLC\n"
37
+ :business_name: Nimbleshop LLC\n"
38
38
  created_at: 2012-04-05 01:42:00.113269
39
39
  updated_at: 2012-04-05 01:42:00.117875
@@ -1,5 +1,5 @@
1
1
  # TODO why rescue
2
- Settings = Util.config2hash(Rails.root.join('config', 'nimbleshop.yml')) rescue nil
2
+ Settings = Nimbleshop::Util.config2hash(Rails.root.join('config', 'nimbleshop.yml'))
3
3
 
4
4
  module Nimbleshop
5
5
  extend self
@@ -2,9 +2,8 @@ if Nimbleshop.config.use_s3
2
2
 
3
3
  unless bucket_name = Nimbleshop.config.s3.bucket_name
4
4
  msg = %Q{
5
- This application's #{Rails.env} environment is configured to use amazon s3.
6
- However bucket_name to use is not specified at config/application.yml .
7
- Please check guide( link here) on how to configure application to use S3.
5
+ This application's #{Rails.env} environment is configured to use amazon s3.
6
+ However bucket_name to use is not specified at config/nimbleshop.yml .
8
7
  }
9
8
 
10
9
  raise msg
@@ -4,4 +4,4 @@
4
4
  # If you change this key, all old signed cookies will become invalid!
5
5
  # Make sure the secret is at least 30 characters and all random,
6
6
  # no regular words or you'll be exposed to dictionary attacks.
7
- Myshop::Application.config.secret_token = '2869833ed07af863e0d1576ecc685b3a1b3c31e53ac7824fd0701f3a28e31bb8f8fe7f3b11cf337d58fca0672094ce4e2a086e4e80be5d270ea0da74dd2425c9'
7
+ Myshop::Application.config.secret_token = 'bf5a7f41beb44c78c400bd12eb8fceca6e5c8a67d48b82d21a8c4b4168b24fc970cc0e96ed4406c409ed401717c1f0fc8caca578afac5506a3c3a3cab81c6e18'
@@ -1,22 +1,13 @@
1
- if Nimbleshop.config.deliver_email_for_real
1
+ if Nimbleshop.config.deliver_email
2
2
 
3
- ActionMailer::Base.delivery_method = :smtp
4
- ActionMailer::Base.smtp_settings = {
5
- user_name: Nimbleshop.config.sendgrid.username,
6
- password: Nimbleshop.config.sendgrid.password,
7
- domain: Nimbleshop.config.sendgrid.domain,
8
- address: "smtp.sendgrid.net",
9
- port: 587,
10
- authentication: :plain,
11
- enable_starttls_auto: true
12
- }
3
+ # Setup how you want email to be delivered
13
4
 
14
5
  else
15
6
 
16
7
  ActionMailer::Base.delivery_method = :smtp
17
8
  ActionMailer::Base.smtp_settings = {
18
- user_name: Nimbleshop.config.mailtrapio.username || "nimbleshop",
19
- password: Nimbleshop.config.mailtrapio.password || "7663e1f272637a4b",
9
+ user_name: Nimbleshop.config.mailtrapio.username,
10
+ password: Nimbleshop.config.mailtrapio.password,
20
11
  address: "mailtrap.io",
21
12
  port: 2525,
22
13
  authentication: :plain }
@@ -3,29 +3,26 @@
3
3
  # Nimbleshop.config.s3.bucket_name
4
4
  #
5
5
  common:
6
- google_analytics_tracking_id:
6
+ google_analytics_tracking_id: <%= ENV['GOOGLE_ANALYTICS_TRACKING_ID'] %>
7
+ deliver_email: false
8
+ mailer: NimbleshopSimply::Mailer
7
9
 
8
10
  # this is used for IPN notification and other places where external serivce cannot ping localhost
9
11
  use_localhost2public_url: true
10
12
  default_localhost2public_url: 4a5w.localtunnel.com
11
13
 
12
14
  authorizedotnet:
13
- login_id: 26Daqx7Jtw7R
14
- transaction_key: 66JWf57KKc82W9y6
15
+ login_id: <%= ENV['AUTHORIZE_NET_LOGIN_ID'] || '26Daqx7Jtw7R' %>
16
+ transaction_key: <%= ENV['AUTHORIZE_NET_TRANSACTION_KEY'] || '66JWf57KKc82W9y6' %>
15
17
 
16
18
  s3:
17
- access_key_id:
18
- secret_access_key:
19
- bucket_name:
20
-
21
- sendgrid:
22
- username:
23
- password:
24
- domain:
19
+ access_key_id: <%= ENV['S3_ACCESS_KEY_ID'] %>
20
+ secret_access_key: <%= ENV['S3_SECRET_ACCESS_KEY'] %>
21
+ bucket_name: <%= ENV['S3_BUCKET_NAME'] %>
25
22
 
26
23
  mailtrapio:
27
- username: nimbleshop
28
- password: 7663e1f272637a4b
24
+ username: <%= ENV['MAILTRAPIO_USERNAME'] || 'nimbleshop' %>
25
+ password: <%= ENV['MAILTRAPIO_PASSWORD'] || 'f42c2934fbc2e229' %>
29
26
 
30
27
  development:
31
28
  use_s3: false
@@ -39,13 +36,13 @@ test:
39
36
 
40
37
  staging:
41
38
  use_s3: true
42
- bare_url_with_port: myshop.net
43
- #TODO this needs fixing
44
- deliver_email_for_real_in_staging:
39
+ bare_url_with_port: nimbleshop.net
40
+ deliver_email: <%= ENV['DELIVER_EMAIL'] %>
45
41
  cache_images: true
46
42
 
47
43
  production:
48
44
  use_s3: true
49
- bare_url_with_port: myshop.com
45
+ bare_url_with_port: nimbleshop.net
50
46
  cache_images: true
51
47
  use_localhost2public_url: false
48
+ deliver_email: <%= ENV['DELIVER_EMAIL'] %>
File without changes
@@ -11,7 +11,7 @@
11
11
  #
12
12
  # It's strongly recommended to check this file into your version control system.
13
13
 
14
- ActiveRecord::Schema.define(:version => 20120707041925) do
14
+ ActiveRecord::Schema.define(:version => 20120717095254) do
15
15
 
16
16
  create_table "addresses", :force => true do |t|
17
17
  t.string "type"
File without changes
@@ -0,0 +1,3 @@
1
+ Connecting to database specified by database.yml
2
+ Connecting to database specified by database.yml
3
+ Connecting to database specified by database.yml
@@ -1,4 +1,4 @@
1
- module ShippingMethodSpecHelper
1
+ module ShippingMethodTestHelper
2
2
  def create_regional_shipping_method
3
3
  create(:country_shipping_method, name: 'Ground Shipping', base_price: 3.99, minimum_order_amount: 1, maximum_order_amount: 99999).regions[0]
4
4
  end
@@ -56,7 +56,7 @@ end
56
56
 
57
57
 
58
58
 
59
- # Require ruby files in support dir.
59
+ # Require files in support dir.
60
60
  Dir["#{File.dirname(__FILE__)}/support/**"].each do |f|
61
61
  require File.expand_path(f) unless File.directory? f
62
62
  end
metadata CHANGED
@@ -1,15 +1,16 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nimbleshop_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5
4
+ version: 0.0.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
8
8
  - Neeraj Singh
9
+ - megpha
9
10
  autorequire:
10
11
  bindir: bin
11
12
  cert_chain: []
12
- date: 2012-07-13 00:00:00.000000000 Z
13
+ date: 2012-08-10 00:00:00.000000000 Z
13
14
  dependencies:
14
15
  - !ruby/object:Gem::Dependency
15
16
  name: rails
@@ -18,7 +19,7 @@ dependencies:
18
19
  requirements:
19
20
  - - '='
20
21
  - !ruby/object:Gem::Version
21
- version: 3.2.6
22
+ version: 3.2.8
22
23
  type: :runtime
23
24
  prerelease: false
24
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -26,23 +27,7 @@ dependencies:
26
27
  requirements:
27
28
  - - '='
28
29
  - !ruby/object:Gem::Version
29
- version: 3.2.6
30
- - !ruby/object:Gem::Dependency
31
- name: hashr
32
- requirement: !ruby/object:Gem::Requirement
33
- none: false
34
- requirements:
35
- - - '='
36
- - !ruby/object:Gem::Version
37
- version: 0.0.19
38
- type: :runtime
39
- prerelease: false
40
- version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
- requirements:
43
- - - '='
44
- - !ruby/object:Gem::Version
45
- version: 0.0.19
30
+ version: 3.2.8
46
31
  - !ruby/object:Gem::Dependency
47
32
  name: carrierwave
48
33
  requirement: !ruby/object:Gem::Requirement
@@ -130,7 +115,7 @@ dependencies:
130
115
  requirements:
131
116
  - - '='
132
117
  - !ruby/object:Gem::Version
133
- version: 1.23.0
118
+ version: 1.26.0
134
119
  type: :runtime
135
120
  prerelease: false
136
121
  version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +123,7 @@ dependencies:
138
123
  requirements:
139
124
  - - '='
140
125
  - !ruby/object:Gem::Version
141
- version: 1.23.0
126
+ version: 1.26.0
142
127
  - !ruby/object:Gem::Dependency
143
128
  name: carmen
144
129
  requirement: !ruby/object:Gem::Requirement
@@ -235,6 +220,22 @@ dependencies:
235
220
  - - '='
236
221
  - !ruby/object:Gem::Version
237
222
  version: 1.0.0
223
+ - !ruby/object:Gem::Dependency
224
+ name: hashr
225
+ requirement: !ruby/object:Gem::Requirement
226
+ none: false
227
+ requirements:
228
+ - - '='
229
+ - !ruby/object:Gem::Version
230
+ version: 0.0.19
231
+ type: :runtime
232
+ prerelease: false
233
+ version_requirements: !ruby/object:Gem::Requirement
234
+ none: false
235
+ requirements:
236
+ - - '='
237
+ - !ruby/object:Gem::Version
238
+ version: 0.0.19
238
239
  description: Provides core e-commerce support to nimbleShop
239
240
  email: neeraj@BigBinary.com
240
241
  executables: []
@@ -253,14 +254,13 @@ files:
253
254
  - app/assets/images/engines/nimbleshop_splitable/splitable.png
254
255
  - app/assets/images/engines/nimbleshop_splitable/splitable_big.png
255
256
  - app/assets/images/engines/nimbleshop_splitable/splitable_small.png
257
+ - app/assets/javascripts/admin/payment_method.js.coffee
258
+ - app/assets/javascripts/admin/product-group-condition.js.coffee
256
259
  - app/assets/javascripts/admin/products/edit.js.coffee
260
+ - app/assets/javascripts/admin/shipit.js.coffee
257
261
  - app/assets/javascripts/admin/shipping_methods/edit.js.coffee
262
+ - app/assets/javascripts/admin/utils/fadeout_success.js.coffee
258
263
  - app/assets/javascripts/admin.js
259
- - app/assets/javascripts/fadeout_success.js.coffee
260
- - app/assets/javascripts/payment_method.js.coffee
261
- - app/assets/javascripts/product-group-condition.js.coffee
262
- - app/assets/javascripts/remove_deletion_of_product_pictures.js.coffee
263
- - app/assets/javascripts/shipit.js.coffee
264
264
  - app/assets/javascripts/twitter_bootstrap.js.coffee
265
265
  - app/assets/stylesheets/admin.css
266
266
  - app/assets/stylesheets/admin_bootstrap_and_overrides.css.less
@@ -284,7 +284,6 @@ files:
284
284
  - app/helpers/nimbleshop_helper.rb
285
285
  - app/helpers/payment_method_helper.rb
286
286
  - app/mailers/admin_mailer.rb
287
- - app/mailers/mailer.rb
288
287
  - app/models/address.rb
289
288
  - app/models/country_shipping_zone.rb
290
289
  - app/models/creditcard.rb
@@ -295,6 +294,7 @@ files:
295
294
  - app/models/link.rb
296
295
  - app/models/link_group.rb
297
296
  - app/models/navigation.rb
297
+ - app/models/order/payment_transitions.rb
298
298
  - app/models/order.rb
299
299
  - app/models/payment_method.rb
300
300
  - app/models/payment_transaction.rb
@@ -310,7 +310,6 @@ files:
310
310
  - app/models/shipping_zone.rb
311
311
  - app/models/shop.rb
312
312
  - app/models/tax_calculator.rb
313
- - app/observers/order_observer.rb
314
313
  - app/uploaders/picture_uploader.rb
315
314
  - app/views/admin/custom_fields/_form.html.erb
316
315
  - app/views/admin/custom_fields/edit.html.erb
@@ -364,10 +363,8 @@ files:
364
363
  - app/views/layouts/payment_method.html.erb
365
364
  - app/views/mailer/order_notification_to_buyer.text.erb
366
365
  - app/views/mailer/shipment_notification_to_buyer.text.erb
367
- - config/initializers/001_settings_application.rb
368
366
  - config/initializers/002_load_core_extensions.rb
369
367
  - config/initializers/field_with_error.rb
370
- - config/initializers/strip_and_nullify.rb
371
368
  - config/initializers/time_formats.rb
372
369
  - config/locales/en.yml
373
370
  - config/routes.rb
@@ -383,7 +380,7 @@ files:
383
380
  - db/migrate/20111106193938_create_custom_fields.rb
384
381
  - db/migrate/20111106195112_create_custom_field_answers.rb
385
382
  - db/migrate/20111106201548_create_product_group_conditions.rb
386
- - db/migrate/20111107035350_create_creditcard_transactions.rb
383
+ - db/migrate/20111107035350_create_payment_transactions.rb
387
384
  - db/migrate/20111109190754_create_addresses.rb
388
385
  - db/migrate/20111125173344_create_pictures.rb
389
386
  - db/migrate/20111201024408_create_shipping_methods.rb
@@ -404,6 +401,7 @@ files:
404
401
  - lib/assets/javascripts/utils/formatNumber.js.coffee
405
402
  - lib/assets/javascripts/utils/formatPrice.js.coffee
406
403
  - lib/generators/nimbleshop/app/install_generator.rb
404
+ - lib/generators/nimbleshop/app/templates/config/initializers/001_load_nimbleshop_config.rb
407
405
  - lib/generators/nimbleshop/app/templates/config/initializers/cache_images.rb
408
406
  - lib/generators/nimbleshop/app/templates/config/initializers/carrierwave.rb
409
407
  - lib/generators/nimbleshop/app/templates/config/initializers/delayed_job.rb
@@ -415,6 +413,7 @@ files:
415
413
  - lib/nimbleshop/core_ext/force_ssl.rb
416
414
  - lib/nimbleshop/core_ext/mustache_templater_handler.rb
417
415
  - lib/nimbleshop/engine.rb
416
+ - lib/nimbleshop/nimbleshop/util.rb
418
417
  - lib/nimbleshop/permalink/builder.rb
419
418
  - lib/nimbleshop/processor/base.rb
420
419
  - lib/nimbleshop/processor.rb
@@ -469,7 +468,6 @@ files:
469
468
  - lib/nimbleshop/sampledata/pictures/product8/pic8.jpg
470
469
  - lib/nimbleshop/sampledata/pictures/product9/pic1.jpg
471
470
  - lib/nimbleshop/sampledata/pictures/product9/pic2.jpg
472
- - lib/nimbleshop/util.rb
473
471
  - lib/nimbleshop/version.rb
474
472
  - lib/nimbleshop_core.rb
475
473
  - lib/tasks/localhost2public.rake
@@ -519,15 +517,6 @@ files:
519
517
  - test/integration/admin/shipping_methods_acceptance_test.rb
520
518
  - test/integration/admin/shipping_zones_acceptance_test.rb
521
519
  - test/integration/admin/shops_acceptance_test.rb
522
- - test/integration/checkout/cart_acceptance_test.rb
523
- - test/integration/checkout/payment_confirmation_acceptance_test.rb
524
- - test/integration/checkout/paypal_acceptance_test.rb
525
- - test/integration/checkout/shipping_address_acceptance_test.rb
526
- - test/integration/checkout/shipping_method_acceptance_test.rb
527
- - test/integration/homepage_acceptance_test.rb
528
- - test/integration/products_acceptance_test.rb
529
- - test/integration/static_pages_acceptance_test.rb
530
- - test/mailers/mailer_test.rb
531
520
  - test/myshop/app/assets/images/engines/nimbleshop_authorizedotnet/american_express.png
532
521
  - test/myshop/app/assets/images/engines/nimbleshop_authorizedotnet/authorize_net_big.png
533
522
  - test/myshop/app/assets/images/engines/nimbleshop_authorizedotnet/authorizedotnet_big.png
@@ -553,6 +542,7 @@ files:
553
542
  - test/myshop/config/environments/development.rb
554
543
  - test/myshop/config/environments/production.rb
555
544
  - test/myshop/config/environments/test.rb
545
+ - test/myshop/config/initializers/001_load_nimbleshop_config.rb
556
546
  - test/myshop/config/initializers/backtrace_silencers.rb
557
547
  - test/myshop/config/initializers/cache_images.rb
558
548
  - test/myshop/config/initializers/carrierwave.rb
@@ -567,31 +557,34 @@ files:
567
557
  - test/myshop/config/nimbleshop.yml
568
558
  - test/myshop/config/routes.rb
569
559
  - test/myshop/config.ru
570
- - test/myshop/db/migrate/20120707041905_create_product_groups.nimbleshop_core.rb
571
- - test/myshop/db/migrate/20120707041906_create_products.nimbleshop_core.rb
572
- - test/myshop/db/migrate/20120707041907_create_orders.nimbleshop_core.rb
573
- - test/myshop/db/migrate/20120707041908_create_line_items.nimbleshop_core.rb
574
- - test/myshop/db/migrate/20120707041909_create_shops.nimbleshop_core.rb
575
- - test/myshop/db/migrate/20120707041910_create_link_groups.nimbleshop_core.rb
576
- - test/myshop/db/migrate/20120707041911_create_navigations.nimbleshop_core.rb
577
- - test/myshop/db/migrate/20120707041912_create_links.nimbleshop_core.rb
578
- - test/myshop/db/migrate/20120707041913_create_custom_fields.nimbleshop_core.rb
579
- - test/myshop/db/migrate/20120707041914_create_custom_field_answers.nimbleshop_core.rb
580
- - test/myshop/db/migrate/20120707041915_create_product_group_conditions.nimbleshop_core.rb
581
- - test/myshop/db/migrate/20120707041916_create_creditcard_transactions.nimbleshop_core.rb
582
- - test/myshop/db/migrate/20120707041917_create_addresses.nimbleshop_core.rb
583
- - test/myshop/db/migrate/20120707041918_create_pictures.nimbleshop_core.rb
584
- - test/myshop/db/migrate/20120707041919_create_shipping_methods.nimbleshop_core.rb
585
- - test/myshop/db/migrate/20120707041920_create_shipping_zones.nimbleshop_core.rb
586
- - test/myshop/db/migrate/20120707041921_create_payment_methods.nimbleshop_core.rb
587
- - test/myshop/db/migrate/20120707041922_create_preferences.nimbleshop_core.rb
588
- - test/myshop/db/migrate/20120707041923_create_shipments.nimbleshop_core.rb
589
- - test/myshop/db/migrate/20120707041924_create_shipment_carriers.nimbleshop_core.rb
590
- - test/myshop/db/migrate/20120707041925_create_delayed_jobs.nimbleshop_core.rb
560
+ - test/myshop/db/development.sqlite3
561
+ - test/myshop/db/migrate/20120717095234_create_product_groups.nimbleshop_core.rb
562
+ - test/myshop/db/migrate/20120717095235_create_products.nimbleshop_core.rb
563
+ - test/myshop/db/migrate/20120717095236_create_orders.nimbleshop_core.rb
564
+ - test/myshop/db/migrate/20120717095237_create_line_items.nimbleshop_core.rb
565
+ - test/myshop/db/migrate/20120717095238_create_shops.nimbleshop_core.rb
566
+ - test/myshop/db/migrate/20120717095239_create_link_groups.nimbleshop_core.rb
567
+ - test/myshop/db/migrate/20120717095240_create_navigations.nimbleshop_core.rb
568
+ - test/myshop/db/migrate/20120717095241_create_links.nimbleshop_core.rb
569
+ - test/myshop/db/migrate/20120717095242_create_custom_fields.nimbleshop_core.rb
570
+ - test/myshop/db/migrate/20120717095243_create_custom_field_answers.nimbleshop_core.rb
571
+ - test/myshop/db/migrate/20120717095244_create_product_group_conditions.nimbleshop_core.rb
572
+ - test/myshop/db/migrate/20120717095245_create_creditcard_transactions.nimbleshop_core.rb
573
+ - test/myshop/db/migrate/20120717095246_create_addresses.nimbleshop_core.rb
574
+ - test/myshop/db/migrate/20120717095247_create_pictures.nimbleshop_core.rb
575
+ - test/myshop/db/migrate/20120717095248_create_shipping_methods.nimbleshop_core.rb
576
+ - test/myshop/db/migrate/20120717095249_create_shipping_zones.nimbleshop_core.rb
577
+ - test/myshop/db/migrate/20120717095250_create_payment_methods.nimbleshop_core.rb
578
+ - test/myshop/db/migrate/20120717095251_create_preferences.nimbleshop_core.rb
579
+ - test/myshop/db/migrate/20120717095252_create_shipments.nimbleshop_core.rb
580
+ - test/myshop/db/migrate/20120717095253_create_shipment_carriers.nimbleshop_core.rb
581
+ - test/myshop/db/migrate/20120717095254_create_delayed_jobs.nimbleshop_core.rb
591
582
  - test/myshop/db/schema.rb
592
583
  - test/myshop/db/seeds.rb
584
+ - test/myshop/db/test.sqlite3
593
585
  - test/myshop/doc/README_FOR_APP
594
586
  - test/myshop/Gemfile
587
+ - test/myshop/log/development.log
595
588
  - test/myshop/public/404.html
596
589
  - test/myshop/public/422.html
597
590
  - test/myshop/public/500.html
@@ -613,13 +606,7 @@ files:
613
606
  - test/unit/creditcard_test.rb
614
607
  - test/unit/custom_field_answer/field_test.rb
615
608
  - test/unit/order_test.rb
616
- - test/unit/payment_method/authorizedotnet_test.rb
617
- - test/unit/payment_method/paypalwp_test.rb
618
- - test/unit/payment_method/splitable_test.rb
619
609
  - test/unit/picture_test.rb
620
- - test/unit/processor/authorize_net_test.rb
621
- - test/unit/processor/paypal_test.rb
622
- - test/unit/processor/splitable_test.rb
623
610
  - test/unit/product_group_condition_test.rb
624
611
  - test/unit/product_group_test.rb
625
612
  - test/unit/product_test.rb
@@ -627,21 +614,6 @@ files:
627
614
  - test/unit/shipping_method_test.rb
628
615
  - test/unit/shop_test.rb
629
616
  - test/unit/tax_calculator_test.rb
630
- - test/vcr_cassettes/authorize_net/authorize-failure.yml
631
- - test/vcr_cassettes/authorize_net/authorize-success.yml
632
- - test/vcr_cassettes/authorize_net/capture-failure.yml
633
- - test/vcr_cassettes/authorize_net/capture-success.yml
634
- - test/vcr_cassettes/authorize_net/purchase-failure.yml
635
- - test/vcr_cassettes/authorize_net/purchase-success.yml
636
- - test/vcr_cassettes/authorize_net/refund-failure.yml
637
- - test/vcr_cassettes/authorize_net/refund-success.yml
638
- - test/vcr_cassettes/authorize_net/void-authorize.yml
639
- - test/vcr_cassettes/authorize_net/void-failure.yml
640
- - test/vcr_cassettes/authorize_net/void-success.yml
641
- - test/vcr_cassettes/splitable/split-create-failure.yml
642
- - test/vcr_cassettes/splitable/split-create-success.yml
643
- - test/vcr_cassettes/splitable/split-draft-create-failure.yml
644
- - test/vcr_cassettes/splitable/split-draft-create-success.yml
645
617
  homepage: http://nimbleShop.org
646
618
  licenses: []
647
619
  post_install_message:
@@ -653,13 +625,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
653
625
  requirements:
654
626
  - - ! '>='
655
627
  - !ruby/object:Gem::Version
656
- version: '0'
628
+ version: 1.9.2
657
629
  required_rubygems_version: !ruby/object:Gem::Requirement
658
630
  none: false
659
631
  requirements:
660
632
  - - ! '>='
661
633
  - !ruby/object:Gem::Version
662
634
  version: '0'
635
+ segments:
636
+ - 0
637
+ hash: 2530722888489526699
663
638
  requirements: []
664
639
  rubyforge_project:
665
640
  rubygems_version: 1.8.24
@@ -701,15 +676,6 @@ test_files:
701
676
  - test/integration/admin/shipping_methods_acceptance_test.rb
702
677
  - test/integration/admin/shipping_zones_acceptance_test.rb
703
678
  - test/integration/admin/shops_acceptance_test.rb
704
- - test/integration/checkout/cart_acceptance_test.rb
705
- - test/integration/checkout/payment_confirmation_acceptance_test.rb
706
- - test/integration/checkout/paypal_acceptance_test.rb
707
- - test/integration/checkout/shipping_address_acceptance_test.rb
708
- - test/integration/checkout/shipping_method_acceptance_test.rb
709
- - test/integration/homepage_acceptance_test.rb
710
- - test/integration/products_acceptance_test.rb
711
- - test/integration/static_pages_acceptance_test.rb
712
- - test/mailers/mailer_test.rb
713
679
  - test/myshop/app/assets/images/engines/nimbleshop_authorizedotnet/american_express.png
714
680
  - test/myshop/app/assets/images/engines/nimbleshop_authorizedotnet/authorize_net_big.png
715
681
  - test/myshop/app/assets/images/engines/nimbleshop_authorizedotnet/authorizedotnet_big.png
@@ -735,6 +701,7 @@ test_files:
735
701
  - test/myshop/config/environments/development.rb
736
702
  - test/myshop/config/environments/production.rb
737
703
  - test/myshop/config/environments/test.rb
704
+ - test/myshop/config/initializers/001_load_nimbleshop_config.rb
738
705
  - test/myshop/config/initializers/backtrace_silencers.rb
739
706
  - test/myshop/config/initializers/cache_images.rb
740
707
  - test/myshop/config/initializers/carrierwave.rb
@@ -749,31 +716,34 @@ test_files:
749
716
  - test/myshop/config/nimbleshop.yml
750
717
  - test/myshop/config/routes.rb
751
718
  - test/myshop/config.ru
752
- - test/myshop/db/migrate/20120707041905_create_product_groups.nimbleshop_core.rb
753
- - test/myshop/db/migrate/20120707041906_create_products.nimbleshop_core.rb
754
- - test/myshop/db/migrate/20120707041907_create_orders.nimbleshop_core.rb
755
- - test/myshop/db/migrate/20120707041908_create_line_items.nimbleshop_core.rb
756
- - test/myshop/db/migrate/20120707041909_create_shops.nimbleshop_core.rb
757
- - test/myshop/db/migrate/20120707041910_create_link_groups.nimbleshop_core.rb
758
- - test/myshop/db/migrate/20120707041911_create_navigations.nimbleshop_core.rb
759
- - test/myshop/db/migrate/20120707041912_create_links.nimbleshop_core.rb
760
- - test/myshop/db/migrate/20120707041913_create_custom_fields.nimbleshop_core.rb
761
- - test/myshop/db/migrate/20120707041914_create_custom_field_answers.nimbleshop_core.rb
762
- - test/myshop/db/migrate/20120707041915_create_product_group_conditions.nimbleshop_core.rb
763
- - test/myshop/db/migrate/20120707041916_create_creditcard_transactions.nimbleshop_core.rb
764
- - test/myshop/db/migrate/20120707041917_create_addresses.nimbleshop_core.rb
765
- - test/myshop/db/migrate/20120707041918_create_pictures.nimbleshop_core.rb
766
- - test/myshop/db/migrate/20120707041919_create_shipping_methods.nimbleshop_core.rb
767
- - test/myshop/db/migrate/20120707041920_create_shipping_zones.nimbleshop_core.rb
768
- - test/myshop/db/migrate/20120707041921_create_payment_methods.nimbleshop_core.rb
769
- - test/myshop/db/migrate/20120707041922_create_preferences.nimbleshop_core.rb
770
- - test/myshop/db/migrate/20120707041923_create_shipments.nimbleshop_core.rb
771
- - test/myshop/db/migrate/20120707041924_create_shipment_carriers.nimbleshop_core.rb
772
- - test/myshop/db/migrate/20120707041925_create_delayed_jobs.nimbleshop_core.rb
719
+ - test/myshop/db/development.sqlite3
720
+ - test/myshop/db/migrate/20120717095234_create_product_groups.nimbleshop_core.rb
721
+ - test/myshop/db/migrate/20120717095235_create_products.nimbleshop_core.rb
722
+ - test/myshop/db/migrate/20120717095236_create_orders.nimbleshop_core.rb
723
+ - test/myshop/db/migrate/20120717095237_create_line_items.nimbleshop_core.rb
724
+ - test/myshop/db/migrate/20120717095238_create_shops.nimbleshop_core.rb
725
+ - test/myshop/db/migrate/20120717095239_create_link_groups.nimbleshop_core.rb
726
+ - test/myshop/db/migrate/20120717095240_create_navigations.nimbleshop_core.rb
727
+ - test/myshop/db/migrate/20120717095241_create_links.nimbleshop_core.rb
728
+ - test/myshop/db/migrate/20120717095242_create_custom_fields.nimbleshop_core.rb
729
+ - test/myshop/db/migrate/20120717095243_create_custom_field_answers.nimbleshop_core.rb
730
+ - test/myshop/db/migrate/20120717095244_create_product_group_conditions.nimbleshop_core.rb
731
+ - test/myshop/db/migrate/20120717095245_create_creditcard_transactions.nimbleshop_core.rb
732
+ - test/myshop/db/migrate/20120717095246_create_addresses.nimbleshop_core.rb
733
+ - test/myshop/db/migrate/20120717095247_create_pictures.nimbleshop_core.rb
734
+ - test/myshop/db/migrate/20120717095248_create_shipping_methods.nimbleshop_core.rb
735
+ - test/myshop/db/migrate/20120717095249_create_shipping_zones.nimbleshop_core.rb
736
+ - test/myshop/db/migrate/20120717095250_create_payment_methods.nimbleshop_core.rb
737
+ - test/myshop/db/migrate/20120717095251_create_preferences.nimbleshop_core.rb
738
+ - test/myshop/db/migrate/20120717095252_create_shipments.nimbleshop_core.rb
739
+ - test/myshop/db/migrate/20120717095253_create_shipment_carriers.nimbleshop_core.rb
740
+ - test/myshop/db/migrate/20120717095254_create_delayed_jobs.nimbleshop_core.rb
773
741
  - test/myshop/db/schema.rb
774
742
  - test/myshop/db/seeds.rb
743
+ - test/myshop/db/test.sqlite3
775
744
  - test/myshop/doc/README_FOR_APP
776
745
  - test/myshop/Gemfile
746
+ - test/myshop/log/development.log
777
747
  - test/myshop/public/404.html
778
748
  - test/myshop/public/422.html
779
749
  - test/myshop/public/500.html
@@ -795,13 +765,7 @@ test_files:
795
765
  - test/unit/creditcard_test.rb
796
766
  - test/unit/custom_field_answer/field_test.rb
797
767
  - test/unit/order_test.rb
798
- - test/unit/payment_method/authorizedotnet_test.rb
799
- - test/unit/payment_method/paypalwp_test.rb
800
- - test/unit/payment_method/splitable_test.rb
801
768
  - test/unit/picture_test.rb
802
- - test/unit/processor/authorize_net_test.rb
803
- - test/unit/processor/paypal_test.rb
804
- - test/unit/processor/splitable_test.rb
805
769
  - test/unit/product_group_condition_test.rb
806
770
  - test/unit/product_group_test.rb
807
771
  - test/unit/product_test.rb
@@ -809,18 +773,3 @@ test_files:
809
773
  - test/unit/shipping_method_test.rb
810
774
  - test/unit/shop_test.rb
811
775
  - test/unit/tax_calculator_test.rb
812
- - test/vcr_cassettes/authorize_net/authorize-failure.yml
813
- - test/vcr_cassettes/authorize_net/authorize-success.yml
814
- - test/vcr_cassettes/authorize_net/capture-failure.yml
815
- - test/vcr_cassettes/authorize_net/capture-success.yml
816
- - test/vcr_cassettes/authorize_net/purchase-failure.yml
817
- - test/vcr_cassettes/authorize_net/purchase-success.yml
818
- - test/vcr_cassettes/authorize_net/refund-failure.yml
819
- - test/vcr_cassettes/authorize_net/refund-success.yml
820
- - test/vcr_cassettes/authorize_net/void-authorize.yml
821
- - test/vcr_cassettes/authorize_net/void-failure.yml
822
- - test/vcr_cassettes/authorize_net/void-success.yml
823
- - test/vcr_cassettes/splitable/split-create-failure.yml
824
- - test/vcr_cassettes/splitable/split-create-success.yml
825
- - test/vcr_cassettes/splitable/split-draft-create-failure.yml
826
- - test/vcr_cassettes/splitable/split-draft-create-success.yml