brainstem 0.2.4 → 0.2.5

data/spec/brainstem/presenter_spec.rb

@@ -10,18 +10,18 @@ describe Brainstem::Presenter do
 
       it "records itself as the presenter for the named class as a string" do
         @klass.presents "String"
-        Brainstem.presenter_collection.for(String).should be_a(@klass)
+        expect(Brainstem.presenter_collection.for(String)).to be_a(@klass)
       end
 
       it "records itself as the presenter for the given class" do
         @klass.presents String
-        Brainstem.presenter_collection.for(String).should be_a(@klass)
+        expect(Brainstem.presenter_collection.for(String)).to be_a(@klass)
       end
 
       it "records itself as the presenter for the named classes" do
         @klass.presents String, Array
-        Brainstem.presenter_collection.for(String).should be_a(@klass)
-        Brainstem.presenter_collection.for(Array).should be_a(@klass)
+        expect(Brainstem.presenter_collection.for(String)).to be_a(@klass)
+        expect(Brainstem.presenter_collection.for(Array)).to be_a(@klass)
       end
     end
 
@@ -33,12 +33,12 @@ describe Brainstem::Presenter do
 
       it "uses the closest module name as the presenter namespace" do
         V1::SomePresenter.presents String
-        Brainstem.presenter_collection(:v1).for(String).should be_a(V1::SomePresenter)
+        expect(Brainstem.presenter_collection(:v1).for(String)).to be_a(V1::SomePresenter)
       end
 
       it "does not map namespaced presenters into the default namespace" do
         V1::SomePresenter.presents String
-        Brainstem.presenter_collection.for(String).should be_nil
+        expect(Brainstem.presenter_collection.for(String)).to be_nil
       end
     end
 
@@ -57,10 +57,10 @@ describe Brainstem::Presenter do
       end
 
       it "includes and extends the given module" do
-        lambda { @klass.new.call_helper }.should raise_error
+        expect { @klass.new.call_helper }.to raise_error
         @klass.helper @helper
-        @klass.new.call_helper.should == "I work"
-        @klass.foo.should == "I work"
+        expect(@klass.new.call_helper).to eq("I work")
+        expect(@klass.foo).to eq("I work")
       end
     end
 
@@ -71,13 +71,13 @@ describe Brainstem::Presenter do
 
       it "creates an entry in the filters class ivar" do
         @klass.filter(:foo, :default => true) { 1 }
-        @klass.filters[:foo][0].should eq({"default" => true})
-        @klass.filters[:foo][1].should be_a(Proc)
+        expect(@klass.filters[:foo][0]).to eq({"default" => true})
+        expect(@klass.filters[:foo][1]).to be_a(Proc)
       end
 
       it "accepts names without blocks" do
         @klass.filter(:foo)
-        @klass.filters[:foo][1].should be_nil
+        expect(@klass.filters[:foo][1]).to be_nil
       end
     end
 
@@ -88,7 +88,7 @@ describe Brainstem::Presenter do
 
       it "creates an entry in the search class ivar" do
         @klass.search do end
-        @klass.search_block.should be_a(Proc)
+        expect(@klass.search_block).to be_a(Proc)
       end
     end
   end
@@ -112,8 +112,8 @@ describe Brainstem::Presenter do
 
       it "outputs the associated object's id and type" do
         data = @presenter.present_and_post_process(@post)
-        data[:id].should eq(@post.id.to_s)
-        data[:body].should eq(@post.body)
+        expect(data[:id]).to eq(@post.id.to_s)
+        expect(data[:body]).to eq(@post.body)
       end
     end
 
@@ -137,12 +137,12 @@ describe Brainstem::Presenter do
         iso8601_date = /\d{4}-\d{2}-\d{2}/
 
         struct = TimePresenter.new.present_and_post_process("something")
-        struct[:time].should =~ iso8601_time
-        struct[:date].should =~ iso8601_date
-        struct[:recursion][:time].should =~ iso8601_time
-        struct[:recursion][:something].first.should =~ iso8601_time
-        struct[:recursion][:something].last.should == :else
-        struct[:recursion][:foo].should == :bar
+        expect(struct[:time]).to match(iso8601_time)
+        expect(struct[:date]).to match(iso8601_date)
+        expect(struct[:recursion][:time]).to match(iso8601_time)
+        expect(struct[:recursion][:something].first).to match(iso8601_time)
+        expect(struct[:recursion][:something].last).to eq(:else)
+        expect(struct[:recursion][:foo]).to eq(:bar)
       end
     end
 
@@ -155,25 +155,48 @@ describe Brainstem::Presenter do
             {
               :body => model.body,
               :subject => association(:subject),
-              :another_subject => association(:subject)
+              :another_subject => association(:subject),
+              :something_else => association(:subject, :ignore_type => true)
             }
           end
         end
 
         @presenter = some_presenter.new
-        @post = Post.first
       end
 
-      it "outputs the associated object's id and type" do
-        data = @presenter.present_and_post_process(@post)
-        data[:subject_id].should eq(@post.subject_id.to_s)
-        data[:subject_type].should eq(@post.subject_type)
+      let(:presented_data) { @presenter.present_and_post_process(post) }
+
+      context "when polymorphic association exists" do
+        let(:post) { Post.find(1) }
+
+
+        it "outputs the object as a hash with the id & class table name" do
+          expect(presented_data[:subject_ref]).to eq({ :id => post.subject.id.to_s,
+                                                       :key => post.subject.class.table_name })
+        end
+
+        it "outputs custom names for the object as a hash with the id & class table name" do
+          expect(presented_data[:another_subject_ref]).to eq({ :id => post.subject.id.to_s,
+                                                               :key => post.subject.class.table_name })
+        end
+
+        it "skips the polymorphic handling when ignore_type is true" do
+          expect(presented_data[:something_else_id]).to eq(post.subject.id.to_s)
+          expect(presented_data).not_to have_key(:something_else_type)
+          expect(presented_data).not_to have_key(:something_else_ref)
+        end
       end
 
-      it "outputs custom names for an associated object's id and type" do
-        data = @presenter.present_and_post_process(@post)
-        data[:another_subject_id].should eq(@post.subject_id.to_s)
-        data[:another_subject_type].should eq(@post.subject_type)
+      context "when polymorphic association does not exist" do
+        let(:post) { Post.find(3) }
+
+        it "outputs nil" do
+          expect(presented_data[:subject_ref]).to be_nil
+        end
+
+        it "outputs nil" do
+          expect(presented_data[:another_subject_ref]).to be_nil
+        end
       end
     end
 
@@ -202,43 +225,43 @@ describe Brainstem::Presenter do
 
       it "should not convert or return non-included associations, but should return <association>_id for belongs_to relationships, plus all fields" do
         json = @presenter.present_and_post_process(@workspace, [])
-        json.keys.should =~ [:id, :updated_at, :something_id, :user_id]
+        expect(json.keys).to match_array([:id, :updated_at, :something_id, :user_id])
       end
 
       it "should convert requested has_many associations (includes) into the <association>_ids format" do
-        @workspace.tasks.length.should > 0
-        @presenter.present_and_post_process(@workspace, ["tasks"])[:task_ids].should =~ @workspace.tasks.map(&:id).map(&:to_s)
+        expect(@workspace.tasks.length).to be > 0
+        expect(@presenter.present_and_post_process(@workspace, ["tasks"])[:task_ids]).to match_array(@workspace.tasks.map(&:id).map(&:to_s))
       end
 
       it "should convert requested belongs_to and has_one associations into the <association>_id format when requested" do
-        @presenter.present_and_post_process(@workspace, ["user"])[:user_id].should == @workspace.user.id.to_s
+        expect(@presenter.present_and_post_process(@workspace, ["user"])[:user_id]).to eq(@workspace.user.id.to_s)
       end
 
       it "converts non-association models into <model>_id format when they are requested" do
-        @presenter.present_and_post_process(@workspace, ["lead_user"])[:lead_user_id].should == @workspace.lead_user.id.to_s
+        expect(@presenter.present_and_post_process(@workspace, ["lead_user"])[:lead_user_id]).to eq(@workspace.lead_user.id.to_s)
       end
 
       it "handles associations provided with lambdas" do
-        @presenter.present_and_post_process(@workspace, ["lead_user_with_lambda"])[:lead_user_with_lambda_id].should == @workspace.lead_user.id.to_s
-        @presenter.present_and_post_process(@workspace, ["tasks_with_lambda"])[:tasks_with_lambda_ids].should == @workspace.tasks.map(&:id).map(&:to_s)
+        expect(@presenter.present_and_post_process(@workspace, ["lead_user_with_lambda"])[:lead_user_with_lambda_id]).to eq(@workspace.lead_user.id.to_s)
+        expect(@presenter.present_and_post_process(@workspace, ["tasks_with_lambda"])[:tasks_with_lambda_ids]).to eq(@workspace.tasks.map(&:id).map(&:to_s))
       end
 
       it "should return <association>_id fields when the given association ids exist on the model whether it is requested or not" do
-        @presenter.present_and_post_process(@workspace, ["user"])[:user_id].should == @workspace.user_id.to_s
+        expect(@presenter.present_and_post_process(@workspace, ["user"])[:user_id]).to eq(@workspace.user_id.to_s)
 
         json = @presenter.present_and_post_process(@workspace, [])
-        json.keys.should =~ [:user_id, :something_id, :id, :updated_at]
-        json[:user_id].should == @workspace.user_id.to_s
-        json[:something_id].should == @workspace.user_id.to_s
+        expect(json.keys).to match_array([:user_id, :something_id, :id, :updated_at])
+        expect(json[:user_id]).to eq(@workspace.user_id.to_s)
+        expect(json[:something_id]).to eq(@workspace.user_id.to_s)
       end
 
       it "should return null, not empty string when ids are missing" do
         @workspace.user = nil
         @workspace.tasks = []
-        @presenter.present_and_post_process(@workspace, ["lead_user_with_lambda"])[:lead_user_with_lambda_id].should == nil
-        @presenter.present_and_post_process(@workspace, ["user"])[:user_id].should == nil
-        @presenter.present_and_post_process(@workspace, ["something"])[:something_id].should == nil
-        @presenter.present_and_post_process(@workspace, ["tasks"])[:task_ids].should == []
+        expect(@presenter.present_and_post_process(@workspace, ["lead_user_with_lambda"])[:lead_user_with_lambda_id]).to eq(nil)
+        expect(@presenter.present_and_post_process(@workspace, ["user"])[:user_id]).to eq(nil)
+        expect(@presenter.present_and_post_process(@workspace, ["something"])[:something_id]).to eq(nil)
+        expect(@presenter.present_and_post_process(@workspace, ["tasks"])[:task_ids]).to eq([])
       end
 
       context "when the model has an <association>_id method but no column" do
@@ -246,7 +269,7 @@ describe Brainstem::Presenter do
           def @workspace.synthetic_id
             raise "this explodes because it's not an association"
           end
-          @presenter.present_and_post_process(@workspace, []).should_not have_key(:synthetic_id)
+          expect(@presenter.present_and_post_process(@workspace, [])).not_to have_key(:synthetic_id)
         end
       end
     end

data/spec/brainstem_spec.rb

@@ -4,22 +4,22 @@ describe Brainstem do
   describe "default_namespace attribute" do
     it "can be set and read" do
       Brainstem.default_namespace = "something"
-      Brainstem.default_namespace.should eq("something")
+      expect(Brainstem.default_namespace).to eq("something")
     end
 
     it "returns 'none' if unset" do
-      Brainstem.default_namespace.should eq("none")
+      expect(Brainstem.default_namespace).to eq("none")
     end
   end
 
   describe "presenter collection method" do
     it "returns an instance of PresenterCollection" do
-      Brainstem.presenter_collection.should be_a(Brainstem::PresenterCollection)
+      expect(Brainstem.presenter_collection).to be_a(Brainstem::PresenterCollection)
     end
 
     it "accepts a namespace" do
-      Brainstem.presenter_collection("v1").should be_a(Brainstem::PresenterCollection)
-      Brainstem.presenter_collection("v1").should_not eq(Brainstem.presenter_collection)
+      expect(Brainstem.presenter_collection("v1")).to be_a(Brainstem::PresenterCollection)
+      expect(Brainstem.presenter_collection("v1")).not_to eq(Brainstem.presenter_collection)
     end
   end
 end

data/spec/spec_helpers/db.rb

@@ -76,4 +76,5 @@ Task.create!(:id => 3, :workspace_id => 1, :parent_id => 2, :name => "Green pref
 Task.create!(:id => 4, :workspace_id => 1, :parent_id => 2, :name => "One bunch")
 
 Post.create!(:id => 1, :subject => Workspace.first, :body => "first post!")
-Post.create!(:id => 2, :subject => Task.first, :body => "this is important. get on it!")
+Post.create!(:id => 2, :subject => Task.first, :body => "this is important. get on it!")
+Post.create!(:id => 3, :body => "Post without subject")

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: brainstem
 version: !ruby/object:Gem::Version
-  version: 0.2.4
-  prerelease: 
+  version: 0.2.5
 platform: ruby
 authors:
 - Mavenlink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -131,27 +116,24 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- brainstem.gemspec
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Guardfile
+- LICENSE
+- README.md
+- Rakefile
+- brainstem.gemspec
+- lib/brainstem.rb
 - lib/brainstem/association_field.rb
 - lib/brainstem/controller_methods.rb
 - lib/brainstem/engine.rb
 - lib/brainstem/presenter.rb
 - lib/brainstem/presenter_collection.rb
 - lib/brainstem/search_unavailable_error.rb
+- lib/brainstem/test_helpers.rb
 - lib/brainstem/time_classes.rb
 - lib/brainstem/version.rb
-- lib/brainstem.rb
-- LICENSE
-- pkg/brainstem-0.0.2.gem
-- pkg/brainstem-0.2.1.gem
-- pkg/brainstem-0.2.2.gem
-- pkg/brainstem-0.2.gem
-- Rakefile
-- README.md
 - spec/brainstem/controller_methods_spec.rb
 - spec/brainstem/presenter_collection_spec.rb
 - spec/brainstem/presenter_spec.rb
@@ -163,33 +145,26 @@ files:
 homepage: http://github.com/mavenlink/brainstem
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1278718761883180932
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1278718761883180932
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord presenters with a rich request API
 test_files:
 - spec/brainstem/controller_methods_spec.rb