json-rigs 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1b5071004ba3dbb211567a93bd9f1e6abae17c6
-  data.tar.gz: 6bdedbf07a0bac649bf6974ddb0fa2c06c3edd1b
+  metadata.gz: 11bd6f19e66a92d5555bb2627629b39fe6a4bc94
+  data.tar.gz: 16d7f93eaac261677e99cd292d9ba1b0477aa513
 SHA512:
-  metadata.gz: f5655dd7ea5ff601f3006db20b1a9fc3cb40ded6086a87d7c1dd8047127743ffa681b7854e947fb4934da0834e80694b9811b1eb7d7f28dc521b025748330ead
-  data.tar.gz: e9dcb96a57265427cf7d22843ce704515ac0d18d775b70d664834c646067157551861fd0d815d08e1cc0d8523d01b89328050351e5ed1532cb7569d9eb04d519
+  metadata.gz: 13496c0df69e5f81b6c574220859b28322c15e7d8b8db77e077cc17d37132565575605c4eef899ec13512251814bb55485c4a3f384362cb74462f312b3078df1
+  data.tar.gz: c572f014c9acbf33d0e78ad9936dce72cce15f3fd2952da8e456a95ef43d0fb17d033ac242d9403d1e1bdc66da3b1c7153b4a2c5691bfc03098dc66fc7d81013

data/lib/json-rigs/fixture.rb

@@ -1,5 +1,3 @@
-require 'json-rigs/fixture-templates'
-
 module JsonRigs
   class Fixture
 
@@ -14,9 +12,15 @@ module JsonRigs
     alias_method :delay, :pause_time=
   end
 
-  class FixturedAction
-    include JsonRigs::FixtureTemplates
+  class DynamicFixture < Fixture
+    attr_accessor :dynamic_response
+
+    def respond_to params
+      @dynamic_response.call(params)
+    end
+  end
 
+  class FixturedAction
     attr_reader :fixtures, :url 
     attr_accessor :active_fixture_name
 
@@ -31,12 +35,33 @@ module JsonRigs
       fixture = Fixture.new
       @fixtures[fixture_name.to_s] = fixture
       fixture.instance_eval &block
-      @active_fixture_name = ''
+    end
+
+    def dynamic_fixture fixture_name, proc
+      fixture = DynamicFixture.new
+      @fixtures[fixture_name.to_s] = fixture
+      fixture.dynamic_response = proc
     end
 
     def active_fixture; @fixtures[@active_fixture_name] end
     def active_fixture?; !@active_fixture_name.empty? end
 
+    def active_fixture_name=(fixture_name)
+      return unless has_fixture?(fixture_name) or fixture_name.empty?
+      @active_fixture_name = fixture_name
+    end
+
+    def has_fixture? fixture_name
+      @fixtures[fixture_name.to_s]
+    end
+
+    def remove_fixture fixture_name
+      if @active_fixture_name == fixture_name
+        @active_fixture_name = ''
+      end
+      @fixtures.delete(fixture_name)
+    end
+
     def to_hash
       fixture_hash = @fixtures.keys.each_with_object({}) do |fixture_name, hash|
         hash[fixture_name] = @active_fixture_name == fixture_name

data/lib/json-rigs/fixtures.rb

@@ -53,6 +53,13 @@ module JsonRigs
       end
     end
 
+    def self.remove_action(url, method, response_name)
+      action = find_action(url, method)
+      if action
+        action.remove_fixture(response_name.to_s)
+      end
+    end
+
     def self.clear_all!
       @actions = {}
     end

data/lib/json-rigs/server.rb

@@ -16,12 +16,18 @@ module JsonRigs
     def self.load_fixtures
       puts "Loading fixtures from #{settings.fixture_path}..."
       Dir[File.join(settings.fixture_path, '**/*.json')].each do |f|
-        load_fixture(f)
+        load_static_fixture(f)
+      end
+      Dir[File.join(settings.fixture_path, '**/*.rb')].each do |f|
+        load_dynamic_fixture(f)
       end
     end
 
     def self.load_fixture(f)
-      puts "Loading #{f}..."
+      File.extname(f) == '.rb' ? load_dynamic_fixture(f) : load_static_fixture(f)
+    end
+
+    def self.extract_pieces_or_halt(f)
       relevant_path = f.sub(/\A#{settings.fixture_path}/, '')
       pieces = Pathname(relevant_path).each_filename.to_a
 
@@ -37,6 +43,13 @@ module JsonRigs
       url = pieces[0...-2].join('/')
       method = pieces[-2]
       response_name = File.basename(pieces[-1], ".*")
+
+      [url, method, response_name]
+    end
+
+    def self.load_static_fixture(f)
+      puts "Loading #{f}..."
+      url, method, response_name = extract_pieces_or_halt(f)
       contents = File.read(f)
       JsonRigs::Fixtures::fixture_action url, method do
         fixture response_name.to_sym do
@@ -45,8 +58,24 @@ module JsonRigs
       end
     end
 
+    def self.load_dynamic_fixture(f)
+      puts "Loading #{f}..."
+      url, method, response_name = extract_pieces_or_halt(f)
+      contents = File.read(f)
+      JsonRigs::Fixtures::fixture_action url, method do
+        dynamic_fixture response_name.to_sym, eval(contents)
+      end
+    end
+
+    def self.remove_fixture(f)
+      puts "Removing #{f}..."
+      url, method, response_name = extract_pieces_or_halt(f)
+
+      JsonRigs::Fixtures::remove_action url, method, response_name
+    end
+
     helpers do
-      def serve_request(servlet_url, method)
+      def serve_request(servlet_url, params, method)
         action = JsonRigs::Fixtures::find_action(servlet_url, method)
         halt "unknown action '#{servlet_url} #{method}'" unless action
 
@@ -63,11 +92,17 @@ module JsonRigs
             sleep(fixture.pause_time)
           end
 
+          if fixture.class == JsonRigs::DynamicFixture
+            response = fixture.respond_to params
+          else
+            response = fixture.response
+          end
+
           content_type 'application/json'
-          return fixture.response
+          response
         else
           logger.info 'No fixture specified, using stub response.'
-          return '{ "success": false, "error_code": 0 }'
+          return 500, "{ \"success\": false, \"error\": \"No fixture specified. Please visit the test panel and chose a fixture for #{method} /#{servlet_url}\" }"
         end
       end
 
@@ -135,19 +170,19 @@ module JsonRigs
     end
 
     get '/*' do |servlet_url|
-      serve_request(servlet_url, :GET)
+      serve_request(servlet_url, request.params, :GET)
     end
 
     post '/*' do |servlet_url|
-      serve_request(servlet_url, :POST)
+      serve_request(servlet_url, request.params, :POST)
     end
 
     put '/*' do |servlet_url|
-      serve_request(servlet_url, :PUT)
+      serve_request(servlet_url, request.params, :PUT)
     end
 
     delete '/*' do |servlet_url|
-      serve_request(servlet_url, :DELETE)
+      serve_request(servlet_url, request.params, :DELETE)
     end
   end
 
@@ -166,7 +201,7 @@ module JsonRigs
         JsonRigs::Fixtures::load_active_fixtures
 
         # Start listener on fixture path to reload fixtures if necessary.
-        listener = Listen.to(fixture_path, only: /\.json$/) { |modified, added, removed|
+        listener = Listen.to(fixture_path, only: /\.(json|rb)$/) { |modified, added, removed|
           on_fixture_change(modified, added, removed)
         }
         listener.start
@@ -179,8 +214,12 @@ module JsonRigs
       def on_fixture_change(modified, added, removed)
         puts 'Reloading fixtures...'
 
-        JsonRigs::Fixtures::clear_all!
-        FixtureServer::load_fixtures
+        removed.map do |f|
+          FixtureServer::remove_fixture(f)
+        end
+        (modified + added).map do |f|
+          FixtureServer::load_fixture(f)
+        end
         JsonRigs::Fixtures::load_active_fixtures
 
         puts 'Fixtures reloaded.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-rigs
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Clinkle
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -82,8 +82,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 description: Serve fixtured API responses quickly and easily. Runs a tiny sinatra
-  server that serves .json files from disk. Control which fixtures are being used
-  at localhost:port/test-panel. Great for QA and fast prototyping.
+  server that serves static .json files or dynamic .rb files from disk. Control which
+  fixtures are being used at localhost:port/test-panel. Great for QA and fast prototyping.
 email:
 - alex@clinkle.com
 - 21echoes@gmail.com
@@ -95,7 +95,6 @@ files:
 - bin/jrigs
 - lib/json-rigs.rb
 - lib/json-rigs/client.rb
-- lib/json-rigs/fixture-templates.rb
 - lib/json-rigs/fixture.rb
 - lib/json-rigs/fixtures.rb
 - lib/json-rigs/server.rb

data/lib/json-rigs/fixture-templates.rb

@@ -1,22 +0,0 @@
-module JsonRigs
-  module FixtureTemplates
-    def basic_post_fixture
-      fixture :success do
-        respond_with %q(
-{
-    "success": true
-}
-        )
-      end
-
-      fixture :failure do
-        respond_with %q(
-{
-    "error_code": 0, 
-    "success": false
-}
-        )
-      end
-    end
-  end
-end