class_kit 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f63485652f99c982496c9c6700e5396ebf743ef8
-  data.tar.gz: 916278e43a38e63989c426c3e5177650664a288c
+  metadata.gz: e6175988d95d1b402e572de4e37188609b472faf
+  data.tar.gz: cb3d17f32c2d552fd0a75f82d6aa07c6767a4b03
 SHA512:
-  metadata.gz: 0ca4b70ac5170bbab15d5ed0759474fc4794d9060964ab3fde6f14c6ba7aae9713bf01ffcd0ecc7a8d43950d57ee4ae98a8c4c390a360e4c298000fd6c26080c
-  data.tar.gz: 78f42842fe99c4bae36377afc738f0039c8364fe1dec569897c6b7b2dc2700a91a0433606e299dd4a75519249f3bb6075487719f7d7fa1b9c84ee8362ff158ae
+  metadata.gz: 63fba237db2c0dfdd7ee309696beb40d4715ce14b79ec3cac04eb8452ca779f759edbc689f3f297a2a13c874270218652b13a96b6d6aa798aab8f49c576ecb8b
+  data.tar.gz: e187ffdfdf9acc30fd4eec3ce2a983899c8ddc495e3eed2ec797e8fd0a040de4c53c3750acb9ded8906782fd655569b11adf5439c7c33c45a569fd435363fcde

data/lib/class_kit/attribute_helper.rb

@@ -1,20 +1,35 @@
 module ClassKit
   class AttributeHelper
+    # Get attributes for a given class
+    #
+    # @param klass [ClassKit] a class that has been extended with ClassKit
+    #
+    # @return [Hash]
     def get_attributes(klass)
-      return klass.class_variable_get(:@@class_kit_attributes).freeze
+      klass.class_variable_get(:@@class_kit_attributes).values.freeze
     end
 
-    def get_attribute(klass: klass, name: name)
-      attribute = get_attributes(klass).detect { |i| i[:name] == name }
-      if attribute == nil
-        raise ClassKit::Exceptions::AttributeNotFoundError.new("Attribute: #{name}, could not be found.")
-      end
-      return attribute
+    # Get attribute for a given class and name
+    #
+    # @param klass [ClassKit] a class that has been extended with ClassKit
+    # @param name [Symbol] an attribute name
+    #
+    # @raise [ClassKit::Exceptions::AttributeNotFoundError] if the given attribute could not be found
+    #
+    # @return [Hash] that describes the attribute
+    def get_attribute(klass:, name:)
+      klass.class_variable_get(:@@class_kit_attributes)[name] ||
+        raise(ClassKit::Exceptions::AttributeNotFoundError, "Attribute: #{name}, could not be found.")
     end
 
-    def get_attribute_type(klass: klass,name: name)
-      return get_attribute(klass: klass,name: name)[:type]
+    # Get the type of a given attribute on a given class
+    #
+    # @param klass [ClassKit] a class that has been extended with ClassKit
+    # @param name [Symbol]
+    #
+    # @return [Class]
+    def get_attribute_type(klass:, name:)
+      get_attribute(klass: klass, name: name)[:type]
     end
-
   end
-end
+end

data/lib/class_kit/class_methods.rb

@@ -1,48 +1,46 @@
 module ClassKit
-  def attr_accessor_type(name, type: nil, collection_type: nil, allow_nil: true, default: nil, auto_init: false, meta: {})
+  def attr_accessor_type(name, type: nil, collection_type: nil, allow_nil: true, default: nil, auto_init: false,
+                         meta: {})
 
-    if !self.class_variable_defined?(:@@class_kit_attributes)
-      self.class_variable_set(:@@class_kit_attributes, [])
+    unless class_variable_defined?(:@@class_kit_attributes)
+      class_variable_set(:@@class_kit_attributes, {})
     end
 
-    if !self.class_variable_defined?(:@@is_class_kit_class)
-      self.class_variable_set(:@@is_class_kit_class, true)
-    end
+    attributes = class_variable_get(:@@class_kit_attributes)
 
-    attributes = self.class_variable_get(:@@class_kit_attributes)
-    attributes.push({ name: name, type: type, collection_type: collection_type, allow_nil: allow_nil, default: default, auto_init: auto_init, meta: meta })
-    self.class_variable_set(:@@class_kit_attributes, attributes)
+    attributes[name] = { name: name, type: type, collection_type: collection_type, allow_nil: allow_nil,
+                                  default: default, auto_init: auto_init, meta: meta }
 
-    self.class_eval do
+    class_eval do
       define_method name do
+        cka = self.class.class_variable_get(:@@class_kit_attributes)[name]
 
-        cka = self.class.class_variable_get(:@@class_kit_attributes).detect { |i| i[:name] == name }
-
-        if eval("@#{name}") == nil && cka[:default] != nil
-          eval("@#{name}=cka[:default]")
-        end
+        current_value = instance_variable_get(:"@#{name}")
 
-        if eval("@#{name}") == nil && cka[:auto_init] == true
-          eval("@#{name}=cka[:type].new")
+        if current_value.nil?
+          if cka[:default] != nil
+            current_value = instance_variable_set(:"@#{name}", cka[:default])
+          elsif cka[:auto_init]
+            current_value = instance_variable_set(:"@#{name}", cka[:type].new)
+          end
         end
 
-        return eval("@#{name}")
+        current_value
       end
     end
 
-    self.class_eval do
+    class_eval do
       define_method "#{name}=" do |value|
-
         #get the attribute meta data
-        cka = self.class.class_variable_get(:@@class_kit_attributes).detect { |i| i[:name] == name }
+        cka = self.class.class_variable_get(:@@class_kit_attributes)[name]
 
         #verify if the attribute is allowed to be set to nil
-        if value == nil && cka[:allow_nil] == false
+        if value.nil? && cka[:allow_nil] == false
           raise ClassKit::Exceptions::InvalidAttributeValueError.new("Attribute: #{name}, must not be nil.")
         end
 
         #check if the value being set is not of the specified type and should attempt to parse the value
-        if cka[:type] != nil && value != nil && (cka[:type] == :bool || !value.is_a?(cka[:type]))
+        if !cka[:type].nil? && !value.nil? && (cka[:type] == :bool || !value.is_a?(cka[:type]))
           begin
             value = ClassKit::ValueHelper.instance.parse(type: cka[:type], value: value)
           rescue => e
@@ -50,9 +48,8 @@ module ClassKit
           end
         end
 
-        eval("@#{name}=value")
+        instance_variable_set(:"@#{name}", value)
       end
     end
-
   end
-end
+end

data/lib/class_kit/helper.rb

@@ -9,73 +9,63 @@ module ClassKit
     end
 
     def is_class_kit?(klass)
-      begin
-        if !klass.class_variable_defined?(:@@is_class_kit_class)
-          return false
-        end
-      rescue
-        return false
-      end
-
-      return true
+      klass.is_a?(ClassKit)
     end
 
     def validate_class_kit(klass)
-      if !is_class_kit?(klass)
-        raise ClassKit::Exceptions::InvalidClassError.new("Class: #{klass} does not implement ClassKit.")
-      end
-      return true
+      is_class_kit?(klass) || raise(ClassKit::Exceptions::InvalidClassError,
+                                    "Class: #{klass} does not implement ClassKit.")
     end
 
     def to_hash(object)
       validate_class_kit(object.class)
-      return @hash_helper.to_hash(object)
+
+      @hash_helper.to_hash(object)
     end
 
-    def from_hash(hash: hash, klass: klass)
+    def from_hash(hash:, klass:)
       validate_class_kit(klass)
+
       hash = @hash_helper.symbolize(hash)
       entity = klass.new
       attributes = @attribute_helper.get_attributes(klass)
-      attributes.each do |a|
-        key = a[:name]
-        type = a[:type]
+      attributes.each do |attribute|
+        key = attribute[:name]
+        type = attribute[:type]
 
         #if the hash value is nil skip it
-        if hash[key] == nil
-          next
-        end
+        next if hash[key].nil?
+
+        value = if is_class_kit?(type)
+                  from_hash(hash: hash[key], klass: type)
+                elsif type == Array
+                  hash[key].map do |array_element|
+                    if attribute[:collection_type].nil?
+                      array_element
+                    else
+                      if is_class_kit?(attribute[:collection_type])
+                        from_hash(hash: array_element, klass: attribute[:collection_type])
+                      else
+                        @value_helper.parse(type: attribute[:collection_type], value: array_element)
+                      end
+                    end
+                  end
+                else
+                  hash[key]
+                end
 
-        if is_class_kit?(type)
-          value = from_hash(hash: hash[key], klass: type)
-        elsif type == Array
-          value = hash[key].map do |i|
-            if a[:collection_type] != nil
-              if is_class_kit?(a[:collection_type])
-                from_hash(hash: i, klass: a[:collection_type])
-              else
-                @value_helper.parse(type: a[:collection_type], value: i)
-              end
-            else
-              i
-            end
-          end
-        else
-          value = hash[key]
-        end
-        eval("entity.#{key}=value")
+        entity.public_send(:"#{key}=", value)
       end
-      return entity
+
+      entity
     end
 
     def to_json(object)
       @json_helper.to_json(object)
     end
 
-    def from_json(json: json, klass: klass)
-      hash = JSON.load(json)
-      return from_hash(hash: hash, klass: klass)
+    def from_json(json:, klass:)
+      from_hash(hash: JSON.load(json), klass: klass)
     end
-
   end
-end
+end

data/lib/class_kit/value_helper.rb

@@ -2,76 +2,72 @@ module ClassKit
   class ValueHelper
 
     def self.instance
-      if !class_variable_defined?(:@@instance)
-        class_variable_set(:@@instance, ClassKit::ValueHelper.new)
-      end
-      return @@instance
+      @@instance ||= new
     end
 
-    def parse(type: type, value: value)
-      begin
+    def parse(type:, value:)
       if type == Time
         if value.is_a?(Time)
-          value = value
+          value
         elsif value.is_a?(Integer) || value.is_a?(Float)
-          value = Time.at(value)
+          Time.at(value)
         else
-          value = Time.parse(value)
+          Time.parse(value)
         end
       elsif type == Date
         if value.is_a?(Date)
-          value = value
+          value
         elsif value.is_a?(Integer)
-          value = Date.at(value)
+          Date.at(value)
         else
-          value = Date.parse(value)
+          Date.parse(value)
         end
       elsif type == DateTime
         if value.is_a?(DateTime)
-          value = value
+          value
         elsif value.is_a?(Integer)
-          value = DateTime.at(value)
+          DateTime.at(value)
         else
-          value = DateTime.parse(value)
+          DateTime.parse(value)
         end
       elsif type == :bool
         if value == true || value == false
-          value = value
+          value
         elsif(/(true|t|yes|y|1)$/i === value.to_s.downcase)
-          value = true
+          true
         elsif (/(false|f|no|n|0)$/i === value.to_s.downcase)
-          value = false
+          false
         elsif value != nil
           raise 'Unable to parse bool'
         end
       elsif type == Integer
-        value = Integer(value)
+        Integer(value)
       elsif type == Float
-        value = Float(value)
-      elsif type == BigDecimal
         Float(value)
-        value = BigDecimal.new(value.to_s)
+      elsif type == BigDecimal
+        if value.is_a?(BigDecimal)
+          value
+        else
+          value = value.to_s
+          raise 'Unable to parse BigDecimal' unless value =~ /\A\d+(\.\d*)?/
+          BigDecimal(value)
+        end
       elsif type == String
-        value = String(value)
+        String(value)
       elsif type == Regexp
-        value = Regexp.new(value)
+        Regexp.new(value)
       elsif type == Hash
-        if !value.is_a?(Hash)
-          raise 'Unable to parse Hash'
-        end
+        raise 'Unable to parse Hash' unless value.is_a?(Hash)
+        value
       elsif type == Array
-        if !value.is_a?(Array)
-          raise 'Unable to parse Array'
-        end
+        raise 'Unable to parse Array' unless value.is_a?(Array)
+        value
       else
         raise 'Unable to parse'
       end
-      rescue => e
-        raise ClassKit::Exceptions::InvalidParseValueError.new("Unable to parse value: #{value} into type: #{type}. Error: #{e}")
-      end
-
-      return value
+    rescue => e
+      raise ClassKit::Exceptions::InvalidParseValueError,
+            "Unable to parse value: #{value} into type: #{type}. Error: #{e}"
     end
-
   end
-end
+end

data/lib/class_kit/version.rb

@@ -1,3 +1,3 @@
 module ClassKit
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: class_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hash_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Toolkit for working with classes
@@ -115,17 +115,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/class_kit.rb
 - lib/class_kit/attribute_helper.rb
 - lib/class_kit/class_methods.rb
+- lib/class_kit/exceptions.rb
 - lib/class_kit/exceptions/attribute_not_found_error.rb
 - lib/class_kit/exceptions/invalid_attribute_value_error.rb
 - lib/class_kit/exceptions/invalid_class_error.rb
 - lib/class_kit/exceptions/invalid_parse_value_error.rb
-- lib/class_kit/exceptions.rb
 - lib/class_kit/helper.rb
 - lib/class_kit/value_helper.rb
 - lib/class_kit/version.rb
-- lib/class_kit.rb
 homepage: https://github.com/vaughanbrittonsage/class_kit
 licenses:
 - MIT
@@ -136,19 +136,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Toolkit for working with classes
 test_files: []
-has_rdoc: