edtf-rails 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/edtf-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "edtf-rails"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["masciugo"]
-  s.date = "2013-11-12"
+  s.date = "2013-11-15"
   s.description = "An ActiveRecord extension to deal with Extended DateTime Format attributes"
   s.email = "masciugo@gmail.com"
   s.extra_rdoc_files = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "lib/edtf-rails.rb",
     "lib/edtf-rails/edtf-rails.rb",
     "lib/edtf-rails/getters_and_setters.rb",
+    "lib/edtf-rails/utils.rb",
     "local_history",
     "spec/edtf-rails_spec.rb",
     "spec/spec_helper.rb",

data/lib/edtf-rails/edtf-rails.rb

@@ -2,23 +2,6 @@ module EdtfRails
   
   EDTF_STRING_FORMAT = /^(\d{4})$|^(\d{4}-(0[1-9]|1[012]))$|^(\d{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01]))$/
 
-  def check_options(options, admitted_keys)
-
-    raise WrongArgumentException, "first argument must be in a hash." unless options.is_a? Hash
-    raise WrongArgumentException, "seconf argument must be in an array." unless admitted_keys.is_a? Array
-
-    options.each do |key, value|
-      unless admitted_keys.include? key
-        raise WrongOptionException.new("Unknown option: #{key.inspect} => #{value.inspect}.")
-      end
-      if block_given?
-        yield key, value
-      end
-    end
-
-  end
-
-
   def edtf options = {}
 
     admitted_keys = [:attributes]
@@ -48,89 +31,58 @@ module EdtfRails
       # setters
       define_method("#{d}=") do |edtf_date|
         edtf_date = edtf_date.edtf if edtf_date.is_a? Date
-        write_attribute(d,edtf_date)
-      end
+        transaction do
 
-      
-    end
-
-    # virtual attributes settings after any initialization
-    after_initialize do
-      edtf_attributes.each do |d|
-        if read_attribute(d)
+          write_attribute(d,edtf_date)
+          
+          # virtual attributes settings after any assignment (including initialization)
+          date_array = read_attribute(d).to_s.split('-')
           [:y, :m, :d].each_with_index do |x,i|
-            send("#{d}_#{x}=",read_attribute(d).split('-')[i])
+            send("#{d}_#{x}=",date_array[i])
           end
+        
         end
       end
+      
     end
 
     # virtual attributes utilization to set date before validation (they are used only if at least one of them is defined)
     before_validation do
       edtf_attributes.each do |d|
         date_array = [:y, :m, :d].map{|x| send("#{d}_#{x}")}
-        if (res = date_array.shift).present? #they are used only if at least one of them is defined
+        self[d]= if (res = date_array.shift).present? #they are used only if at least one of them is defined
           date_array.each{|x| x.blank? ? break : (res += "-#{x}") }
-          self[d]= res
+          res
+        else
+          nil
         end
       end
     end
 
 
     # Include instance methods and class methods
-    include EdtfRails::GettersAndSetters
+    # include EdtfRails::GettersAndSetters
+    # include EdtfRails::Utils
 
   end
 
-  # def has_parents options = {}
-
-  #   admitted_keys = [:sex_column, :sex_values, :father_column, :mother_column, :current_spouse_column, :current_spouse]
-  #   check_options(options, admitted_keys) do |key, value|
-  #     if key == :sex_values
-  #       raise WrongOptionException, ":sex_values option must be an array with two char: first for male sex symbol an last for female" unless value.is_a?(Array) and value.size == 2 and value.first.to_s.size == 1 and value.last.to_s.size == 1
-  #     end
-  #   end
-    
-  #   class_attribute :genealogy_enabled, :current_spouse_enabled, :genealogy_class
-  #   self.genealogy_enabled = true
-  #   self.current_spouse_enabled = options[:current_spouse].try(:==,true) || false
-  #   self.genealogy_class = self #keep track of the original extend class to prevent wrong scopes in query method in case of STI
-    
-  #   tracked_relatives = [:father, :mother]
-  #   tracked_relatives << :current_spouse if current_spouse_enabled
-
-  #   ## sex
-  #   # class attributes
-  #   class_attribute :sex_column, :sex_values, :sex_male_value, :sex_female_value
-  #   self.sex_column = options[:sex_column] || :sex
-  #   self.sex_values = (options[:sex_values] and options[:sex_values].to_a.map(&:to_s)) || ['M','F']
-  #   self.sex_male_value = self.sex_values.first
-  #   self.sex_female_value = self.sex_values.last
-  #   # instance attribute
-  #   alias_attribute :sex, sex_column if self.sex_column != :sex
-  #   # validation
-  #   validates_presence_of sex_column
-  #   validates_format_of sex_column, :with => /[#{sex_values.join}]/ 
-
-  #   ## relatives associations
-  #   tracked_relatives.each do |key|
-  #     # class attribute where is stored the correspondig foreign_key column name
-  #     class_attribute_name = "#{key}_column"
-  #     foreign_key = "#{key}_id"
-  #     class_attribute class_attribute_name
-  #     self.send("#{class_attribute_name}=", options[class_attribute_name.to_sym] || foreign_key)
-      
-  #     # self join association
-  #     attr_accessible foreign_key
-  #     belongs_to key, class_name: self, foreign_key: foreign_key
-    
-  #   end
-
-  #   # Include instance methods and class methods
-  #   include Genealogy::QueryMethods
-  #   include Genealogy::AlterMethods
-  #   include Genealogy::SpouseMethods if current_spouse_enabled
-
-  # end
-  
+  private
+
+  def check_options(options, admitted_keys)
+
+    raise WrongArgumentException, "first argument must be in a hash." unless options.is_a? Hash
+    raise WrongArgumentException, "seconf argument must be in an array." unless admitted_keys.is_a? Array
+
+    options.each do |key, value|
+      unless admitted_keys.include? key
+        raise WrongOptionException.new("Unknown option: #{key.inspect} => #{value.inspect}.")
+      end
+      if block_given?
+        yield key, value
+      end
+    end
+
+  end
+
+
 end

data/lib/edtf-rails/utils.rb

@@ -0,0 +1,10 @@
+module EdtfRails
+  module Utils
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+
+
+    end
+  end
+end

data/lib/edtf-rails.rb

@@ -1,7 +1,8 @@
 require "edtf"
 # require File.join(File.expand_path(File.dirname(__FILE__)), 'edtf-rails/constants')
 # require File.join(File.expand_path(File.dirname(__FILE__)), 'edtf-rails/exceptions')
-require File.join(File.expand_path(File.dirname(__FILE__)), 'edtf-rails/getters_and_setters')
+# require File.join(File.expand_path(File.dirname(__FILE__)), 'edtf-rails/getters_and_setters')
+# require File.join(File.expand_path(File.dirname(__FILE__)), 'edtf-rails/utils')
 require File.join(File.expand_path(File.dirname(__FILE__)), 'edtf-rails/edtf-rails')
 
 ActiveRecord::Base.send :extend, EdtfRails

data/spec/edtf-rails_spec.rb

@@ -83,16 +83,6 @@ describe EdtfRailsTest::Model do
 
   subject { @obj }
 
-  shared_examples "dob getter return a Date object but a string is stored in the db" do
-    describe "#dob" do
-      subject { @obj.dob }
-      specify { should be_a Date }
-    end
-    it "has a string as value in the db" do
-      expect(@obj.read_attribute(:dob)).to be_a String
-    end
-  end
-
   describe "#new" do
     context "when initialized with no params" do
       let(:params) { nil }
@@ -100,24 +90,35 @@ describe EdtfRailsTest::Model do
       its(:dob) {should be_nil }
       its(:dod) {should be_nil }
       describe "#dob=new_date" do
+
         before(:each) do
           @obj.dob = new_date
           @obj.save!
         end
-
-        context "when new_date is Date.new(2001,9,10) " do
+        
+        shared_examples "return a Date object but store a String in the db" do
+          describe "#dob" do
+            subject { @obj.dob }
+            specify { should be_a Date }
+          end
+          it "has a string as value in the db" do
+            expect(@obj.read_attribute(:dob)).to be_a String
+          end
+        end
+        
+        context "when new_date is Date.new(2001,9,10)" do
           let(:new_date) { Date.new(2001,9,10) }
-          it_should_behave_like "dob getter return a Date object but a string is stored in the db"
+          it_should_behave_like "return a Date object but store a String in the db"
           its(:dob) {should eql Date.new(2001,9,10) }
         end
         context "when new_date is the string '2001-09-10'" do
           let(:new_date) { '2001-09-10' }
-          it_should_behave_like "dob getter return a Date object but a string is stored in the db"
+          it_should_behave_like "return a Date object but store a String in the db"
           its(:dob) {should eql Date.new(2001,9,10) }
         end
         context "when new_date is the string '2001-09'" do
           let(:new_date) { '2001-09' }
-          it_should_behave_like "dob getter return a Date object but a string is stored in the db"
+          it_should_behave_like "return a Date object but store a String in the db"
           describe "dob precision" do
             specify { expect(@obj.dob.precision).to be :month }
           end
@@ -161,34 +162,42 @@ describe EdtfRailsTest::Model do
   end
 
   describe "#dob_? atomic getters" do
-    context "when initialized with dob 1995-12-24" do
-      let(:params) { {:dob => "1995-12-24" } }
-      its(:dob_y) { should == '1995'}
-      its(:dob_m) { should == '12'}
-      its(:dob_d) { should == '24'}
-      context "and dod 1935-02-14" do
-        let(:params) { {:dob => "1995-12-24", :dod => "1935-02-14" } }
-        its(:dod_y) { should == '1935'}
-        its(:dod_m) { should == '02'}
-        its(:dod_d) { should == '14'}
-      end
+
+    shared_examples "a composed date" do |attribute|
+      let(:date_array) { subject.read_attribute(attribute).to_s.split('-') }
+      its(:dob_y) { should == date_array[0]}
+      its(:dob_m) { should == date_array[1]}
+      its(:dob_d) { should == date_array[2]}
     end
+
     context "when initialized with dob 1995-12" do
       let(:params) { {:dob => "1995-12" } }
-      its(:dob_y) { should == '1995'}
-      its(:dob_m) { should == '12'}
-      its(:dob_d) { should be_nil}
+      it_should_behave_like "a composed date", :dob
     end
     context "when initialized with dob 1995" do
       let(:params) { {:dob => "1995" } }
-      its(:dob_y) { should == '1995'}
-      its(:dob_m) { should be_nil}
-      its(:dob_d) { should be_nil}
+      it_should_behave_like "a composed date", :dob
+    end
+    context "when initialized with dob 1995-12-24" do
+      let(:params) { {:dob => "1995-12-24" } }
+      it_should_behave_like "a composed date", :dob
+      context "and when assign a new date 2001-09-11" do
+        before(:each) do
+          @obj.dob = "2001-09-11"
+        end
+        it_should_behave_like "a composed date", :dob
+      end
+      context "and when assign a new nil date" do
+        before(:each) do
+          @obj.dob = nil
+        end
+        it_should_behave_like "a composed date", :dob
+      end
     end
   end
 
 
-  describe "#dob_?= atomic setters effect", :wip => true do
+  describe "#dob_?= atomic setters effect" do
     context "when initialized with no params" do
       let(:params) { nil }
       describe "#dob_y = 1976" do
@@ -201,32 +210,27 @@ describe EdtfRailsTest::Model do
           before(:each) do
             @obj.save
           end
-          it_should_behave_like "dob getter return a Date object but a string is stored in the db"
+          it_should_behave_like "return a Date object but store a String in the db"
           describe "dob precision" do
             specify { expect(@obj.dob.precision).to be :year  }
           end
-          its(:dob_y) { should == '1976'}
-          its(:dob_m) { should be_nil}
-          its(:dob_d) { should be_nil}
+          it_should_behave_like "a composed date", :dob
         end
         describe "#dob_m = '05'" do
           before(:each) do
             @obj.dob_m = '05'
           end
           its(:dob) { should be_nil}
-          its(:dob_y) { should == '1976'}
-          its(:dob_m) { should == '05'}
+          # it_should_behave_like "a composed date", :dob # NO because until it is saved 
           context "after saving" do
             before(:each) do
               @obj.save
             end
-            it_should_behave_like "dob getter return a Date object but a string is stored in the db"
+            it_should_behave_like "return a Date object but store a String in the db"
             describe "dob precision" do
               specify { expect(@obj.dob.precision).to be :month  }
             end
-            its(:dob_y) { should == '1976'}
-            its(:dob_m) { should == '05'}
-            its(:dob_d) { should be_nil}
+            it_should_behave_like "a composed date", :dob
           end
         end
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edtf-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -176,6 +176,7 @@ files:
 - lib/edtf-rails.rb
 - lib/edtf-rails/edtf-rails.rb
 - lib/edtf-rails/getters_and_setters.rb
+- lib/edtf-rails/utils.rb
 - local_history
 - spec/edtf-rails_spec.rb
 - spec/spec_helper.rb
@@ -196,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3685247014501985280
+      hash: -2884630438112940405
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: