pure_form 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7025ebff1558b57eb3dc586e5f6fcbb4af7c6680
-  data.tar.gz: 9a923ef9e28728fd0ce013a7c2d7f7aba6466cec
+  metadata.gz: 90f8472fd99ffd4d20924e0c56ebeb8cbb85243e
+  data.tar.gz: 518154b27102d26a3d7e4589a58b853a355934c2
 SHA512:
-  metadata.gz: 9094f32da6ee09629c3da92d650ba85351b65f8ad949993d41aeeb1d4a9fc68b8c0da8b8efd6a97c63b6dc86c6f3044f3877b31af94bb0c12462982dda8f970e
-  data.tar.gz: c7800172e42789f6d37a445a58c9df83acadaf8f0dd05ab2353e9d01062217cf37d13970f8d47b1b93803b484362976a0ccd8b59c78d1b0a00533ca4e169dac4
+  metadata.gz: d0414269400b2bd657fea2bf6e44a0ab844fd1b9201f494de5f78f8681c84d65751287755ae088cc3255b21a6f4d3263ba8af0e2d7eb0637ef861fb4c9377b5d
+  data.tar.gz: d718fb38262b2484126a27e8578315cfae794280a2c321a80348177a30b68347a799e99f3ed7d3290c3a82c199e7b6ce6fe623d57be0d29fe988d2c4212f6e43

data/lib/pure_form/assignment.rb

@@ -1,9 +1,9 @@
 module PureForm
   class Assignment
-    attr_reader :form, :attributes
+    attr_reader :form, :attributes, :options
 
-    def initialize(form, attributes)
-      @form, @attributes = form, attributes
+    def initialize(form, attributes, **options)
+      @form, @attributes, @options = form, attributes, options
     end
 
     def perform
@@ -16,14 +16,17 @@ module PureForm
       end
 
       flush_complex_attributes
+
+      form.attributes
     end
 
     private
 
     def assign_attribute(attribute_name, value)
-      setter = "#{attribute_name}="
-      fail Errors::UnknownAttributeError.build(attribute_name) unless form.respond_to?(setter)
-      form.public_send setter, value
+      method_name = "#{attribute_name}="
+      call_form_method_or_fail method_name, value do
+        fail Errors::UnknownAttributeError.build(attribute_name)
+      end
     end
 
     def assign_complex_attribute(complex_attribute_name, value)
@@ -41,8 +44,17 @@ module PureForm
     def flush_complex_attributes
       complex_attributes.each do |key, values|
         method_name = "set_complex_#{key}_value"
-        raise Errors::MissingComplexAttributeError.build(key) unless form.respond_to?(method_name)
-        form.public_send method_name, *values
+        call_form_method_or_fail method_name, *values do
+          raise Errors::MissingComplexAttributeError.build(key)
+        end
+      end
+    end
+
+    def call_form_method_or_fail(method_name, *args)
+      if form.respond_to?(method_name)
+        form.public_send(method_name, *args)
+      else
+        yield unless options[:ignore_undefined]
       end
     end
   end

data/lib/pure_form/attribute.rb

@@ -38,10 +38,12 @@ module PureForm
       context.instance_eval do
         define_method name, &block
       end
+
+      nil
     end
 
     def setter_proc
-      attribute_name = self.name
+      attribute_name = name
       type = value_type
       ->(value){ store_attribute(attribute_name, type.typecast(value)) }
     end
@@ -53,19 +55,20 @@ module PureForm
     end
 
     def getter_proc
-      attribute_name = self.name
+      attribute_name = name
       ->{ read_attribute(attribute_name) }
     end
 
     def predicate_proc
-      attribute_name = self.name
+      attribute_name = name
       ->{ public_send(attribute_name).present? }
     end
 
     def build_value_type
       return Types::BaseType.new(options) unless options.key?(:type)
-      type = options.delete(:type)
-      "PureForm::Types::#{type.to_s.classify}Type".constantize.new(options)
+      type = options.delete(:type).to_s
+      type = "date_time" if type == "datetime"
+      "PureForm::Types::#{type.camelize}Type".constantize.new(options)
     end
   end
 end

data/lib/pure_form/base.rb

@@ -4,13 +4,19 @@ module PureForm
   class Base
     include ActiveModel::Model
 
-    class_attribute :attributes, instance_accessor: false, instance_predicate: false
+    class Boolean
+      def self.to_s
+        "Boolean"
+      end
+    end
+
+    class_attribute :defined_attributes, instance_accessor: false, instance_predicate: false
 
     class << self
       def attribute(name, **options)
         attribute = Attribute.new(self, name, options)
-        self.attributes ||= HashWithIndifferentAccess.new
-        self.attributes = attributes.merge(name => attribute)
+        self.defined_attributes ||= HashWithIndifferentAccess.new
+        self.defined_attributes = defined_attributes.merge(attribute.name => attribute)
         attribute.define
       end
 
@@ -25,9 +31,21 @@ module PureForm
         end
       end
 
+      def copy_attributes_from(model, **options)
+        raise ArgumentError unless model < ActiveRecord::Base
+
+        included = Array.wrap(options.fetch(:only){ model.column_names }).map(&:to_s)
+        excluded = Array.wrap(options[:except]).map(&:to_s)
+
+        model.columns.each do |column|
+          next if !column.name.in?(included) || column.name.in?(excluded)
+          attribute column.name, type: column.type
+        end
+      end
+
       def default_values
-        return {} unless attributes
-        @default_values ||= attributes.each_with_object({}) do |(name, attribute), defaults|
+        return {} unless defined_attributes
+        @default_values ||= defined_attributes.each_with_object({}) do |(name, attribute), defaults|
           if attribute.options.key?(:default)
             defaults[name] = attribute.options.fetch(:default)
           end
@@ -50,10 +68,14 @@ module PureForm
       Assignment.new(self, attributes).perform
     end
 
+    def assign_defined_attributes(attributes)
+      Assignment.new(self, attributes, ignore_undefined: true).perform
+    end
+
     alias_method :attributes=, :assign_attributes
 
     def attributes
-      self.class.attributes.each_with_object({}) do |(name, _), attributes|
+      self.class.defined_attributes.each_with_object({}) do |(name, _), attributes|
         attributes[name] = public_send(name)
       end.with_indifferent_access
     end
@@ -75,11 +97,11 @@ module PureForm
     end
 
     def store_attribute(name, value)
-      attributes_store.store name, value
+      attributes_store.store name.to_s, value
     end
 
     def read_attribute(name)
-      attributes_store[name]
+      attributes_store[name.to_s]
     end
   end
 end

data/lib/pure_form/types.rb

@@ -1,10 +1,11 @@
 module PureForm
   module Types
-    autoload :BaseType,    "pure_form/types/base"
-    autoload :StringType,  "pure_form/types/string"
-    autoload :IntegerType, "pure_form/types/integer"
-    autoload :FloatType,   "pure_form/types/float"
-    autoload :BooleanType, "pure_form/types/boolean"
-    autoload :DateType,    "pure_form/types/date"
+    autoload :BaseType,     "pure_form/types/base"
+    autoload :StringType,   "pure_form/types/string"
+    autoload :IntegerType,  "pure_form/types/integer"
+    autoload :FloatType,    "pure_form/types/float"
+    autoload :BooleanType,  "pure_form/types/boolean"
+    autoload :DateType,     "pure_form/types/date"
+    autoload :DateTimeType, "pure_form/types/date_time"
   end
 end

data/lib/pure_form/types/date_time.rb

@@ -0,0 +1,17 @@
+module PureForm
+  module Types
+    class DateTimeType < BaseType
+      def typecast(value)
+        value.to_datetime
+      rescue TypeError, ArgumentError, NoMethodError
+        nil
+      end
+
+      def complex_typecast(*args)
+        DateTime.new(*args)
+      rescue TypeError, ArgumentError, NoMethodError
+        nil
+      end
+    end
+  end
+end

data/lib/pure_form/types/float.rb

@@ -2,7 +2,7 @@ module PureForm
   module Types
     class FloatType < BaseType
       def typecast(value)
-        value.to_f
+        value.blank?? nil : value.to_f
       rescue NoMethodError
         nil
       end

data/lib/pure_form/types/integer.rb

@@ -2,7 +2,7 @@ module PureForm
   module Types
     class IntegerType < BaseType
       def typecast(value)
-        value.to_i
+        value.blank?? nil : value.to_i
       rescue NoMethodError
         nil
       end

data/lib/pure_form/version.rb

@@ -1,3 +1,3 @@
 module PureForm
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pure_form
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Pavel Pravosud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -44,6 +44,7 @@ files:
 - lib/pure_form/types/base.rb
 - lib/pure_form/types/boolean.rb
 - lib/pure_form/types/date.rb
+- lib/pure_form/types/date_time.rb
 - lib/pure_form/types/float.rb
 - lib/pure_form/types/integer.rb
 - lib/pure_form/types/string.rb
@@ -68,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: ''