acts_as_splittable 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46aa795a10f340366785314f8d7b06c134aef5d5
-  data.tar.gz: ac8a335ccb40e3a20a0c5e9276e4cad6b1f78881
+  metadata.gz: 637013ac8fc1b1ed1e0bb79b28fd09caa2ec9172
+  data.tar.gz: 708003b189efb2ef05eba73a960a35cd5190c5ef
 SHA512:
-  metadata.gz: 4e1d5fc52de895056ae9655ff439526d7660ee616299b21d0b263d0371f476d883a0c6d5ac761b15f521dbe2f6babafb3b22d4c85295023525f6a3b23539f60c
-  data.tar.gz: b81343e23eb3e736e20637ab50c83252fec7eaa2e4afdcf24ad3582938358ac0ec64bd78b0cf13dd3b037ac242779b0dde712cf43aa2fe61f21279a0a7e9bea4
+  metadata.gz: 8d4999d86e3455f1ee8f1a711ba2165035ca7cf2bb6b8123a8a1b84b523235bc3561e9862a6ee870ccd28daedf3a277a0e22c128199e16016f74e5a1389635ba
+  data.tar.gz: 580d2eda99d8b58e629062f99deb5a36fed68a83575ce9aa3e79d57e8bfe7d25287ce01723cfa3d1568d22206c4e69c4cfeaef41c20f5d631e99c184a85d3adf

data/README.md

@@ -34,9 +34,9 @@ class Splittable < ActiveRecord::Base
 
   acts_as_splittable
 
-  splittable :email,        split: ['@', 2], partials: [:email_local, :email_domain], on_join: Proc.new{|partials| partials.join('@') }
+  splittable :email,        split: ['@', 2], attributes: [:email_local, :email_domain], on_join: Proc.new{|values| values.join('@') }
   splittable :postal_code,  pattern: /\A(?<postal_code1>[0-9]{3})(?<postal_code2>[0-9]{4})\Z/
-  splittable :phone_number, partials: [:phone_number1, :phone_number2, :phone_number3], on_split: :split_phone_number, on_join: :join_phone_number
+  splittable :phone_number, attributes: [:phone_number1, :phone_number2, :phone_number3], on_split: :split_phone_number, on_join: :join_phone_number
 
   validates :email_local,   format: { with: /\A[a-zA-Z0-9_.-]+\Z/ }
   validates :email_domain,  format: { with: /\A(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,4}\Z/ }
@@ -144,7 +144,8 @@ p splittable.email_domain #=> "example.com"
 ```ruby
 class Splittable < ActiveRecord::Base
   
-  acts_as_splittable split_on_change: true, join_on_change: true, callbacks: false
+  acts_as_hasty_splittable
+  # same as `acts_as_splittable split_on_change: true, join_on_change: true, callbacks: false`
 
   # ...
 end
@@ -178,7 +179,7 @@ class Splittable < ActiveRecord::Base
   
   acts_as_splittable split_on_change: true, join_on_change: true
 
-  splittable :email, delimiter: '@', partials: [:email_local, :email_domain]
+  splittable :email, delimiter: '@', attributes: [:email_local, :email_domain]
   # :delimiter will be expanded to:
   # {
   #   split: ['@'],

data/lib/acts_as_splittable.rb

@@ -30,6 +30,10 @@ module ActsAsSplittable
     end
   end
 
+  def acts_as_hasty_splittable(options = {})
+    acts_as_splittable options.reverse_merge(join_on_change: true, split_on_change: true, callbacks: false)
+  end
+
   module ClassMethods
     attr_writer :splittable_options
 
@@ -54,10 +58,10 @@ module ActsAsSplittable
       splitter = Splitter.new(options)
       splittable_config.splitters << splitter
 
-      splitter.partials.each do |partial|
-        define_splittable_getter(partial)
-        define_splittable_setter(partial, splitter)
-        define_splittable_predicator(partial) if splittable_options[:predicates]
+      splitter.attributes.each do |attribute|
+        define_splittable_getter(attribute)
+        define_splittable_setter(attribute, splitter)
+        define_splittable_predicator(attribute) if splittable_options[:predicates]
       end
 
       if splittable_options[:split_on_change]
@@ -69,29 +73,37 @@ module ActsAsSplittable
       super
 
       child.splittable_options = splittable_options.dup
+
+      if child.splittable_options[:split_on_change]
+        child.splittable_module = splittable_module.dup
+        child.send(:include, child.splittable_module)
+      end
+        
       child.splittable_config.inherit! splittable_config
     end
 
     protected
 
+    attr_writer :splittable_module
+
     def splittable_module
       @splittable_module ||= Module.new
     end
-    
+
     private
 
-    def define_splittable_getter(partial)
-      define_method partial do
-        splittable_partials[partial]
+    def define_splittable_getter(attribute)
+      define_method attribute do
+        splittable_attributes[attribute]
       end
     end
 
-    def define_splittable_setter(partial, splitter)
-      define_method :"#{partial}=" do |value|
-        splittable_partials[partial] = value
+    def define_splittable_setter(attribute, splitter)
+      define_method :"#{attribute}=" do |value|
+        splittable_attributes[attribute] = value
 
-        unless splittable_changed_partial? partial
-          splittable_changed_partials << partial
+        unless splittable_changed_attribute? attribute
+          splittable_changed_attributes << attribute
         end
 
         self.class.with_splittable_options split_on_change: false do |options|
@@ -102,9 +114,9 @@ module ActsAsSplittable
       end
     end
 
-    def define_splittable_predicator(partial)
-      define_method :"#{partial}_changed?" do
-        splittable_changed_partial? partial
+    def define_splittable_predicator(attribute)
+      define_method :"#{attribute}_changed?" do
+        splittable_changed_attribute? attribute
       end
     end
 

data/lib/acts_as_splittable/splittable.rb

@@ -1,51 +1,57 @@
 module ActsAsSplittable
   module Splittable
 
-    def splittable_partials
-      @splittable_partials ||= {}
+    def splittable_attributes
+      @splittable_attributes ||= {}
     end
 
+    alias_method :splittable_partials, :splittable_attributes
+
     def split_column_values!(columns = nil)
       splittable_aggregate_columns(columns) do |column, splitter|
         value = __send__(column) or next
 
         values = splitter.split(value, self)
-        splitter.partials.zip(values).each do |key, value|
+        splitter.attributes.zip(values).each do |key, value|
           __send__ :"#{key}=", value
         end
-        reset_splittable_changed_partials splitter.partials
+        reset_splittable_changed_attributes splitter.attributes
       end
       self
     end
 
     def join_column_values!(columns = nil)
       splittable_aggregate_columns(columns) do |column, splitter|
-        values = splitter.partials.map {|partial| __send__(partial) }
+        values = splitter.attributes.map {|partial| __send__(partial) }
         next if values.include?(nil)
 
         __send__ :"#{column}=", splitter.restore(values, self)
-        reset_splittable_changed_partials splitter.partials
+        reset_splittable_changed_attributes splitter.attributes
       end
       self
     end
 
     protected
 
-    attr_writer :splittable_changed_partials
+    attr_writer :splittable_changed_attributes
 
-    def splittable_changed_partials
-      @splittable_changed_partials ||= []
+    def splittable_changed_attributes
+      @splittable_changed_attributes ||= []
     end
 
-    def splittable_changed_partial?(partial)
-      splittable_changed_partials.include? partial
+    def splittable_changed_attribute?(attribute)
+      splittable_changed_attributes.include? attribute
     end
 
-    def reset_splittable_changed_partials(partials)
-      self.splittable_changed_partials.uniq!
-      self.splittable_changed_partials -= partials
+    def reset_splittable_changed_attributes(attributes)
+      self.splittable_changed_attributes.uniq!
+      self.splittable_changed_attributes -= attributes
     end
 
+    alias_method :splittable_changed_partials, :splittable_changed_attributes
+    alias_method :splittable_changed_partial?, :splittable_changed_attribute?
+    alias_method :reset_splittable_changed_partials, :reset_splittable_changed_attributes
+
     private
     def splittable_aggregate_columns(columns = nil)
       config = self.class.splittable_config

data/lib/acts_as_splittable/splitter.rb

@@ -1,13 +1,14 @@
 module ActsAsSplittable
-  class Splitter < Struct.new(:name, :for_split, :pattern, :partials, :on_split, :on_join)
+  class Splitter < Struct.new(:name, :for_split, :pattern, :attributes, :on_split, :on_join, :type)
     DEFAULTS = {
       on_join: Proc.new {|values| values.join }
     }.freeze
 
     ALIASES = {
-      split:  :for_split,
-      column: :name,
-      regex:  :pattern,
+      split:    :for_split,
+      column:   :name,
+      regex:    :pattern,
+      partials: :attributes,
     }.freeze
 
     def initialize(options = {})
@@ -30,11 +31,11 @@ module ActsAsSplittable
         self.on_join   = Proc.new {|values| values.join(delimiter)}
       end
 
-      self.partials ||= pattern_members
+      self.attributes ||= pattern_members
     end
 
     def split(value, delegate = nil)
-      case
+      cast case
       when on_split
         delegation(delegate || self, on_split, value)
       when for_split
@@ -62,5 +63,17 @@ module ActsAsSplittable
     def pattern_members
       pattern.names.map(&:to_sym)
     end
+
+    def cast(values)
+      case type
+      when Proc, Symbol
+        values.map(&type)
+      when Class
+        name = type.name.to_sym
+        
+        values.map{|value| Object.__send__(name, value) } if
+          Object.private_method_defined?(name)
+      end || values
+    end
   end
 end

data/lib/acts_as_splittable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsSplittable
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/models.rb

@@ -5,9 +5,9 @@ class Splittable < ActiveRecord::Base
 
   acts_as_splittable predicates: true
 
-  splittable :email,        split: ['@', 2], partials: [:email_local, :email_domain], on_join: EMAIL_JOIN_PROCESS
+  splittable :email,        split: ['@', 2], attributes: [: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/
-  splittable :phone_number, partials: [:phone_number1, :phone_number2, :phone_number3], on_split: :split_phone_number, on_join: :join_phone_number
+  splittable :phone_number, attributes: [:phone_number1, :phone_number2, :phone_number3], on_split: :split_phone_number, on_join: :join_phone_number
 
   protected
 
@@ -48,7 +48,8 @@ end
 class SplittableSplitOrJoinOnChange < ActiveRecord::Base
   self.table_name = 'splittables'
 
-  acts_as_splittable join_on_change: true, split_on_change: true, callbacks: false
+  acts_as_hasty_splittable
+  # same as `acts_as_splittable join_on_change: true, split_on_change: true, callbacks: false`
 
   splittable :email, pattern: EMAIL_SPLIT_PATTERN, on_join: EMAIL_JOIN_PROCESS
 
@@ -72,5 +73,11 @@ class SplittableUseDelimiter < ActiveRecord::Base
 
   acts_as_splittable join_on_change: true, split_on_change: true, callbacks: false
 
-  splittable :email, delimiter: '@', partials: [:email_local, :email_domain]
+  splittable :email, delimiter: '@', attributes: [:email_local, :email_domain]
+end
+
+class SplittableUseTypeCasting < ActiveRecord::Base
+  self.table_name = 'splittables'
+
+  acts_as_hasty_splittable
 end

data/spec/models/splittable_spec.rb

@@ -279,3 +279,52 @@ describe SplittableUseDelimiter do
   end
 
 end
+
+describe SplittableUseTypeCasting do
+
+  shared_examples_for 'splittable typecasting' do
+
+    it 'should typecast' do
+      splittable.lat.should == 35.629902
+      splittable.lng.should == 139.793934
+    end
+
+    it 'should restore' do
+      splittable.lat = 51.476877
+      splittable.lng = -0.00033
+      splittable.latlng.should == '51.476877,-0.00033'
+    end
+
+  end
+
+  context 'with method' do
+    let (:splittable) do
+      Class.new(SplittableUseTypeCasting) {
+        splittable :latlng, delimiter: ',', attributes: [:lat, :lng], type: Float
+      }.new(latlng: '35.629902,139.793934')
+    end
+
+    it_behaves_like 'splittable typecasting'
+  end
+
+  context 'with Proc' do
+    let (:splittable) do
+      Class.new(SplittableUseTypeCasting) {
+        splittable :latlng, delimiter: ',', attributes: [:lat, :lng], type: Proc.new{|value| value.to_f }
+      }.new(latlng: '35.629902,139.793934')
+    end
+
+    it_behaves_like 'splittable typecasting'
+  end
+
+  context 'with Symbol' do
+    let (:splittable) do
+      Class.new(SplittableUseTypeCasting) {
+        splittable :latlng, delimiter: ',', attributes: [:lat, :lng], type: :to_f
+      }.new(latlng: '35.629902,139.793934')
+    end
+
+    it_behaves_like 'splittable typecasting'
+  end
+
+end

data/spec/schema.rb

@@ -7,6 +7,7 @@ ActiveRecord::Schema.define version: 0 do
     t.string   "phone_number"
     t.string   "birthday_era"
     t.string   "birthday"
+    t.string   "latlng"
     t.datetime "created_at"
     t.datetime "updated_at"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_splittable
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - tatat
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails