jekyll-bookshop 2.0.0.pre.alpha.4 → 2.0.0.pre.alpha.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c46fab0870b0fe3bf2f18ef2de82d603f18698c2b2e91d2dcab4a0f955d8c015
4
- data.tar.gz: 2c3d5177e8b9f1f560cfa11cbb38bca7c882b9ef0059f8f2849fc73c926558c6
3
+ metadata.gz: e92ee512a6bc33f0b3bd8559a05d6b60302c0e11c22a14c6f89ec001121a05db
4
+ data.tar.gz: 1c05f39bea2e59713a16c54f03d8ebe63a9c37bbeb8546a0da41342a51011360
5
5
  SHA512:
6
- metadata.gz: 29560e6e5a13f36cab682805f6d97a885c5d3ec9d7f5bc1d0bff9cb374ec45e7c297077274526b82bad425024cec247bfc3c3651b10f8097011f20c426324880
7
- data.tar.gz: 9f09c58f4b19555df6d90fb810c3170bf7a020cb9b97dbdf046731d4a555c63c724f027081316a1c2f51b5abf53d8956d136bd5a9f0ac6c683fee99d44725266
6
+ metadata.gz: a8f34bf13c9ab929a66fb53f09d4f79efc8384b10fb27b466fb6c7fde6f38a418be50eb67c07029bf61c5c1d01cb41684996af8e52120af18d361c2eb5f5b4e2
7
+ data.tar.gz: 4bed403b8d80a9ec62ac56e69cf8e405f9da6a654b942813d3f2ba4d5c0b7bb16e3b937493b843f44dc7040947a23e34097d6556b861ee581c6d6c4039e3fe60
@@ -6,10 +6,7 @@ module JekyllBookshop
6
6
 
7
7
  # Look for includes in the built bookshop directory
8
8
  def tag_includes_dirs(context)
9
- bookshop_locations = context['site']['bookshop_locations']&.collect do |location|
10
- Pathname.new(location + "/components").cleanpath.to_s
11
- end
12
- bookshop_locations.freeze
9
+ context['site']['bookshop_component_locations'].freeze
13
10
  end
14
11
 
15
12
  # Support the bind syntax, spreading an object into params
@@ -91,19 +88,28 @@ module JekyllBookshop
91
88
 
92
89
  # Add the paths to find bookshop's styles
93
90
  def self.open_bookshop(site)
94
- bookshop_locations = site.config['bookshop_locations']&.collect do |location|
95
- Pathname.new(location + "/").cleanpath.to_s
91
+ base_bookshop_locations = site.config['bookshop_locations']&.collect do |location|
92
+ Pathname.new("#{site.source}/#{location}/").cleanpath.to_s
96
93
  end
97
- bookshop_locations = bookshop_locations.select do |location|
94
+ base_bookshop_locations = base_bookshop_locations.select do |location|
98
95
  Dir.exist?(location)
99
96
  end
97
+ bookshop_component_locations = base_bookshop_locations&.collect do |location|
98
+ Pathname.new("#{location}/components/").cleanpath.to_s
99
+ end
100
100
 
101
101
  site.config['watch_dirs'] ||= [] # Paired with CloudCannon/jekyll-watch
102
- site.config['watch_dirs'].push(*bookshop_locations);
102
+ site.config['watch_dirs'].push(*base_bookshop_locations);
103
103
 
104
104
  site.config['sass'] ||= {}
105
105
  site.config['sass']['load_paths'] ||= []
106
- site.config['sass']['load_paths'].push(*bookshop_locations)
106
+ site.config['sass']['load_paths'].push(*base_bookshop_locations)
107
+
108
+ site.config['bookshop_locations'] = []
109
+ site.config['bookshop_locations'].push(*base_bookshop_locations)
110
+
111
+ site.config['bookshop_component_locations'] ||= []
112
+ site.config['bookshop_component_locations'].push(*bookshop_component_locations)
107
113
  end
108
114
  end
109
115
 
@@ -1,3 +1,3 @@
1
1
  module JekyllBookshop
2
- VERSION = "2.0.0.pre.alpha.4"
2
+ VERSION = "2.0.0.pre.alpha.5"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jekyll-bookshop
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.pre.alpha.4
4
+ version: 2.0.0.pre.alpha.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Liam Bigelow
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-05-28 00:00:00.000000000 Z
11
+ date: 2021-06-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll