NCCConfidence 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce62f93e711c057287466bde7ef3afae762fc811
-  data.tar.gz: b6d646783815a48b19c5a503637f95408e27f454
+  metadata.gz: f54147ae297a70b99519050016bb95595db7709f
+  data.tar.gz: af53e0b2ccd6f5f90afa731e20ff1d4134a1c58b
 SHA512:
-  metadata.gz: 1ee48f7be9e10238ff5fc827902807376988a3552f942ec42e35f2855e856c872134da5c5742002a2e716c81fe4daf539dbf03c887719876c67be0a702f39340
-  data.tar.gz: 181ab8302e76ffbca7d952f84e884be31bd8a83073b8a3767964cad3d6b6dcc2b1ae2df014e52a068abf5a6a9f1385d8851c831366c2135152860a76e21dc242
+  metadata.gz: 80077736342ec835bfba55ae76a41c35740bd8ad15e68cf26b24978df4725588754653bfe5420a42d06a4eb5bee905e889f2fb3b46261c3b1a9e5ca6f1975867
+  data.tar.gz: b84672f0703d3375b5960dc54aad78d2cab0b5b359e5d584f25626b73c6da59432bb13e6d75ff4847e7c76c0087d9d5db1dbc9302578487da788ddd76ddbb3b3

data/README.md

@@ -94,6 +94,45 @@ That way you can make them re-usable or make the query easily changable by just
 
 Please note you have to put both test_filter & data_filter into an array otherwise the client will only get one of the filters instead of an array of two two filters.
 
+Lastly you can use the query builder to build and make queries more easily.
+
+```ruby
+    NCCConfidence::Query.make "test_query" do 
+        test_filter do
+            account_id "MN2A6933"
+            id "MN2PG30601"
+            start_date "2015-08-12"
+            start_time "12:00:00"
+            end_date "2015-08-07"
+            end_time "07:05:05"
+            status_code 1
+        end
+
+        data_filter do
+            object "Account" do
+                item "AccountId"
+                object "Pages" do 
+                    item "Page"
+                end
+                object "ServiceStatus" do 
+                    item "HighestStatusCode"
+                end
+            end
+        end
+    end
+```
+
+To run all the queries do this
+```ruby
+result = NCCConfidence.query 
+```
+
+or to run a single query do this
+
+```ruby
+result = NCCConfidence.query NCCConfidence::Query.queries["test_query"] 
+```
+
 Here's a list of possible test filters:
 + account_id
 + id

data/lib/nccconfidence.rb

@@ -14,16 +14,33 @@ module NCCConfidence
  			URL.api_key = key
  		end
 
- 		def query
- 			test_filter,data_filter = yield(Builder::Test,Builder::Data)
+ 		def query query_object=nil
+ 			if query_object
+ 					make_query(
+ 						Builder::Test.make(&query_object.test_filter),
+ 						Builder::Data.make(&query_object.data_filter)
+ 					)
+ 			elsif Query.queries.first
+ 				Query.queries.inject({}) do |result,(name,query)|
+ 					result[name] = make_query(
+ 						Builder::Test.make(&query.test_filter),
+ 						Builder::Data.make(&query.data_filter)
+ 					)
+ 					result
+ 				end
+ 			else
+ 				make_query(*yield(Builder::Test,Builder::Data))
+ 			end
+ 		end
+
+ 		private
+ 		def make_query test_filter,data_filter
  			request = { 	
  				method: 'GET',
  				url: URL.build(test_filter,data_filter)
  			}
  			make_request(request)
  		end
-
- 		private 
  			def make_request request
  				http = Http.request do
  					set_uri request[:url]

data/lib/nccconfidence/query_builder.rb

@@ -0,0 +1,30 @@
+module NCCConfidence
+	class Query
+		class << self
+			attr_accessor :queries
+			def make query, &filters
+				new_query = self.new
+				new_query.instance_eval(&filters)
+				self.queries[query] = new_query
+			end
+		end
+
+		self.queries = {}
+
+		def test_filter &filter
+			if filter
+				@test_filter = Proc.new &filter
+			else
+				@test_filter
+			end
+		end
+
+		def data_filter &filter
+			if filter
+				@data_filter = Proc.new &filter
+			else
+				@data_filter
+			end
+		end
+	end
+end

data/lib/nccconfidence/url_builder.rb

@@ -4,6 +4,9 @@ require "#{nccc_root}/test_builder"
 
 require "#{nccc_root}/data_filters"
 require "#{nccc_root}/data_builder"
+
+require "#{nccc_root}/query_builder"
+
 module NCCConfidence
 	class URL
 		class << self

data/lib/nccconfidence/version.rb

@@ -1,3 +1,3 @@
 module NCCConfidence
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: NCCConfidence
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Thermatix
@@ -102,6 +102,7 @@ files:
 - lib/nccconfidence/data_builder.rb
 - lib/nccconfidence/data_filters.rb
 - lib/nccconfidence/http_client.rb
+- lib/nccconfidence/query_builder.rb
 - lib/nccconfidence/test_builder.rb
 - lib/nccconfidence/test_filters.rb
 - lib/nccconfidence/url_builder.rb