g5_updatable 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3da77bb3b76b2b886e1bbbbca5150cdc8335d2d3
-  data.tar.gz: 650fa27e5eb4bb1c47198c4ffb8872d19a73d24e
+  metadata.gz: 6e5c5697b79384b5cc532c8a9d692f15784475fb
+  data.tar.gz: 7b862cf10c89e412bbb68d42004934539b5aaecc
 SHA512:
-  metadata.gz: 4e6833532814f8e51d4cf898659e8f55051fa6939b1b39f57eca409d422654e91858db1f7a2c5d6ae2bbdbf12b5a3684f5b8924bea150b13bde7bfa912ff3734
-  data.tar.gz: a68b14ed307b852fbdeccd95016055c6daa112927ddc4beef94cf4d17e43ec383a93e069b8ea21148a1100d52ef7366663d0cf28e7a01d4d6d6f6ae4fe772b7e
+  metadata.gz: 968edabc4d300e1fa34c6d56448ab37e28e64f1fccc08304899db06f1c30b19ef34910f63a9a9fd4ba3fb781a6da2eaaad530ce1fc058d4714279748ae13f54c
+  data.tar.gz: a29f3772392f43e9492cda4f923a2e6ca097c99216f7084c186bf546b4b9fddf919e5a95a124f8708a415e5e6a39b0926aca1d23cf5595377562f450cadaa5aa

data/app/controllers/g5_updatable/syncs_controller.rb

@@ -1,12 +1,18 @@
 class G5Updatable::SyncsController < G5Updatable::BaseUpdatableController
 
+  before_filter :set_client
+
   def index
-    timestamp = G5Updatable::Location.maximum(:updated_at)
+    timestamp = @client.locations.max_updated_at
     render json: {updated_at: formatted_timestamp(timestamp)}
   end
 
   private
 
+  def set_client
+    @client = G5Updatable::Client.find_by_urn!(params[:urn])
+  end  
+
   def formatted_timestamp(timestamp)
     timestamp.in_time_zone.strftime("%I:%M%P on %B %e, %Y") if timestamp
   end  

data/app/models/g5_updatable/client.rb

@@ -10,6 +10,5 @@ module G5Updatable
     })
 
     validates :uid, :urn, presence: true
-
   end
 end

data/app/models/g5_updatable/location.rb

@@ -6,5 +6,8 @@ module G5Updatable
 
     validates :uid, :urn, :client_uid, presence: true
 
+    scope :by_client_uid, -> (client_uid) { where(client_uid: client_uid) }
+    scope :max_updated_at, -> { maximum(:updated_at) }  
+
   end
 end

data/lib/g5_updatable/locations_updater.rb

@@ -6,14 +6,14 @@ class G5Updatable::LocationsUpdater
   def update
     @g5_locations.each do |g5_location|
       attributes = g5_location.location_hash.dup
-
       G5Updatable::Location.
           find_or_initialize_by(uid: attributes[:uid]).
           update_attributes!(
               urn:        attributes[:urn],
               name:       attributes[:name],
               client_uid: attributes[:client_uid],
-              properties: attributes
+              properties: attributes,
+              updated_at: DateTime.now
           )
     end
   end

data/lib/g5_updatable/version.rb

@@ -1,3 +1,3 @@
 module G5Updatable
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/controllers/syncs_controller_spec.rb

@@ -4,17 +4,27 @@ describe G5Updatable::SyncsController, type: :controller do
   routes { G5Updatable::Engine.routes }
 
   describe 'GET index' do
-    let!(:location) { create(:location) }
-    let!(:location2) { create(:location) }
+    let(:client){ create(:client) }
+    let!(:location) { create(:location, client: client) }
+    let!(:location2) { create(:location, client: client) }
+    let!(:location3) { create(:location, client: create(:client)) }
     let(:expected_result) { location2.updated_at.in_time_zone.strftime("%I:%M%P on %B %e, %Y") }
+    let(:params) { {urn: client.urn } }
 
-    before do
-      get :index
-      @result = JSON.parse response.body
+    subject do
+      get :index, params
+      JSON.parse response.body
     end
 
-    it 'serializes' do
-      expect(@result['updated_at']).to eq(expected_result)
-    end
+    its(['updated_at']){ should eq(expected_result) }
+
+    describe "no client" do
+      let(:params) { {urn: "xxx" } }
+
+      it "raises" do
+        # This error will cause rails to return a 404 in production
+        expect{ subject }.to raise_error(ActiveRecord::RecordNotFound)
+      end  
+    end  
   end
 end