has_dynamic_columns 0.1.1 → 0.2.0

data/lib/has_dynamic_columns/model/instance_methods.rb

@@ -0,0 +1,6 @@
+module HasDynamicColumns
+	module Model
+		module InstanceMethods
+		end
+	end
+end

data/lib/has_dynamic_columns/version.rb

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

data/spec/has_dynamic_columns_spec.rb

@@ -38,6 +38,82 @@ describe HasDynamicColumns do
 		account
 	end
 
+
+	describe HasDynamicColumns::ActiveRecord, :focus => true do
+		it 'should find everyone in the current account scope' do
+			customer = Customer.create(:account => account)
+			customer.fields = {
+				"first_name" => "Butch",
+				"last_name" => "Marshall",
+				"email" => "butch.a.marshall@gmail.com",
+				"trusted" => true,
+			}
+			customer.save
+
+			customer = Customer.create(:account => account)
+			customer.fields = {
+				"first_name" => "John",
+				"last_name" => "Paterson",
+				"email" => "john.paterson@gmail.com",
+				"trusted" => true,
+			}
+			customer.save
+
+			customer = Customer.create(:account => account)
+			customer.fields = {
+				"first_name" => "Steve",
+				"last_name" => "Paterson",
+				"email" => "steve.paterson@gmail.com",
+				"trusted" => true,
+			}
+			customer.save
+
+			customer = Customer.create(:account => account)
+			customer.fields = {
+				"first_name" => "Carl",
+				"last_name" => "Marx",
+				"email" => "carl@communist.com",
+				"trusted" => false,
+			}
+			customer.save
+
+			table = Customer.arel_table
+
+			# 1 communist
+			result = Customer.where.has_dynamic_columns(table[:email].matches("%gmail.com")).with_scope(account)
+			expect(result.length).to eq(3)
+
+			# 2 patersons
+			result = Customer.where.has_dynamic_columns(table[:last_name].eq("Paterson")).with_scope(account)
+			expect(result.length).to eq(2)
+			
+			# 1 john paterson
+			result = Customer
+						.where.has_dynamic_columns(table[:first_name].eq("John")).with_scope(account)
+						.where.has_dynamic_columns(table[:last_name].eq("Paterson")).with_scope(account)
+			expect(result.length).to eq(1)
+		end
+
+		it 'should find the single person in this scope' do
+			customer = Customer.create(:account => account)
+			customer.fields = {
+				"first_name" => "Merridyth",
+				"last_name" => "Marshall",
+				"email" => "merridyth.marshall@gmail.com",
+				"trusted" => true,
+			}
+			customer.save
+
+			result = Customer.where.has_dynamic_columns(Customer.arel_table[:email].matches("%gmail.com")).with_scope(account)
+			expect(result.length).to eq(1)
+		end
+
+		it 'should find all 4 gmail users when no scope passed' do
+			result = Customer.where.has_dynamic_columns(Customer.arel_table[:email].matches("%gmail.com")).without_scope
+			expect(result.length).to eq(4)
+		end
+	end
+
 	describe Product do
 		subject(:product) {
 			Product.new(:name => "Product #1", :account => account)

data/spec/spec_helper.rb

@@ -1,13 +1,10 @@
 require 'logger'
 require 'rspec'
 
-require 'active_support/dependencies'
-require 'active_record'
-
 require 'has_dynamic_columns'
 
 if ENV['DEBUG_LOGS']
-	
+
 else
 
 end
@@ -73,12 +70,12 @@ end
 class Customer < ActiveRecord::Base
 	belongs_to :account
 	has_many :customer_addresses
-	has_dynamic_columns field_scope: "account", dynamic_type: "Customer", as: "fields"
+	has_dynamic_columns field_scope: "account", as: "fields"
 end
 
 class CustomerAddress < ActiveRecord::Base
 	belongs_to :customer
-	has_dynamic_columns field_scope: "customer.account", dynamic_type: "CustomerAddress", as: "fields"
+	has_dynamic_columns field_scope: "customer.account", as: "fields"
 end
 
 class Product < ActiveRecord::Base
@@ -87,10 +84,10 @@ class Product < ActiveRecord::Base
 	has_many :categories, :through => :category_owners
 
 	# Fields defined via the account
-	has_dynamic_columns field_scope: "account", dynamic_type: "Product", as: "product_fields"
+	has_dynamic_columns field_scope: "account", as: "product_fields"
 
 	# Fields defined via any associated categories
-	has_dynamic_columns field_scope: "categories", dynamic_type: "Product", as: "category_fields"
+	has_dynamic_columns field_scope: "categories", as: "category_fields"
 end
 
 class Category < ActiveRecord::Base

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: has_dynamic_columns
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Butch Marshall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +55,9 @@ dependencies:
 description: Adds ability to put dynamic fields into active record models
 email:
 - butch.a.marshall@gmail.com
-executables: []
+executables:
+- console
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -71,17 +67,26 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
 - has_dynamic_columns.gemspec
 - lib/generators/has_dynamic_columns/active_record_generator.rb
 - lib/generators/has_dynamic_columns/has_dynamic_columns_generator.rb
 - lib/generators/has_dynamic_columns/next_migration_version.rb
 - lib/generators/has_dynamic_columns/templates/migration.rb
 - lib/has_dynamic_columns.rb
+- lib/has_dynamic_columns/active_record.rb
+- lib/has_dynamic_columns/active_record/query_methods.rb
+- lib/has_dynamic_columns/active_record/relation.rb
+- lib/has_dynamic_columns/active_record_relation.rb
 - lib/has_dynamic_columns/compatibility.rb
 - lib/has_dynamic_columns/dynamic_column.rb
 - lib/has_dynamic_columns/dynamic_column_datum.rb
 - lib/has_dynamic_columns/dynamic_column_option.rb
 - lib/has_dynamic_columns/dynamic_column_validation.rb
+- lib/has_dynamic_columns/model.rb
+- lib/has_dynamic_columns/model/class_methods.rb
+- lib/has_dynamic_columns/model/instance_methods.rb
 - lib/has_dynamic_columns/version.rb
 - spec/has_dynamic_columns_spec.rb
 - spec/spec_helper.rb