acts_as_splittable 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d4595fb64c43327405f29ae3530fe069a772599
-  data.tar.gz: e40f06000ded452b21769446530453e8eba7243d
+  metadata.gz: 9c322425fe4d630018ee8191f6faa6dac4e28429
+  data.tar.gz: e4991fe6c463cdac97e36df4121efcd316f43d55
 SHA512:
-  metadata.gz: 0b1ccfc10ca315b1b35d733c767c54b241c1c19996d30d1a0e5ccb6f0a2d88b50c966eaf4f723e704678fe25587d821025846a8b8eaf1888bae6e8a92d9bd814
-  data.tar.gz: 61a3e79425cad2336247816305eaaf51dec3e7579d4237a0fd46f5027df5d15cc728ae433617ac6f8a6d6e23560fe7e108b75e772cf43e634e2bed79d7379635
+  metadata.gz: e7143c847c534b3ffe2146ab7b148a8e8ec154a0e906a4130c4a7d1fb3faec7da57236b7aea94ff882c0579192b082f8a57ad33981bc4f94b8210f57d51251e6
+  data.tar.gz: 5e844b023d12fd13779bd052d10507c532c50c98c71dfa577d9ae04b7b778dce242f1173297e718b2d020d4b4a7413de1ea63078e2029772c3112682ef17108c

data/acts_as_splittable.gemspec

@@ -7,8 +7,8 @@ require "acts_as_splittable/version"
 Gem::Specification.new do |s|
   s.name        = "acts_as_splittable"
   s.version     = ActsAsSplittable::VERSION
-  s.authors     = ["tatat"]
-  s.email       = ["ioiioioloo@gmail.com"]
+  s.authors     = ["tatat", "takkkun"]
+  s.email       = ["ioiioioloo@gmail.com", "heartery@gmail.com"]
   s.homepage    = "https://github.com/tatat/acts_as_splittable"
   s.summary     = "Create virtual attributes."
   s.description = "Create virtual attributes."

data/lib/acts_as_splittable/version.rb

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

data/lib/acts_as_splittable.rb

@@ -56,7 +56,7 @@ module ActsAsSplittable
 
         unless value.nil?
           values = if on_split
-            on_split.is_a?(Symbol) ? send(on_split, value) : on_split.(value)
+            run_callback(on_split, value)
           elsif value
             if split
               value.to_s.split *(split.is_a?(Array) ? split : [split])
@@ -83,16 +83,26 @@ module ActsAsSplittable
         partials                                    = partials.map{|partial| send(partial) }
 
         unless partials.any?(&:nil?)
-          send :"#{column}=", on_join.is_a?(Symbol) ? send(on_join, partials) : on_join.(partials)
+          send :"#{column}=", run_callback(on_join, partials)
         end
       end
-        
+
       self
     end
 
     def splittable_partials
       @splittable_partials ||= {}
     end
+
+    private
+
+    def run_callback(callback, *args)
+      if callback.is_a?(Proc)
+        instance_exec(*args, &callback)
+      else
+        send(callback, *args)
+      end
+    end
   end
 end
 

data/spec/models/splittable_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 [Splittable, SplittableInherited, SplittableInheritedInherited].each do |klass|
   describe klass do
-    
+
     before :each do
       @splittable1               = klass.new(name: "#{klass.name} 1")
       @splittable1.email_local   = 'splittable'
@@ -88,3 +88,48 @@ require 'spec_helper'
     end
   end
 end
+
+describe Splittable do
+  context 'when was given a proc to callbacks' do
+    it 'should call in the record' do
+      model_class = Class.new(ActiveRecord::Base) do
+        self.table_name = :splittables
+
+        acts_as_splittable
+
+        splittable :birthday, {
+          partials: [:birthday_year, :birthday_month, :birthday_day],
+
+          on_split: -> (value) {
+            year, month, day = value.chars.each_slice(2).map(&:join).map(&:to_i)
+            [year + birthday_base, month, day]
+          },
+
+          on_join: -> (values) {
+            year, month, day = values.map(&:to_i)
+            '%02d%02d%02d' % [year - birthday_base, month, day]
+          }
+        }
+
+        def birthday_base
+          birthday_era == 'showa' ? 1925 : birthday_era == 'heisei' ? 1988 : 0
+        end
+      end
+
+      model = model_class.create!(
+        birthday_era:   'heisei',
+        birthday_year:  1989,
+        birthday_month: 7,
+        birthday_day:   7
+      )
+
+      model.birthday = '010707'
+
+      model = model_class.find(model.id)
+
+      model.birthday_year.should  == 1989
+      model.birthday_month.should == 7
+      model.birthday_day.should   == 7
+    end
+  end
+end

data/spec/schema.rb

@@ -5,8 +5,10 @@ ActiveRecord::Schema.define version: 0 do
     t.string   "email"
     t.string   "postal_code"
     t.string   "phone_number"
+    t.string   "birthday_era"
+    t.string   "birthday"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-end
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_splittable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - tatat
+- takkkun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -75,6 +76,7 @@ dependencies:
 description: Create virtual attributes.
 email:
 - ioiioioloo@gmail.com
+- heartery@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []