lhs 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c11e58cb09f9ff88f5fcc1fe3c89709482fc4089
-  data.tar.gz: b37486d8daa8d33ddd1556f3ce5e02f637d78b54
+  metadata.gz: f8f2de0442c0fd0c96714b05351fb4c2391b92ac
+  data.tar.gz: 293a214e0e8f3df3e4dd1a5a6f2e126975e64f62
 SHA512:
-  metadata.gz: 8a6fb56d82bb2f1807f60685b74f83226fd3a8c99b1727353e2ac6888b6491febef33c5be0d9e281eed67ddf5d657609b389a4b222150f790e3ec079e618add5
-  data.tar.gz: 821ac2f5ef3c9bd221937243c33634ba5ad4032311bc4f54a9db276a3b3d9ddf3414085749a389b9d4a15b0edcaae36786b53564098e5d7e94b22b5e852fde8f
+  metadata.gz: 54c9049ccdc8e552de6f46a30d10015887cdf8f5846fa1b896b0e3b72ba3a49d69f3e31d82e1cf18ecfab4f04282fb7b2ae17f2c98e80699f21e55eb2577f1b8
+  data.tar.gz: a63d017d4a76de45b613f66c69c7755fd71c59dbd8f18736f58d7b435b86501e18843feea8158122c78fe31db50044a9b39f3b65f3b486d244958ae6cd928197

data/lib/lhs/concerns/record/endpoints.rb

@@ -47,9 +47,13 @@ class LHS::Record
       end
 
       # Prevent clashing endpoints.
-      def sanity_check(endpoint)
-        placeholders = endpoint.placeholders
-        fail 'Clashing endpoints.' if endpoints.any? { |e| e.placeholders.sort == placeholders.sort }
+      def sanity_check(new_endpoint)
+        endpoints.each do |existing_endpoint|
+          invalid = existing_endpoint.placeholders.sort == new_endpoint.placeholders.sort &&
+            existing_endpoint.url != new_endpoint.url
+          next unless invalid
+          fail "Clashing endpoints! Cannot differentiate between #{existing_endpoint.url} and #{new_endpoint.url}"
+        end
       end
 
       # Computes the url from params

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "5.0.0"
+  VERSION = "5.0.1"
 end

data/spec/record/endpoint_misconfiguration_spec.rb

@@ -10,7 +10,7 @@ describe LHS::Record do
             endpoint ':datastore/v2/reviews'
           end
         }
-      ).to raise_error('Clashing endpoints.')
+      ).to raise_error
       expect(
         lambda {
           class Record < LHS::Record
@@ -18,7 +18,7 @@ describe LHS::Record do
             endpoint ':datastore/v2/:campaign_id/reviews'
           end
         }
-      ).to raise_error('Clashing endpoints.')
+      ).to raise_error
     end
   end
 end

data/spec/record/loading_twice_spec.rb

@@ -0,0 +1,17 @@
+require 'rails_helper'
+
+describe LHS::Record do
+  context 'build' do
+    let(:datastore) { 'http://local.ch/v2' }
+
+    it 'is possible to load records twice' do
+      class Feedback < LHS::Record
+        endpoint ':datastore/feedbacks'
+      end
+
+      class Feedback < LHS::Record
+        endpoint ':datastore/feedbacks'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -291,6 +291,7 @@ files:
 - spec/record/find_spec.rb
 - spec/record/first_spec.rb
 - spec/record/includes_spec.rb
+- spec/record/loading_twice_spec.rb
 - spec/record/mapping_spec.rb
 - spec/record/model_name_spec.rb
 - spec/record/new_spec.rb
@@ -421,6 +422,7 @@ test_files:
 - spec/record/find_spec.rb
 - spec/record/first_spec.rb
 - spec/record/includes_spec.rb
+- spec/record/loading_twice_spec.rb
 - spec/record/mapping_spec.rb
 - spec/record/model_name_spec.rb
 - spec/record/new_spec.rb