has_dynamic_columns 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ca96bb424702503964607990ceaf8bd1f1d295d
-  data.tar.gz: a58a689b2bd09f47717d03f46eb159642c9ed585
+  metadata.gz: b0b1ecc13bba58282485955da6aeb21a51273498
+  data.tar.gz: ebfb6b3d4ce705e8e7cc3252c5ec08481511e1a5
 SHA512:
-  metadata.gz: d28daa53d39118043b48317fa1528a858f4879700314f1409c3c85be2e5d75da596d68c6ff82c0c215b7ef98754861f8c35707a6398addefa35a458f856007d4
-  data.tar.gz: 809f23544abba7769655652fe364e58a1d697133ffebf721a813b8301526b4edb624121f25e9d4f91f634413f42f0d34a7b84d8f2e00981a1cb873b55d45a13b
+  metadata.gz: db67f6150244898ad99a6ed6b92fe48a8f39e9a66b7073dfda0ec4083430f4f06cd57353f8e6dc1e1bc4ed908f15ef9b629076ab61aa3b3c41eb9bad5647880d
+  data.tar.gz: 3f484bdd7d0d1964630f5c646607380475f74aeffd622527ee426c0ddf3db0598baf92e4ee6b45e13dfcbe0446ae84942506f5245eb69a5d4625234a34e78ba4

data/lib/has_dynamic_columns/active_record/v3/query_methods.rb

@@ -80,12 +80,12 @@ module HasDynamicColumns
 				end
 			end
 
-			def order_with_dynamic_columns(opts = :chain)
+			def order_with_dynamic_columns(*args)
 				# Chain - by_dynamic_columns
-				if opts == :chain
+				if args.empty?
 					::ActiveRecord::QueryMethods::OrderChain.new(clone)
 				else
-					order_without_dynamic_columns(opts)
+					order_without_dynamic_columns(*args)
 				end
 			end
 		end

data/lib/has_dynamic_columns/active_record/v4/query_methods.rb

@@ -54,12 +54,12 @@ module HasDynamicColumns
 				end
 			end
 
-			def order_with_dynamic_columns(opts = :chain)
+			def order_with_dynamic_columns(*args)
 				# Chain - by_dynamic_columns
-				if opts == :chain
+				if args.empty?
 					::ActiveRecord::QueryMethods::OrderChain.new(spawn)
 				else
-					order_without_dynamic_columns(opts)
+					order_without_dynamic_columns(*args)
 				end
 			end
 		end

data/lib/has_dynamic_columns/dynamic_column_boolean_datum.rb

@@ -1,5 +1,5 @@
 module HasDynamicColumns
 	class DynamicColumnBooleanDatum < ::ActiveRecord::Base
-		belongs_to :dynamic_column_datum, :class_name => "HasDynamicColumns::DynamicColumnDatum"
+		has_one :dynamic_column_datum, :as => :datum
 	end
 end

data/lib/has_dynamic_columns/dynamic_column_date_datum.rb

@@ -1,5 +1,5 @@
 module HasDynamicColumns
 	class DynamicColumnDateDatum < ::ActiveRecord::Base
-		belongs_to :dynamic_column_datum, :class_name => "HasDynamicColumns::DynamicColumnDatum"
+		has_one :dynamic_column_datum, :as => :datum
 	end
 end

data/lib/has_dynamic_columns/dynamic_column_datetime_datum.rb

@@ -1,5 +1,5 @@
 module HasDynamicColumns
 	class DynamicColumnDatetimeDatum < ::ActiveRecord::Base
-		belongs_to :dynamic_column_datum, :class_name => "HasDynamicColumns::DynamicColumnDatum"
+		has_one :dynamic_column_datum, :as => :datum
 	end
 end

data/lib/has_dynamic_columns/dynamic_column_enum_datum.rb

@@ -1,5 +1,5 @@
 module HasDynamicColumns
 	class DynamicColumnEnumDatum < ::ActiveRecord::Base
-		belongs_to :dynamic_column_datum, :class_name => "HasDynamicColumns::DynamicColumnDatum"
+		has_one :dynamic_column_datum, :as => :datum
 	end
 end

data/lib/has_dynamic_columns/dynamic_column_float_datum.rb

@@ -1,5 +1,5 @@
 module HasDynamicColumns
 	class DynamicColumnFloatDatum < ::ActiveRecord::Base
-		belongs_to :dynamic_column_datum, :class_name => "HasDynamicColumns::DynamicColumnDatum"
+		has_one :dynamic_column_datum, :as => :datum
 	end
 end

data/lib/has_dynamic_columns/dynamic_column_integer_datum.rb

@@ -1,5 +1,5 @@
 module HasDynamicColumns
 	class DynamicColumnIntegerDatum < ::ActiveRecord::Base
-		belongs_to :dynamic_column_datum, :class_name => "HasDynamicColumns::DynamicColumnDatum"
+		has_one :dynamic_column_datum, :as => :datum
 	end
 end

data/lib/has_dynamic_columns/dynamic_column_model_datum.rb

@@ -1,6 +1,6 @@
 module HasDynamicColumns
 	class DynamicColumnModelDatum < ::ActiveRecord::Base
-		belongs_to :dynamic_column_datum, :class_name => "HasDynamicColumns::DynamicColumnDatum"
+		has_one :dynamic_column_datum, :as => :datum
 		belongs_to :value, :polymorphic => true
 	end
 end

data/lib/has_dynamic_columns/dynamic_column_string_datum.rb

@@ -1,5 +1,5 @@
 module HasDynamicColumns
 	class DynamicColumnStringDatum < ::ActiveRecord::Base
-		belongs_to :dynamic_column_datum, :class_name => "HasDynamicColumns::DynamicColumnDatum"
+		has_one :dynamic_column_datum, :as => :datum
 	end
 end

data/lib/has_dynamic_columns/dynamic_column_text_datum.rb

@@ -1,5 +1,5 @@
 module HasDynamicColumns
 	class DynamicColumnTextDatum < ::ActiveRecord::Base
-		belongs_to :dynamic_column_datum, :class_name => "HasDynamicColumns::DynamicColumnDatum"
+		has_one :dynamic_column_datum, :as => :datum
 	end
 end

data/lib/has_dynamic_columns/dynamic_column_time_datum.rb

@@ -1,5 +1,5 @@
 module HasDynamicColumns
 	class DynamicColumnTimeDatum < ::ActiveRecord::Base
-		belongs_to :dynamic_column_datum, :class_name => "HasDynamicColumns::DynamicColumnDatum"
+		has_one :dynamic_column_datum, :as => :datum
 	end
 end

data/lib/has_dynamic_columns/dynamic_column_timestamp_datum.rb

@@ -1,5 +1,5 @@
 module HasDynamicColumns
 	class DynamicColumnTimestampDatum < ::ActiveRecord::Base
-		belongs_to :dynamic_column_datum, :class_name => "HasDynamicColumns::DynamicColumnDatum"
+		has_one :dynamic_column_datum, :as => :datum
 	end
 end

data/lib/has_dynamic_columns/model/class_methods.rb

@@ -285,6 +285,9 @@ module HasDynamicColumns
 									v = i.value
 									v = v.as_json(:root => nil) if as_json && v.respond_to?(:as_json)
 
+									# If a specific column is used, use it in the as_json method
+									v = v[i.dynamic_column.column_name] if as_json && v && v.is_a?(Hash) && !i.dynamic_column.column_name.to_s.empty?
+
 									if i.dynamic_column.multiple
 										h[i.dynamic_column.key] << v
 									else

data/lib/has_dynamic_columns/version.rb

@@ -1,3 +1,3 @@
 module HasDynamicColumns
-  VERSION = "0.3.6"
+  VERSION = "0.3.8"
 end

data/spec/factories/account.rb

@@ -14,7 +14,7 @@ FactoryGirl.define do
 			account.activerecord_dynamic_columns.build(:dynamic_type => "Customer", :key => "total_purchases", :data_type => "integer")
 			account.activerecord_dynamic_columns.build(:dynamic_type => "Customer", :key => "tags", :data_type => "string", :multiple => true)
 			account.activerecord_dynamic_columns.build(:dynamic_type => "Customer", :key => "address", :data_type => "model", :class_name => "CustomerAddress", :column_name => "name")
-			account.activerecord_dynamic_columns.build(:dynamic_type => "Customer", :key => "products", :data_type => "model", :multiple => true)
+			account.activerecord_dynamic_columns.build(:dynamic_type => "Customer", :key => "products", :data_type => "model", :class_name => "Product", :column_name => "name", :multiple => true)
 		end
 	end
 

data/spec/has_dynamic_columns/dynamic_columns_model_datum_spec.rb

@@ -25,11 +25,11 @@ describe HasDynamicColumns::DynamicColumnModelDatum do
 			customer.save
 			json = customer.as_json(:root => nil)
 
-			expect(json["fields"]["address"]["name"]).to eq("1796 18th St, San Francisco, CA 94107, United States")
+			expect(json["fields"]["address"]).to eq("1796 18th St, San Francisco, CA 94107, United States")
 			expect(json["fields"]["products"].length).to eq(5)
 			# Each of the products should be json
 			json["fields"]["products"].each_with_index { |i, index|
-				expect(i["name"]).to eq("P#{index+1}")
+				expect(i).to eq("P#{index+1}")
 			}
 		end
 
@@ -112,7 +112,7 @@ describe HasDynamicColumns::DynamicColumnModelDatum do
 					)
 					.with_scope(account)
 			expect(result.length).to eq(2)
-			expect(result.first.as_json["fields"]["address"]["name"]).to eq("1600 Amphitheatre Pkwy, Mountain View, CA 94043, United States")
+			expect(result.first.as_json["fields"]["address"]).to eq("1600 Amphitheatre Pkwy, Mountain View, CA 94043, United States")
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_dynamic_columns
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord