kalibro_gem 0.0.1.rc17 → 0.0.1.rc18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24f925dbbaf13c9a84e2b7b122548edf45c5b40e
-  data.tar.gz: c09a1d431de84a771d80026d67b329fcf0468ada
+  metadata.gz: b08d40ee1a65aa9776e0424662e0783c9c804db3
+  data.tar.gz: 8093846611b9be8e0cc3c89c0a209db0370647d7
 SHA512:
-  metadata.gz: 262a79e487e79243e6e97866ef0ae14d14aafddaccec6b86d542e2ee4eecccf295d878ceb0bcc1290cc558da0726540a33d0cf78d44263779bdbcc8405bfad25
-  data.tar.gz: 61528adbf75d240b0cc0e7867b238bf10e532ad6eaf18c060ba1495d63aa06edf1d47add4d5cadc7c338acd076ccb334041b5802539cb7c3db186ae58292f625
+  metadata.gz: 3892c2cb2c3921a85c305b50b4aca72eab468f1fdde4a0c58e2c9ecafc4d6fb9eb0a9dfd61cf66a16e9ac21678b399ee519802e33042a86b445529e03133f3d1
+  data.tar.gz: 5fd585c3f90c3e8fc47162d0551707b9a3f5ac040827cec5b3880507b51d4c41ae6d7e397e5460582e5728f447a79f8ff5925bb1ea68bd3c854a1b0ce906a6f0

data/features/range/save.feature

@@ -17,8 +17,7 @@ Feature: Save
   Scenario: When there is not a metric configuration
     Given I have a reading group with name "Group"
     And I have a reading within the given reading group
-    And I have an unsaved range within the given reading
-    When I ask to save the given range with an inexistent metric configuration
+    When I try to save a range with an inexistent metric configuration
     Then I should get an error in range kalibro errors attribute
 
   @kalibro_restart

data/features/step_definitions/range_steps.rb

@@ -1,6 +1,6 @@
 Given(/^I have a range within the given reading$/) do
-  @range = FactoryGirl.build(:range, {id: nil, reading_id: @reading.id})
-  @range.save @metric_configuration.id
+  @range = FactoryGirl.build(:range, {id: nil, reading_id: @reading.id, metric_configuration_id: @metric_configuration.id})
+  @range.save
 end
 
 Given(/^I have an unsaved range$/) do
@@ -8,21 +8,28 @@ Given(/^I have an unsaved range$/) do
 end
 
 Given(/^I have an unsaved range within the given reading$/) do
-  @range = FactoryGirl.build(:range, {id: nil, reading_id: @reading.id})
+  @range = FactoryGirl.build(:range, {id: nil, reading_id: @reading.id, metric_configuration_id: @metric_configuration.id})
 end
 
 When(/^I ask to save the given range$/) do
-  @range.save @metric_configuration.id
+  @range.save
 end
 
 When(/^I ask to save the given range with an inexistent metric configuration$/) do
-  @range.save rand(Time.now.to_i)
+  @range.metric_configuration_id = rand(Time.now.to_i)
+  @range.save 
 end
 
 When(/^I ask ranges of the given metric configuration$/) do
   @response = KalibroGem::Entities::Range.ranges_of @metric_configuration.id
 end
 
+When(/^I try to save a range with an inexistent metric configuration$/) do
+    @range = FactoryGirl.build(:range, {id: nil, reading_id: @reading.id})
+    @range.metric_configuration_id = rand(Time.now.to_i)
+    @range.save 
+end 
+
 When(/^I ask for all the ranges$/) do
   @response = KalibroGem::Entities::Range.all
 end
@@ -49,7 +56,7 @@ Then(/^I should get an error in range kalibro errors attribute$/) do
 end
 
 Then(/^the id of the given range should be set$/) do
- @range.id.should_not eq(0)
+  @range.id.should_not eq(0)
 end
 
 Then(/^it should return the same range as the given one$/) do

data/lib/kalibro_gem/entities/range.rb

@@ -20,7 +20,7 @@ module KalibroGem
   module Entities
     class Range < Model
 
-      attr_accessor :id, :beginning, :end, :reading_id, :comments
+      attr_accessor :id, :beginning, :end, :reading_id, :comments, :metric_configuration_id
 
       def id=(value)
         @id = value.to_i
@@ -54,23 +54,6 @@ module KalibroGem
         self.create_objects_array_from_hash request(:ranges_of, {metric_configuration_id: metric_configuration_id} )[:range]
       end
 
-      def save(metric_configuration_id)
-        begin
-          @id = self.class.request(:save_range, {:range => self.to_hash, :metric_configuration_id => metric_configuration_id})[:range_id]
-          true
-        rescue Exception => exception
-          add_error exception
-          false
-        end
-      end
-
-      private
-
-      def reading
-        @reading ||= KalibroGem::Entities::Reading.find(reading_id)
-        @reading
-      end
-
       def self.all
         metric_configurations = []
         ranges = []
@@ -101,6 +84,17 @@ module KalibroGem
           return false
         end
       end
+
+      private
+
+      def save_params
+        {:range => self.to_hash, :metric_configuration_id => self.metric_configuration_id}
+      end
+
+      def reading
+        @reading ||= KalibroGem::Entities::Reading.find(reading_id)
+        @reading
+      end
     end
   end
-end
+end

data/lib/kalibro_gem/version.rb

@@ -15,5 +15,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module KalibroGem
-  VERSION = "0.0.1.rc17"
+  VERSION = "0.0.1.rc18"
 end

data/spec/entities/range_spec.rb

@@ -134,47 +134,20 @@ describe KalibroGem::Entities::Range do
     end
   end
 
+  # The only purpose of this test is to cover the overrided save_params method
   describe 'save' do
-    let(:metric_configuration) { FactoryGirl.build(:metric_configuration) }
-    
-    context 'when kalibro does not save' do
-      before :each do
-        any_error_message = ""
-        any_code = rand(Time.now.to_i)
-
-        KalibroGem::Entities::Range.
-          expects(:request).
-          with(:save_range, {:range => subject.to_hash, :metric_configuration_id => metric_configuration.id}).
-          raises(Savon::SOAPFault.new(any_error_message, any_code))
-      end
-
-      it 'should returns false' do
-        subject.save(metric_configuration.id).should eq(false)
-      end
+    subject {FactoryGirl.build(:range, {id: nil})}
 
-      it 'should set the error on kalibro_errors attribute' do
-        subject.save(metric_configuration.id)
-        subject.kalibro_errors.should_not eq([])
-      end
+    before :each do
+      KalibroGem::Entities::Range.
+        expects(:request).
+        with(:save_range, {:range => subject.to_hash, :metric_configuration_id => subject.metric_configuration_id}).
+        returns({:range_id => 2})
     end
 
-    context 'when kalibro saves the range' do
-      let(:new_id) { rand(Time.now.to_i) }
-      before :each do
-        KalibroGem::Entities::Range.
-          expects(:request).
-          with(:save_range, {:range => subject.to_hash, :metric_configuration_id => metric_configuration.id}).
-          returns({range_id: new_id})
-      end
-
-      it 'should returns true' do
-        subject.save(metric_configuration.id).should eq(true)
-      end
-
-      it 'should set the id attribute' do
-        subject.save(metric_configuration.id)
-        subject.id.should eq(new_id)
-      end
+    it 'should make a request to save model with id and return true without errors' do
+      subject.save.should be(true)
+      subject.kalibro_errors.should be_empty
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kalibro_gem
 version: !ruby/object:Gem::Version
-  version: 0.0.1.rc17
+  version: 0.0.1.rc18
 platform: ruby
 authors:
 - Carlos Morais
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler