findable 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 022bdcf5a11ab55395af5ca7af256b23afd96376
-  data.tar.gz: 86900a51201b84491a1e361f0945ec4d36b4e064
+  metadata.gz: ed73de3540dfd5ad802f506f399aa52cfa748a7f
+  data.tar.gz: f35dc8a71965b62c822e6aa7a9070f733b043db5
 SHA512:
-  metadata.gz: 880d6023b382295648fd89c61c4e1bba1a73bc3a6e9266b7b84840d0eee4722ef388a8e94ba9b5c166e752f74b79a36b24577b1f6ba68998e5726306a1fd385d
-  data.tar.gz: 0670803e036bd49527ebc2d4208afb298ab5faed78eee5e2fc8052a00b340b4228efc7b6fbec58bc63d9e890aa7902b516b09afc9c52bd9208969de6437be339
+  metadata.gz: 8ffdcafaef3953de07e19f63d804bd25e0c69db535d964b96c4f0da81d3f4cddcdcb1bd1ddebaccc2dee5e48fb04a1a4d234526830050dfb423d5ef903b7b68e
+  data.tar.gz: 41d2b9c45cbd8b5902c66ca28779aa8d3bac5d453ce7912bb2578cd8180326598fb89ef77bf9f6a507233554cd74e4e8ece7a1ecd14e03527aab83720722a948

data/lib/findable.rb

@@ -1,4 +1,5 @@
 require "json"
+require "bigdecimal"
 
 require "active_support"
 require "active_support/core_ext"

data/lib/findable/associations/active_record_ext.rb

@@ -1,3 +1,5 @@
+require "findable/associations/utils"
+
 module Findable
   module Associations
     module ActiveRecordExt

data/lib/findable/schema.rb

@@ -19,7 +19,7 @@ module Findable
         name = args.first
         if !public_method_defined?(name) || options.present?
           define_attribute_methods name
-          conversion = Conversion.for(options[:type])
+          conversion = Findable::Schema::Conversion.for(options[:type])
           define_method(name) { conversion.call(attributes[name.to_sym]) }
           column_names << name.to_sym
         end

data/lib/findable/schema/conversion.rb

@@ -17,10 +17,13 @@ module Findable
 
         def add_type!(type)
           return type if type.respond_to?(:call)
-          raise ArgumentError unless private_method_defined?(type)
           types[type.to_sym] = method(type)
         end
 
+        def clear_types
+          @_types = nil
+        end
+
         private
           # Conversion methods
           def integer(value)
@@ -42,10 +45,8 @@ module Findable
           def boolean(value)
             if value.is_a?(TrueClass) || value.is_a?(FalseClass)
               value
-            elsif value.in?(FALSE_VALUE)
-              false
             else
-              !!value
+              value.in?(FALSE_VALUE) ? false : !!value
             end
           end
 
@@ -58,7 +59,7 @@ module Findable
             if value.is_a?(Time) || value.is_a?(ActiveSupport::TimeWithZone)
               return value
             end
-            Time.zone.parse(value)
+            (Time.zone || Time).parse(value)
           end
 
           def symbol(value)

data/lib/findable/version.rb

@@ -1,3 +1,3 @@
 module Findable
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/findable/associations/utils_spec.rb

@@ -11,7 +11,7 @@ describe Findable::Associations::Utils do
     it { expect(utils.model_for(model_name.plural, collection: true)).to eq(model) }
     it { expect(utils.model_for("invalid", class_name: model_name.name)).to eq(model) }
 
-    it { expect { utils.model_for("invalid") }.to raise_error }
+    it { expect { utils.model_for("invalid") }.to raise_error(NameError) }
     it { expect { utils.model_for("invalid", safe: true) }.not_to raise_error }
     it { expect(utils.model_for("invalid", safe: true)).to be_nil }
   end

data/spec/findable/configuration_spec.rb

@@ -55,7 +55,7 @@ describe Findable::Configuration do
       it {
         expect {
           Findable.configure {|config| config.unknown = :value }
-        }.to raise_error
+        }.to raise_error(NoMethodError)
       }
     end
 

data/spec/findable/schema/conversion_spec.rb

@@ -0,0 +1,96 @@
+require "spec_helper"
+
+describe Findable::Schema::Conversion do
+  after(:each) { conversion.clear_types }
+  let(:conversion) { Findable::Schema::Conversion }
+
+  describe ".for" do
+    it { expect(conversion.for(nil)).to eq(conversion.types[:default]) }
+    it { expect(conversion.for(:integer)).to eq(conversion.types[:integer]) }
+    it { expect(conversion.for(:float)).to eq(conversion.types[:float]) }
+    it { expect(conversion.for(:decimal)).to eq(conversion.types[:decimal]) }
+    it { expect(conversion.for(:string)).to eq(conversion.types[:string]) }
+    it { expect(conversion.for(:boolean)).to eq(conversion.types[:boolean]) }
+    it { expect(conversion.for(:date)).to eq(conversion.types[:date]) }
+    it { expect(conversion.for(:datetime)).to eq(conversion.types[:datetime]) }
+    it { expect(conversion.for(:symbol)).to eq(conversion.types[:symbol]) }
+    it { expect(conversion.for(:inquiry)).to eq(conversion.types[:inquiry]) }
+  end
+
+  describe ".types" do
+    it { expect(conversion.types).to be_kind_of(Hash) }
+    it { expect(conversion.types[:default]).not_to be_nil }
+  end
+
+  describe ".add_type!" do
+    it {
+      expect {
+        conversion.add_type!(:integer)
+      }.to change { conversion.types.size }.by(1)
+    }
+  end
+
+  describe ".integer" do
+    it { expect(conversion.send(:integer, "1")).to be_kind_of(Integer) }
+    it { expect(conversion.send(:integer, 1)).to eq(1) }
+  end
+
+  describe ".float" do
+    it { expect(conversion.send(:float, "1")).to be_kind_of(Float) }
+    it { expect(conversion.send(:float, 1)).to eq(1.to_f) }
+  end
+
+  describe ".decimal" do
+    it { expect(conversion.send(:decimal, "1")).to be_kind_of(BigDecimal) }
+    it { expect(conversion.send(:decimal, 1)).to eq(BigDecimal(1)) }
+  end
+
+  describe ".string" do
+    it { expect(conversion.send(:string, 1)).to be_kind_of(String) }
+    it { expect(conversion.send(:string, 1)).to eq("1") }
+  end
+
+  describe ".boolean" do
+    it { expect(conversion.send(:boolean, true)).to be_truthy }
+    it { expect(conversion.send(:boolean, false)).to be_falsey }
+    it { expect(conversion.send(:boolean, "false")).to be_falsey }
+    it { expect(conversion.send(:boolean, "0")).to be_falsey }
+    it { expect(conversion.send(:boolean, "true")).to be_truthy }
+  end
+
+  describe ".date" do
+    let(:strdate) { "2015-07-12" }
+    it { expect(conversion.send(:date, strdate)).to be_kind_of(Date) }
+    it { expect(conversion.send(:date, strdate)).to eq(Date.parse(strdate)) }
+    it {
+      d = Date.current
+      expect(conversion.send(:date, d)).to eq(d)
+    }
+  end
+
+  describe ".datetime" do
+    let(:strtime) { "2015-07-12 22:15:48 +0900" }
+    it { expect(conversion.send(:datetime, strtime)).to be_kind_of(Time) }
+    it { expect(conversion.send(:datetime, strtime)).to eq(Time.parse(strtime)) }
+    it {
+      t = Time.now
+      expect(conversion.send(:datetime, t)).to eq(t)
+    }
+    it {
+      t = Time.current
+      expect(conversion.send(:datetime, t)).to eq(t)
+    }
+  end
+
+  describe ".symbol" do
+    let(:string) { "string" }
+    it { expect(conversion.send(:symbol, string)).to be_kind_of(Symbol) }
+    it { expect(conversion.send(:symbol, string)).to eq(string.to_sym) }
+  end
+
+  describe ".inquiry" do
+    let(:string) { "string" }
+    it { expect(conversion.send(:inquiry, string)).to be_kind_of(ActiveSupport::StringInquirer) }
+    it { expect(conversion.send(:inquiry, string)).to eq(string.inquiry) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: findable
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -213,6 +213,7 @@ files:
 - spec/findable/query/connection_spec.rb
 - spec/findable/query/namespace_spec.rb
 - spec/findable/query_spec.rb
+- spec/findable/schema/conversion_spec.rb
 - spec/spec_helper.rb
 - spec/support/initialize_database.rb
 - spec/support/shared_contexts.rb
@@ -251,6 +252,7 @@ test_files:
 - spec/findable/query/connection_spec.rb
 - spec/findable/query/namespace_spec.rb
 - spec/findable/query_spec.rb
+- spec/findable/schema/conversion_spec.rb
 - spec/spec_helper.rb
 - spec/support/initialize_database.rb
 - spec/support/shared_contexts.rb