muve 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4f36cfe27c1f7f7ed994364976bc49c15c7e677
-  data.tar.gz: 3115d65888228e346e5d079367aa18867ee19b78
+  metadata.gz: 83efb234b5e0adc0d47b9d3d6263e03068a35631
+  data.tar.gz: 45802b059dcb15e55f077e6530df7268e21c3e08
 SHA512:
-  metadata.gz: cb4d0e4eddf27e19af900241cfc184d003b2ec84ed833d12bdfa7fe91bfd7f3623ab4f196d12b883b69e868584ec390eced54711f2fbddb64d4726702d0b3b8f
-  data.tar.gz: 6ad01f4ad7c17805edb36165bfe8b223bb430ef6c1baf2d0421e6269acfa9e974193a3db5256b812244acde4f0f221b99da6bc4ef1d6eb36d155a4bbf7790e63
+  metadata.gz: 5fbcbd69dd00b52e288a46d6c0d61db502f9e655bb6e2437aea3ac799c4863ee2cb86ef1b029a8161697d29f81147d0746aa12b542b0c2cf0a9c4d2a40aed96d
+  data.tar.gz: b8717958986af1366ede7c2e22676c0d6aa8bd92fd94a7c89c76c99c10369775247b7bbe0474e7cfa604c714624d470e96b29ec6b0776ca526bc6fe5eabbf992

data/lib/muve/model.rb

@@ -58,7 +58,7 @@ module Muve
 
     # Destroy a resource
     def destroy
-      if adaptor.delete(container, id) == true
+      if adaptor.delete(self.class.container, id) == true
         @destroyed = true 
       end
     end
@@ -107,7 +107,7 @@ module Muve
 
       details.each do |attr, value|
         next if invalid_attributes.include? attr.to_s
-        self.public_send "#{attr}=", value
+        self.public_send "#{attr}=", value if fields.include? attr.to_sym
       end
 
       @new_record = false if details.key? :id
@@ -121,32 +121,32 @@ module Muve
     # NOTE: not sure we need this
     def attributes
       data = {}
-      fields.each { |k| data[k.to_sym] = self.public_send(k) }
+      fields.select{ |k| k != invalid_attributes }.each { |k| 
+        data[k.to_sym] = self.public_send(k) 
+      }
       data
     end
 
+    def fields
+      []
+    end
+
     # Creates the record and performs the necessary housekeeping (e.g.: setting
     # the new id and un-marking the new_record?
     def create(attr)
-      @id = adaptor.create(container, attr)
+      @id = adaptor.create(self.class.container, attr)
       @new_record = false
     end
 
     # TODO: Update the record and return the number of modified rows
     def update(attr)
-      adaptor.update(container, id, attr)
+      adaptor.update(self.class.container, id, attr)
     end
 
     def adaptor
       self.class.adaptor
     end
 
-    def container
-    end
-
-    def details
-    end
-
     # Class methods exposed to all Muve models
     module ClassMethods
       # Configure the adaptor to take care of handling persistence for this

data/lib/muve/version.rb

@@ -1,3 +1,3 @@
 module Muve
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/location_spec.rb

@@ -1,51 +1,31 @@
 require 'spec_helper'
 
 describe Muve::Location do
-  before do
-    @lat, @lng = Faker::Geolocation.lat, Faker::Geolocation.lng
-  end
-
-  it 'knows its latitude and longitude' do
-    expect(Muve::Location.new(@lat, @lng).latitude).to eq(@lat)
-    expect(Muve::Location.new(@lat, @lng).longitude).to eq(@lng)
-  end
-
-  it 'gets the longitude through its aliases' do
-    location = Muve::Location.new(@lat, @lng)
-    expect(location.lng).to eq(@lng)
-  end
-
-  it 'gets the latitude through aliases' do
-    location = Muve::Location.new(@lat, @lng)
-    expect(location.lat).to eq(@lat)
-  end
-
-  it 'sets the longitude through its aliases' do
-    location = Muve::Location.new(@lat, @lng)
-
-    longitude = Faker::Geolocation.lng
-    location.lng = longitude
-    expect(location.longitude).to eq(longitude)
-
-    longitude = Faker::Geolocation.lng
-    location.long = longitude
-    expect(location.longitude).to eq(longitude)
-  end
-
-  it 'sets the latitude through its aliases' do
-    location = Muve::Location.new(@lat, @lng)
-    latitude = Faker::Geolocation.lat
-    location.lat = latitude
-    expect(location.latitude).to eq(latitude)
-  end
+  let(:latitude) { Faker::Geolocation.lat }
+  let(:longitude) { Faker::Geolocation.lng }
+
+  subject { Muve::Location.new(latitude, longitude) }
+  it { expect(subject.latitude).to eq(latitude) }
+  it { expect(subject.longitude).to eq(longitude) }
+  it { expect(subject.lat).to eq(latitude) }
+  it { expect(subject.long).to eq(longitude) }
+  it { expect(subject.lng).to eq(longitude) }
+
+  let(:new_latitude) { Faker::Geolocation.lat }
+  let(:new_longitude) { Faker::Geolocation.lng }
+  it { expect { subject.latitude = new_latitude }.to change{subject.latitude}.to(new_latitude) }
+  it { expect { subject.lat = new_latitude }.to change{subject.latitude}.to(new_latitude) }
+  it { expect { subject.longitude = new_longitude }.to change{subject.longitude}.to(new_longitude) }
+  it { expect { subject.long = new_longitude }.to change{subject.longitude}.to(new_longitude) }
+  it { expect { subject.lng = new_longitude }.to change{subject.longitude}.to(new_longitude) }
 
   it 'is invalid when latitude exceeds bounds' do
-    expect(Muve::Location.new(-91, @lng)).to be_invalid
-    expect(Muve::Location.new( 91, @lng)).to be_invalid
+    expect(Muve::Location.new(-91, longitude)).to be_invalid
+    expect(Muve::Location.new( 91, longitude)).to be_invalid
   end
 
   it 'is invalid when longitude exceeds bounds' do
-    expect(Muve::Location.new(@lat, -181)).to be_invalid
-    expect(Muve::Location.new(@lat,  181)).to be_invalid
+    expect(Muve::Location.new(latitude, -181)).to be_invalid
+    expect(Muve::Location.new(latitude,  181)).to be_invalid
   end
 end

data/spec/model_spec.rb

@@ -8,6 +8,7 @@ describe 'Model' do
         'resources'
       end
 
+      private
       def fields
         [:name, :version]
       end
@@ -21,6 +22,7 @@ describe 'Model' do
         'other_resources'
       end
 
+      private
       def fields
         [:name, :version, :description]
       end
@@ -50,6 +52,7 @@ describe 'Model' do
 
   it 'knows the identifier of its repository' do
     expect(Resource).to respond_to(:container)
+    expect(Resource.container).to eq('resources')
   end
 
   it 'allows the setting of the adaptor' do
@@ -222,11 +225,16 @@ describe 'Model' do
       it 'is not a new record' do
         expect { @res.destroy }.to change{ @res.destroyed? }.to(true)
       end
-    end
-
-    it 'calls the delete handler upon remove' do
-      expect(GenericAdaptor).to receive(:delete).once
-      @res.destroy
+  
+      it 'calls the delete handler upon remove' do
+        expect(GenericAdaptor).to receive(:delete).once
+        @res.destroy
+      end
+  
+      it 'calls the delete handler with the proper details' do
+        expect(GenericAdaptor).to receive(:delete).with('other_resources', @id).once
+        @res.destroy
+      end
     end
 
     it 'calls the update handler upon save on a resource with an id' do

data/spec/movement_spec.rb

@@ -1,37 +1,40 @@
 require 'spec_helper'
 
 describe Muve::Movement do
-  it 'knows a location and a traveller and possibly a time' do
-    expect(Muve::Movement.new).to respond_to(:traveller)
-    expect(Muve::Movement.new).to respond_to(:location)
-    expect(Muve::Movement.new).to respond_to(:time)
-  end
+  subject { Muve::Movement.new }
 
-  it 'is invalid without a traveller' do
-    expect(build(Muve::Movement, traveller: nil)).to be_invalid
-  end
+  it { is_expected.to respond_to(:traveller) }
+  it { is_expected.to respond_to(:location) }
+  it { is_expected.to respond_to(:time) }
 
-  it 'is invalid without a location' do
-    expect(build(Muve::Movement, location: nil)).to be_invalid
+  shared_examples "a invalid resource" do
+    it { is_expected.to be_invalid }
   end
 
-  it 'assumes the current time unless specified' do
-    expect(build(Muve::Movement).time).to be_within(2).of(Time.now)
+  context "without traveller" do
+    subject { build(Muve::Movement, traveller: nil) }
+    it_behaves_like "a invalid resource"
   end
 
-  it 'accepts keeps the specified' do
-    last_time = Time.now - rand(500000)
-    expect(build(Muve::Movement, time: last_time).time).to eq(last_time)
+  context "without location" do
+    subject { build(Muve::Movement, location: nil) }
+    it_behaves_like "a invalid resource"
   end
 
-  it 'is valid with a traveller and location' do
-    expect(build(Muve::Movement)).to be_valid
+  context "with explicitely set time" do
+    let(:time_of_interest) { Time.now - rand(500000) }
+    subject { build(Muve::Movement, time: time_of_interest) }
+    it { expect(subject.time).to eq(time_of_interest) }
   end
 
-  it 'knows a connection' do
-    expect(Muve::Movement.new).to respond_to(:connection)
+  context "new movement" do
+    subject { build(Muve::Movement) }
+    it { expect(subject.time).to be_within(2).of(Time.now) }
+    it { is_expected.to be_valid }
   end
 
+  it { is_expected.to respond_to(:connection) }
+
   it 'shares the connection among other models' do
     connection = Object.new
     Muve.init(connection)

data/spec/traveller_spec.rb

@@ -1,12 +1,13 @@
 require 'spec_helper'
 
 describe Muve::Traveller do
-  it 'has an id' do
-    expect(Muve::Traveller.new).to respond_to(:id)
-  end
+  subject { Muve::Traveller.new }
+
+  it { is_expected.to respond_to(:id) }
+  it { is_expected.to be_invalid }
 
-  it 'is invalid without an id' do
-    expect(Muve::Traveller.new).to be_invalid
-    expect(Muve::Traveller.new(SecureRandom.uuid)).to be_valid
+  context "linked to an existing traveller" do
+    subject { Muve::Traveller.new(SecureRandom.uuid) }
+    it { is_expected.to be_valid }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muve
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - David Asabina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies: []
 description: Basic helpers to be used with Muvement
 email: