acts_as_splittable 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c322425fe4d630018ee8191f6faa6dac4e28429
-  data.tar.gz: e4991fe6c463cdac97e36df4121efcd316f43d55
+  metadata.gz: 0398f1488b36c65e7f0573f2b0c1e8b103e2c0cd
+  data.tar.gz: ebc482f510f36b2d4e96b52bb2a658afdab6f1dc
 SHA512:
-  metadata.gz: e7143c847c534b3ffe2146ab7b148a8e8ec154a0e906a4130c4a7d1fb3faec7da57236b7aea94ff882c0579192b082f8a57ad33981bc4f94b8210f57d51251e6
-  data.tar.gz: 5e844b023d12fd13779bd052d10507c532c50c98c71dfa577d9ae04b7b778dce242f1173297e718b2d020d4b4a7413de1ea63078e2029772c3112682ef17108c
+  metadata.gz: e2a3c47fe22bf41f4d68cc895ac283f0ea6b1b0ed8aac4e642069cf5ccaec769ff497d3e8eabb2f61309e4c057ae07daaade3a88e5ba3ae5416e0dd7e79f04ab
+  data.tar.gz: dfd523946987d69389c3a3580b176aa28b3bc294b548ecc0c5f198e5a684c3777c3f658c28f19f4d59666c2ccae9b9ab81c3ec87ab58f895a11f69f9190cf6d6

data/README.md

@@ -139,6 +139,38 @@ p splittable.email_local  #=> "splittable"
 p splittable.email_domain #=> "example.com"
 ```
 
+### Automatically (without callbacks)
+
+```ruby
+class Splittable < ActiveRecord::Base
+  
+  acts_as_splittable split_on_change: true, join_on_change: true, callbacks: false
+
+  # ...
+end
+```
+
+then
+
+```ruby
+splittable = Splittable.new(
+  email_local:   'splittable',
+  email_domain:  'example.com',
+)
+
+p splittable.email  #=> "splittable@example.com"
+p splittable.valid? #=> true
+```
+
+and
+
+```ruby
+splittable = Splittable.find(splittable_id)
+
+p splittable.email_local  #=> "splittable"
+p splittable.email_domain #=> "example.com"
+```
+
 Contributing
 --------------------
 

data/lib/acts_as_splittable/splittable.rb

@@ -0,0 +1,84 @@
+module ActsAsSplittable
+
+  module Splittable
+
+    def split_column_values!(column = nil)
+      if column.nil?
+        self.class.splittable_columns.each_key{|key| send __method__, key }
+      else
+        column                                      = column.to_sym
+        split, pattern, partials, on_split, on_join = self.class.splittable_columns[column]
+        value                                       = send(column)
+
+        unless value.nil?
+          values = if on_split
+            splittable_run_callback(on_split, value)
+          elsif value
+            if split
+              value.to_s.split *(split.is_a?(Array) ? split : [split])
+            elsif matches = value.to_s.match(pattern)
+              matches[1..(matches.length - 1)]
+            end
+          end || []
+
+          partials.each_with_index do |partial, index|
+            send :"#{partial}=", values[index]
+          end
+
+          reset_splittable_changed_partials partials
+        end
+      end
+
+      self
+    end
+
+    def join_column_values!(column = nil)
+      if column.nil?
+        self.class.splittable_columns.each_key{|key| send __method__, key }
+      else
+        split, pattern, partials, on_split, on_join = self.class.splittable_columns[column.to_sym]
+        values                                      = partials.map{|partial| send(partial) }
+
+        unless values.any?(&:nil?)
+          send :"#{column}=", splittable_run_callback(on_join, values)
+          reset_splittable_changed_partials partials
+        end
+      end
+
+      self
+    end
+
+    def splittable_partials
+      @splittable_partials ||= {}
+    end
+
+    protected
+
+    attr_writer :splittable_changed_partials
+
+    def splittable_changed_partials
+      @splittable_changed_partials ||= []
+    end
+
+    def splittable_changed_partial?(partial)
+      splittable_changed_partials.include? partial
+    end
+
+    def reset_splittable_changed_partials(partials)
+      self.splittable_changed_partials.uniq!
+      self.splittable_changed_partials -= partials
+    end
+
+    private
+
+    def splittable_run_callback(callback, *args)
+      if callback.is_a?(Proc)
+        instance_exec(*args, &callback)
+      else
+        send(callback, *args)
+      end
+    end
+    
+  end
+
+end

data/lib/acts_as_splittable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsSplittable
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/acts_as_splittable.rb

@@ -1,16 +1,28 @@
+$LOAD_PATH.unshift File.dirname(__FILE__)
+
 require 'active_record'
+require 'acts_as_splittable/splittable'
 
 module ActsAsSplittable
 
   def acts_as_splittable(options = {})
-    options.reverse_merge!(
-      callbacks: true,
+    options = options.reverse_merge!(
+      callbacks:       true,
+      predicates:      false,
+      join_on_change:  false,
+      split_on_change: false,
     )
 
     extend  ClassMethods
-    include InstanceMethods
+    include Splittable
+
+    self.splittable_options = options
 
-    if options[:callbacks]
+    if splittable_options[:split_on_change]
+      include splittable_module
+    end
+
+    if splittable_options[:callbacks]
       after_initialize { new_record? or split_column_values! }
       before_save      { join_column_values! }
     end
@@ -19,6 +31,19 @@ module ActsAsSplittable
   module ClassMethods
     SPLITTABLE_DEFAULT_JOIN_PROCESS = Proc.new{|values| values.join }
 
+    attr_writer :splittable_options
+
+    def splittable_options(other_options = {})
+      @splittable_options ||= {}
+    end
+
+    def with_splittable_options(other_options = {})
+      original_options        = splittable_options
+      self.splittable_options = splittable_options.merge(other_options)
+      Proc.new.(splittable_options)
+      self.splittable_options = original_options
+    end
+
     def splittable_columns
       @splittable_columns ||= {}
     end
@@ -35,75 +60,51 @@ module ActsAsSplittable
 
         define_method :"#{partial}=" do |value|
           splittable_partials[partial] = value
-        end
-      end
-    end
-
-    def inherited(child)
-      super
-      child.splittable_columns.merge! splittable_columns.dup
-    end
-  end
+          splittable_changed_partials << partial unless splittable_changed_partial? partial
 
-  module InstanceMethods
-    def split_column_values!(column = nil)
-      if column.nil?
-        self.class.splittable_columns.each_key{|key| send __method__, key }
-      else
-        column                                      = column.to_sym
-        split, pattern, partials, on_split, on_join = self.class.splittable_columns[column]
-        value                                       = send(column)
-
-        unless value.nil?
-          values = if on_split
-            run_callback(on_split, value)
-          elsif value
-            if split
-              value.to_s.split *(split.is_a?(Array) ? split : [split])
-            else
-              matches = value.to_s.match(pattern)
-              matches[1..(matches.length - 1)]
-            end
-          end || []
-
-          partials.each_with_index do |partial, index|
-            send :"#{partial}=", values[index]
+          self.class.with_splittable_options split_on_change: false do |options|
+            join_column_values! column if options[:join_on_change]
           end
         end
-      end
-
-      self
-    end
 
-    def join_column_values!(column = nil)
-      if column.nil?
-        self.class.splittable_columns.each_key{|key| send __method__, key }
-      else
-        split, pattern, partials, on_split, on_join = self.class.splittable_columns[column.to_sym]
-        partials                                    = partials.map{|partial| send(partial) }
-
-        unless partials.any?(&:nil?)
-          send :"#{column}=", run_callback(on_join, partials)
+        if splittable_options[:predicates]
+          define_method :"#{partial}_changed?" do
+            splittable_changed_partial? partial
+          end
         end
       end
 
-      self
+      if splittable_options[:split_on_change]
+        splittable_module.module_eval <<-"EOS"
+          def #{column}=(value)
+            if defined?(super)
+              super
+            elsif respond_to?(:write_attribute, true)
+              write_attribute :#{column}, value
+            end
+            
+            self.class.with_splittable_options join_on_change: false do
+              split_column_values! :#{column}
+            end
+          end
+        EOS
+      end
     end
 
-    def splittable_partials
-      @splittable_partials ||= {}
+    def inherited(child)
+      super
+
+      child.splittable_options = splittable_options.dup
+      child.splittable_columns.merge! splittable_columns.dup
     end
 
-    private
+    protected
 
-    def run_callback(callback, *args)
-      if callback.is_a?(Proc)
-        instance_exec(*args, &callback)
-      else
-        send(callback, *args)
-      end
+    def splittable_module
+      @splittable_module ||= Module.new
     end
   end
+
 end
 
 ActiveRecord::Base.extend ActsAsSplittable

data/spec/models/splittable_spec.rb

@@ -47,7 +47,7 @@ require 'spec_helper'
 
     it 'should split columns after initialize' do
       @splittables.each do |record|
-        splittable = Splittable.find(record.id)
+        splittable = klass.find(record.id)
 
         splittable.email_local.should   == 'splittable'
         splittable.email_domain.should  == 'example.com'
@@ -59,6 +59,39 @@ require 'spec_helper'
       end
     end
 
+    describe '#*_changed?' do
+      before do
+        @splittable = klass.new
+      end
+
+      it 'should return true when value is changed until #split_column_values! or #join_column_values! is called' do
+        @splittable.email_local_changed?.should_not  be_true
+        @splittable.email_domain_changed?.should_not be_true
+
+        @splittable.email_local = 'splittable'
+        @splittable.email_local_changed?.should be_true
+
+        @splittable.email_domain = 'example.com'
+        @splittable.email_domain_changed?.should be_true
+
+        @splittable.join_column_values!
+
+        @splittable.email_local_changed?.should_not  be_true
+        @splittable.email_domain_changed?.should_not be_true
+
+        @splittable.email_local = nil
+        @splittable.email_local_changed?.should be_true
+
+        @splittable.email_domain = nil
+        @splittable.email_domain_changed?.should be_true
+
+        @splittable.split_column_values!
+
+        @splittable.email_local_changed?.should_not  be_true
+        @splittable.email_domain_changed?.should_not be_true
+      end
+    end
+
     context 'when nil includes in partials or value of column is nil' do
       before :each do
         @splittable1 = klass.new(name: "#{klass.name} 1")
@@ -133,3 +166,80 @@ describe Splittable do
     end
   end
 end
+
+describe SplittableSplitOrJoinOnChange do
+
+  it 'should join partials when one of partials is set and all of them are not nil' do
+    splittable = SplittableSplitOrJoinOnChange.new
+
+    splittable.email_local  = 'splittable'
+    splittable.email_domain = 'example.com'
+
+    splittable.email.should == 'splittable@example.com'
+
+    splittable.email = nil
+
+    splittable.phone_number1       = '012'
+    splittable.phone_number.should be_nil
+
+    splittable.phone_number2       = '3456'
+    splittable.phone_number.should be_nil
+
+    splittable.phone_number3       = '7890'
+    splittable.phone_number.should == '012-3456-7890'
+
+    splittable.phone_number3       = '0000'
+    splittable.phone_number.should == '012-3456-0000'
+
+    splittable.email.should be_nil
+  end
+
+  it 'should split value when value is set' do
+    splittable1 = SplittableSplitOrJoinOnChange.new(
+      email:        'splittable@example.com',
+      phone_number: '012-3456-7890',
+    )
+
+    splittable2              = SplittableSplitOrJoinOnChange.new
+    splittable2.email        = 'splittable@example.com'
+    splittable2.phone_number = '012-3456-7890'
+
+    [splittable1, splittable2].each do |splittable|
+      splittable.email_local.should   == 'splittable'
+      splittable.email_domain.should  == 'example.com'
+      splittable.phone_number1.should == '012'
+      splittable.phone_number2.should == '3456'
+      splittable.phone_number3.should == '7890'
+    end
+
+    splittable1.phone_number = '000-0000-0000'
+
+    splittable1.phone_number1.should == '000'
+    splittable1.phone_number2.should == '0000'
+    splittable1.phone_number3.should == '0000'
+  end
+
+end
+
+describe SplittableSplitOrJoinOnChangeWithAliasAttribute do
+
+  it 'should split value when value is set' do
+    splittable1 = SplittableSplitOrJoinOnChangeWithAliasAttribute.new(
+      email_address:        'splittable@example.com',
+    )
+
+    splittable2               = SplittableSplitOrJoinOnChangeWithAliasAttribute.new
+    splittable2.email_address = 'splittable@example.com'
+
+    [splittable1, splittable2].each do |splittable|
+      splittable.email_local.should   == 'splittable'
+      splittable.email_domain.should  == 'example.com'
+    end
+
+    splittable1.email_address = 'splittable1@1.example.com'
+
+    splittable1.email_local.should   == 'splittable1'
+    splittable1.email_domain.should  == '1.example.com'
+  end
+
+end

data/spec/models.rb

@@ -3,7 +3,7 @@ EMAIL_JOIN_PROCESS  = Proc.new{|values| values.join('@') }
 
 class Splittable < ActiveRecord::Base
 
-  acts_as_splittable
+  acts_as_splittable predicates: true
 
   splittable :email,        split: ['@', 2], partials: [:email_local, :email_domain], on_join: EMAIL_JOIN_PROCESS
   splittable :postal_code,  pattern: /\A(?<postal_code1>[0-9]{3})(?<postal_code2>[0-9]{4})\Z/
@@ -43,4 +43,26 @@ class SplittableWithValidationForOriginalColumn < ActiveRecord::Base
   splittable :email, pattern: EMAIL_SPLIT_PATTERN, on_join: EMAIL_JOIN_PROCESS
 
   validates :email, format: { with: /\A[a-zA-Z0-9_.-]+@(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,4}\Z/ }
+end
+
+class SplittableSplitOrJoinOnChange < ActiveRecord::Base
+  self.table_name = 'splittables'
+
+  acts_as_splittable join_on_change: true, split_on_change: true, callbacks: false
+
+  splittable :email, pattern: EMAIL_SPLIT_PATTERN, on_join: EMAIL_JOIN_PROCESS
+
+  splittable :phone_number,
+    pattern: /\A(?<phone_number1>\d{3})-(?<phone_number2>\d{4})-(?<phone_number3>\d{4})\Z/,
+    on_join: ->(values) { values.join '-' }
+end
+
+class SplittableSplitOrJoinOnChangeWithAliasAttribute < ActiveRecord::Base
+  self.table_name = 'splittables'
+
+  acts_as_splittable join_on_change: true, split_on_change: true, callbacks: false
+
+  splittable :email, pattern: EMAIL_SPLIT_PATTERN, on_join: EMAIL_JOIN_PROCESS
+
+  alias_attribute :email_address, :email
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_splittable
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - tatat
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -89,6 +89,7 @@ files:
 - Rakefile
 - acts_as_splittable.gemspec
 - lib/acts_as_splittable.rb
+- lib/acts_as_splittable/splittable.rb
 - lib/acts_as_splittable/version.rb
 - lib/tasks/acts_as_splittable_tasks.rake
 - spec/database.yml.sample