middleman-data_source 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85df268b12b267b0188e48c25197f71e010d8fb1
-  data.tar.gz: ff9ba310306744a80915886e1e49ac64c0e24e9b
+  metadata.gz: a1740b08c31a4760f0ab73077c0aa67c7e20bbb1
+  data.tar.gz: b8d7771afa4af37eb51e11043c201bbb14dc4e5a
 SHA512:
-  metadata.gz: 13f802e2a98a282a811b285d6c1333feb82a1cd49661e38d72210dbb0d79754e484d8c28a31d6bd9c8c979fd20d1265a328b5c3e04dfbfe9ac7d38126aaab8dc
-  data.tar.gz: 332500e03df8e1c0a1e9e28edbc29106554f5f8a3e493a91f35bbaa522b38890df0bb4217c6dd2368e33b7491697a5ecd85b5bd37362e6bd3e909d29d04aed5b
+  metadata.gz: 459a8197ac39ed4bc0e38eccc64a7f7e0397381d2b65dc3ab9fabc07b2dd876d09725730ec275274ad1123662e99d0550b2e99df7d8bf50bb56efc56bb34ce95
+  data.tar.gz: 678fd4d620a23691270fa5f780cf2eee58f99c853364519fbdcaf86ec8bb79e3a2844ace266d9adc5d2e503502164c3460997e70922bafffa727b340cefea0b4

data/changelog.md

@@ -1,2 +1,10 @@
+# 0.2.0
+- add support for specifying file resources as a hash so you can do
+  ```ruby
+  c.files = {
+    "/url/for/resource" => "data_key"
+  }
+  ```
+
 # 0.1.0
 - initial release supporting rack or borrower discovered assets parsed with YAML or JSON.

data/lib/middleman/data_source/extension.rb

@@ -12,11 +12,23 @@ module Middleman
         @_rack_app ||= ::Rack::Test::Session.new( ::Rack::MockSession.new( options.rack_app ) )
       end
 
+      # files = [
+      #  '/url' => 'data/name'
+      # ]
+
       def after_configuration
-        options.files.each do |remote_file|
-          extension = File.extname  remote_file
-          basename  = File.basename remote_file, extension
-          parts     = remote_file.split(File::SEPARATOR)[0..-2]
+        remote_datas = if options.files.respond_to? :keys
+          options.files
+        else
+          Hash[options.files.map do |remote_file|
+            [remote_file, remote_file]
+          end]
+        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
 
           if parts.empty?
             original_callback = app.data.callbacks[basename]

data/lib/middleman/data_source/version.rb

@@ -1,7 +1,7 @@
 module Middleman
   module DataSource
 
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
 
   end
 end

data/readme.md

@@ -34,6 +34,18 @@ And access them like any other data:
 = data.some.title
 ```
 
+You can also specify data resources as a hash to map the name:
+
+```ruby
+# config.rb (in data_source activation block)
+c.files = {
+  "/url/to/resource.json" => "my_resource"
+}
+
+# source/index.html
+= data.my_resource
+```
+
 You can fetch your data in two ways:
 1. from the file system or web with [Borrower](http://github.com/stevenosloan/borrower)
 2. with a rack app

data/spec/fixtures/files_as_hash/config.rb

@@ -0,0 +1,14 @@
+set :environment,     :test
+set :show_exceptions, false
+
+activate :data_source do |c|
+
+  c.root = File.join( Dir.pwd, 'remote_data' )
+
+  c.files = {
+    "/deeply/nested.json" => "mapped_nested",
+    "/in_yaml.yml" => "mapped_in_yaml",
+    "/in_json.json" => "mapped_in_json"
+  }
+
+end

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

@@ -87,4 +87,22 @@ describe Middleman::DataSource::Extension do
     end
   end
 
+  context "with files specified as hash" do
+    before :each do
+      Given.fixture 'files_as_hash'
+      @mm = Middleman::Fixture.app
+      @extension = @mm.extensions[:data_source]
+    end
+
+    after :each do
+      Given.cleanup!
+    end
+
+    it "maps correctly between route & data name" do
+      expect( @mm.data.mapped_nested["nestable"] ).to eq "data"
+      expect( @mm.data.mapped_in_yaml ).to eq ["data","in","yaml"]
+      expect( @mm.data.mapped_in_json ).to eq ["data","in","json"]
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-data_source
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman
@@ -53,6 +53,7 @@ files:
 - readme.md
 - spec/fixtures/base/config.rb
 - spec/fixtures/borrower/config.rb
+- spec/fixtures/files_as_hash/config.rb
 - spec/fixtures/multiple_instances/config.rb
 - spec/fixtures/unsupported_extension/config.rb
 - spec/lib/middleman-data_source_spec.rb
@@ -89,6 +90,7 @@ summary: Allow for loading data in middleman from remote sources
 test_files:
 - spec/fixtures/base/config.rb
 - spec/fixtures/borrower/config.rb
+- spec/fixtures/files_as_hash/config.rb
 - spec/fixtures/multiple_instances/config.rb
 - spec/fixtures/unsupported_extension/config.rb
 - spec/lib/middleman/data_source/extension_spec.rb