middleman-data_source 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1103c960a4e677056993c7c122238ef8cd900479
-  data.tar.gz: 2c0cc6a97dffda9d2583668620915bb262f9c39b
+  metadata.gz: f007a9a894f8c5fc6d56b47a8e238939b96fbf12
+  data.tar.gz: 03abe96ea5700bb92236b4f00fc0681b279d33f9
 SHA512:
-  metadata.gz: 03f1c68acf968a58280fad1abd61de96bfeeb106c7896916d60c9d7ae34e160780b461e874d077d118c3f749cf013703c3c3f4ad81773153e8c758c1269d693d
-  data.tar.gz: 164d77b687d6d1c28b7ff60d1445ef89662cbe73fdfa32c6f4a4677a36a8ef38f893436234c9b8876e715f4923d7d5bf256c726f7ec984521d0cb8009176dd95
+  metadata.gz: 0f38a7aade0e3d9f051c37fe2095aacf13a8bc070d66072e9ed95051b09087ff01a1900052baf8aa9aefcc47f201fd93441bcd8477c71e924c145c539a6958b5
+  data.tar.gz: a01f2c2bc6beacfb1a8e606241ff3a2fb5a4b66c159706f32145be7e57d820fe6f707ed584bea12c1449d3d14b91e1ae84c7dd52deb7f7635fb23f78c697c586

data/changelog.md

@@ -1,3 +1,6 @@
+# 0.5.0
+- include support for resources that include query params after their file extension [@jordanandree]
+
 # 0.4.0
 - add specs & support for middleman v4
 

data/lib/middleman/data_source/extension.rb

@@ -25,9 +25,10 @@ module Middleman
         end
 
         remote_datas.each do |remote_file, local_representation|
-          extension = File.extname remote_file
-          parts     = local_representation.split(File::SEPARATOR)
-          basename  = File.basename parts.pop, extension
+          raw_extension = File.extname(remote_file)
+          extension     = raw_extension.split('?').first
+          parts         = local_representation.split(File::SEPARATOR)
+          basename      = File.basename(parts.pop, raw_extension)
 
           if parts.empty?
             original_callback = app_inst.data.callbacks[basename]

data/lib/middleman/data_source/version.rb

@@ -1,7 +1,7 @@
 module Middleman
   module DataSource
 
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
 
   end
 end

data/spec/fixtures/base/config.rb

@@ -14,7 +14,8 @@ activate :data_source do |c|
     'deeply/nested.json',
     'deeply/nested/routes.json',
     'in_yaml.yml',
-    'in_json.json'
+    'in_json.json',
+    'query_param.json?token=foo'
   ]
 
 end

data/spec/fixtures/borrower/config.rb

@@ -10,7 +10,8 @@ activate :data_source do |c|
     'deeply/nested.json',
     'deeply/nested/routes.json',
     'in_yaml.yml',
-    'in_json.json'
+    'in_json.json',
+    'query_param.json?token=foo'
   ]
 
 end

data/spec/lib/middleman/data_source/extension_spec.rb

@@ -15,6 +15,10 @@ describe Middleman::DataSource::Extension do
       expect( @mm.data.deeply.nested.routes ).to eq [{"item" => "one"}, {"item" => "two"}]
     end
 
+    it "supports query params" do
+      expect( @mm.data.query_param ).to eq [{"foo" => "bar"}]
+    end
+
     it "attempts to not clobber data of overlapping nested routes (if it's hashes)" do
       expect( @mm.data.deeply.nested.has_key? "nestable" ).to eq true
       expect( @mm.data.deeply.nested["nestable"] ).to eq "data"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-data_source
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman