middleman-data_source 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f92c547722c3acc8279689d9f9b03f9bd22501fb
-  data.tar.gz: 7c597e7a910b1fa2226131e2791d52b2783b8512
+  metadata.gz: 1103c960a4e677056993c7c122238ef8cd900479
+  data.tar.gz: 2c0cc6a97dffda9d2583668620915bb262f9c39b
 SHA512:
-  metadata.gz: 1ad2e9d4c9ee45e674f37a784da7eb9b5f3082b3d15f59e81f4d9085a1e6819819f14eb4256c92ad85a76b3c8ad0a19c713fd0dedaf398f53a252cd6d3d9f384
-  data.tar.gz: 642a9856acd83198fd44920d3a71d3b627dda1f64884eac09960b988fba9743b7e4ab161cead01220fd612e98cbd1a5a54b0e8b02e3e009c777da7e834309ce9
+  metadata.gz: 03f1c68acf968a58280fad1abd61de96bfeeb106c7896916d60c9d7ae34e160780b461e874d077d118c3f749cf013703c3c3f4ad81773153e8c758c1269d693d
+  data.tar.gz: 164d77b687d6d1c28b7ff60d1445ef89662cbe73fdfa32c6f4a4677a36a8ef38f893436234c9b8876e715f4923d7d5bf256c726f7ec984521d0cb8009176dd95

data/changelog.md

@@ -1,3 +1,6 @@
+# 0.4.0
+- add specs & support for middleman v4
+
 # 0.3.0
 - add support for using remote data imediatly after activating the extension
 

data/lib/middleman/data_source/extension.rb

@@ -15,7 +15,7 @@ module Middleman
       def initialize app, options_hash={}, &block
         super app, options_hash, &block
 
-        app_inst     = app.inst
+        app_inst     = app.respond_to?(:inst) ? app.inst : app
         remote_datas = if options.files.respond_to? :keys
           options.files
         else

data/lib/middleman/data_source/version.rb

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

data/spec/fixtures/base/config.rb

@@ -3,9 +3,9 @@ set :show_exceptions, false
 
 activate :data_source do |c|
 
-  c.rack_app = Rack::Builder.new do
-                 use Rack::Static, urls: ["/"],
-                                   root: "remote_data"
+  c.rack_app = ::Rack::Builder.new do
+                 use ::Rack::Static, urls: ["/"],
+                                     root: "remote_data"
                  run lambda {|env| [404, {'Content-type' => 'text/plain'}, ['Not found']] }
               end
 

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

@@ -109,7 +109,8 @@ describe Middleman::DataSource::Extension do
     Given.fixture 'imediate_use'
     @mm = Middleman::Fixture.app
 
-    expect( @mm.remote_data ).to match_array [{"item"=>"one"},{"item"=>"two"}]
+    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"}]
   end
 
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rspec'
+require 'rack/builder'
 require 'rack/test'
 require 'middleman'
 

data/spec/support/fixture.rb

@@ -1,19 +1,30 @@
+
+begin
+  require 'middleman-core/rack'
+rescue LoadError
+end
+
+
 module Middleman
   module Fixture
 
     class << self
 
-      def default env=:test
-        Middleman::Application.server.inst do
-          set :environment, env
-        end
-      end
-
       def app &block
         ENV['MM_ROOT'] = Given::TMP
-        Middleman::Application.server.inst do
-          instance_eval(&block) if block
+
+        if Middleman::Application.respond_to?(:server)
+          app = Middleman::Application.server.inst do
+            instance_eval(&block) if block
+          end
+        else
+          require 'middleman-core/renderers/sass'
+          app = Middleman::Application.new do
+            instance_eval(&block) if block
+          end
         end
+
+        app
       end
 
     end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: middleman-data_source
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: borrower
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Allow for loading data in middleman from remote sources