has_dynamic_columns 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8adcb2fa0100a0caea34697193e9d0f008eb633a
-  data.tar.gz: 7dcd964a4ed65285fb819ad51f1f7656491b2610
+  metadata.gz: 69d28ea4aadd2689e5653aceb6092dd913dbb831
+  data.tar.gz: 26a14d5b8a98d70565094e588f2a40ee3355de01
 SHA512:
-  metadata.gz: 0f933582fe5fce22e3cae11bb0af740581b08d221aa24b555fbcbb92323082b49bd5c19191204601d0a24a96a01382ee96f8a07a7387852bec36eddde7fe3904
-  data.tar.gz: 8b6f80d4116c9074149469cd4f6c33c047c1b96dabc517217578b2e0878eddbf2de0a770370398b868eaf81fc05491672fce6c131e3a043939f875d5e990f983
+  metadata.gz: cff1aba3d57c28d9ebe93d660555a6959e064546c5d16768bdc308836fc89facdbd46b578cd94adfccc0c18b8e7dd40019a8a9d694d2912d0d53c050bf6a5f66
+  data.tar.gz: 9981d60459e0c61e76247ac59a11fe9a7558ec3429026de3904dd05a1e0c59cbc9957ede55a120d1896e50291ee8cba17f06dc9b1c0a8cd7f790ddf6b2e19b66

data/lib/has_dynamic_columns/version.rb

@@ -1,3 +1,3 @@
 module HasDynamicColumns
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/has_dynamic_columns.rb

@@ -87,7 +87,7 @@ module HasDynamicColumns
 									# If any errors exist - add them
 									if validation_errors.length > 0
 										if dynamic_column.nil?
-										puts validation_errors.inspect
+											# TODO - fix  from the has_many - need to fix validations
 											#errors.add(:dynamic_columns, { "unknown" => validation_errors })
 										else
 											errors.add(:dynamic_columns, { dynamic_column.key.to_s => validation_errors })
@@ -105,20 +105,26 @@ module HasDynamicColumns
 							column_table = HasDynamicColumns::DynamicColumn.arel_table.alias("dynamic_order_"+key.to_s)
 							column_datum_table = HasDynamicColumns::DynamicColumnDatum.arel_table.alias("dynamic_order_data_"+key.to_s)
 
-							field_scope_type = field_scope.class.name.constantize.to_s
+							field_scope_id = (!field_scope.nil?) ? field_scope.id : nil
+							field_scope_type = (!field_scope.nil?) ? field_scope.class.name.constantize.to_s : nil
 							dynamic_type = self.name.constantize.to_s
-							field_scope_id = field_scope.id
 
 							# Join on the column with the key
+							on_query = column_table[:key].eq(key)
+							if !field_scope_type.nil?
+								on_query = on_query.and(
+									column_table[:field_scope_type].eq(field_scope_type)
+								)
+							end
+							if !field_scope_id.nil?
+								on_query = on_query.and(
+									column_table[:field_scope_id].eq(field_scope_id)
+								)
+							end
+
 							column_table_join_on = column_table
 													.create_on(
-														column_table[:field_scope_type].eq(field_scope_type).and(
-															column_table[:dynamic_type].eq(dynamic_type)
-														).and(
-															column_table[:field_scope_id].eq(field_scope_id)
-														).and(
-															column_table[:key].eq(key)
-														)
+														on_query
 													)
 
 							column_table_join = table.create_join(column_table, column_table_join_on)
@@ -148,12 +154,12 @@ module HasDynamicColumns
 
 						# Find by dynamic columns
 						def self.dynamic_where(*args)
-							field_scope = args[0]
+							field_scope = args[0].is_a?(Hash) ? nil : args[0]
 							options = args.extract_options!
 
-							field_scope_type = field_scope.class.name.constantize.to_s
+							field_scope_id = (!field_scope.nil?) ? field_scope.id : nil
+							field_scope_type = (!field_scope.nil?) ? field_scope.class.name.constantize.to_s : nil
 							dynamic_type = self.name.constantize.to_s
-							field_scope_id = field_scope.id
 
 							table = self.name.constantize.arel_table
 							query = nil
@@ -167,15 +173,21 @@ module HasDynamicColumns
 								column_datum_table = HasDynamicColumns::DynamicColumnDatum.arel_table.alias("dynamic_where_data_"+key.to_s)
 
 								# Join on the column with the key
+								on_query = column_table[:key].eq(key)
+								if !field_scope_type.nil?
+									on_query = on_query.and(
+										column_table[:field_scope_type].eq(field_scope_type)
+									)
+								end
+								if !field_scope_id.nil?
+									on_query = on_query.and(
+										column_table[:field_scope_id].eq(field_scope_id)
+									)
+								end
+
 								column_table_join_on = column_table
 														.create_on(
-															column_table[:field_scope_type].eq(field_scope_type).and(
-																column_table[:dynamic_type].eq(dynamic_type)
-															).and(
-																column_table[:field_scope_id].eq(field_scope_id)
-															).and(
-																column_table[:key].eq(key)
-															)
+															on_query
 														)
 
 								column_table_join = table.create_join(column_table, column_table_join_on)
@@ -292,10 +304,6 @@ module HasDynamicColumns
 		end
 
 		module InstanceMethods
-			# Validate all the dynamic_column_data at once
-			def validate_dynamic_column_data(field_scope = nil)
-
-			end
 		end
 	end
 end

data/spec/has_dynamic_columns_spec.rb

@@ -67,6 +67,56 @@ describe HasDynamicColumns do
 		context 'when it has a defined has_many relationship' do
 
 			context 'when it has_many categories' do
+				it 'should work with dynamic_where' do
+					product1 = Product.new(:name => "Product #1", :account => account)
+					product2 = Product.new(:name => "Product #2", :account => account)
+
+					# Product 1 is associated with both categories
+					product1.categories << @category1
+					product1.categories << @category2
+					# Product 2 is only associated with a single category
+					product2.categories << @category1
+
+					product1.product_fields = {
+						"rarity" => "very rare"
+					}
+					product2.product_fields = {
+						"rarity" => "kinda rare"
+					}
+
+					product1.category_fields = {
+						"vin_number" => "abc",
+						"serial_number" => "456"
+					}
+					product2.category_fields = {
+						"vin_number" => "cde",
+					}
+					product1.save
+					product2.save
+
+					result = Product.dynamic_where({ vin_number: "abc" })
+					expect(result.length).to eq(1)
+					expect(result.first).to eq(product1)
+
+					result = Product.dynamic_where({ vin_number: "cde" })
+					expect(result.length).to eq(1)
+					expect(result.first).to eq(product2)
+
+					result = Product.dynamic_where({ rarity: "rare" })
+					expect(result.length).to eq(2)
+					expect(result.first).to eq(product1)
+					expect(result.last).to eq(product2)
+
+					result = Product.dynamic_where({ rarity: "rare", vin_number: "cde" })
+					expect(result.length).to eq(1)
+					expect(result.first).to eq(product2)
+
+					result = Product.dynamic_where({ rarity: "rare", vin_number: "cde", serial_number: "456" })
+					expect(result.length).to eq(0)
+
+					result = Product.dynamic_where({ rarity: "rare", vin_number: "c", serial_number: "456" })
+					expect(result.length).to eq(1)
+				end
 
 				it 'should return empty category_fields when no categories associated' do
 					json = product.as_json

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_dynamic_columns
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Butch Marshall