magic_lamp 1.0.0 → 1.1.0

data/spec/lib/magic_lamp_spec.rb

@@ -2,22 +2,35 @@ require "rails_helper"
 
 describe MagicLamp do
   context "attr_accessor" do
-    it { is_expected.to respond_to :registered_fixtures }
-    it { is_expected.to respond_to :registered_fixtures= }
-
-    it { is_expected.to respond_to :configuration }
-    it { is_expected.to respond_to :configuration= }
+    it { is_expected.to attr_accessorize(:registered_fixtures) }
+    it { is_expected.to attr_accessorize(:configuration) }
   end
 
   context "aliases" do
-    let(:register_fixture) { subject.method(:register_fixture) }
+    MagicLamp::REGISTER_FIXTURE_ALIASES.each do |method_name|
+      it { is_expected.to alias_the_method(:register_fixture).to(method_name) }
+    end
+  end
 
-    it "rub is the same as register_fixture" do
-      expect(subject.method(:rub)).to eq(register_fixture)
+  describe "#define" do
+    let(:block) { proc { "foo" } }
+    let(:options) { { foo: :bar } }
+
+    it "creates a new defaults manager and evaluates the block in its context" do
+      suspect = subject.define(options) do |block_arg|
+        @foo = "foo"
+      end
+      expect(suspect).to be_a(MagicLamp::DefaultsManager)
+      expect(suspect.instance_variable_get(:@foo)).to eq("foo")
+      expect(suspect.configuration).to eq(subject.configuration)
+      expect(suspect.defaults).to eq(options)
+      expect(suspect.parent).to be_nil
     end
 
-    it "wish is the same as register_fixture" do
-      expect(subject.method(:wish)).to eq(register_fixture)
+    it "raises an error if it's not given a block" do
+      expect do
+        subject.define
+      end.to raise_error(MagicLamp::ArgumentError, /define requires a block/)
     end
   end
 
@@ -53,12 +66,16 @@ describe MagicLamp do
 
   describe "#register_fixture" do
     let(:fixture_name) { "foo" }
-    let(:controller_class) { "doesn't matter here" }
+    let(:controller_class) { ::ApplicationController }
     let(:block) { proc { "so?" } }
-
-    it "caches the controller class and block" do
-      subject.register_fixture(controller: controller_class, name: fixture_name, &block)
-      expect(subject.registered_fixtures[fixture_name]).to eq([controller_class, block])
+    let(:extensions) { [1, 2, 3] }
+
+    it "caches the controller class, block, and extensions" do
+      subject.register_fixture(controller: controller_class, name: fixture_name, extend: extensions, &block)
+      at_fixture_name = subject.registered_fixtures[fixture_name]
+      expect(at_fixture_name[:controller]).to eq(controller_class)
+      expect(at_fixture_name[:render_block]).to eq(block)
+      expect(at_fixture_name[:extend]).to eq(extensions)
     end
 
     it "raises an error without a block" do
@@ -67,7 +84,7 @@ describe MagicLamp do
       end.to raise_error(MagicLamp::ArgumentError, /register_fixture requires a block/)
     end
 
-    context "don't infer names" do
+    context "without name inference" do
       it "raises an error without a specified name" do
         subject.configuration.infer_names = false
         expect do
@@ -81,7 +98,24 @@ describe MagicLamp do
 
       it "uses ApplicationController as the default controller" do
         subject.register_fixture { render :index }
-        expect(at_index.first).to eq(::ApplicationController)
+        expect(at_index[:controller]).to eq(::ApplicationController)
+      end
+
+      context "extend" do
+        it "defaults to an empty array" do
+          subject.register_fixture { render :index }
+          expect(at_index[:extend]).to eq([])
+        end
+
+        it "wraps a bare object in an array" do
+          subject.register_fixture(extend: "foo") { render :index }
+          expect(at_index[:extend]).to eq(["foo"])
+        end
+
+        it "does not double wrap an array" do
+          subject.register_fixture(extend: ["foo"]) { render :index }
+          expect(at_index[:extend]).to eq(["foo"])
+        end
       end
 
       context "fixture name" do
@@ -92,18 +126,31 @@ describe MagicLamp do
           end.to raise_error(MagicLamp::AlreadyRegisteredFixtureError, "a fixture called 'index' has already been registered")
         end
 
-        context "ApplicationController" do
-          it "uses the first argument to render when given 2" do
-            render_block = proc { render :index, foo: :bar }
-            subject.register_fixture(controller: ::ApplicationController, &render_block)
+        context "namespacing" do
+          it "removes 'application'" do
+            subject.register_fixture(namespace: "application/orders/application/foos") { render :foo }
+            expect(subject.registered_fixtures).to_not have_key("application/orders/application/foos/foo")
+            expect(subject.registered_fixtures).to have_key("orders/foos/foo")
+          end
 
-            expect(at_index).to eq([::ApplicationController, render_block])
+          it "prevents double namespacing" do
+            subject.register_fixture(namespace: "orders/orders/foos/orders/orders/bars") { render :foo }
+            expect(subject.registered_fixtures).to_not have_key("orders/orders/foos/orders/orders/bars/foo")
+            expect(subject.registered_fixtures).to have_key("orders/foos/orders/bars/foo")
           end
+        end
 
-          it "uses the only argument when it isn't a hash" do
-            render_block = proc { render :index }
-            subject.register_fixture(controller: ::ApplicationController, &render_block)
-            expect(at_index).to eq([::ApplicationController, render_block])
+        context "with ApplicationController" do
+          let(:index) { "index" }
+
+          it "is the first argument to render when given 2" do
+            subject.register_fixture(controller: ::ApplicationController) { render :index, foo: :bar }
+            expect(subject.registered_fixtures).to have_key(index)
+          end
+
+          it "is the only argument when it isn't a hash" do
+            subject.register_fixture(controller: ::ApplicationController) { render :index }
+            expect(subject.registered_fixtures).to have_key(index)
           end
 
           it "passes its configuration object to the render catcher" do
@@ -111,39 +158,70 @@ describe MagicLamp do
             subject.register_fixture { render :foo }
           end
 
-          context "1 hash argument" do
+          context "and 1 hash argument to render" do
             it "raises an error if it can't figure out a default name" do
               expect do
                 subject.register_fixture(controller: ::ApplicationController) { render collection: [1, 2, 3] }
               end.to raise_error(MagicLamp::AmbiguousFixtureNameError, /Unable to infer fixture name/)
             end
 
-            it "uses the name at the template key" do
-              render_block = proc { render template: :index }
-              subject.register_fixture(controller: ::ApplicationController, &render_block)
-              expect(at_index).to eq([::ApplicationController, render_block])
+            it "is the name at the template key" do
+              subject.register_fixture(controller: ::ApplicationController) { render template: :index }
+              expect(subject.registered_fixtures).to have_key(index)
             end
 
-            it "uses the name at the partial key" do
-              render_block = proc { render partial: :index }
-              subject.register_fixture(controller: ::ApplicationController, &render_block)
-              expect(at_index).to eq([::ApplicationController, render_block])
+            it "is the name at the partial key" do
+              subject.register_fixture(controller: ::ApplicationController) { render partial: :partial }
+              expect(subject.registered_fixtures).to have_key("partial")
             end
           end
-        end
 
-        context "other controller" do
-          it "prepends the controller's name to the fixture_name" do
-            render_block = proc { render partial: :index }
-            subject.register_fixture(controller: OrdersController, &render_block)
-            expect(subject.registered_fixtures["orders/index"]).to eq([OrdersController, render_block])
+          context "namespacing" do
+            it "prepends the namespace to the front of the fixture name when inferred" do
+              subject.register_fixture(controller: ::ApplicationController, namespace: "foo") do
+                render :bar
+              end
+              expect(subject.registered_fixtures).to have_key("foo/bar")
+            end
+
+            it "prepends the namespace to the front of the fixture name when specified" do
+              subject.register_fixture(controller: ::ApplicationController, namespace: "foo", name: "baz") do
+                render :bar
+              end
+              expect(subject.registered_fixtures).to have_key("foo/baz")
+            end
           end
+        end
 
-          it "does not prepend the controller's name when it is already the beginning of the string" do
-            render_block = proc { render partial: "orders/order" }
-            subject.register_fixture(controller: OrdersController, &render_block)
-            expect(subject.registered_fixtures["orders/orders/order"]).to be_nil
-            expect(subject.registered_fixtures["orders/order"]).to eq([OrdersController, render_block])
+        context "with another controller" do
+          context "namespacing" do
+            context "unspecified namespace" do
+              it "namespaces the fixture name with the controller's name" do
+                subject.register_fixture(controller: OrdersController) { render partial: :index }
+                expect(subject.registered_fixtures).to_not have_key("index")
+                expect(subject.registered_fixtures).to have_key("orders/index")
+              end
+
+              it "does not prepend the controller's name when it is already the beginning of the string" do
+                subject.register_fixture(controller: OrdersController) { render partial: "orders/order" }
+                expect(subject.registered_fixtures).to_not have_key("orders/orders/order")
+                expect(subject.registered_fixtures).to have_key("orders/order")
+              end
+            end
+
+            context "specified namespace" do
+              it "does not use the controller's name as a namespace" do
+                subject.register_fixture(controller: OrdersController, namespace: "foo") { render partial: :index }
+                expect(subject.registered_fixtures).to_not have_key("orders/index")
+                expect(subject.registered_fixtures).to have_key("foo/index")
+              end
+
+              it "does not prepend the namespace when the fixture name starts with the string" do
+                subject.register_fixture(controller: OrdersController, namespace: "foo") { render partial: "foo/order" }
+                expect(subject.registered_fixtures).to_not have_key("foo/foo/order")
+                expect(subject.registered_fixtures).to have_key("foo/order")
+              end
+            end
           end
         end
       end
@@ -159,14 +237,14 @@ describe MagicLamp do
     it "does not raise an error if there's no config" do
       allow(Dir).to receive(:[]).and_return([])
       expect(subject).to_not receive(:registered_fixtures)
-      subject.load_config
+      expect { subject.load_config }.to_not raise_error
     end
   end
 
   describe "#load_lamp_files" do
     it "loads all lamp files" do
       subject.load_lamp_files
-      expect(subject.registered_fixtures["orders/foo"]).to be_an(Array)
+      expect(subject.registered_fixtures["orders/foo"]).to be_a(Hash)
     end
 
     it "blows out registered_fixtures on each call" do
@@ -186,7 +264,6 @@ describe MagicLamp do
   end
 
   describe "#registered?" do
-
     it "returns true if the fixture is registered" do
       subject.registered_fixtures["foo"] = :something
       expect(subject.registered?("foo")).to eq(true)
@@ -199,13 +276,19 @@ describe MagicLamp do
 
   describe "#generate_fixture" do
     let(:block) { proc { render :foo } }
+    let(:fixture_name) { "foo_test" }
+    let(:extensions) { 3.times.map { Module.new } }
 
     before do
-      subject.registered_fixtures["foo_test"] = [OrdersController, block]
+      subject.registered_fixtures[fixture_name] = {
+        controller: OrdersController,
+        render_block: block,
+        extend: extensions
+      }
     end
 
     it "returns the template" do
-      expect(subject.generate_fixture("foo_test")).to eq("foo\n")
+      expect(subject.generate_fixture(fixture_name)).to eq("foo\n")
     end
 
     it "raises an error when told to generate a template that is not registered" do
@@ -214,11 +297,21 @@ describe MagicLamp do
       end.to raise_error(MagicLamp::UnregisteredFixtureError, /is not a registered fixture/)
     end
 
-    it "passes its configuration object to the render catcher" do
-      subject.registered_fixtures["foo"] = []
+    it "passes its configuration object to the fixture creator" do
       dummy = double(generate_template: :generate_template)
       expect(MagicLamp::FixtureCreator).to receive(:new).with(subject.configuration).and_return(dummy)
-      subject.generate_fixture("foo")
+      subject.generate_fixture(fixture_name)
+    end
+
+    it "passes the controller, extensions, and block to the fixture creator's generate_template method" do
+      dummy = double
+      allow(MagicLamp::FixtureCreator).to receive(:new).and_return(dummy)
+      expect(dummy).to receive(:generate_template) do |controller, extend_args, &passed_block|
+        expect(controller).to eq(OrdersController)
+        expect(extend_args).to eq(extensions)
+        expect(passed_block).to eq(block)
+      end
+      subject.generate_fixture(fixture_name)
     end
   end
 

data/spec/lib/render_catcher_spec.rb

@@ -6,8 +6,7 @@ describe MagicLamp::RenderCatcher do
   it { is_expected.to be_kind_of(MagicLamp::Callbacks) }
 
   context "attr_accessor" do
-    it { is_expected.to respond_to :render_argument }
-    it { is_expected.to respond_to :render_argument= }
+    it { is_expected.to attr_accessorize :render_argument }
   end
 
   describe "#render" do

data/spec/spec_helper.rb

@@ -14,7 +14,32 @@
 # users commonly want.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+require "fantaskspec"
+MAIN_OBJECT = self
+
+RSpec::Matchers.define :alias_the_method do |method_name|
+  match do |actual|
+    if actual.respond_to?(method_name) && actual.respond_to?(@other_method_name)
+      aliased_method = actual.method(@other_method_name)
+      original_method = actual.method(method_name)
+      aliased_method.original_name == original_method.name
+    end
+  end
+
+  chain :to do |other_method_name|
+    @other_method_name = other_method_name
+  end
+end
+
+RSpec::Matchers.define :attr_accessorize do |attribute_name|
+  match do |actual|
+    actual.respond_to?(attribute_name) && actual.respond_to?("#{attribute_name}=")
+  end
+end
+
 RSpec.configure do |config|
+  config.infer_rake_task_specs_from_file_location!
+
   config.before(:each) do
     MagicLamp.registered_fixtures = {}
     MagicLamp.configuration = MagicLamp::Configuration.new
@@ -65,6 +90,7 @@ RSpec.configure do |config|
     # For more details, see:
     #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
     expectations.syntax = :expect
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
   # rspec-mocks config goes here. You can use an alternate test double

data/spec/tasks/fixture_names_task_spec.rb

@@ -1,23 +1,15 @@
 require "rails_helper"
 
-describe "Fixture names task" do
-  let(:task) { Rake::Task["magic_lamp:fixture_names"] }
+describe "magic_lamp:fixture_names" do
+  it { is_expected.to depend_on(:environment) }
 
   it "outputs a sorted list of all the fixture names" do
-    dummy = Object.new
-    task_proc = task.actions.first
-
-    expect(dummy).to receive(:puts) do |output|
+    expect(MAIN_OBJECT).to receive(:puts) do |output|
       fixture_names = MagicLamp.registered_fixtures.keys.sort
       expect(output).to_not be_empty
       expect(output).to eq(fixture_names)
     end
 
-    dummy.instance_eval(&task_proc)
-  end
-
-  it "depends on the environment task" do
-    prereqs = task.all_prerequisite_tasks
-    expect(prereqs).to include(Rake::Task["environment"])
+    subject.execute
   end
 end

data/spec/tasks/lint_task_spec.rb

@@ -1,17 +1,11 @@
 require "rails_helper"
 
-describe "Lint task" do
-  let(:task) { Rake::Task["magic_lamp:lint"] }
+describe "magic_lamp:lint" do
+  it { is_expected.to depend_on(:environment) }
 
   it "generates all fixtures" do
     expect(MagicLamp).to receive(:generate_all_fixtures)
-    dummy = double(puts: nil)
-    task_proc = task.actions.first
-    dummy.instance_eval(&task_proc)
-  end
-
-  it "depends on the environment task" do
-    prereqs = task.all_prerequisite_tasks
-    expect(prereqs).to include(Rake::Task["environment"])
+    allow(MAIN_OBJECT).to receive(:puts).and_return(:puts)
+    subject.execute
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_lamp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Crismali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fantaskspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +202,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- VERSION
 - app/assets/javascripts/magic_lamp.js
 - app/assets/javascripts/magic_lamp/application.js
 - app/assets/javascripts/magic_lamp/boot.js
@@ -188,6 +217,8 @@ files:
 - lib/magic_lamp.rb
 - lib/magic_lamp/callbacks.rb
 - lib/magic_lamp/configuration.rb
+- lib/magic_lamp/constants.rb
+- lib/magic_lamp/defaults_manager.rb
 - lib/magic_lamp/engine.rb
 - lib/magic_lamp/fixture_creator.rb
 - lib/magic_lamp/render_catcher.rb
@@ -210,6 +241,7 @@ files:
 - spec/dummy/app/views/orders/edit.html.erb
 - spec/dummy/app/views/orders/foo.html.erb
 - spec/dummy/app/views/orders/index.html.erb
+- spec/dummy/app/views/orders/needs_extending.html.erb
 - spec/dummy/app/views/orders/new.html.erb
 - spec/dummy/app/views/orders/show.html.erb
 - spec/dummy/bin/bundle
@@ -368,6 +400,7 @@ files:
 - spec/javascripts/support/underscore-1.6.js
 - spec/lib/callbacks_spec.rb
 - spec/lib/configuration_spec.rb
+- spec/lib/defaults_manager_spec.rb
 - spec/lib/fixture_creator_spec.rb
 - spec/lib/magic_lamp_spec.rb
 - spec/lib/render_catcher_spec.rb
@@ -415,6 +448,7 @@ test_files:
 - spec/dummy/app/views/orders/edit.html.erb
 - spec/dummy/app/views/orders/foo.html.erb
 - spec/dummy/app/views/orders/index.html.erb
+- spec/dummy/app/views/orders/needs_extending.html.erb
 - spec/dummy/app/views/orders/new.html.erb
 - spec/dummy/app/views/orders/show.html.erb
 - spec/dummy/bin/bundle
@@ -575,6 +609,7 @@ test_files:
 - spec/javascripts/support/underscore-1.6.js
 - spec/lib/callbacks_spec.rb
 - spec/lib/configuration_spec.rb
+- spec/lib/defaults_manager_spec.rb
 - spec/lib/fixture_creator_spec.rb
 - spec/lib/magic_lamp_spec.rb
 - spec/lib/render_catcher_spec.rb
@@ -583,3 +618,4 @@ test_files:
 - spec/tasks/fixture_names_task_spec.rb
 - spec/tasks/lint_task_spec.rb
 - spec/teaspoon_env.rb
+has_rdoc: