middleman-data_source 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1740b08c31a4760f0ab73077c0aa67c7e20bbb1
-  data.tar.gz: b8d7771afa4af37eb51e11043c201bbb14dc4e5a
+  metadata.gz: f92c547722c3acc8279689d9f9b03f9bd22501fb
+  data.tar.gz: 7c597e7a910b1fa2226131e2791d52b2783b8512
 SHA512:
-  metadata.gz: 459a8197ac39ed4bc0e38eccc64a7f7e0397381d2b65dc3ab9fabc07b2dd876d09725730ec275274ad1123662e99d0550b2e99df7d8bf50bb56efc56bb34ce95
-  data.tar.gz: 678fd4d620a23691270fa5f780cf2eee58f99c853364519fbdcaf86ec8bb79e3a2844ace266d9adc5d2e503502164c3460997e70922bafffa727b340cefea0b4
+  metadata.gz: 1ad2e9d4c9ee45e674f37a784da7eb9b5f3082b3d15f59e81f4d9085a1e6819819f14eb4256c92ad85a76b3c8ad0a19c713fd0dedaf398f53a252cd6d3d9f384
+  data.tar.gz: 642a9856acd83198fd44920d3a71d3b627dda1f64884eac09960b988fba9743b7e4ab161cead01220fd612e98cbd1a5a54b0e8b02e3e009c777da7e834309ce9

data/changelog.md

@@ -1,3 +1,6 @@
+# 0.3.0
+- add support for using remote data imediatly after activating the extension
+
 # 0.2.0
 - add support for specifying file resources as a hash so you can do
   ```ruby

data/lib/middleman/data_source/extension.rb

@@ -12,11 +12,10 @@ module Middleman
         @_rack_app ||= ::Rack::Test::Session.new( ::Rack::MockSession.new( options.rack_app ) )
       end
 
-      # files = [
-      #  '/url' => 'data/name'
-      # ]
+      def initialize app, options_hash={}, &block
+        super app, options_hash, &block
 
-      def after_configuration
+        app_inst     = app.inst
         remote_datas = if options.files.respond_to? :keys
           options.files
         else
@@ -31,13 +30,13 @@ module Middleman
           basename  = File.basename parts.pop, extension
 
           if parts.empty?
-            original_callback = app.data.callbacks[basename]
-            app.data.callbacks[basename] = Proc.new do
+            original_callback = app_inst.data.callbacks[basename]
+            app_inst.data.callbacks[basename] = Proc.new do
               attempt_merge_then_enhance decode_data(remote_file, extension), original_callback
             end
           else
-            original_callback = app.data.callbacks[parts.first]
-            app.data.callbacks[parts.first] = Proc.new do
+            original_callback = app_inst.data.callbacks[parts.first]
+            app_inst.data.callbacks[parts.first] = Proc.new do
               built_data = { basename => decode_data(remote_file, extension) }
               parts[1..-1].reverse.each do |part|
                 built_data = { part => built_data }

data/lib/middleman/data_source/version.rb

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

data/spec/fixtures/imediate_use/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 = [
+    'remote.json'
+  ]
+
+end
+
+set :remote_data, data.remote

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

@@ -105,4 +105,11 @@ describe Middleman::DataSource::Extension do
     end
   end
 
+  it "allows for imediate use in config once defined" do
+    Given.fixture 'imediate_use'
+    @mm = Middleman::Fixture.app
+
+    expect( @mm.remote_data ).to match_array [{"item"=>"one"},{"item"=>"two"}]
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-data_source
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman
@@ -54,6 +54,7 @@ files:
 - spec/fixtures/base/config.rb
 - spec/fixtures/borrower/config.rb
 - spec/fixtures/files_as_hash/config.rb
+- spec/fixtures/imediate_use/config.rb
 - spec/fixtures/multiple_instances/config.rb
 - spec/fixtures/unsupported_extension/config.rb
 - spec/lib/middleman-data_source_spec.rb
@@ -91,6 +92,7 @@ test_files:
 - spec/fixtures/base/config.rb
 - spec/fixtures/borrower/config.rb
 - spec/fixtures/files_as_hash/config.rb
+- spec/fixtures/imediate_use/config.rb
 - spec/fixtures/multiple_instances/config.rb
 - spec/fixtures/unsupported_extension/config.rb
 - spec/lib/middleman/data_source/extension_spec.rb