partitioned 1.1.1 → 1.1.3

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/Gemfile.lock

@@ -0,0 +1,116 @@
+PATH
+  remote: .
+  specs:
+    partitioned (1.1.3)
+      bulk_data_methods (= 1.0.0)
+      pg
+      rails (>= 3.2.8)
+      rspec-rails
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
+      mail (~> 2.4.4)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
+      builder (~> 3.0.0)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.4)
+    bulk_data_methods (1.0.0)
+      pg
+      rails (>= 3.0.0)
+      rspec-rails
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    jquery-rails (2.1.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.7.6)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    multi_json (1.5.0)
+    pg (0.14.1)
+    polyglot (0.3.3)
+    rack (1.4.4)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.11)
+      actionmailer (= 3.2.11)
+      actionpack (= 3.2.11)
+      activerecord (= 3.2.11)
+      activeresource (= 3.2.11)
+      activesupport (= 3.2.11)
+      bundler (~> 1.0)
+      railties (= 3.2.11)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+    rspec-rails (2.12.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jquery-rails
+  partitioned!

data/examples/company_id.rb

@@ -131,7 +131,7 @@
 #
 #  update_many - allows you to update multiple records.
 #  :set_array - additional option, you may read the description
-#  of the method in the file update_many bulk_methods_mixin.rb about this option.
+#  of the method update_many in the gem bulk_data_methods about this option.
 #  Employee.update_many(updates, { :set_array => '"salary = #{table_name}.salary +
 #                                   datatable.salary, updated_at = now()"' })
 #

data/examples/company_id_and_created_at.rb

@@ -230,7 +230,7 @@
 #
 #  update_many - allows you to update multiple records.
 #  :set_array - additional option, you may read the description
-#  of the method in the file update_many bulk_methods_mixin.rb about this option.
+#  of the method update_many in the gem bulk_data_methods about this option.
 #  Employee.update_many(updates,  { :set_array => '"salary = #{table_name}.salary +
 #                                   datatable.salary, updated_at = now()"' })
 #

data/examples/created_at.rb

@@ -216,7 +216,7 @@
 #
 #  update_many - allows you to update multiple records.
 #  :set_array - additional option, you may read the description
-#  of the method in the file update_many bulk_methods_mixin.rb about this option.
+#  of the method update_many in the gem bulk_data_methods about this option.
 #  Employee.update_many(updates, {:set_array => '"salary = #{table_name}.salary +
 #                                        datatable.salary, updated_at = now()"'})
 #

data/examples/created_at_referencing_awards.rb

@@ -240,7 +240,7 @@
 #
 #  update_many - allows you to update multiple records.
 #  :set_array - additional option, you may read the description
-#  of the method in the file update_many bulk_methods_mixin.rb about this option.
+#  of the method update_many in the gem bulk_data_methods about this option.
 #  Employee.update_many(updates, { :set_array => '"salary = #{table_name}.salary +
 #                                                    datatable.salary, updated_at = now()"' })
 #
@@ -364,7 +364,7 @@
 #
 #  update_many - allows you to update multiple records.
 #  :set_array - additional option, you may read the description
-#  of the method in the file update_many bulk_methods_mixin.rb about this option.
+#  of the method update_many in the gem bulk_data_methods about this option.
 #  Award.update_many(updates, { :set_array => '"award_title = datatable.award_title,
 #                                                            awarded_on = now()"' })
 #

data/examples/id.rb

@@ -150,7 +150,7 @@
 #
 #  update_many - allows you to update multiple records.
 #  :set_array - additional option, you may read the description
-#  of the method in the file update_many bulk_methods_mixin.rb about this option.
+#  of the method update_many in the gem bulk_data_methods about this option.
 #  Employee.update_many(updates, {:set_array => '"salary = #{table_name}.salary +
 #                                         datatable.salary, updated_at = now()"'})
 #

data/examples/lib/company.rb

@@ -1,5 +1,5 @@
 class Company < ActiveRecord::Base
-  extend Partitioned::BulkMethodsMixin
+  extend BulkMethodsMixin
   has_many :employees, :class_name => 'Company', :conditions => "companies.id = employees.companies_id"
 
   connection.execute <<-SQL

data/examples/start_date.rb

@@ -200,7 +200,7 @@
 #
 #  update_many - allows you to update multiple records.
 #  :set_array - additional option, you may read the description
-#  of the method in the file update_many bulk_methods_mixin.rb about this option.
+#  of the method update_many in the gem bulk_data_methods about this option.
 #  Employee.update_many(updates,  {:set_array => '"salary = #{table_name}.salary +
 #                                                    datatable.salary, updated_at = now()"'})
 #

data/lib/partitioned/by_yearly_time_field.rb

@@ -0,0 +1,29 @@
+module Partitioned
+  #
+  # Partition tables by a time field grouping them by year.
+  #
+  class ByYearlyTimeField < ByTimeField
+    self.abstract_class = true
+
+    # Normalize a partition key value by year.
+    #
+    # @param [Time] time_value the time value to normalize
+    # @return [Time] the value normalized
+    def self.partition_normalize_key_value(time_value)
+      return time_value.at_beginning_of_year
+    end
+
+    # The size of the partition table, a year
+    # 
+    # @return [Integer] the size of this partition
+    def self.partition_table_size
+      return 1.year
+    end
+
+    partitioned do |partition|
+      partition.base_name lambda { |model, time_field|
+        return model.partition_normalize_key_value(time_field).strftime('%Y')
+      }
+    end
+  end
+end

data/lib/partitioned/partitioned_base.rb

@@ -1,6 +1,7 @@
 #
 # :include: ../../README
 #
+require "bulk_data_methods"
 
 module Partitioned
   #
@@ -19,7 +20,7 @@ module Partitioned
   # Uses a domain specific language to configure, see Partitioned::PartitionedBase::Configurator
   # for more information.
   #
-  # Extends Partitioned::BulkMethodsMixin to provide create_many and update_many.
+  # Extends BulkMethodsMixin to provide create_many and update_many.
   #
   # Uses PartitionManager to manage creation of child tables.
   #
@@ -28,7 +29,7 @@ module Partitioned
   #
   class PartitionedBase < ActiveRecord::Base
     include ActiveRecordOverrides
-    extend Partitioned::BulkMethodsMixin
+    extend ::BulkMethodsMixin
 
     self.abstract_class = true
 
@@ -161,7 +162,7 @@ module Partitioned
     #
     # Use as:
     #
-    #   Foo.from_partitioned_without_alias(KEY).find(:all, :select => "*")
+    #   Foo.from_partition_without_alias(KEY).find(:all, :select => "*")
     #
     # where KEY is the key value(s) used as the check constraint on Foo's table.
     #
@@ -174,13 +175,9 @@ module Partitioned
     # which fails because table foos is not referenced.  using the form #from_partition
     # is almost always the correct thing when using activerecord.
     #
-    # Because the scope is specific to a class (a class method) but unlike
-    # class methods is not inherited, one  must use this form (#from_partitioned_without_alias) instead
-    # of #from_partitioned_without_alias_scope to get the most derived classes specific active record scope.
-    #
     # @param [*Array<Object>] partition_field the field values to partition on
     # @return [Hash] the scoping
-    def self.from_partitioned_without_alias(*partition_field)
+    def self.from_partition_without_alias(*partition_field)
       table_alias_name = partition_table_name(*partition_field)
       from(table_alias_name).
         tap{|relation| relation.table.table_alias = table_alias_name}

data/lib/partitioned/version.rb

@@ -1,4 +1,4 @@
 module Partitioned
   # the current version of this gem
-  VERSION = "1.1.1"
+  VERSION = "1.1.3"
 end

data/lib/partitioned.rb

@@ -1,7 +1,6 @@
 require 'monkey_patch_activerecord'
 require 'monkey_patch_postgres'
 
-require 'partitioned/bulk_methods_mixin'
 require 'partitioned/active_record_overrides'
 require 'partitioned/partitioned_base/configurator.rb'
 require 'partitioned/partitioned_base/configurator/data'
@@ -12,6 +11,7 @@ require 'partitioned/partitioned_base/partition_manager'
 require 'partitioned/partitioned_base/sql_adapter'
 
 require 'partitioned/by_time_field'
+require 'partitioned/by_yearly_time_field'
 require 'partitioned/by_monthly_time_field'
 require 'partitioned/by_weekly_time_field'
 require 'partitioned/by_created_at'
@@ -23,4 +23,4 @@ require 'partitioned/multi_level'
 require 'partitioned/multi_level/configurator/data'
 require 'partitioned/multi_level/configurator/dsl'
 require 'partitioned/multi_level/configurator/reader'
-require 'partitioned/multi_level/partition_manager'
+require 'partitioned/multi_level/partition_manager'

data/partitioned.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
  s.name        = 'partitioned'
  s.version     = Partitioned::VERSION
  s.license     = 'New BSD License'
- s.date        = '2012-09-13'
+ s.date        = '2013-10-14'
  s.summary     = "Postgres table partitioning support for ActiveRecord."
  s.description = "A gem providing support for table partitioning in ActiveRecord. Support is only available for postgres databases. Other features include child table management (creation and deletion) and bulk data creating and updating."
  s.authors     = ["Keith Gabryelski", "Aleksandr Dembskiy"]
@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
  s.require_path = 'lib'
  s.homepage    = 'http://github.com/fiksu/partitioned'
- s.add_dependency('pg')
- s.add_dependency "rails", '>= 3.2.8'
- s.add_dependency('rspec-rails')
+ s.add_dependency 'pg'
+ s.add_dependency 'rails', '>= 3.2.8'
+ s.add_dependency 'rspec-rails'
+ s.add_dependency 'bulk_data_methods', '1.0.0'
 end

data/spec/monkey_patch_posgres_spec.rb

@@ -37,7 +37,7 @@ module ActiveRecord::ConnectionAdapters
       before do
         class Employee < ActiveRecord::Base
           include Partitioned::ActiveRecordOverrides
-          extend Partitioned::BulkMethodsMixin
+          extend BulkMethodsMixin
         end
         create_tables
       end

data/spec/partitioned/by_yearly_time_field_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+require "#{File.dirname(__FILE__)}/../support/tables_spec_helper"
+require "#{File.dirname(__FILE__)}/../support/shared_example_spec_helper_for_time_key"
+
+module Partitioned
+
+  describe ByYearlyTimeField do
+
+    include TablesSpecHelper
+
+    module YearlyTimeField
+      class Employee < Partitioned::ByYearlyTimeField
+        belongs_to :company, :class_name => 'Company'
+        attr_accessible :company_id, :name, :created_at
+
+        def self.partition_time_field
+          return :created_at
+        end
+
+        partitioned do |partition|
+          partition.index :id, :unique => true
+          partition.foreign_key :company_id
+        end
+      end # Employee
+    end # YearlyTimeField
+
+    before(:all) do
+      @employee = YearlyTimeField::Employee
+      create_tables
+      dates = @employee.partition_generate_range(DATE_NOW,
+                                                 DATE_NOW + 1.year)
+      @employee.create_new_partition_tables(dates)
+      ActiveRecord::Base.connection.execute <<-SQL
+        insert into employees_partitions.
+          p#{DATE_NOW.at_beginning_of_year.strftime('%Y')}
+          (company_id,name) values (1,'Keith');
+      SQL
+    end
+
+    after(:all) do
+      drop_tables
+    end
+
+    let(:class_by_yearly_time_field) { ::Partitioned::ByYearlyTimeField }
+
+    describe "model is abstract class" do
+
+      it "returns true" do
+        class_by_yearly_time_field.abstract_class.should be_true
+      end
+
+    end # model is abstract class
+
+    describe "#partition_normalize_key_value" do
+
+      it "returns date with day set to 1st January of the year" do
+        class_by_yearly_time_field.
+            partition_normalize_key_value(Date.parse('2011-02-05')).
+            should == Date.parse('2011-01-01')
+      end
+
+    end # #partition_normalize_key_value
+
+    describe "#partition_table_size" do
+
+      it "returns 1.year" do
+        class_by_yearly_time_field.partition_table_size.should == 1.year
+      end
+
+    end # #partition_table_size
+
+    describe "partitioned block" do
+
+      let(:data) do
+        class_by_yearly_time_field.configurator_dsl.data
+      end
+
+      context "checks data in the base_name is Proc" do
+
+        it "returns Proc" do
+          data.base_name.should be_is_a Proc
+        end
+
+      end # checks data in the on_field is Proc
+
+      context "checks data in the base_name" do
+
+        it "returns base_name" do
+          data.base_name.call(@employee, Date.parse('2011-02-05')).should == "2011"
+        end
+
+      end # checks data in the base_name
+
+    end # partitioned block
+
+    it_should_behave_like "check that basic operations with postgres works correctly for time key", YearlyTimeField::Employee
+
+  end # ByYearlyTimeField
+
+end # Partitioned

data/spec/partitioned/multi_level/configurator/dsl_spec.rb

@@ -20,9 +20,13 @@ describe Partitioned::MultiLevel::Configurator::Dsl do
       {
         "on_field" => nil,
         "indexes" => [],
+        "janitorial_archives_needed" => nil,
+        "janitorial_creates_needed" => nil,
+        "janitorial_drops_needed" => nil,
         "foreign_keys" => [],
         "last_partitions_order_by_clause" => nil,
         "schema_name" => nil,
+        "table_alias_name" => nil,
         "name_prefix" => nil,
         "base_name" => nil,
         "part_name" => nil,