spree_core 3.1.7 → 3.1.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/spree/zone.rb +1 -1
  3. data/lib/spree/core/version.rb +1 -1
  4. data/spec/fixtures/microdata.html +22 -0
  5. data/spec/fixtures/microdata_itemref.html +15 -0
  6. data/spec/fixtures/microdata_no_itemscope.html +20 -0
  7. data/spec/fixtures/thinking-cat.jpg +0 -0
  8. data/spree_core.gemspec +3 -3
  9. metadata +11 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1e678a0621d7fbc38a51385f2e14dac5ac4cbe8a
4
- data.tar.gz: 8939c8fea96cfb908fe5e464f13fc879cc5d817f
3
+ metadata.gz: 46020900e2f02e38e893ea39b773baba7c88a4bf
4
+ data.tar.gz: 575b850d405f97fda0c364d0f7ddafeed7f683d8
5
5
  SHA512:
6
- metadata.gz: 00de72307c971846acb3fa7ec1b95aff45b46c0c0a2ae7025fa8dea3e4b00b9a31f95dfe97a389a330c566025887725d2218e08e2c49921a23bf88c77b34a4a0
7
- data.tar.gz: a6fee69a508d8f3b7ee667c9595f70639b98e361afd16cc11e3aa648c8b58ee0df38c17dfc76826c1f92965b461201d7b9fff57584181d6da7a95b557858ea1a
6
+ metadata.gz: fffcf363d41e6f6e57ae5debba5bd05ab74ec9289705c5cd5787d1eb8acc3fcbf7fb95088aedb48b203c66f9dc8932f58281474de7905d931452bdc7cd612d55
7
+ data.tar.gz: c5f68ec5562dfd742eac233a3f45d4111e8fdd18aca82dd325469ed9e0312f1f2c9e3d1a1afd58ec71395182e2567514ca9d9435b52e83cec82331032a6dc2fa
data/app/models/spree/zone.rb CHANGED
@@ -10,7 +10,7 @@ module Spree
10
10
  end
11
11
 
12
12
  has_many :shipping_method_zones, class_name: 'Spree::ShippingMethodZone'
13
- has_many :zones, through: :shipping_method_zones, class_name: 'Spree::Zone'
13
+ has_many :shipping_methods, through: :shipping_method_zones, class_name: 'Spree::ShippingMethod'
14
14
 
15
15
  validates :name, presence: true, uniqueness: { allow_blank: true }
16
16
 
data/lib/spree/core/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Spree
2
2
  def self.version
3
- "3.1.7"
3
+ "3.1.8"
4
4
  end
5
5
  end
data/spec/fixtures/microdata.html ADDED
@@ -0,0 +1,22 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <!-- shameless -->
4
+ <head>
5
+ <title>Jason Ronallo</title>
6
+ </head>
7
+
8
+ <body>
9
+ <span itemscope itemtype="http://schema.org/Person"
10
+ itemid="http://ronallo.com#me">
11
+ <a itemprop="url" href="http://twitter.com/ronallo">
12
+ <span itemprop="name">Jason Ronallo</span>
13
+ </a> is the
14
+ <span itemprop="jobTitle">Associate Head of Digital Library Initiatives</span> at
15
+ <span itemprop="affiliation" itemscope itemtype="http://schema.org/Library" itemid="http://lib.ncsu.edu">
16
+ <span itemprop="name">
17
+ <a itemprop="url" href="http://www.lib.ncsu.edu">NCSU Libraries</a>
18
+ </span>
19
+ </span>
20
+ </span>
21
+ </body>
22
+ </html>
data/spec/fixtures/microdata_itemref.html ADDED
@@ -0,0 +1,15 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <title>itemref example from Microdata spec</title>
5
+ </head>
6
+ <body>
7
+ <div itemscope id="amanda" itemref="a b"></div>
8
+ <p id="a">Name: <span itemprop="name">Amanda</span></p>
9
+ <div id="b" itemprop="band" itemscope itemref="c"></div>
10
+ <div id="c">
11
+ <p>Band: <span itemprop="name">Jazz Band</span></p>
12
+ <p>Size: <span itemprop="size">12</span> players</p>
13
+ </div>
14
+ </body>
15
+ </html>
data/spec/fixtures/microdata_no_itemscope.html ADDED
@@ -0,0 +1,20 @@
1
+ <!doctype html>
2
+ <html>
3
+ <head>
4
+ <title>Jason Ronallo</title>
5
+ </head>
6
+ <body>
7
+ <span itemtype="http://schema.org/Person"
8
+ itemid="http://ronallo.com#me">
9
+ <a itemprop="url" href="http://twitter.com/ronallo">
10
+ <span itemprop="name">Jason Ronallo</span>
11
+ </a> is the
12
+ <span itemprop="jobTitle">Associate Head of Digital Library Initiatives</span> at
13
+ <span itemprop="affiliation" itemtype="http://schema.org/Library" itemid="http://lib.ncsu.edu">
14
+ <span itemprop="name">
15
+ <a itemprop="url" href="http://www.lib.ncsu.edu">NCSU Libraries</a>
16
+ </span>
17
+ </span>
18
+ </span>
19
+ </body>
20
+ </html>
data/spec/fixtures/thinking-cat.jpg ADDED
Binary file
data/spree_core.gemspec CHANGED
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
16
16
  s.homepage = 'http://spreecommerce.com'
17
17
  s.license = 'BSD-3'
18
18
 
19
- s.files = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) }
19
+ s.files = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
20
20
  s.require_path = 'lib'
21
21
 
22
22
  s.add_dependency 'activemerchant', '~> 1.59'
@@ -25,11 +25,11 @@ Gem::Specification.new do |s|
25
25
  s.add_dependency 'carmen', '~> 1.0.0'
26
26
  s.add_dependency 'cancancan', '~> 1.10.1'
27
27
  s.add_dependency 'deface', '~> 1.0'
28
- s.add_dependency 'ffaker', '~> 2.2.0'
28
+ s.add_dependency 'ffaker', '~> 2.2'
29
29
  s.add_dependency 'font-awesome-rails', '~> 4.0'
30
30
  s.add_dependency 'friendly_id', '~> 5.1.0'
31
31
  s.add_dependency 'highline', '~> 1.6.18' # Necessary for the install generator
32
- s.add_dependency 'kaminari', '~> 0.17'
32
+ s.add_dependency 'kaminari', '~> 1.0.1'
33
33
  s.add_dependency 'monetize', '~> 1.1'
34
34
  s.add_dependency 'paperclip', '~> 4.3.0'
35
35
  s.add_dependency 'paranoia', '~> 2.1.0'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.7
4
+ version: 3.1.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-08-03 00:00:00.000000000 Z
11
+ date: 2017-09-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activemerchant
@@ -106,14 +106,14 @@ dependencies:
106
106
  requirements:
107
107
  - - "~>"
108
108
  - !ruby/object:Gem::Version
109
- version: 2.2.0
109
+ version: '2.2'
110
110
  type: :runtime
111
111
  prerelease: false
112
112
  version_requirements: !ruby/object:Gem::Requirement
113
113
  requirements:
114
114
  - - "~>"
115
115
  - !ruby/object:Gem::Version
116
- version: 2.2.0
116
+ version: '2.2'
117
117
  - !ruby/object:Gem::Dependency
118
118
  name: font-awesome-rails
119
119
  requirement: !ruby/object:Gem::Requirement
@@ -162,14 +162,14 @@ dependencies:
162
162
  requirements:
163
163
  - - "~>"
164
164
  - !ruby/object:Gem::Version
165
- version: '0.17'
165
+ version: 1.0.1
166
166
  type: :runtime
167
167
  prerelease: false
168
168
  version_requirements: !ruby/object:Gem::Requirement
169
169
  requirements:
170
170
  - - "~>"
171
171
  - !ruby/object:Gem::Version
172
- version: '0.17'
172
+ version: 1.0.1
173
173
  - !ruby/object:Gem::Dependency
174
174
  name: monetize
175
175
  requirement: !ruby/object:Gem::Requirement
@@ -940,6 +940,10 @@ files:
940
940
  - lib/tasks/email.rake
941
941
  - lib/tasks/exchanges.rake
942
942
  - script/rails
943
+ - spec/fixtures/microdata.html
944
+ - spec/fixtures/microdata_itemref.html
945
+ - spec/fixtures/microdata_no_itemscope.html
946
+ - spec/fixtures/thinking-cat.jpg
943
947
  - spree_core.gemspec
944
948
  - vendor/assets/javascripts/jquery-migrate-1.0.0.js
945
949
  - vendor/assets/javascripts/jquery.payment.js
@@ -966,7 +970,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
966
970
  version: 1.8.23
967
971
  requirements: []
968
972
  rubyforge_project:
969
- rubygems_version: 2.6.12
973
+ rubygems_version: 2.6.13
970
974
  signing_key:
971
975
  specification_version: 4
972
976
  summary: The bare bones necessary for Spree.