params_ready 0.0.7 → 0.0.8

data/lib/params_ready/query/join_clause.rb

@@ -1,14 +1,45 @@
 require_relative '../helpers/arel_builder'
+require_relative '../error'
 
 module ParamsReady
   module Query
     class Join
+      class Builder
+        def initialize(&block)
+          @block = block
+          @statement_builder = nil
+          @only_if = nil
+        end
+
+        def build
+          instance_eval(&@block)
+          @block = nil
+          raise ParamsReadyError, 'Join statement must be present' if @statement_builder.nil?
+          [@statement_builder.build, @only_if]
+        end
+
+        def on(expression, arel_table: nil)
+          @statement_builder ||= JoinStatement::Builder.new
+          @statement_builder.on(expression, arel_table: arel_table)
+        end
+
+        def only_if(&block)
+          @only_if = block
+          nil
+        end
+      end
+
       attr_reader :arel_table, :statement, :type
 
-      def initialize(table, type, &block)
-        @arel_table = table
+      def initialize(table, type, table_alias: nil, &block)
+        @arel_table = Helpers::ArelBuilder::Table.instance(table, table_alias: table_alias)
         @type = arel_type(type)
-        @statement = JoinStatement.new(&block)
+        @statement, @only_if = Builder.new(&block).build
+        freeze
+      end
+
+      def arel_table(context, parameter)
+        @arel_table.to_arel(context, parameter)
       end
 
       def arel_type(type)
@@ -19,32 +50,51 @@ module ParamsReady
         end
       end
 
-      def to_arel(base_table, context, parameter)
-        join_statement = @statement.to_arel(base_table, @arel_table, context, parameter)
-        base_table.join(@arel_table, @type).on(join_statement)
+      def to_arel(joined_table, base_table, context, parameter)
+        return joined_table unless eligible?(context, parameter)
+
+        arel_table = arel_table(context, parameter)
+        join_statement = @statement.to_arel(base_table, arel_table, context, parameter)
+        joined_table.join(arel_table, @type).on(join_statement)
+      end
+
+      def eligible?(context, parameter)
+        return true if @only_if.nil?
+
+        @only_if.call(context, parameter)
       end
     end
 
     class JoinStatement
-      def initialize(on: nil, eq: nil, &block)
-        @conditions = []
-        if on
-          condition = on(on)
-          if eq
-            condition.eq(eq)
+      class Builder
+        def initialize(on: nil, eq: nil, &block)
+          @condition_builders = []
+          if on.nil?
+            raise ParamsReadyError, 'Parameter :eq unexpected' unless eq.nil?
+          else
+            condition = on(on)
+            condition.eq(eq) unless eq.nil?
           end
-        else
-          raise ParamsReadyError('Parameter :eq unexpected') unless eq.nil?
+          @block = block
         end
 
-        instance_eval(&block) unless block.nil?
-        raise ParamsReadyError, "Join clause is empty" if @conditions.empty?
+        def on(expression, arel_table: nil)
+          condition = JoinCondition::Builder.new(expression, arel_table: arel_table)
+          @condition_builders << condition
+          condition
+        end
+
+        def build
+          instance_eval(&@block) unless @block.nil?
+          JoinStatement.new(@condition_builders.map(&:build))
+        end
       end
 
-      def on(expression, arel_table: nil)
-        condition = JoinCondition.new(expression, arel_table: arel_table)
-        @conditions << condition
-        condition
+      def initialize(conditions)
+        @conditions = conditions.freeze
+        raise ParamsReadyError, "Join clause is empty" if @conditions.empty?
+
+        freeze
       end
 
       def to_arel(base_table, join_table, context, parameter)
@@ -58,16 +108,29 @@ module ParamsReady
     end
 
     class JoinCondition
-      def initialize(expression, arel_table: nil)
-        @on = Helpers::ArelBuilder.instance(expression, arel_table: arel_table)
-        @to = nil
-        @op = nil
+      class Builder
+        def initialize(expression, arel_table: nil)
+          @on = Helpers::ArelBuilder::Attribute.instance(expression, arel_table: arel_table)
+          @op = nil
+          @to = nil
+        end
+
+        def eq(expression, arel_table: nil)
+          raise ParamsReadyError, "Operator already set" unless @op.nil?
+          @op = :eq
+          @to = Helpers::ArelBuilder::Attribute.instance(expression, arel_table: arel_table)
+        end
+
+        def build
+          JoinCondition.new(@on, @op, @to)
+        end
       end
 
-      def eq(expression, arel_table: nil)
-        raise ParamsReadyError, "Operator already set" unless @op.nil?
-        @op = :eq
-        @to = Helpers::ArelBuilder.instance(expression, arel_table: arel_table)
+      def initialize(on, op, to)
+        @on = on
+        @op = op
+        @to = to
+        freeze
       end
 
       def to_arel(base_table, join_table, context, parameter)

data/lib/params_ready/query/predicate.rb

@@ -1,6 +1,6 @@
 require_relative '../extensions/registry'
 require_relative '../parameter/array_parameter'
-require_relative '../parameter/hash_set_parameter'
+require_relative '../parameter/enum_set_parameter'
 require_relative '../helpers/arel_builder'
 
 module ParamsReady
@@ -45,7 +45,7 @@ module ParamsReady
       registry :types, as: :type, getter: true
       register_type :value, Parameter::ValueParameterBuilder
       register_type :array, Parameter::ArrayParameterBuilder
-      register_type :hash_set, Parameter::HashSetParameterBuilder
+      register_type :enum_set, Parameter::EnumSetParameterBuilder
     end
 
     class AbstractPredicateDefinition < Parameter::AbstractDefinition
@@ -70,7 +70,7 @@ module ParamsReady
         end
 
         def build_select_expression(arel_table, context)
-          arel_builder = Helpers::ArelBuilder.instance(select_expression, arel_table: @arel_table)
+          arel_builder = Helpers::ArelBuilder::Attribute.instance(select_expression, arel_table: @arel_table)
           arel = arel_builder.to_arel(arel_table, context, self)
 
           arel

data/lib/params_ready/query/relation.rb

@@ -136,7 +136,7 @@ module ParamsReady
 
       def perform_count(scope: nil, context: Restriction.blanket_permission)
         scope ||= definition.model_class if definition.model_class_defined?
-        group = predicate_group(scope.arel_table, context: context)
+        group = to_query_if_eligible(scope.arel_table, context: context)
         relation = scope.where(group)
         relation = perform_joins(relation, context)
         relation.count
@@ -144,7 +144,7 @@ module ParamsReady
 
       def keysets(limit, direction, keyset, scope: nil, context: Restriction.blanket_permission, &block)
         model_class = scope || definition.model_class
-        group = predicate_group(model_class.arel_table, context: context)
+        group = to_query_if_eligible(model_class.arel_table, context: context)
         relation = model_class.where(group)
         relation = perform_joins(relation, context)
 
@@ -156,7 +156,7 @@ module ParamsReady
 
       def build_relation(scope: nil, include: [], context: Restriction.blanket_permission, paginate: true)
         model_class = scope || definition.model_class
-        group = predicate_group(model_class.arel_table, context: context)
+        group = to_query_if_eligible(model_class.arel_table, context: context)
         relation = model_class.where(group)
         relation = relation.includes(*include) unless include.empty?
         relation = perform_joins(relation, context)
@@ -165,9 +165,12 @@ module ParamsReady
       end
 
       def perform_joins(relation, context)
-        return relation if definition.joins.empty?
+        eligible_joins = definition.joins.select do |join|
+          join.eligible?(context, self)
+        end
+        return relation if eligible_joins.empty?
 
-        sql = joined_tables(relation.arel_table, context).join_sources.map(&:to_sql).join(' ')
+        sql = join_tables(eligible_joins, relation.arel_table, context).join_sources.map(&:to_sql).join(' ')
         relation.joins(sql)
       end
 
@@ -176,7 +179,7 @@ module ParamsReady
 
         arel_table = joined_tables(model_class.arel_table, context)
 
-        group = self.predicate_group(model_class.arel_table, context: context)
+        group = to_query_if_eligible(model_class.arel_table, context: context)
 
         query = if group.nil?
           arel_table
@@ -200,7 +203,7 @@ module ParamsReady
       def build_query(model_class, context)
         arel_table = arel_table(model_class)
 
-        group = self.predicate_group(arel_table, context: context)
+        group = to_query_if_eligible(arel_table, context: context)
         joined = joined_tables(arel_table, context)
 
         query = if group.nil?
@@ -212,6 +215,12 @@ module ParamsReady
         [arel_table, query]
       end
 
+      def to_query_if_eligible(arel_table, context:)
+        return if respond_to?(:to_query?) && !to_query?(arel_table, context)
+
+        predicate_group(arel_table, context: context)
+      end
+
       def order_if_applicable(arel_table, context)
         if child_is_definite?(:ordering) && (context.permitted?(ordering) || ordering.required?)
           ordering = self.ordering.to_arel(arel_table, context: context)
@@ -248,16 +257,23 @@ module ParamsReady
         query
       end
 
-      def joined_tables(proper_table, context)
-        definition.joins.reduce(proper_table) do |table, join|
-          join.to_arel(table, context, self)
+      def joined_tables(base_table, context)
+        join_tables(definition.joins, base_table, context)
+      end
+
+      def join_tables(joins, base_table, context)
+        joins.reduce(base_table) do |joined_table, join|
+          join = join.to_arel(joined_table, base_table, context, self)
+          next joined_table if join.nil?
+
+          join
         end
       end
     end
 
     class RelationParameterBuilder < Builder
       include GroupingLike
-      include Parameter::AbstractHashParameterBuilder::HashLike
+      include Parameter::AbstractStructParameterBuilder::StructLike
       include HavingModel
 
       def self.instance(name, altn: nil)
@@ -288,9 +304,8 @@ module ParamsReady
         add ordering
       end
 
-      def join_table(arel_table, type, &block)
-        join = Join.new arel_table, type, &block
-        join.freeze
+      def join_table(arel_table, type, table_alias: nil, &block)
+        join = Join.new arel_table, type, table_alias: nil, &block
         @definition.add_join(join)
       end
     end

data/lib/params_ready/query/structured_grouping.rb

@@ -1,4 +1,4 @@
-require_relative '../parameter/hash_parameter'
+require_relative '../parameter/struct_parameter'
 require_relative '../parameter/value_parameter'
 require_relative 'fixed_operator_predicate'
 require_relative 'nullness_predicate'
@@ -6,7 +6,7 @@ require_relative 'grouping'
 
 module ParamsReady
   module Query
-    class StructuredGrouping < Parameter::HashParameter
+    class StructuredGrouping < Parameter::StructParameter
       include Parameter::GroupingLike
       def predicates
         return [] if is_nil?
@@ -29,7 +29,7 @@ module ParamsReady
 
     class StructuredGroupingBuilder < Builder
       include GroupingLike
-      include Parameter::AbstractHashParameterBuilder::HashLike
+      include Parameter::AbstractStructParameterBuilder::StructLike
       PredicateRegistry.register_predicate :structured_grouping_predicate, self
 
       def self.instance(name, altn: nil)
@@ -37,7 +37,7 @@ module ParamsReady
       end
     end
 
-    class StructuredGroupingDefinition < Parameter::HashParameterDefinition
+    class StructuredGroupingDefinition < Parameter::StructParameterDefinition
       attr_reader :arel_table, :predicates
 
       def initialize(*args, **opts)

data/lib/params_ready/query/variable_operator_predicate.rb

@@ -1,5 +1,5 @@
 require_relative 'predicate'
-require_relative '../parameter/hash_parameter'
+require_relative '../parameter/struct_parameter'
 require_relative '../parameter/value_parameter'
 require_relative '../value/validator'
 require_relative 'predicate_operator'
@@ -12,7 +12,7 @@ module ParamsReady
 
       def initialize(definition)
         super definition
-        @data = definition.hash_parameter.create
+        @data = definition.struct_parameter.create
       end
 
       def build_query(select_expression, context: nil)
@@ -64,7 +64,7 @@ module ParamsReady
       PredicateRegistry.register_predicate :variable_operator_predicate, self
       include HavingType
       include HavingAttribute
-      include DelegatingBuilder[:hash_parameter_builder]
+      include DelegatingBuilder[:struct_parameter_builder]
 
       def self.instance(name, altn: nil, attr: nil)
         new VariableOperatorPredicateDefinition.new name, altn: altn, attribute_name: attr
@@ -82,19 +82,19 @@ module ParamsReady
     class VariableOperatorPredicateDefinition < AbstractPredicateDefinition
       include HavingAttribute
 
-      attr_reader :hash_parameter_builder
-      attr_reader :hash_parameter
+      attr_reader :struct_parameter_builder
+      attr_reader :struct_parameter
 
       def initialize(*args, attribute_name: nil, **opts)
         super *args, **opts
         @attribute_name = attribute_name
-        @hash_parameter_builder = Builder.builder(:hash).instance(name, altn: altn)
+        @struct_parameter_builder = Builder.builder(:struct).instance(name, altn: altn)
         @operator_parameter_builder = Builder.builder(:predicate_operator).instance(:operator, altn: :op)
       end
 
       def set_type(type)
         @type = type
-        @hash_parameter_builder.add @type.finish
+        @struct_parameter_builder.add @type.finish
       end
 
       def set_operators(array, &block)
@@ -107,12 +107,12 @@ module ParamsReady
           constrain :enum, operators
         end
         @operator_parameter_builder.include(&block) unless block.nil?
-        @hash_parameter_builder.add @operator_parameter_builder.build
+        @struct_parameter_builder.add @operator_parameter_builder.build
       end
 
       def finish
-        @hash_parameter = @hash_parameter_builder.build
-        @hash_parameter_builder = nil
+        @struct_parameter = @struct_parameter_builder.build
+        @struct_parameter_builder = nil
         @operator_parameter_builder = nil
         @type = nil
 

data/lib/params_ready/value/coder.rb

@@ -53,10 +53,13 @@ module ParamsReady
         def strict_default?
           self.class.strict_default?
         end
+
+        def value_class_name
+          self.class.value_class_name
+        end
       end
     end
 
-
     class GenericCoder
       extend Extensions::LateInit
       extend Extensions::Finalizer
@@ -97,7 +100,9 @@ module ParamsReady
 
       def self.coerce(input, _)
         return nil if input.nil? || input == ''
-        Integer(input)
+
+        base = 10 if input.is_a? String
+        Integer(input, base)
       end
   
       def self.format(value, format)

data/lib/params_ready/version.rb

@@ -0,0 +1,7 @@
+module ParamsReady
+  VERSION = '0.0.8'.freeze
+
+  def self.gem_version
+    ::Gem::Version.new(VERSION)
+  end
+end

data/lib/params_ready.rb

@@ -2,8 +2,8 @@ require 'ruby2_keywords'
 require 'arel'
 
 require_relative 'params_ready/parameter/array_parameter'
-require_relative 'params_ready/parameter/hash_parameter'
-require_relative 'params_ready/parameter/hash_set_parameter'
+require_relative 'params_ready/parameter/struct_parameter'
+require_relative 'params_ready/parameter/enum_set_parameter'
 require_relative 'params_ready/parameter/polymorph_parameter'
 require_relative 'params_ready/parameter/tuple_parameter'
 require_relative 'params_ready/parameter/value_parameter'
@@ -25,12 +25,4 @@ require_relative 'params_ready/query/nullness_predicate'
 require_relative 'params_ready/query/polymorph_predicate'
 require_relative 'params_ready/query/relation'
 require_relative 'params_ready/query/variable_operator_predicate'
-
-
-module ParamsReady
-  VERSION = '0.0.7'.freeze
-
-  def self.gem_version
-    ::Gem::Version.new(VERSION)
-  end
-end
+require_relative 'params_ready/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: params_ready
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Tomas Milsimer
@@ -132,8 +132,10 @@ files:
 - lib/params_ready/extensions/undefined.rb
 - lib/params_ready/format.rb
 - lib/params_ready/helpers/arel_builder.rb
+- lib/params_ready/helpers/callable.rb
 - lib/params_ready/helpers/conditional_block.rb
 - lib/params_ready/helpers/find_in_hash.rb
+- lib/params_ready/helpers/interface_definer.rb
 - lib/params_ready/helpers/key_map.rb
 - lib/params_ready/helpers/memo.rb
 - lib/params_ready/helpers/options.rb
@@ -150,10 +152,10 @@ files:
 - lib/params_ready/marshaller/builder_module.rb
 - lib/params_ready/marshaller/collection.rb
 - lib/params_ready/marshaller/definition_module.rb
-- lib/params_ready/marshaller/hash_marshallers.rb
-- lib/params_ready/marshaller/hash_set_marshallers.rb
+- lib/params_ready/marshaller/enum_set_marshallers.rb
 - lib/params_ready/marshaller/parameter_module.rb
 - lib/params_ready/marshaller/polymorph_marshallers.rb
+- lib/params_ready/marshaller/struct_marshallers.rb
 - lib/params_ready/marshaller/tuple_marshallers.rb
 - lib/params_ready/ordering/column.rb
 - lib/params_ready/ordering/ordering.rb
@@ -166,14 +168,14 @@ files:
 - lib/params_ready/pagination/nulls.rb
 - lib/params_ready/pagination/offset_pagination.rb
 - lib/params_ready/pagination/tendency.rb
-- lib/params_ready/parameter/abstract_hash_parameter.rb
+- lib/params_ready/parameter/abstract_struct_parameter.rb
 - lib/params_ready/parameter/array_parameter.rb
 - lib/params_ready/parameter/definition.rb
-- lib/params_ready/parameter/hash_parameter.rb
-- lib/params_ready/parameter/hash_set_parameter.rb
+- lib/params_ready/parameter/enum_set_parameter.rb
 - lib/params_ready/parameter/parameter.rb
 - lib/params_ready/parameter/polymorph_parameter.rb
 - lib/params_ready/parameter/state.rb
+- lib/params_ready/parameter/struct_parameter.rb
 - lib/params_ready/parameter/tuple_parameter.rb
 - lib/params_ready/parameter/value_parameter.rb
 - lib/params_ready/parameter_definer.rb
@@ -198,6 +200,7 @@ files:
 - lib/params_ready/value/constraint.rb
 - lib/params_ready/value/custom.rb
 - lib/params_ready/value/validator.rb
+- lib/params_ready/version.rb
 homepage: https://github.com/lame-impala/params_ready
 licenses:
 - MIT
@@ -217,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Define controller interfaces in Rails