hario 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f50d53adcbb963fc89944af16e00690535a7c6ab
-  data.tar.gz: 45235182715628de22cdde31fa12a65556c5fcca
+  metadata.gz: 879fa179f9fab01c486396fc9afd19c19b98c674
+  data.tar.gz: 180dd6a66f7b4fd8a63403a70a955a8f9a5da1da
 SHA512:
-  metadata.gz: 7a2f840423cda8d11c7c702b2512646bbddbfe55022b4b173262f3fcd404b80cfd2adbbf6f0891dee7fbde5297889758b58cf6622d37eed5816d3b7036bc73a8
-  data.tar.gz: d0017e3e65ae1f31e4cbf46d56b12092f056fcddfbda1703f059ce2b2beaa5373ed75a71abee4225ba28675e4f4d8037639fcedf691f0620afff6829ba930443
+  metadata.gz: 4dd7b5574c72a7157316dd8a59f5f8f809c8c12d896a563627eddf8eed6e76fc8feafb7766edd45137a7b8a468dd314649592ef2eedb3d369cfbdd41a26cbad6
+  data.tar.gz: e972fde3bfb04f2b42e7ff87d2958ac4d6d442da443c61aaa7907d4452712bb748a8efe0116c6583e15f4de8f266d58c59fda32f82a913c1ec3b951f63178f1d

data/README.md

@@ -24,7 +24,7 @@ Add `include Hario::Filterable` to your AR model to add the `search` method, for
 
 ```ruby
 def Brand < ActiveRecord::Base
-  include Hario::Filterable
+  extend Hario::Filterable
 
   has_many :products
 end

data/lib/hario/behaviours/filter.rb

@@ -20,7 +20,7 @@ class FilterParser
         association_chain, attribute, operator = parse_descriptor(descriptor)
         condition = build_condition(association_chain, attribute, operator, value)
 
-        nested_associations = (association_chain << {}).reverse.inject { |v, key| { key => v } }
+        nested_associations = (association_chain.dup << {}).reverse.inject { |v, key| { key => v } }
         joins = m[0].deep_merge(nested_associations)
         wheres = m[1] + [condition]
         [joins, wheres]

data/lib/hario/behaviours/pluck.rb

@@ -24,7 +24,7 @@ class PluckParser
       ns.each do |p|
         association_chain, attribute = parse_namespace(p)
 
-        nested_associations = (association_chain << {}).reverse.inject { |v, key| { key => v } }
+        nested_associations = (association_chain.dup << {}).reverse.inject { |v, key| { key => v } }
         @join_clause.deep_merge!(nested_associations)
 
         attribute_table = table_name_from_association_chain(association_chain)

data/lib/hario/version.rb

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

data/lib/hario.rb

@@ -4,33 +4,33 @@ require "hario/behaviours/pluck"
 
 module Hario
   module Filterable
-    extend ActiveSupport::Concern
+    def search(filters, pluck = nil)
+      s = all
+      s = s.apply_filters(filters) if filters
+      s = s.apply_pluck(pluck) if pluck
+      s
+    end
 
-    module ClassMethods
-      def search(filters, pluck = nil)
-        s = all
-        s = s.apply_filters(filters) if filters
-        s = s.apply_pluck(pluck) if pluck
-        s
-      end
+    def apply_filters(filters)
+      fp = FilterParser.new(filters, self)
 
-      def apply_filters(filters)
-        fp = FilterParser.new(filters, self)
+      fp.where_clauses.reduce(joins(fp.join_clause), &:where)
+    end
 
-        fp.where_clauses.reduce(joins(fp.join_clause), &:where)
-      end
+    def apply_pluck(pluck)
+      pp = PluckParser.new(pluck, self)
 
-      def apply_pluck(pluck)
-        pp = PluckParser.new(pluck, self)
+      results = joins(pp.join_clause).hash_pluck(*pp.pluck_clause)
 
-        results = hash_pluck(*pp.pluck_clause)
+      remove_local_table_prefix(results)
+    end
 
-        remove_local_table_prefix(results)
-      end
+    def remove_local_table_prefix(results)
+      results.map{ |r| r.transform_keys!{ |k| k.gsub(/^#{table_name}\./, '') } }
+    end
 
-      def remove_local_table_prefix(results)
-        results.map{ |r| r.transform_keys!{ |k| k.gsub(/^#{table_name}\./, '') } }
-      end
+    def hash_pluck(*keys)
+      pluck(*keys).map{ |vals| Hash[keys.zip(Array(vals))] }
     end
   end
 end

data/test/hario_test_class.rb

@@ -1,6 +1,6 @@
 require "minitest/autorun"
 
-class Hario::Test < Minitest::Unit::TestCase
+class Hario::Test < Minitest::Test
   def teardown
     DatabaseRewinder.clean
   end

data/test/models.rb

@@ -1,12 +1,14 @@
 require 'hario'
 
 class Brand < ActiveRecord::Base
-  include Hario::Filterable
+  extend Hario::Filterable
 
   has_many :products
 end
 
 class Product < ActiveRecord::Base
+  extend Hario::Filterable
+
   belongs_to :brand
   belongs_to :category, class_name: "ProductCategory"
 end

data/test/pluck_test.rb

@@ -0,0 +1,19 @@
+require_relative 'test_helper'
+
+class PluckTest < Hario::Test
+  def test_simple_pluck
+    brands = Brand.search(nil, ["name"])
+
+    assert_equal ["id", "name"], brands.flat_map(&:keys).uniq,
+        "Pluck not returning correct attributes"
+  end
+
+  def test_pluck_through_association
+    # TODO: fix this so that it returns the association_name.attribute as
+    # the hash key, rather than table_name.attribute (different to input)
+    products = Product.search(nil, ["name", "brand.name"])
+
+    assert_equal ["id", "name", "brands.name"], products.flat_map(&:keys).uniq,
+        "Pluck not returning correct attributes with association pluck"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hario
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Mike Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord