cohort_analysis 1.0.1 → 1.0.2

data/CHANGELOG

@@ -1,8 +1,15 @@
+unreleased
+
+* Enhancements
+
+  * Arel::SelectManager#cohort_possible? - in case you want to know without having to re-count.
+  * Simplify aliasing examples in tests.
+
 1.0.1 / 2012-06-05
 
 * Bug fixes
 
-  * Properly test on mysql and postgres - you'll need a table alias. You may also need to `require 'arel/nodes/table_alias'`
+  * Properly test on mysql and postgres - you'll need a table/subquery alias like "AS t1"
 
 1.0.0 / 2012-06-05
 

data/lib/cohort_analysis/arel_select_manager_instance_methods.rb

@@ -4,5 +4,21 @@ module CohortAnalysis
     def cohort(characteristics, options = {})
       where Strategy.create(self, characteristics, options)
     end
+
+    # If a cohort has been constructed using this Arel::SelectManager, then this will tell you whether it was successful (posssible) or not.
+    # @return [true,false,nil]
+    def cohort_possible?
+      @cohort_possible_query
+    end
+
+    # @private
+    def cohort_possible!
+      @cohort_possible_query = true
+    end
+
+    # @private
+    def cohort_impossible!
+      @cohort_possible_query = false
+    end
   end
 end

data/lib/cohort_analysis/strategy.rb

@@ -37,7 +37,7 @@ module CohortAnalysis
       @original = characteristics.dup
       @current = characteristics.dup
       @minimum_size = options.fetch(:minimum_size, 1)
-      @final_mutex = ::Mutex.new
+      @final_mutex = Mutex.new
     end
 
     def final
@@ -68,11 +68,14 @@ module CohortAnalysis
     # Recursively look for a scope that meets the characteristics and is at least <tt>minimum_size</tt>.
     def resolve!
       if original.empty?
+        select_manager.cohort_possible!
         AlwaysTrue
       elsif current.empty?
+        select_manager.cohort_impossible!
         Impossible
       elsif count(current) >= minimum_size
-        Arel::Nodes::Grouping.new grasp(current).inject(:and)
+        select_manager.cohort_possible!
+        grasp(current).inject :and
       else
         reduce!
         resolve!

data/lib/cohort_analysis/version.rb

@@ -1,3 +1,3 @@
 module CohortAnalysis
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/test/helper.rb

@@ -14,8 +14,6 @@ require 'active_record_inline_schema'
 
 require 'cohort_analysis'
 
-require 'arel/nodes/table_alias' # strange
-
 if ::Bundler.definition.specs['debugger'].first
   require 'debugger'
 elsif ::Bundler.definition.specs['ruby-debug'].first

data/test/test_cohort_analysis.rb

@@ -183,7 +183,7 @@ shared_examples_for 'an adapter the provides #cohort' do
     it "can get where sql" do
       FactoryGirl.create(:lax_ord)
       FactoryGirl.create(:lax_sfo)
-      model.cohort(:origin => 'LAX').where_sql.delete('"`').must_equal %{WHERE (flights.origin = 'LAX')}
+      model.cohort(:origin => 'LAX').where_sql.delete('"`').must_equal %{WHERE flights.origin = 'LAX'}
     end
 
     it "will resolve independently from other cohorts" do
@@ -234,23 +234,23 @@ shared_examples_for 'an adapter the provides #cohort' do
         sfo = model.where(f_t[:dest].eq('SFO'))
         ord.projections = [Arel.star]
         sfo.projections = [Arel.star]
-        Flight.find_by_sql("SELECT * FROM #{Arel::Nodes::TableAlias.new(ord.union(sfo), 't1').to_sql}").must_equal [@ord, @sfo]
+        Flight.find_by_sql("SELECT * FROM #{ord.union(sfo).to_sql} AS subquery").must_equal [@ord, @sfo]
       end
         
       it "builds successful cohorts" do
         ord = model.cohort(:dest => 'ORD').project(Arel.star)
         sfo = model.cohort(:dest => 'SFO').project(Arel.star)
-        Flight.find_by_sql("SELECT * FROM #{Arel::Nodes::TableAlias.new(ord.union(sfo), 't1').to_sql}").must_equal [@ord, @sfo]
+        Flight.find_by_sql("SELECT * FROM #{ord.union(sfo).to_sql} AS subquery").must_equal [@ord, @sfo]
 
         msn = model.cohort(:origin => 'LAX', :dest => 'MSN').project(Arel.star)
         lhr = model.cohort(:origin => 'LAX', :dest => 'LHR').project(Arel.star)
-        Flight.find_by_sql("SELECT * FROM #{Arel::Nodes::TableAlias.new(msn.union(lhr), 't1').to_sql}").must_equal [@ord, @sfo]
+        Flight.find_by_sql("SELECT * FROM #{msn.union(lhr).to_sql} AS subquery").must_equal [@ord, @sfo]
       end
 
       it "doesn't somehow create unions with false positives" do
         msn = model.cohort(:dest => 'MSN').project(Arel.star)
         lhr = model.cohort(:dest => 'LHR').project(Arel.star)
-        count = ActiveRecord::Base.connection.select_value("SELECT COUNT(*) FROM #{Arel::Nodes::TableAlias.new(msn.union(lhr), 't1').to_sql}")
+        count = ActiveRecord::Base.connection.select_value("SELECT COUNT(*) FROM #{msn.union(lhr).to_sql} AS subquery")
         flunk "count was nil" if count.nil?
         count.to_i.must_equal 0
       end
@@ -258,7 +258,31 @@ shared_examples_for 'an adapter the provides #cohort' do
       it "builds unions where only one side has rows" do
         msn = model.cohort(:dest => 'MSN').project(Arel.star)
         ord = model.cohort(:dest => 'ORD').project(Arel.star)
-        Flight.find_by_sql("SELECT * FROM #{Arel::Nodes::TableAlias.new(msn.union(ord), 't1').to_sql}").must_equal [@ord]
+        Flight.find_by_sql("SELECT * FROM #{msn.union(ord).to_sql} AS subquery").must_equal [@ord]
+      end
+    end
+
+    describe :cohort_possible? do
+      it "can be used after the cohort is resolved" do
+        FactoryGirl.create(:lax_ord)
+        FactoryGirl.create(:lax_sfo)
+        yes = model.cohort(:origin => 'LAX')
+        yes.to_sql # force the cohort to resolve
+        no = model.cohort(:dest => 'MSN')
+        no.to_sql
+        assert yes.cohort_possible?
+        refute no.cohort_possible?
+      end
+
+      it "may be available even after further composition" do
+        FactoryGirl.create(:lax_ord)
+        FactoryGirl.create(:lax_sfo)
+        yes = model.cohort(:origin => 'LAX').where(moot_condition)
+        yes.to_sql # force the cohort to resolve
+        no = model.cohort(:dest => 'MSN').where(moot_condition)
+        no.to_sql
+        assert yes.cohort_possible?
+        refute no.cohort_possible?
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cohort_analysis
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport