dynamometer 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1046c5c0c35f7f1e839dbb022b07674fb2a9a5b7
-  data.tar.gz: 95bf8c5241b1b9c4aac3aa9067c64dffb1e96122
+  metadata.gz: 8381df54a2f01ec5e7a6fc5116c183830a40adc8
+  data.tar.gz: 5ca5d4ff2ec9f94eb84cc404b82d29793c3efdf5
 SHA512:
-  metadata.gz: ac1fa8bdac3b2314d7eea6e6b9a24e179882f8b5ee74f8be5d3d64be4e922b487a0bfd93e2ce70c07ece18f905688c4cfba6ca7fe525bea9dc7cc42f972db9af
-  data.tar.gz: 622650be73b4af1e98019e67b7ae80a3ebe93febb407a0f12dc436b5946e34d453dca54b580e76f91eda8e3ba0a2e1c85e79b4c70238bb7935e4e9aa2dc9bde7
+  metadata.gz: a2bb08080e830c9cf61b00b774816195741e31be5393619bf2af076118fbb71e3504b17b381ee23589ee39ceb58c0a3c836ce0c701b54c5cb6d0ae02dcde6d27
+  data.tar.gz: 3d8fae53ed967b10910ad15cfe0a8ea70e4095a3c41a5d8e742c789fecd0f2270e36e6e3e9759e46d5959112a94404216b1bfbc420095ff2317697841faddf75

data/README.md

@@ -56,10 +56,16 @@ You can access just the dynamic attributes by calling `dynamic_attributes`.
 
 ## Querying
 
-You can query for matches to dynamic_attributes by calling `where_dynamic_attributes`. 
+You can query for matches to dynamic attributes just like regular attributes.
+
+    current_site.users.where(category: 'superuser')
+    current_site.users.where(category: 'superuser', name: 'Steve')
+
+You can also query for matches to dynamic attributes by calling
+`where_dynamic_attributes`. Unlike `where` above, this will not work if you
+mix dynamic and regular attributes.
 
     current_site.users.where_dynamic_attributes(category: 'superuser')
-    current_site.users.where_dynamic_attributes(category: 'superuser', name: 'Steve')
 
 ## ActiveModel Serializers
 

data/app/models/concerns/dynamic_attributes.rb

@@ -2,6 +2,14 @@ module DynamicAttributes
 
   extend ActiveSupport::Concern
 
+  module ClassMethods
+    # we only define this for classes with dynamic attributes
+    # so that unmodified classes work exactly as before
+    def partition_wheres(wheres)
+      wheres.partition { |k, v| column_names.include?(k.to_s) || reflect_on_association(k.to_sym) }.map { |x| Hash[x] }
+    end
+  end
+
   def [](attr_name)
     if @attributes.has_key?(attr_name.to_s)
       super

data/lib/dynamometer/dynamic_attributes_in_where.rb

@@ -0,0 +1,22 @@
+module Dynamometer
+  module DynamicAttributesInWhere
+
+    def where(*args)
+      return super if !args.first.is_a?(Hash) || args.first.keys.any? { |x| x.is_a?(Hash) }
+      regulars, dynamics = klass.partition_wheres(args.first)
+      if dynamics.empty?
+        super
+      else
+        super(regulars).where_dynamic_attributes(dynamics)
+      end
+    end
+
+    def where_dynamic_attributes(filters)
+      spawn.tap do |new_rel|
+        (filters || {}).each do |k, v|
+          new_rel.where_values += build_where("dynamic_attributes @> hstore(?, ?)", [k, v])
+        end
+      end
+    end
+  end
+end

data/lib/dynamometer/railtie.rb

@@ -1,3 +1,5 @@
+require 'dynamometer/dynamic_attributes_in_where'
+
 module Dynamometer
   class Railtie < Rails::Engine
     railtie_name :dynamometer
@@ -8,15 +10,11 @@ module Dynamometer
           delegate :where_dynamic_attributes, to: :all
         end
 
-        ActiveRecord::QueryMethods.module_eval do
-          def where_dynamic_attributes(filters)
-            spawn.tap do |new_rel|
-              (filters || {}).each do |k, v|
-                new_rel.where_values += build_where("dynamic_attributes @> hstore(?, ?)", [k, v])
-              end
-            end
-          end
+        ActiveRecord::Base.class_eval do
+          def self.partition_wheres(args); [args,{}]; end
         end
+
+        ActiveRecord::Relation.send(:include, DynamicAttributesInWhere)
       end
     end
   end

data/lib/dynamometer/version.rb

@@ -1,3 +1,3 @@
 module Dynamometer
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/dummy/app/models/person.rb

@@ -1,6 +1,8 @@
 class Person < ActiveRecord::Base
   include DynamicAttributes
 
+  belongs_to :father, class_name: 'Person'
+
   def active_model_serializer
     PersonSerializer
   end

data/test/dummy/db/migrate/20131011183117_add_father_id_to_people.rb

@@ -0,0 +1,5 @@
+class AddFatherIdToPeople < ActiveRecord::Migration
+  def change
+    add_column :people, :father_id, :integer
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,12 +11,13 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20131008210406) do
+ActiveRecord::Schema.define(version: 20131011183117) do
 
   create_table "people", force: true do |t|
     t.string  "name",               null: false
     t.integer "age"
     t.hstore  "dynamic_attributes"
+    t.integer "father_id"
   end
 
   add_index "people", ["dynamic_attributes"], name: "index_people_on_dynamic_attributes", using: :btree

data/test/person_test.rb

@@ -78,14 +78,34 @@ class PersonTest < ActiveSupport::TestCase
 
   test "can find records by a dynamic attribute" do
     @person = Person.create(name: 'Nobody', magic_level: 'over 9000')
-    results = Person.where_dynamic_attributes(magic_level: 'over 9000')
+    results = Person.where(magic_level: 'over 9000')
+    assert results.present?
+    assert_equal @person, results.first
+  end
+
+  test "can find records by a dynamic attribute and a static one" do
+    @person = Person.create(name: 'Nobody', magic_level: 'over 9000')
+    results = Person.where(name: 'Nobody', magic_level: 'over 9000')
+    assert results.present?
+    assert_equal @person, results.first
+  end
+
+  test "can find records by a nonexistent dynamic attribute" do
+    results = Person.where(attribute_not_appearing_in_this_gem: 'wat')
+    assert results.empty?
+  end
+
+  test "can find records via associations" do
+    father = Person.create(name: 'Somebody')
+    @person = Person.create(name: 'Nobody', magic_level: 'over 9000', father: father)
+    results = Person.where(magic_level: 'over 9000', father: father)
     assert results.present?
     assert_equal @person, results.first
   end
 
   test "chaining does not damage original Relation" do
     original_relation = Person.where(id: 1)
-    new_relation = original_relation.where_dynamic_attributes(magic_level: 'over 9000')
+    new_relation = original_relation.where(magic_level: 'over 9000')
     duplicate_relation = Person.where(id: 1)
     assert_equal duplicate_relation.where_values, original_relation.where_values
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamometer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - John Colvin
@@ -68,6 +68,7 @@ files:
 - app/serializers/dynamic_attributes_serializer.rb
 - dynamometer.gemspec
 - lib/dynamometer.rb
+- lib/dynamometer/dynamic_attributes_in_where.rb
 - lib/dynamometer/railtie.rb
 - lib/dynamometer/version.rb
 - lib/tasks/dynamometer_tasks.rake
@@ -107,6 +108,7 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20131008210130_add_hstore.rb
 - test/dummy/db/migrate/20131008210406_create_model.rb
+- test/dummy/db/migrate/20131011183117_add_father_id_to_people.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep
@@ -179,6 +181,7 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20131008210130_add_hstore.rb
 - test/dummy/db/migrate/20131008210406_create_model.rb
+- test/dummy/db/migrate/20131011183117_add_father_id_to_people.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep