cancancan-squeel 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e54134fb57f78cfd282b96b03b2bc49cf164468
-  data.tar.gz: 1c5b7a4a8f1aeea3cca907c7755a8a3fc9f4d13c
+  metadata.gz: edbfe73803fc60f8f004514ca962dcb92818cbb4
+  data.tar.gz: fc92e4d84a7557edf512293ebcfefd8995496d82
 SHA512:
-  metadata.gz: 0b03fa5bfafc638b66de73e42856e3047de0450898f2f6b31b0b4c2f514b4ffbeec719b6b6a35e8d03c09f129351a21c97729d41ecdb1c414e64891ff9901fbb
-  data.tar.gz: 9b2cee5e00ea453850b5065b826ae5917ebfbd9dd0017bd5870f7770f5802797ece8169f8652af4a33b11bcb219af4af1af4fd925b78dd9175ab52160bdf7c9d
+  metadata.gz: ca8e2455b16e3bc007829341fffdce9682cdebfccc1089e1f0874a6edfcdc35433a955388814dd79b929e79a43e55b0b198fcd959587429d40fba178a4d9fe39
+  data.tar.gz: 9ea2d0969b402e28030d14b1a3c464aafaf8a34d13385056a9853bea7123b5b1e23e10d7ec602ba7f1894a06fbb6b2948fe1beaea158e841092d65bf726101e7

data/.rubocop.yml

@@ -7,7 +7,7 @@ AllCops:
     - '**/Rakefile'
   Exclude:
    - 'vendor/bundle/**/*'
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.3
 
 Metrics/LineLength:
   Max: 100

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+## master
+
+### enhancements
+
+ - Remove unnecessary joins when performing algebraic simplification
+   [@lowjoel](https://github.com/lowjoel)
+ - Allow querying an unloaded association using a database query. For rules which reference 
+   associations, and the association is not currently loaded, an SQL query will be executed 
+   instead to verify the rule instead of loading all rows to memory
+   [@lowjoel](https://github.com/lowjoel)
+ - Add Frozen String Literal directive [@lowjoel](https://github.com/lowjoel)
+
+## 0.1.1
+
+### enhancements
+
+ - Added usage instructions. [@lowjoel](https://github.com/lowjoel)
+
+### bug fixes
+
+ - Follow CanCanCan's default ability rule priority [@lowjoel](https://github.com/lowjoel)
+ - Fix generation of comparison operators for array values [@lowjoel](https://github.com/lowjoel)
+
+## 0.1.0
+
+Initial release.

data/README.md

@@ -11,3 +11,13 @@ uses
  - `WHERE` fragments, joined lexically using `OR` or `AND` or `NOT`.
 
 As a side effect of using `squeel`, this allows self-joins in rule definitions.
+
+## Usage
+
+In your `Gemfile`, insert the following line:
+
+```ruby
+gem 'cancancan-squeel'
+```
+
+after you included `cancancan`.

data/cancancan-squeel.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = CanCanCan::Squeel::VERSION
   spec.authors       = ['Joel Low']
   spec.email         = ['joel@joelsplace.sg']
+  spec.license       = 'MIT'
 
   spec.summary       = 'Squeel database adapter for CanCanCan.'
   spec.description   = "Implements CanCanCan's rule-based record fetching using Squeel."

data/lib/cancancan/squeel.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
 require 'active_record'
 require 'cancancan'
 require 'squeel'
 
 require 'cancancan/squeel/version'
 require 'cancancan/squeel/active_record_disabler'
+require 'cancancan/squeel/attribute_mapper'
+require 'cancancan/squeel/expression_builder'
+require 'cancancan/squeel/expression_combinator'
 require 'cancancan/squeel/squeel_adapter'
-

data/lib/cancancan/squeel/active_record_disabler.rb

@@ -1,7 +1,8 @@
-class CanCanCan::Squeel::ActiveRecordDisabler
-  ::CanCan::ModelAdapters::ActiveRecord4Adapter.class_eval do
-    def self.for_class?(_)
-      false
-    end
-  end
-end
+# frozen_string_literal: true
+class CanCanCan::Squeel::ActiveRecordDisabler
+  ::CanCan::ModelAdapters::ActiveRecord4Adapter.class_eval do
+    def self.for_class?(_)
+      false
+    end
+  end
+end

data/lib/cancancan/squeel/attribute_mapper.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+# Implements mapping attributes, values, and comparators for a given model to appropriate
+# database equivalents.
+#
+# This implements:
+#  - comparing values against an array: interpreted as any value for ==, none of the values for !=.
+#  - mapping foreign keys to IDs
+module CanCanCan::Squeel::AttributeMapper
+  module_function
+
+  # Picks the appropriate column, comparator, and value to use in the Squeel expression.
+  #
+  # This checks for association references: this will use the appropriate column name.
+  #
+  # Array values are interpreted as alternative choices allowed or disallowed.
+  #
+  # @param [Class] model_class The model class which the key references.
+  # @param [Symbol] key The column being compared.
+  # @param [Symbol] comparator The comparator to get the appropriate Squeel comparator for.
+  # @param value The value to be comparing against.
+  # @return [Array<(Symbol, Symbol, Object)>] A triple containing the column to compare with, the
+  #   comparator to use, and the value to compare with.
+  def squeel_comparison_for(model_class, key, comparator, value)
+    key, value = map_association(model_class, key, value)
+
+    comparator = squeel_comparator_for(comparator, value)
+    [key, comparator, value]
+  end
+
+  # Picks the table column to compare the value against for the given key.
+  #
+  # This sets associations to use the proper foreign key column.
+  #
+  # @param [Class] model_class The model class which the key references.
+  # @param [Symbol] key The column being compared.
+  # @param value The value to be comparing against.
+  # @return [Array<(Symbol, Object)>] A tuple containing the column to compare with and the value
+  #   to compare with.
+  def map_association(model_class, key, value)
+    if (association = model_class.reflect_on_association(key))
+      key = association.foreign_key
+    end
+
+    [key, value]
+  end
+
+  # Maps the given comparator to a comparator appropriate for the given value.
+  #
+  # Array values are interpreted as alternative choices allowed or disallowed.
+  #
+  # @param [Symbol] comparator The comparator to get the appropriate Squeel comparator for.
+  # @param value The value to be comparing against.
+  # @return [Symbol] The comparator for the desired effect, suitable for the given type.
+  def squeel_comparator_for(comparator, value)
+    if value.is_a?(Array)
+      case comparator
+      when :== then :>>
+      when :!= then :<<
+      end
+    else
+      comparator
+    end
+  end
+end

data/lib/cancancan/squeel/expression_builder.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+# Builds Squeel expressions from the given scope, model class, and a hash of conditions.
+#
+# This is used by building a set of rules for retrieving all accessible records, as well as for
+# building queries instead of loading all records into memory.
+module CanCanCan::Squeel::ExpressionBuilder
+  module_function
+
+  # Builds a new Squeel expression node given a model class, the comparator, and the conditions.
+  #
+  # @param squeel The Squeel context. This is the value of +self+ within a +where+ DSL block.
+  # @param [Class] model_class The model class which the conditions reference.
+  # @param [Symbol] comparator The comparator to use when generating the comparison.
+  # @param [Hash] conditions The values to compare the given node's attributes against.
+  # @return [Array<(Squeel::Nodes::Node, Array<Array<Symbol>>)>] A tuple containing the Squeel
+  #   expression representing the rule's conditions, as well as an array of joins which the Squeel
+  #   expression must be joined to.
+  def build(squeel, model_class, comparator, conditions)
+    build_expression_node(squeel, model_class, comparator, conditions, true)
+  end
+
+  # Builds a new Squeel expression node.
+  #
+  # @param node The parent node context.
+  # @param [Class] model_class The model class which the conditions reference.
+  # @param [Symbol] comparator The comparator to use when generating the comparison.
+  # @param [Hash] conditions The values to compare the given node's attributes against.
+  # @param [Boolean] root True if the node being built is from the root. The root node is special
+  #   because it does not mutate itself; all other nodes do.
+  # @return [Array<(Squeel::Nodes::Node, Array<Array<Symbol>>)>] A tuple containing the Squeel
+  #   expression representing the rule's conditions, as well as an array of joins which the Squeel
+  #   expression must be joined to.
+  def build_expression_node(node, model_class, comparator, conditions, root = false)
+    conditions.reduce([nil, []]) do |(left_expression, joins), (key, value)|
+      comparison_node, node_joins = build_comparison_node(root ? node : node.dup, model_class,
+                                                          key, comparator, value)
+      if left_expression
+        [left_expression & comparison_node, joins.concat(node_joins)]
+      else
+        [comparison_node, node_joins]
+      end
+    end
+  end
+
+  # Builds a comparison node for the given key and value.
+  #
+  # @param node The node context to build the comparison.
+  # @param [Class] model_class The model class which the conditions reference.
+  # @param [Symbol] key The column to compare against.
+  # @param [Symbol] comparator The comparator to compare the column against the value.
+  # @param value The value to compare the column against.
+  def build_comparison_node(node, model_class, key, comparator, value)
+    if value.is_a?(Hash)
+      reflection_class = model_class.reflect_on_association(key).klass
+      expression, joins = build_expression_node(node.__send__(key), reflection_class, comparator,
+                                                value)
+      [expression, joins.map { |join| join.unshift(key) }.unshift([key])]
+    else
+      key, comparator, value = CanCanCan::Squeel::AttributeMapper.
+                               squeel_comparison_for(model_class, key, comparator, value)
+      [node.__send__(key).public_send(comparator, value), []]
+    end
+  end
+end

data/lib/cancancan/squeel/expression_combinator.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+module CanCanCan::Squeel::ExpressionCombinator
+  # This true expression is used to indicate a condition that is always satisfied.
+  ALWAYS_TRUE = Squeel::Nodes::Predicate.new(Squeel::Nodes::Literal.new('1'), :eq, 1).freeze
+
+  # This true expression is used to indicate a condition that is never satisfied.
+  ALWAYS_FALSE = Squeel::Nodes::Predicate.new(Squeel::Nodes::Literal.new('1'), :eq, 0).freeze
+
+  # Combines two Squeel expressions. This is aware of the +ALWAYS_TRUE+ and +ALWAYS_FALSE+
+  # constants and performs simplification.
+  #
+  # @param [Squeel::Nodes::Node] left_expression The left expression.
+  # @param [Array] left_expression_joins An array of joins which the Squeel expression must be
+  #   joined to.
+  # @param [Symbol] operator The operator to combine with. This must be either +:&+ or +:|+.
+  # @param [Squeel::Nodes::Node] right_expression The right expression.
+  # @param [Array] right_expression_joins An array of joins which the Squeel expression must be
+  #   joined to.
+  # @return [Array<(Squeel::Nodes::Node, Array)>] A tuple containing the combination of the given
+  #   expressions, as well as an array of joins which the Squeel expression must be joined to.
+  def combine_squeel_expressions(left_expression, left_expression_joins, operator,
+                                 right_expression, right_expression_joins)
+    case operator
+    when :& then conjunction_expressions(left_expression, left_expression_joins,
+                                         right_expression, right_expression_joins)
+    when :| then disjunction_expressions(left_expression, left_expression_joins,
+                                         right_expression, right_expression_joins)
+    else
+      raise ArgumentError, "#{operator} must either be :& or :|"
+    end
+  end
+
+  # Computes the conjunction of the two Squeel expressions.
+  #
+  # Boolean simplification is done for the +ALWAYS_TRUE+ and +ALWAYS_FALSE+ values.
+  # @param [Squeel::Nodes::Node] left_expression The left expression.
+  # @param [Array] left_expression_joins An array of joins which the Squeel expression must be
+  #   joined to.
+  # @param [Squeel::Nodes::Node] right_expression The right expression.
+  # @param [Array] right_expression_joins An array of joins which the Squeel expression must be
+  #   joined to.
+  # @return [Array<(Squeel::Nodes::Node, Array)>] A tuple containing the conjunction of the left and
+  #   right expressions, as well as an array of joins which the Squeel expression must be joined to.
+  def conjunction_expressions(left_expression, left_expression_joins, right_expression,
+                              right_expression_joins)
+    if left_expression == ALWAYS_FALSE || right_expression == ALWAYS_FALSE
+      [ALWAYS_FALSE, []]
+    elsif left_expression == ALWAYS_TRUE
+      [right_expression, right_expression_joins]
+    elsif right_expression == ALWAYS_TRUE
+      [left_expression, left_expression_joins]
+    else
+      [left_expression & right_expression, left_expression_joins + right_expression_joins]
+    end
+  end
+
+  # Computes the disjunction of the two Squeel expressions.
+  #
+  # Boolean simplification is done for the +ALWAYS_TRUE+ and +ALWAYS_FALSE+ values.
+  # @param [Squeel::Nodes::Node] left_expression The left expression.
+  # @param [Array] left_expression_joins An array of joins which the Squeel expression must be
+  #   joined to.
+  # @param [Squeel::Nodes::Node] right_expression The right expression.
+  # @param [Array] right_expression_joins An array of joins which the Squeel expression must be
+  #   joined to.
+  # @return [Array<(Squeel::Nodes::Node, Array)>] A tuple containing the disjunction of the left and
+  #   right expressions, as well as an array of joins which the Squeel expression must be joined to.
+  def disjunction_expressions(left_expression, left_expression_joins, right_expression,
+                              right_expression_joins)
+    if left_expression == ALWAYS_TRUE || right_expression == ALWAYS_TRUE
+      [ALWAYS_TRUE, []]
+    elsif left_expression == ALWAYS_FALSE
+      [right_expression, right_expression_joins]
+    elsif right_expression == ALWAYS_FALSE
+      [left_expression, left_expression_joins]
+    else
+      [left_expression | right_expression, left_expression_joins + right_expression_joins]
+    end
+  end
+end

data/lib/cancancan/squeel/squeel_adapter.rb

@@ -1,15 +1,37 @@
+# frozen_string_literal: true
 class CanCanCan::Squeel::SqueelAdapter < CanCan::ModelAdapters::AbstractAdapter
+  include CanCanCan::Squeel::ExpressionCombinator
+
+  ALWAYS_TRUE = CanCanCan::Squeel::ExpressionCombinator::ALWAYS_TRUE
+  ALWAYS_FALSE = CanCanCan::Squeel::ExpressionCombinator::ALWAYS_FALSE
+
   def self.for_class?(model_class)
     model_class <= ActiveRecord::Base
   end
 
   def self.override_condition_matching?(subject, name, _)
-    return false unless subject.class.respond_to?(:defined_enums)
-
-    subject.class.defined_enums.include?(name.to_s)
+    match_relation?(subject, name) || match_enum?(subject, name)
   end
 
   def self.matches_condition?(subject, name, value)
+    if match_relation?(subject, name)
+      matches_relation?(subject, name, value)
+    elsif match_enum?(subject, name)
+      matches_enum?(subject, name, value)
+    else
+      false
+    end
+  end
+
+  # Overrides condition matching for enums.
+  def self.match_enum?(subject, name)
+    klass = subject.class
+    klass.respond_to?(:defined_enums) && klass.defined_enums.include?(name.to_s)
+  end
+  private_class_method :match_enum?
+
+  # Overrides condition matching for enums.
+  def self.matches_enum?(subject, name, value)
     # Get the mapping from enum strings to values.
     enum = subject.class.public_send(name.to_s.pluralize)
 
@@ -19,6 +41,24 @@ class CanCanCan::Squeel::SqueelAdapter < CanCan::ModelAdapters::AbstractAdapter
     # Check to see if the value matches the condition.
     value.is_a?(Enumerable) ? value.include?(attribute) : attribute == value
   end
+  private_class_method :matches_enum?
+
+  def self.match_relation?(subject, name)
+    subject_attribute = subject.public_send(name)
+    subject_attribute.is_a?(ActiveRecord::Relation) && !subject_attribute.loaded
+  end
+  private_class_method :match_relation?
+
+  def self.matches_relation?(subject, name, value)
+    relation = subject.public_send(name)
+    klass = subject.class.reflect_on_association(name).klass
+
+    relation.where do
+      expression, = CanCanCan::Squeel::ExpressionBuilder.build(self, klass, :==, value)
+      expression
+    end.any?
+  end
+  private_class_method :matches_relation?
 
   def database_records
     # TODO: Handle overridden scopes.
@@ -29,32 +69,17 @@ class CanCanCan::Squeel::SqueelAdapter < CanCan::ModelAdapters::AbstractAdapter
 
   # Builds a relation that expresses the set of provided rules.
   #
-  # This first joins all the tables specified in the rules, then builds the corresponding Squeel
-  # expression for the conditions.
+  # The required Squeel expression is built, then the joins which are necessary to satisfy the
+  # expressions are added to the query scope.
   def relation
-    join_scope = @rules.reduce(@model_class.where(nil)) do |scope, rule|
-      add_joins_to_scope(scope, build_join_list(rule.conditions))
+    adapter = self
+    join_list = nil
+    scope = @model_class.where(nil).where do
+      expression, join_list = adapter.send(:build_accessible_by_expression, self)
+      expression
     end
 
-    add_conditions_to_scope(join_scope)
-  end
-
-  # Builds an array of joins for the given conditions hash.
-  #
-  # For example:
-  #
-  # a: { b: { c: 3 }, d: { e: 4 }} => [[:a, :b], [:a, :d]]
-  #
-  # @param [Hash] conditions The conditions to build the joins.
-  # @return [Array<Array<Symbol>>] The joins needed to satisfy the given conditions
-  def build_join_list(conditions)
-    conditions.flat_map do |key, value|
-      if value.is_a?(Hash)
-        [[key]].concat(build_join_list(value).map { |join| Array(join).unshift(key) })
-      else
-        []
-      end
-    end
+    add_joins_to_scope(scope, join_list)
   end
 
   # Builds a relation, outer joined on the provided associations.
@@ -72,24 +97,17 @@ class CanCanCan::Squeel::SqueelAdapter < CanCan::ModelAdapters::AbstractAdapter
     end
   end
 
-  # Adds the rule conditions to the scope.
-  #
   # This builds Squeel expression for each rule, and combines the expression with those to the left
   # using a fold-left.
   #
-  # @param [ActiveRecord::Relation] scope The scope to add the rule conditions to.
-  def add_conditions_to_scope(scope)
-    adapter = self
-    rules = @rules
-
-    # default n
-    scope.where do
-      rules.reduce(nil) do |left_expression, rule|
-        combined_rule = adapter.send(:combine_expression_with_rule, self, left_expression, rule)
-        break if combined_rule.nil?
-
-        combined_rule
-      end
+  # The rules provided by Cancancan are in reverse order, i.e. the lowest priority rule is first.
+  #
+  # @param squeel The Squeel scope.
+  # @return [Array<(Squeel::Nodes::Node, Array<Array<Symbol>>)>] A tuple containing the Squeel
+  #   expression, as well as an array of joins which the Squeel expression must be joined to.
+  def build_accessible_by_expression(squeel)
+    @rules.reverse.reduce([ALWAYS_FALSE, []]) do |(left_expression, joins), rule|
+      combine_expression_with_rule(squeel, left_expression, joins, rule)
     end
   end
 
@@ -97,99 +115,32 @@ class CanCanCan::Squeel::SqueelAdapter < CanCan::ModelAdapters::AbstractAdapter
   #
   # @param squeel The Squeel scope.
   # @param left_expression The Squeel expression for all preceding rules.
+  # @param [Array<Array<Symbol>>] joins An array of joins which the Squeel expression must be
+  #   joined to.
   # @param [CanCan::Rule] rule The rule being added.
-  # @return [Squeel::Nodes::Node] If the rule has an expression.
-  # @return [NilClass] If the rule is unconditional.
-  def combine_expression_with_rule(squeel, left_expression, rule)
-    right_expression = build_expression_from_rule(squeel, rule)
-    return right_expression if right_expression.nil? || !left_expression
-
-    if rule.base_behavior
-      left_expression | right_expression
-    else
-      left_expression & right_expression
-    end
+  # @return [Array<(Squeel::Nodes::Node, Array<Array<Symbol>>)>] A tuple containing the Squeel
+  #   expression, as well as an array of joins which the Squeel expression must be joined to.
+  def combine_expression_with_rule(squeel, left_expression, joins, rule)
+    right_expression, right_expression_joins = build_expression_from_rule(squeel, rule)
+
+    operator = rule.base_behavior ? :| : :&
+    combine_squeel_expressions(left_expression, joins, operator, right_expression,
+                               right_expression_joins)
   end
 
   # Builds a Squeel expression representing the rule's conditions.
   #
   # @param squeel The Squeel scope.
   # @param [CanCan::Rule] rule The rule being built.
+  # @return [Array<(Squeel::Nodes::Node, Array<Array<Symbol>>)>] A tuple containing the Squeel
+  #   expression representing the rule's conditions, as well as an array of joins which the Squeel
+  #   expression must be joined to.
   def build_expression_from_rule(squeel, rule)
-    comparator = rule.base_behavior ? :== : :!=
-    build_expression_node(squeel, @model_class, comparator, rule.conditions, true)
-  end
-
-  # Builds a new Squeel expression node.
-  #
-  # @param node The parent node context.
-  # @param [Class] model_class The model class which the conditions reference.
-  # @param [Symbol] comparator The comparator to use when generating the comparison.
-  # @param [Hash] conditions The values to compare the given node's attributes against.
-  # @param [Boolean] root True if the node being built is from the root. The root node is special
-  #   because it does not mutate itself; all other nodes do.
-  def build_expression_node(node, model_class, comparator, conditions, root = false)
-    conditions.reduce(nil) do |left_expression, (key, value)|
-      comparison_node = build_comparison_node(root ? node : node.dup, model_class, key,
-                                              comparator, value)
-      if left_expression
-        left_expression & comparison_node
-      else
-        comparison_node
-      end
-    end
-  end
-
-  # Builds a comparison node for the given key and value.
-  #
-  # @param node The node context to build the comparison.
-  # @param [Class] model_class The model class which the conditions reference.
-  # @param [Symbol] key The column to compare against.
-  # @param [Symbol] comparator The comparator to compare the column against the value.
-  # @param value The value to compare the column against.
-  def build_comparison_node(node, model_class, key, comparator, value)
-    if value.is_a?(Hash)
-      reflection = model_class.reflect_on_association(key)
-      build_expression_node(node.__send__(key), reflection.klass, comparator, value)
+    if rule.conditions.empty?
+      [rule.base_behavior ? ALWAYS_TRUE : ALWAYS_FALSE, []]
     else
-      key, comparator, value = squeel_comparison_for(model_class, key, comparator, value)
-      node.__send__(key).public_send(comparator, value)
-    end
-  end
-
-  # Picks the appropriate column, comparator, and value to use in the Squeel expression.
-  #
-  # This checks for association references: this will use the appropriate column name.
-  #
-  # Array values are interpreted as alternative choices allowed or disallowed.
-  #
-  # @param [Class] model_class The model class which the key references.
-  # @param [Symbol] key The column being compared.
-  # @param [Symbol] comparator The comparator to get the appropriate Squeel comparator for.
-  # @param value The value to be comparing against.
-  # @return [Array<(Symbol, Symbol, Object)>] A triple containing the column to compare with, the
-  #   comparator to use, and the value to compare with.
-  def squeel_comparison_for(model_class, key, comparator, value)
-    if (association = model_class.reflect_on_association(key))
-      key = association.foreign_key
-    end
-
-    comparator = squeel_comparator_for(comparator, value)
-    [key, comparator, value]
-  end
-
-  # Maps the given comparator to a comparator appropriate for the given value.
-  #
-  # Array values are interpreted as alternative choices allowed or disallowed.
-  #
-  # @param [Symbol] comparator The comparator to get the appropriate Squeel comparator for.
-  # @param value The value to be comparing against.
-  # @return [Symbol] The comparator for the desired effect, suitable for the given type.
-  def squeel_comparator_for(comparator, value)
-    case [comparator, value]
-    when :==, Array then :>>
-    when :!=, Array then :<<
-    else comparator
+      comparator = rule.base_behavior ? :== : :!=
+      CanCanCan::Squeel::ExpressionBuilder.build(squeel, @model_class, comparator, rule.conditions)
     end
   end
 end

data/lib/cancancan/squeel/version.rb

@@ -1,4 +1,5 @@
-module CanCanCan; end
-module CanCanCan::Squeel
-  VERSION = '0.1.0'.freeze
-end
+# frozen_string_literal: true
+module CanCanCan; end
+module CanCanCan::Squeel
+  VERSION = '0.1.2'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cancancan-squeel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Joel Low
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,16 +164,21 @@ files:
 - ".rubocop.unhound.yml"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
 - cancancan-squeel.gemspec
 - lib/cancancan/squeel.rb
 - lib/cancancan/squeel/active_record_disabler.rb
+- lib/cancancan/squeel/attribute_mapper.rb
+- lib/cancancan/squeel/expression_builder.rb
+- lib/cancancan/squeel/expression_combinator.rb
 - lib/cancancan/squeel/squeel_adapter.rb
 - lib/cancancan/squeel/version.rb
 homepage: https://github.com/lowjoel/cancancan-squeel
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []