tito 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0cc60e74e048a8f1d1b5774851440161bb367e0
-  data.tar.gz: 8cad39c5b9f2e5f8bb01043deebae07b63885b4d
+  metadata.gz: bbcfc2e33a486952025a18c74a0d7d5ea16a9eaf
+  data.tar.gz: 00dac2e1cbafaf7db2b62e307392e4e578c38992
 SHA512:
-  metadata.gz: 5767602b6e339e10470f493ed0858674a95a0b8ff06e8b2b21bb7d0dc02e19dc02575e48d8345ccd1772f4e75a3c6b68a13cfed3e3c96bab264e14b85bbaafaa
-  data.tar.gz: 0e1aa3256e59d45eccc8bbaa4396694bef3feadc777893531604f1101a84af440da318a66c36e5f7a474516c17396aa4b2143c40afe23d6cffd5efba5b128fd3
+  metadata.gz: 4f73f2adb05d5fece4893ff3662c7c23f3f9cf9d615c939873ca9c073116b631f6d74a7246d885841772e3cb7fa71604524a64f0854ac0b46990e37102c623c5
+  data.tar.gz: dbddf26fd4a90bb00241ffb3204bf172733fe64b10462b26d1a7efebda02b864aff2e269368919b235a07292d0c10abebaf43a2b2fa7cc3cffe943942233e173

data/lib/tito/eventable.rb

@@ -16,14 +16,27 @@ module Tito
     end
 
     module ClassMethods
+
+      def event_id_from_params(params)
+        return params[:event][:id] if params[:event]
+        return params[:filter][:event_id] if params[:filter]
+      end
+
+      def account_id_from_params(params)
+        return params[:event][:account_id] if params[:event]
+        return params[:filter][:account_id] if params[:filter]
+      end
+
       def path(params=nil)
         prefix_path = '%{account_id}/%{event_id}'
         path_params = params.delete(:path) || params
-        path_params[:event_id] = params[:event][:id]
-        path_params[:account_id] = params[:event][:account_id] || params[:event]['account-id']
+        path_params[:event_id] = event_id_from_params(params)
+        path_params[:account_id] = account_id_from_params(params)
         parts = [].unshift(prefix_path % path_params.symbolize_keys)
-        parts << params[:type]
+        parts << table_name
+
         File.join(*parts)
+
         rescue KeyError
           raise ArgumentError, "Please make sure to include account_id and event_id"
       end

data/lib/tito/version.rb

@@ -1,3 +1,3 @@
 module Tito
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tito
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Paul Campbell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client