kakurenbo 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1db2fcbe670f950ac46f450c5365921042ec298b
-  data.tar.gz: b52de24c10f252966d25f629b86679142fcb0024
+  metadata.gz: 9d17f226c87b76328e3f11a74e9224af2c25ec7d
+  data.tar.gz: 85ecc8c56e701cf1500416a969733c6bb098c1e6
 SHA512:
-  metadata.gz: ad49f6368d5bd864abbe3847ceeae2db12f0df1a55977fc3de36b94758ea6ce561be9e60504e4218f40afaba2c29b174cc1122fc71bc8c7f936fa716e664fbec
-  data.tar.gz: 7f198fd7fb0ab7a0cd41e17ffcffe8f2c3e8464759d0db95cc7334c79202765f57195afdbd628bb8a1a3311f8021e3122d69e0b89b895db26121b97498933575
+  metadata.gz: 28c44c302564b18f8930dac1a90553e83c8bbbf0a3186575eafce1898a75e8902a88c3f0d1a06f02d0064ab3a61e37e1ef6d7bbd1a9ee9bf32a57d3ba7c2f4fa
+  data.tar.gz: 44d3f77630f0872526c21d94761f81e98dbe5e52f43de9e3e7e97fec8ed09f1bc5d8a9b5bfc95096ceebc8b901ef36227316dbfc008d0497db8eb07db48b99f0

data/.travis.yml

@@ -8,3 +8,4 @@ rvm:
 env:
   - RAILS=3.2.16
   - RAILS=4.0.2
+  - RAILS=4.1.0

data/lib/kakurenbo/mixin_ar_base.rb

@@ -8,14 +8,9 @@ module Kakurenbo
     module ClassMethods
       # Initialize Kakurenbo in child class.
       def inherited(child_class)
-        child_class.instance_eval {
-          begin
-            next unless column_names.include?('deleted_at')
-            remodel_as_soft_delete
-          rescue
-            # When exec first db:migrate and db:migrate:reset.
-          end
-        }
+        child_class.instance_eval do
+          remodel_as_soft_delete if has_kakurenbo_column?
+        end
         super
       end
 
@@ -35,10 +30,10 @@ module Kakurenbo
           alias_method :hard_destroy!, :destroy
 
           class_attribute :kakurenbo_column
-          self.kakurenbo_column = options[:column]
-
           include Kakurenbo::SoftDeleteCore
         end
+
+        self.kakurenbo_column = options[:column]
       end
       alias_method :acts_as_paranoid, :remodel_as_soft_delete
 
@@ -46,6 +41,24 @@ module Kakurenbo
       def paranoid?
         false
       end
+
+      # When set table name, remodel.
+      def table_name=(value)
+        super
+        remodel_as_soft_delete if has_kakurenbo_column?
+      end
+
+      private
+      # Check if Model has kakurenbo_column.
+      #
+      # @return [Boolean] result.
+      def has_kakurenbo_column?
+        begin
+          column_names.include?('deleted_at')
+        rescue
+          false
+        end
+      end
     end
 
     def paranoid?

data/lib/kakurenbo/version.rb

@@ -1,3 +1,3 @@
 module Kakurenbo
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/kakurenbo/mixin_ar_base_spec.rb

@@ -4,6 +4,7 @@ describe Kakurenbo::MixinARBase do
   create_temp_table(:hard_deletes) {}
   create_temp_table(:soft_deletes) {|t| t.datetime :deleted_at}
   create_temp_table(:other_columns){|t| t.datetime :destroyed_at}
+  create_temp_table(:other_table_name) {|t| t.datetime :deleted_at}
 
   context 'when mixin ActiveRecord::Base' do
     it 'has paranoid? in class methods.'do
@@ -54,4 +55,20 @@ describe Kakurenbo::MixinARBase do
       expect(OtherColumn.kakurenbo_column).to eq(:destroyed_at)
     end
   end
+
+  context 'when define class of DiffTableName' do
+    before :all do
+      class DiffTableName < ActiveRecord::Base
+        self.table_name='other_table_name'
+      end
+    end
+
+    it 'table_name is right.' do
+      expect(DiffTableName.table_name).to eq('other_table_name')
+    end
+
+    it 'paranoid? return true.' do
+      expect(DiffTableName.paranoid?).to be_true
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kakurenbo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - alfa-jpn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler