middleman-data_source 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8149a40f5de297992c3027d32d35a35592781065
-  data.tar.gz: 14b91bba9a92160b4c2d696df4698eefc48266ec
+  metadata.gz: 8644a9a460f377c8c69f395ad49f85e08c600fcc
+  data.tar.gz: 2dc0d7139e818f655f7ad6a3bbd7eb8612d38693
 SHA512:
-  metadata.gz: 218bd22fd6a2875f9015641d9f87ccaaa865a24e4022304a1ed2a89b0094276e3197b0bf651b4a1cfff6300d097918e726e764087671dc1149ee7ee230ea52ea
-  data.tar.gz: 6589a1e6dd03534bf4121ff797058f91776ca6b90ce34b141b1bdb3171c4203a3e51b144a5184b75147b66f133f3e68d77f7b9f9563b475719bd5832b4bd54ce
+  metadata.gz: 031b02e3c88069f6232345bf159f007b9d0b14fa22e87e74c461beaf5abef13d47e7a85bff1d4cf210247ed695c1b37fba8128964c7e286d78af391d748fda0e
+  data.tar.gz: 1699caaa0cdfad8f4ba4cf5d311ca0ff0fe44ea101cfe2bd0d2f7a9e68027763a9e5e0b647e8480dd655126e08ec217afa61f68d4ca16ea5ef38aaa9775a7edf

data/changelog.md

@@ -1,3 +1,6 @@
+# 0.6.1
+- fixes for newer versions of middleman 4 compatability
+
 # 0.6.0
 - add definable decoders & allow override of default json & yaml decoders
 - allow for defining sources with arbitrary data types

data/lib/middleman/data_source/extension.rb

@@ -73,8 +73,10 @@ module Middleman
         def attempt_merge_then_enhance new_data, original_callback
           if original_callback
             original_data = original_callback.call
-            if original_data.respond_to? :merge
+            if original_data.respond_to? :deep_merge
               return ::Middleman::Util.recursively_enhance original_data.deep_merge(new_data)
+            elsif original_data.respond_to? :merge
+              return ::Middleman::Util.recursively_enhance deep_merge(original_data, new_data)
             end
           end
 
@@ -105,6 +107,19 @@ module Middleman
           end
         end
 
+        def deep_merge base, extension
+          base.merge extension do |key, old_val, new_val|
+            old_val = old_val.to_hash if old_val.respond_to?(:to_hash)
+            new_val = new_val.to_hash if new_val.respond_to?(:to_hash)
+
+            if old_val.respond_to?(:merge) && new_val.respond_to?(:merge)
+              deep_merge old_val, new_val
+            else
+              new_val
+            end
+          end
+        end
+
       class UnsupportedDataExtension < ArgumentError
       end
 

data/lib/middleman/data_source/version.rb

@@ -1,7 +1,7 @@
 module Middleman
   module DataSource
 
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
 
   end
 end

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

@@ -8,25 +8,25 @@ describe Middleman::DataSource::Extension do
 
   shared_examples "data import" do
     it "adds data to application" do
-      expect( @mm.data.remote ).to eq [{"item" => "one"}, {"item" => "two"}]
+      expect( @mm.data.remote.map(&:to_h) ).to match_array [{"item" => "one"}, {"item" => "two"}]
     end
 
     it "supports nested routes" do
-      expect( @mm.data.deeply.nested.routes ).to eq [{"item" => "one"}, {"item" => "two"}]
+      expect( @mm.data.deeply.nested.routes.map(&:to_h) ).to match_array [{"item" => "one"}, {"item" => "two"}]
     end
 
     it "supports query params" do
-      expect( @mm.data.query_param ).to eq [{"foo" => "bar"}]
+      expect( @mm.data.query_param.map(&:to_h) ).to match_array [{"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.to_h.has_key? "nestable" ).to eq true
       expect( @mm.data.deeply.nested["nestable"] ).to eq "data"
     end
 
     it "support yaml or json" do
-      expect( @mm.data.in_yaml ).to eq ["data","in","yaml"]
-      expect( @mm.data.in_json ).to eq ["data","in","json"]
+      expect( @mm.data.in_yaml ).to match_array ["data","in","yaml"]
+      expect( @mm.data.in_json ).to match_array ["data","in","json"]
     end
   end
 
@@ -98,8 +98,8 @@ describe Middleman::DataSource::Extension do
     end
 
     it "returns data from both instances" do
-      expect( @mm.data.remote ).to eq [{"item" => "one"}, {"item" => "two"}]
-      expect( @mm.data.in_yaml ).to eq ["data","in","yaml"]
+      expect( @mm.data.remote ).to match_array [{"item" => "one"}, {"item" => "two"}]
+      expect( @mm.data.in_yaml ).to match_array ["data","in","yaml"]
     end
   end
 
@@ -116,8 +116,8 @@ describe Middleman::DataSource::Extension do
 
     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"]
+      expect( @mm.data.mapped_in_yaml ).to match_array ["data","in","yaml"]
+      expect( @mm.data.mapped_in_json ).to match_array ["data","in","json"]
     end
   end
 
@@ -125,8 +125,9 @@ describe Middleman::DataSource::Extension do
     Given.fixture 'imediate_use'
     @mm = Middleman::Fixture.app
 
-    data = (@mm.respond_to?(:config) && @mm.config.respond_to?(:setting)) ? @mm.config.setting(:remote_data).value : @mm.remote_data
-    expect( data ).to match_array [{"item"=>"one"},{"item"=>"two"}]
+    remote_data = (@mm.config.setting(:remote_data).value.respond_to?(:value)) ? @mm.config.setting(:remote_data).value.value : @mm.config.setting(:remote_data).value
+
+    expect( 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.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Allow for loading data in middleman from remote sources