attr_permit 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60085da6f28a79531a08f8a04d9c68494fe0c44f
-  data.tar.gz: a645d055a3f44b56b20dc30db4bda4b8b0d7535c
+  metadata.gz: f4d534037b060cc2a56910ea66ffcf2fe20c4d1d
+  data.tar.gz: 3aa06e273bf5c3d6d06f245dfbe6963dc2d1d439
 SHA512:
-  metadata.gz: d6da0f2e29721338bede8902ddc6d5bc35faad38b5cefebd61e7f1e571943dde4815883b421b2922018b098a21ff5d78539a9be52f8badeac29e95f482c0133b
-  data.tar.gz: d206db4ae5890cee787af67efd1ce92122edcbcf350d8d21cd5c3400e39b228742446f26b9d2ba7aa9cbedfb0eaa07e21cda4134e7dbe6bc012844cbe9b1dad4
+  metadata.gz: 324b9d1f6190cb54d3fe1dae24bc883095fb58f33c3c3d6e8be2f01562ab1dbcd46f7a53e7c013941fe23f657f3bc03708d1a2d5d4cc136adab94fd5ea0bfa32
+  data.tar.gz: f0c5b34709b0944c5e7b3b88e77fc8d497d0a422045874f484ce611a12ad499f8b45e6f44945d6a0f1c4868e5b3bed882c875accd14df73922a7902d9bdc3eb2

data/lib/attr_permit.rb

@@ -1,4 +1,3 @@
-require 'attr_permit/version'
 require 'active_support/core_ext/big_decimal'
 
 class AttrPermit
@@ -9,8 +8,12 @@ class AttrPermit
       @permissible_methods ||= []
     end
 
+    def mapped_methods
+      @mapped_methods ||= []
+    end
+
     def attr_permit(*permissible_methods)
-      self.permissible_methods.concat [*permissible_methods, *get_super_attr]
+      self.permissible_methods.concat [*permissible_methods, *get_super_permissible_methods]
       self.permissible_methods.each do |meth|
 
         send(:define_method, meth) do
@@ -21,12 +24,35 @@ class AttrPermit
       end
     end
 
+    def map_attributes(map_hash)
+      map_hash.each do |to, from|
+        map_attribute to, from
+      end
+    end
+
+    def map_attribute(to, from)
+      self.mapped_methods.concat [*to, *get_super_mapped_methods]
+      if from.is_a? Proc
+        send(:define_method, to) do
+          instance_exec(&from)
+        end
+      else
+        send(:define_method, to) do
+          call_method(from)
+        end
+      end
+    end
+
     protected
 
-    def get_super_attr
+    def get_super_permissible_methods
       superclass.permissible_methods unless superclass == AttrPermit
     end
 
+    def get_super_mapped_methods
+      superclass.mapped_methods unless superclass == AttrPermit
+    end
+
   end
   protected
   attr_reader :source
@@ -53,26 +79,23 @@ class AttrPermit
 
   protected :call_method
 
+  def map_hash(big_decimal_as_string: false, all_values_as_string: false)
+    hasher([*self.class.mapped_methods], big_decimal_as_string, all_values_as_string)
+  end
+
+  def permit_hash(big_decimal_as_string: false, all_values_as_string: false)
+    hasher([*self.class.permissible_methods], big_decimal_as_string, all_values_as_string)
+  end
+
   def to_hash(big_decimal_as_string: false, all_values_as_string: false)
-    @big_decimal_as_string = big_decimal_as_string
-    @all_values_as_string = all_values_as_string
-    hash = {}
-    self.class.permissible_methods.each do |var|
-      value = send(var)
-      value = to_hash_object(value)
-      value = big_decimal_as_string_convert(value)
-      value = all_values_as_string_convert(value)
-      value = array_to_hash(value)
-      hash[var] = value
-    end
-    hash
+    hasher([*self.class.permissible_methods, *self.class.mapped_methods], big_decimal_as_string, all_values_as_string)
   end
 
   alias_method :to_h, :to_hash
 
-  def non_nil_values
+  def non_nil_values(hash_type=:to_hash)
     hash = {}
-    to_hash.each { |k, v| hash[k] = v unless v.nil? }
+    send(hash_type).each { |k, v| hash[k] = v unless v.nil? }
     hash
   end
 
@@ -80,6 +103,14 @@ class AttrPermit
     self.hash == obj.hash
   end
 
+  def is_equivalent?(obj)
+    self_hash = self.to_hash
+    obj_hash = obj.to_hash
+    self_hash.each { |k, v| self_hash[k] = v.to_s }
+    obj_hash.each { |k, v| obj_hash[k] = v.to_s }
+    self_hash == obj_hash
+  end
+
   def hash
     self.to_hash.hash
   end
@@ -138,4 +169,38 @@ class AttrPermit
     value
   end
 
+  def hasher(methods, big_decimal_as_string, all_values_as_string)
+    @big_decimal_as_string = big_decimal_as_string
+    @all_values_as_string = all_values_as_string
+    hash = {}
+    methods.each do |var|
+      value = send(var)
+      value = to_hash_object(value)
+      value = big_decimal_as_string_convert(value)
+      value = all_values_as_string_convert(value)
+      value = array_to_hash(value)
+      hash[var] = value
+    end
+    hash
+  end
+
 end
+
+class AttrPermitLazy < AttrPermit
+
+  def self.attr_permit(*permissible_methods)
+    self.permissible_methods.concat [*permissible_methods, *get_super_premissible_methods]
+    self.permissible_methods.each do |meth|
+
+      send(:define_method, meth) do
+        callable = instance_variable_get("@#{meth}")
+        instance_variable_set("@#{meth}", callable.call) if callable.respond_to?(:call)
+        instance_variable_get("@#{meth}")
+      end
+
+      attr_writer meth unless public_instance_methods.include?("#{meth}=")
+    end
+  end
+
+end
+

data/lib/attr_permit/version.rb

@@ -1,3 +1,3 @@
 class AttrPermit
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/attr_permit_spec.rb

@@ -95,6 +95,14 @@ RSpec.describe AttrPermit, unit: true do
 
   end
 
+  describe "is_equivalent?" do
+    it "will convert all values to strings before checking ==" do
+      obj1 = TestStruct.new(foo: "1", bar: "2")
+      obj2 = TestStruct.new(foo: 1, bar: 2)
+      expect(obj1.is_equivalent?(obj2)).to eq true
+    end
+  end
+
   describe 'sub classing' do
 
     before do
@@ -193,4 +201,68 @@ RSpec.describe AttrPermit, unit: true do
 
   end
 
+  describe 'map_attribute' do
+
+    it 'will return value from mapped attribute' do
+      class MapAttributeOne < AttrPermit
+        attr_permit :attr
+        map_attribute :my_attr, :attr
+      end
+
+      expect(MapAttributeOne.new(attr: 'attr').my_attr).to eq 'attr'
+    end
+
+    it 'will call proc from map' do
+      class MapAttributeTwo < AttrPermit
+        map_attribute :my_attr, -> { source.item }
+      end
+
+      expect(MapAttributeTwo.new(OpenStruct.new(item: 'My Item')).my_attr).to eq 'My Item'
+    end
+
+  end
+
+  describe 'map_attributes' do
+
+    before do
+      class MapAttributeOne < AttrPermit
+        attr_permit :attr, :attr2
+        map_attributes :my_attr => :attr, :my_attr2 => :attr2
+      end
+    end
+
+    it 'will return value from mapped attribute' do
+      expect(MapAttributeOne.new(attr: 'attr1').my_attr).to eq 'attr1'
+      expect(MapAttributeOne.new(attr2: 'attr2').my_attr2).to eq 'attr2'
+    end
+
+    it 'map_hash' do
+      expect(MapAttributeOne.new(attr2: 'attr2', attr: 'attr1').map_hash).to eq({:my_attr => "attr1", :my_attr2 => "attr2"})
+    end
+
+    it 'permit_hash' do
+      expect(MapAttributeOne.new(attr2: 'attr2', attr: 'attr1').permit_hash).to eq({:attr => "attr1", :attr2 => "attr2"})
+    end
+
+    it 'to_hash' do
+      expect(MapAttributeOne.new(attr2: 'attr2', attr: 'attr1').to_hash).to eq({:attr => "attr1", :attr2 => "attr2", :my_attr => "attr1", :my_attr2 => "attr2"})
+    end
+
+    it 'non_nil_values' do
+      expect(MapAttributeOne.new(attr2: 'attr2').non_nil_values(:map_hash)).to eq({:my_attr2 => "attr2"})
+      expect(MapAttributeOne.new(attr2: 'attr2').non_nil_values(:permit_hash)).to eq({:attr2 => "attr2"})
+      expect(MapAttributeOne.new(attr2: 'attr2').non_nil_values).to eq({:attr2 => "attr2", :my_attr2 => "attr2"})
+    end
+
+    it 'will call proc from map' do
+      class MapAttributeTwo < AttrPermit
+        map_attributes :my_attr => -> { source.item }
+      end
+
+      expect(MapAttributeTwo.new(OpenStruct.new(item: 'My Item')).my_attr).to eq 'My Item'
+      expect(MapAttributeTwo.new(OpenStruct.new(item: 'My Item')).to_hash).to eq({:my_attr => "My Item"})
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attr_permit
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus