acts_as_api 0.4.4 → 1.0.0

data/spec/support/model_examples/closures.rb

@@ -1,49 +1,41 @@
-shared_examples_for "calling a closure in the api template" do
+shared_examples_for 'calling a closure in the api template' do
+  describe 'i.e. a proc (the record is passed as only parameter)' do
+    subject(:response) { @luke.as_api_response(:calling_a_proc) }
 
-  describe "i.e. a proc (the record is passed as only parameter)" do
-
-    before(:each) do
-      @response = @luke.as_api_response(:calling_a_proc)
-    end
-
-    it "returns a hash" do
-      @response.should be_kind_of(Hash)
+    it 'returns a hash' do
+      expect(response).to be_kind_of(Hash)
     end
 
-    it "returns the correct number of fields" do
-      @response.should have(2).keys
+    it 'returns the correct number of fields' do
+      expect(response).to have(2).keys
     end
 
-    it "returns all specified fields" do
-      @response.keys.sort_by(&:to_s).should eql([:all_caps_name, :without_param])
+    it 'returns all specified fields' do
+      expect(response.keys.sort_by(&:to_s)).to eql([:all_caps_name, :without_param])
     end
 
-    it "returns the correct values for the specified fields" do
-      @response.values.sort.should eql(["LUKE SKYWALKER", "Time"])
+    it 'returns the correct values for the specified fields' do
+      expect(response.values.sort).to eql(['LUKE SKYWALKER', 'Time'])
     end
   end
 
-  describe "i.e. a lambda (the record is passed as only parameter)" do
+  describe 'i.e. a lambda (the record is passed as only parameter)' do
+    subject(:response) { @luke.as_api_response(:calling_a_lambda) }
 
-    before(:each) do
-      @response = @luke.as_api_response(:calling_a_lambda)
+    it 'returns a hash' do
+      expect(response).to be_kind_of(Hash)
     end
 
-    it "returns a hash" do
-      @response.should be_kind_of(Hash)
+    it 'returns the correct number of fields' do
+      expect(response).to have(2).keys
     end
 
-    it "returns the correct number of fields" do
-      @response.should have(2).keys
+    it 'returns all specified fields' do
+      expect(response.keys.sort_by(&:to_s)).to eql([:all_caps_name, :without_param])
     end
 
-    it "returns all specified fields" do
-      @response.keys.sort_by(&:to_s).should eql([:all_caps_name, :without_param])
+    it 'returns the correct values for the specified fields' do
+      expect(response.values.sort).to eql(['LUKE SKYWALKER', 'Time'])
     end
-
-    it "returns the correct values for the specified fields" do
-      @response.values.sort.should eql(["LUKE SKYWALKER", "Time"])
-    end
-
   end
 end

data/spec/support/model_examples/conditional_if.rb

@@ -1,165 +1,133 @@
-shared_examples_for "conditional if statements" do
-
-  describe "using the :if option" do
-
-    describe "passing a symbol" do
-
-      describe "that returns false" do
-
-        before(:each) do
-          @response = @luke.as_api_response(:if_over_thirty)
+shared_examples_for 'conditional if statements' do
+  describe 'using the :if option' do
+    describe 'passing a symbol' do
+      describe 'that returns false' do
+        subject(:response) { @luke.as_api_response(:if_over_thirty) }
+
+        it 'returns a hash' do
+          expect(response).to be_kind_of(Hash)
         end
 
-        it "returns a hash" do
-          @response.should be_kind_of(Hash)
+        it 'returns the correct number of fields' do
+          expect(response).to have(1).keys
         end
 
-        it "returns the correct number of fields" do
-          @response.should have(1).keys
+        it 'will not add the conditional field but all others' do
+          expect(response.keys).to include(:first_name)
+          expect(response.keys).not_to include(:full_name)
         end
 
-        it "won't add the conditional field but all others" do
-          @response.keys.should include(:first_name)
-          @response.keys.should_not include(:full_name)
+        it 'the other specified fields have the correct value' do
+          expect(response.values).to include(@luke.first_name)
         end
-
-        it "the other specified fields have the correct value" do
-          @response.values.should include(@luke.first_name)
-        end
-
       end
 
-      describe "that returns nil" do
+      describe 'that returns nil' do
+        subject(:response) { @luke.as_api_response(:if_returns_nil) }
 
-        before(:each) do
-          @response = @luke.as_api_response(:if_returns_nil)
+        it 'returns a hash' do
+          expect(response).to be_kind_of(Hash)
         end
 
-        it "returns a hash" do
-          @response.should be_kind_of(Hash)
+        it 'returns the correct number of fields' do
+          expect(response).to have(1).keys
         end
 
-        it "returns the correct number of fields" do
-          @response.should have(1).keys
+        it 'will not add the conditional field but all others' do
+          expect(response.keys).to include(:first_name)
+          expect(response.keys).not_to include(:full_name)
         end
 
-        it "won't add the conditional field but all others" do
-          @response.keys.should include(:first_name)
-          @response.keys.should_not include(:full_name)
+        it 'the other specified fields have the correct value' do
+          expect(response.values).to include(@luke.first_name)
         end
-
-        it "the other specified fields have the correct value" do
-          @response.values.should include(@luke.first_name)
-        end
-
       end
 
-      describe "that returns true" do
+      describe 'that returns true' do
+        subject(:response) { @han.as_api_response(:if_over_thirty) }
 
-        before(:each) do
-          @response = @han.as_api_response(:if_over_thirty)
+        it 'returns a hash' do
+          expect(response).to be_kind_of(Hash)
         end
 
-        it "returns a hash" do
-          @response.should be_kind_of(Hash)
+        it 'returns the correct number of fields' do
+          expect(response).to have(2).keys
         end
 
-        it "returns the correct number of fields" do
-          @response.should have(2).keys
+        it 'will not add the conditional field but all others' do
+          expect(response.keys).to include(:first_name)
+          expect(response.keys).to include(:last_name)
         end
 
-        it "won't add the conditional field but all others" do
-          @response.keys.should include(:first_name)
-          @response.keys.should include(:last_name)
+        it 'the other specified fields have the correct value' do
+          expect(response.values).to include(@han.first_name, @han.last_name)
         end
-
-        it "the other specified fields have the correct value" do
-          @response.values.should include(@han.first_name, @han.last_name)
-        end
-
       end
-
     end
-
   end
 
-  describe "passing a proc" do
-
-    describe "that returns false" do
-
-      before(:each) do
-        @response = @luke.as_api_response(:if_over_thirty_proc)
-      end
+  describe 'passing a proc' do
+    describe 'that returns false' do
+      subject(:response) { @luke.as_api_response(:if_over_thirty_proc) }
 
-      it "returns a hash" do
-        @response.should be_kind_of(Hash)
+      it 'returns a hash' do
+        expect(response).to be_kind_of(Hash)
       end
 
-      it "returns the correct number of fields" do
-        @response.should have(1).keys
+      it 'returns the correct number of fields' do
+        expect(response).to have(1).keys
       end
 
-      it "won't add the conditional field but all others" do
-        @response.keys.should include(:first_name)
-        @response.keys.should_not include(:full_name)
+      it 'will not add the conditional field but all others' do
+        expect(response.keys).to include(:first_name)
+        expect(response.keys).not_to include(:full_name)
       end
 
-      it "the other specified fields have the correct value" do
-        @response.values.should include(@luke.first_name)
+      it 'the other specified fields have the correct value' do
+        expect(response.values).to include(@luke.first_name)
       end
-
     end
 
-    describe "that returns nil" do
-
-      before(:each) do
-        @response = @luke.as_api_response(:if_returns_nil_proc)
-      end
+    describe 'that returns nil' do
+      subject(:response) { @luke.as_api_response(:if_returns_nil_proc) }
 
-      it "returns a hash" do
-        @response.should be_kind_of(Hash)
+      it 'returns a hash' do
+        expect(response).to be_kind_of(Hash)
       end
 
-      it "returns the correct number of fields" do
-        @response.should have(1).keys
+      it 'returns the correct number of fields' do
+        expect(response).to have(1).keys
       end
 
-      it "won't add the conditional field but all others" do
-        @response.keys.should include(:first_name)
-        @response.keys.should_not include(:full_name)
+      it 'will not add the conditional field but all others' do
+        expect(response.keys).to include(:first_name)
+        expect(response.keys).not_to include(:full_name)
       end
 
-      it "the other specified fields have the correct value" do
-        @response.values.should include(@luke.first_name)
+      it 'the other specified fields have the correct value' do
+        expect(response.values).to include(@luke.first_name)
       end
-
     end
 
-    describe "that returns true" do
-
-      before(:each) do
-        @response = @han.as_api_response(:if_over_thirty_proc)
-      end
+    describe 'that returns true' do
+      subject(:response) { @han.as_api_response(:if_over_thirty_proc) }
 
-      it "returns a hash" do
-        @response.should be_kind_of(Hash)
+      it 'returns a hash' do
+        expect(response).to be_kind_of(Hash)
       end
 
-      it "returns the correct number of fields" do
-        @response.should have(2).keys
+      it 'returns the correct number of fields' do
+        expect(response).to have(2).keys
       end
 
-      it "won't add the conditional field but all others" do
-        @response.keys.should include(:first_name)
-        @response.keys.should include(:last_name)
+      it 'will not add the conditional field but all others' do
+        expect(response.keys).to include(:first_name)
+        expect(response.keys).to include(:last_name)
       end
 
-      it "the other specified fields have the correct value" do
-        @response.values.should include(@han.first_name, @han.last_name)
+      it 'the other specified fields have the correct value' do
+        expect(response.values).to include(@han.first_name, @han.last_name)
       end
-
     end
-
   end
 end
-

data/spec/support/model_examples/conditional_unless.rb

@@ -1,165 +1,133 @@
-shared_examples_for "conditional unless statements" do
-
-  describe "using the :unless option" do
-
-    describe "passing a symbol" do
-
-      describe "that returns false" do
-
-        before(:each) do
-          @response = @luke.as_api_response(:unless_under_thirty)
+shared_examples_for 'conditional unless statements' do
+  describe 'using the :unless option' do
+    describe 'passing a symbol' do
+      describe 'that returns false' do
+        subject(:response) { @luke.as_api_response(:unless_under_thirty) }
+
+        it 'returns a hash' do
+          expect(response).to be_kind_of(Hash)
         end
 
-        it "returns a hash" do
-          @response.should be_kind_of(Hash)
+        it 'returns the correct number of fields' do
+          expect(response).to have(1).keys
         end
 
-        it "returns the correct number of fields" do
-          @response.should have(1).keys
+        it 'will not add the conditional field but all others' do
+          expect(response.keys).to include(:first_name)
+          expect(response.keys).not_to include(:full_name)
         end
 
-        it "won't add the conditional field but all others" do
-          @response.keys.should include(:first_name)
-          @response.keys.should_not include(:full_name)
+        it 'the other specified fields have the correct value' do
+          expect(response.values).to include(@luke.first_name)
         end
-
-        it "the other specified fields have the correct value" do
-          @response.values.should include(@luke.first_name)
-        end
-
       end
 
-      describe "that returns nil" do
+      describe 'that returns nil' do
+        subject(:response) { @luke.as_api_response(:unless_returns_nil) }
 
-        before(:each) do
-          @response = @luke.as_api_response(:unless_returns_nil)
+        it 'returns a hash' do
+          expect(response).to be_kind_of(Hash)
         end
 
-        it "returns a hash" do
-          @response.should be_kind_of(Hash)
+        it 'returns the correct number of fields' do
+          expect(response).to have(2).keys
         end
 
-        it "returns the correct number of fields" do
-          @response.should have(2).keys
+        it 'will not add the conditional field but all others' do
+          expect(response.keys).to include(:first_name)
+          expect(response.keys).to include(:last_name)
         end
 
-        it "won't add the conditional field but all others" do
-          @response.keys.should include(:first_name)
-          @response.keys.should include(:last_name)
+        it 'the other specified fields have the correct value' do
+          expect(response.values).to include(@luke.first_name, @luke.last_name)
         end
-
-        it "the other specified fields have the correct value" do
-          @response.values.should include(@luke.first_name, @luke.last_name)
-        end
-
       end
 
-      describe "that returns true" do
+      describe 'that returns true' do
+        subject(:response) { @han.as_api_response(:unless_under_thirty) }
 
-        before(:each) do
-          @response = @han.as_api_response(:unless_under_thirty)
+        it 'returns a hash' do
+          expect(response).to be_kind_of(Hash)
         end
 
-        it "returns a hash" do
-          @response.should be_kind_of(Hash)
+        it 'returns the correct number of fields' do
+          expect(response).to have(2).keys
         end
 
-        it "returns the correct number of fields" do
-          @response.should have(2).keys
+        it 'will not add the conditional field but all others' do
+          expect(response.keys).to include(:first_name)
+          expect(response.keys).to include(:last_name)
         end
 
-        it "won't add the conditional field but all others" do
-          @response.keys.should include(:first_name)
-          @response.keys.should include(:last_name)
+        it 'the other specified fields have the correct value' do
+          expect(response.values).to include(@han.first_name, @han.last_name)
         end
-
-        it "the other specified fields have the correct value" do
-          @response.values.should include(@han.first_name, @han.last_name)
-        end
-
       end
-
     end
-
   end
 
-  describe "passing a proc" do
-
-    describe "that returns false" do
-
-      before(:each) do
-        @response = @luke.as_api_response(:unless_under_thirty_proc)
-      end
+  describe 'passing a proc' do
+    describe 'that returns false' do
+      subject(:response) { @luke.as_api_response(:unless_under_thirty_proc) }
 
-      it "returns a hash" do
-        @response.should be_kind_of(Hash)
+      it 'returns a hash' do
+        expect(response).to be_kind_of(Hash)
       end
 
-      it "returns the correct number of fields" do
-        @response.should have(1).keys
+      it 'returns the correct number of fields' do
+        expect(response).to have(1).keys
       end
 
-      it "won't add the conditional field but all others" do
-        @response.keys.should include(:first_name)
-        @response.keys.should_not include(:full_name)
+      it 'will not add the conditional field but all others' do
+        expect(response.keys).to include(:first_name)
+        expect(response.keys).not_to include(:full_name)
       end
 
-      it "the other specified fields have the correct value" do
-        @response.values.should include(@luke.first_name)
+      it 'the other specified fields have the correct value' do
+        expect(response.values).to include(@luke.first_name)
       end
-
     end
 
-    describe "that returns nil" do
-
-      before(:each) do
-        @response = @luke.as_api_response(:if_returns_nil_proc)
-      end
+    describe 'that returns nil' do
+      subject(:response) { @luke.as_api_response(:if_returns_nil_proc) }
 
-      it "returns a hash" do
-        @response.should be_kind_of(Hash)
+      it 'returns a hash' do
+        expect(response).to be_kind_of(Hash)
       end
 
-      it "returns the correct number of fields" do
-        @response.should have(1).keys
+      it 'returns the correct number of fields' do
+        expect(response).to have(1).keys
       end
 
-      it "won't add the conditional field but all others" do
-        @response.keys.should include(:first_name)
-        @response.keys.should_not include(:full_name)
+      it 'will not add the conditional field but all others' do
+        expect(response.keys).to include(:first_name)
+        expect(response.keys).not_to include(:full_name)
       end
 
-      it "the other specified fields have the correct value" do
-        @response.values.should include(@luke.first_name)
+      it 'the other specified fields have the correct value' do
+        expect(response.values).to include(@luke.first_name)
       end
-
     end
 
-    describe "that returns true" do
-
-      before(:each) do
-        @response = @han.as_api_response(:unless_under_thirty_proc)
-      end
+    describe 'that returns true' do
+      subject(:response) { @han.as_api_response(:unless_under_thirty_proc) }
 
-      it "returns a hash" do
-        @response.should be_kind_of(Hash)
+      it 'returns a hash' do
+        expect(response).to be_kind_of(Hash)
       end
 
-      it "returns the correct number of fields" do
-        @response.should have(2).keys
+      it 'returns the correct number of fields' do
+        expect(response).to have(2).keys
       end
 
-      it "won't add the conditional field but all others" do
-        @response.keys.should include(:first_name)
-        @response.keys.should include(:last_name)
+      it 'will not add the conditional field but all others' do
+        expect(response.keys).to include(:first_name)
+        expect(response.keys).to include(:last_name)
       end
 
-      it "the other specified fields have the correct value" do
-        @response.values.should include(@han.first_name, @han.last_name)
+      it 'the other specified fields have the correct value' do
+        expect(response.values).to include(@han.first_name, @han.last_name)
       end
-
     end
-
   end
-
 end