osc_ruby 0.7.1 → 1.0.2

data/lib/osc_ruby/modules/query_module.rb

@@ -1,70 +1,70 @@
-require 'osc_ruby/connect'
-require 'osc_ruby/modules/validations_module'
-require 'osc_ruby/modules/normalize_module'
-require_relative '../../ext/string.rb'
-
-module OSCRuby
-
-	module QueryModule
-
-		class << self
-
-			include ValidationsModule, NormalizeModule
-		
-			def find(rn_client,resource)
-
-				obj_to_find = OSCRuby::Connect.get(rn_client,resource)
-
-				if obj_to_find.code.to_i == 200 || obj_to_find.code.to_i == 201
-
-					ValidationsModule::check_obj_for_errors(obj_to_find)
-
-					NormalizeModule::normalize(obj_to_find,resource)
-				else
-
-					obj_to_find.body
-
-				end
-
-			end
-
-			def nested_find(rn_client,resource)
-
-				obj_to_find = OSCRuby::Connect.get(rn_client,resource)
-
-				if obj_to_find.code.to_i == 200 || obj_to_find.code.to_i == 201
-
-					ValidationsModule::check_obj_for_errors(obj_to_find)
-
-					NormalizeModule::nested_normalize(obj_to_find,resource)
-				else
-
-					obj_to_find.body
-
-				end
-
-			end
-
-			def create(rn_client,resource,json_content)
-
-				OSCRuby::Connect.post_or_patch(rn_client,resource,json_content)
-
-			end
-
-			def update(rn_client,resource,json_content)
-
-				OSCRuby::Connect.post_or_patch(rn_client,resource,json_content,true)
-
-			end
-
-			def destroy(rn_client,resource)
-
-				OSCRuby::Connect.delete(rn_client,resource)
-				
-			end
-
-		end
-		
-	end
-
+require 'osc_ruby/connect'
+require 'osc_ruby/modules/validations_module'
+require 'osc_ruby/modules/normalize_module'
+require_relative '../../ext/string.rb'
+
+module OSCRuby
+
+	module QueryModule
+
+		class << self
+
+			include ValidationsModule, NormalizeModule
+		
+			def find(rn_client,resource)
+
+				obj_to_find = OSCRuby::Connect.get(rn_client,resource)
+
+				if obj_to_find.code.to_i == 200 || obj_to_find.code.to_i == 201
+
+					ValidationsModule::check_obj_for_errors(obj_to_find)
+
+					NormalizeModule::normalize(obj_to_find,resource)
+				else
+
+					obj_to_find.body
+
+				end
+
+			end
+
+			def nested_find(rn_client,resource)
+
+				obj_to_find = OSCRuby::Connect.get(rn_client,resource)
+
+				if obj_to_find.code.to_i == 200 || obj_to_find.code.to_i == 201
+
+					ValidationsModule::check_obj_for_errors(obj_to_find)
+
+					NormalizeModule::nested_normalize(obj_to_find,resource)
+				else
+
+					obj_to_find.body
+
+				end
+
+			end
+
+			def create(rn_client,resource,json_content)
+
+				OSCRuby::Connect.post_or_patch(rn_client,resource,json_content)
+
+			end
+
+			def update(rn_client,resource,json_content)
+
+				OSCRuby::Connect.post_or_patch(rn_client,resource,json_content,true)
+
+			end
+
+			def destroy(rn_client,resource)
+
+				OSCRuby::Connect.delete(rn_client,resource)
+				
+			end
+
+		end
+		
+	end
+
 end

data/lib/osc_ruby/modules/validations_module.rb

@@ -1,169 +1,169 @@
-require 'osc_ruby/connect'
-require 'json'
-
-module OSCRuby
-
-	module ValidationsModule
-
-		class << self
-
-			def extract_attributes(obj)
-
-				empty_arr = [{}]
-
-				obj_vars = obj.instance_variables
-
-				obj_vars.each do |var| 
-
-					# Make sure to get rid of the empty ID
-					# otherwise everything gets all screwed up
-
-					if var.to_s != '@id'
-
-						obj_attr = var.to_s.delete("@")
-
-						obj_attr_val = obj.instance_variable_get(var)
-
-						empty_arr[0][obj_attr] = obj_attr_val
-
-					end
-
-				end
-
-				empty_arr
-
-			end
-
-			def check_for_id(id)
-
-				if id.nil? == true
-
-		    		raise ArgumentError, 'ID cannot be nil'
-
-				elsif id.class != Fixnum
-
-		    		raise ArgumentError, 'ID must be an integer'
-
-				end
-
-			end
-
-			def check_object_for_id(obj,class_name)
-
-				if obj.id.nil?
-
-					raise ArgumentError, "#{class_name} must have a valid ID set"
-
-				end
-
-			end
-
-			def check_attributes(attributes)
-
-				if attributes.class != Hash
-
-					puts attributes
-					
-					raise ArgumentError, "Attributes must be a hash; please use the appropriate data structure"
-			
-				end
-
-			end
-
-		    def check_query(query,method_name = "where")
-
-				if query.empty?
-					
-					raise ArgumentError, "A query must be specified when using the '#{method_name}' method"
-
-				end
-
-		    end
-
-		    def check_attributes_request(attributes_request,class_name)
-
-				if attributes_request.empty?
-					
-					raise ArgumentError, "The attributes you are requesting for the #{class_name} object must be specified when using the 'select' method"
-
-				end
-
-		    end
-
-			def check_client(client)
-
-				if client.class != OSCRuby::Client || client.nil?
-
-					raise ArgumentError, "Client must have some configuration set; please create an instance of OSCRuby::Client with configuration settings"
-
-				end
-
-			end
-
-			def attr_hash_exists_and_is_type_of(obj,key,val,class_of_value)
-
-				return obj[0][key][val].nil? || obj[0][key][val].class != class_of_value
-
-			end
-
-			def check_for_names(obj_attrs,class_name)
-
-				if obj_attrs[0]['names'].count == 0 || obj_attrs[0]['names'][0]['labelText'].nil? || obj_attrs[0]['names'][0]['language'].nil?
-					
-					raise ArgumentError, "#{class_name} should at least have one name set"
-				
-				end
-
-				obj_attrs
-
-			end
-
-			def check_for_parents(obj_attrs)
-
-				if !obj_attrs[0]['parent'].nil? && obj_attrs[0]['parent'].is_a?(Hash) && !obj_attrs[0]['parent'].key?('id') && !obj_attrs[0]['parent'].key?('lookupName')
-				
-					obj_attrs[0].delete('parent')
-				
-				end
-
-				obj_attrs
-
-			end
-
-			def check_interfaces(empty_arr)
-
-				if empty_arr[0]['adminVisibleInterfaces'].empty?
-					
-					empty_arr[0].delete('adminVisibleInterfaces')
-				
-				end
-
-				if empty_arr[0]['endUserVisibleInterfaces'].empty?
-					
-					empty_arr[0].delete('endUserVisibleInterfaces')
-				
-				end
-
-				empty_arr
-
-			end
-
-			def check_obj_for_errors(obj_to_check)
-
-				json_obj = JSON.parse(obj_to_check.body)
-
-				if !json_obj.nil? && json_obj['items'][0]['rows'].count == 0
-
-					puts obj_to_check.body
-
-					raise ArgumentError, 'There were no objects matching your query; please try again.'
-
-				end
-
-			end
-
-		end
-
-	end
-	
+require 'osc_ruby/connect'
+require 'json'
+
+module OSCRuby
+
+	module ValidationsModule
+
+		class << self
+
+			def extract_attributes(obj)
+
+				empty_arr = [{}]
+
+				obj_vars = obj.instance_variables
+
+				obj_vars.each do |var| 
+
+					# Make sure to get rid of the empty ID
+					# otherwise everything gets all screwed up
+
+					if var.to_s != '@id'
+
+						obj_attr = var.to_s.delete("@")
+
+						obj_attr_val = obj.instance_variable_get(var)
+
+						empty_arr[0][obj_attr] = obj_attr_val
+
+					end
+
+				end
+
+				empty_arr
+
+			end
+
+			def check_for_id(id)
+
+				if id.nil? == true
+
+		    		raise ArgumentError, 'ID cannot be nil'
+
+				elsif id.class != Fixnum
+
+		    		raise ArgumentError, 'ID must be an integer'
+
+				end
+
+			end
+
+			def check_object_for_id(obj,class_name)
+
+				if obj.id.nil?
+
+					raise ArgumentError, "#{class_name} must have a valid ID set"
+
+				end
+
+			end
+
+			def check_attributes(attributes)
+
+				if attributes.class != Hash
+
+					puts attributes
+					
+					raise ArgumentError, "Attributes must be a hash; please use the appropriate data structure"
+			
+				end
+
+			end
+
+		    def check_query(query,method_name = "where")
+
+				if query.empty?
+					
+					raise ArgumentError, "A query must be specified when using the '#{method_name}' method"
+
+				end
+
+		    end
+
+		    def check_attributes_request(attributes_request,class_name)
+
+				if attributes_request.empty?
+					
+					raise ArgumentError, "The attributes you are requesting for the #{class_name} object must be specified when using the 'select' method"
+
+				end
+
+		    end
+
+			def check_client(client)
+
+				if client.class != OSCRuby::Client || client.nil?
+
+					raise ArgumentError, "Client must have some configuration set; please create an instance of OSCRuby::Client with configuration settings"
+
+				end
+
+			end
+
+			def attr_hash_exists_and_is_type_of(obj,key,val,class_of_value)
+
+				return obj[0][key][val].nil? || obj[0][key][val].class != class_of_value
+
+			end
+
+			def check_for_names(obj_attrs,class_name)
+
+				if obj_attrs[0]['names'].count == 0 || obj_attrs[0]['names'][0]['labelText'].nil? || obj_attrs[0]['names'][0]['language'].nil?
+					
+					raise ArgumentError, "#{class_name} should at least have one name set"
+				
+				end
+
+				obj_attrs
+
+			end
+
+			def check_for_parents(obj_attrs)
+
+				if !obj_attrs[0]['parent'].nil? && obj_attrs[0]['parent'].is_a?(Hash) && !obj_attrs[0]['parent'].key?('id') && !obj_attrs[0]['parent'].key?('lookupName')
+				
+					obj_attrs[0].delete('parent')
+				
+				end
+
+				obj_attrs
+
+			end
+
+			def check_interfaces(empty_arr)
+
+				if empty_arr[0]['adminVisibleInterfaces'].empty?
+					
+					empty_arr[0].delete('adminVisibleInterfaces')
+				
+				end
+
+				if empty_arr[0]['endUserVisibleInterfaces'].empty?
+					
+					empty_arr[0].delete('endUserVisibleInterfaces')
+				
+				end
+
+				empty_arr
+
+			end
+
+			def check_obj_for_errors(obj_to_check)
+
+				json_obj = JSON.parse(obj_to_check.body)
+
+				if !json_obj.nil? && json_obj['items'][0]['rows'].count == 0
+
+					puts obj_to_check.body
+
+					raise ArgumentError, 'There were no objects matching your query; please try again.'
+
+				end
+
+			end
+
+		end
+
+	end
+	
 end

data/lib/osc_ruby/version.rb

@@ -1,3 +1,3 @@
-module OSCRuby
-  VERSION = "0.7.1"
+module OSCRuby
+  VERSION = "1.0.2"
 end

data/lib/osc_ruby.rb

@@ -1,11 +1,5 @@
-module OSCRuby; end
-
-require 'osc_ruby/client'
-require 'osc_ruby/connect'
-require 'osc_ruby/classes/service_class'
-require 'osc_ruby/classes/product_category_shared'
-require 'osc_ruby/classes/service_product'
-require 'osc_ruby/classes/service_category'
-require 'osc_ruby/classes/answer'
-require 'osc_ruby/classes/account'
+module OSCRuby; end
+
+require 'osc_ruby/client'
+require 'osc_ruby/connect'
 require 'osc_ruby/classes/query_results'

data/osc_ruby.gemspec

@@ -1,30 +1,29 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'osc_ruby/version'
-
-Gem::Specification.new do |spec|
-    spec.name          = "osc_ruby"
-    spec.version       = OSCRuby::VERSION
-    spec.authors       = ["Rajan Davis"]
-    spec.email         = ["rajangdavis@gmail.com"]
-    spec.summary       = %q{Making the best of opensource and enterprise technology}
-    spec.description   = %q{An unofficial Ruby ORM on top of the Oracle Cloud Services (fka RightNow Technologies) REST API}
-    spec.homepage      = %q{https://github.com/rajangdavis/osc_ruby}
-    spec.license       = "MIT"
-
-    spec.files         = `git ls-files -z`.split("\x0")
-    spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-    spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-    spec.require_paths = ["lib"]
-
-    spec.add_development_dependency "simplecov"   
-    spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"   
-    spec.add_development_dependency "bundler"
-    spec.add_development_dependency "rake", "~> 10.0"
-    spec.add_development_dependency "rspec", "~> 3.2.0"
-    spec.add_development_dependency "vcr", "~> 3.0.3"
-    spec.add_development_dependency "fakeweb"
-
-    spec.add_dependency 'yard'
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'osc_ruby/version'
+
+Gem::Specification.new do |spec|
+    spec.name          = "osc_ruby"
+    spec.version       = OSCRuby::VERSION
+    spec.authors       = ["Rajan Davis"]
+    spec.email         = ["rajangdavis@gmail.com"]
+    spec.summary       = %q{Making the best of opensource and enterprise technology}
+    spec.description   = %q{An unofficial Ruby ORM on top of the Oracle Cloud Services (fka RightNow Technologies) REST API}
+    spec.homepage      = %q{https://github.com/rajangdavis/osc_ruby}
+    spec.license       = "MIT"
+
+    spec.files         = `git ls-files -z`.split("\x0")
+    spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+    spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+    spec.require_paths = ["lib"]
+
+    spec.add_development_dependency "simplecov"   
+    spec.add_development_dependency "codeclimate-test-reporter", '~> 1.0', '>= 1.0.0'   
+    spec.add_development_dependency "bundler"
+    spec.add_development_dependency "rake", "~> 10.0"
+    spec.add_development_dependency 'rspec', '~> 3.2', '>= 3.2.0'
+    spec.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.3'
+    spec.add_development_dependency "fakeweb"
+    spec.add_development_dependency 'yard'
 end