active_data 0.1.0 → 0.2.0

data/.rspec

@@ -1,2 +1,3 @@
 --colour
 --backtrace
+--order random

data/.travis.yml

@@ -1,5 +1,5 @@
 rvm:
   - 1.9.2
   - 1.9.3
-  - ruby-head
+  - 2.0.0
   #- rbx-19mode

data/Gemfile

@@ -3,12 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in active_data.gemspec
 gemspec
 
+gem 'timecop'
+
 gem 'guard'
 gem 'guard-rspec'
-
-if RUBY_PLATFORM =~ /darwin/i
-  gem 'rb-fsevent'
-else
-  gem 'rb-inotify'
-  gem 'libnotify'
-end
+gem 'rb-inotify', require: false
+gem 'rb-fsevent', require: false
+gem 'rb-fchange', require: false

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2 do
+guard :rspec do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
@@ -13,7 +13,12 @@ guard 'rspec', :version => 2 do
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
   watch('config/routes.rb')                           { "spec/routing" }
   watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-  # Capybara request specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
 end
 

data/active_data.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
-  gem.add_runtime_dependency "activesupport"
-  gem.add_runtime_dependency "activemodel"
+  gem.add_runtime_dependency "activesupport", "~> 3.0"
+  gem.add_runtime_dependency "activemodel", "~> 3.0"
 end

data/lib/active_data/attributes/base.rb

@@ -10,7 +10,7 @@ module ActiveData
       end
 
       def type
-        @type ||= options[:type] || String
+        @type ||= options[:type] || Object
       end
 
       def values
@@ -18,15 +18,20 @@ module ActiveData
       end
 
       def default
-        @default ||= options[:default].respond_to?(:call) ? options[:default] : proc { options[:default] }
+        @default ||= @options[:default]
+      end
+
+      def default_blank?
+        @default_blank ||= !!@options[:default_blank]
       end
 
       def default_value instance
-        default.call instance
+        default.respond_to?(:call) ? default.call(instance) : default unless default.nil?
       end
 
       def type_cast value
-        type.active_data_type_cast value
+        return value if value.instance_of?(type)
+        type.active_data_type_cast(value)
       end
 
       def generate_instance_methods context
@@ -49,7 +54,7 @@ module ActiveData
         EOS
       end
 
-      def generate_singleton_methods context
+      def generate_class_methods context
         if values
           context.class_eval <<-EOS
             def #{name}_values

data/lib/active_data/attributes/localized.rb

@@ -34,7 +34,7 @@ module ActiveData
         EOS
       end
 
-      def generate_singleton_methods context
+      def generate_class_methods context
       end
 
     end

data/lib/active_data/model/associations/{many.rb → association.rb}

@@ -1,7 +1,7 @@
 module ActiveData
   module Model
     module Associations
-      class Many
+      class Association
         attr_reader :name, :klass, :options
 
         def initialize name, options = {}
@@ -14,10 +14,16 @@ module ActiveData
           klass.to_s
         end
 
-        def collection?
-          true
+        def define_accessor klass
+          define_reader klass
+          define_writer klass
         end
 
+        def define_reader klass
+        end
+
+        def define_writer klass
+        end
       end
     end
   end

data/lib/active_data/model/associations/embeds_many.rb

@@ -0,0 +1,33 @@
+module ActiveData
+  module Model
+    module Associations
+      class EmbedsMany < Association
+
+        def collection?
+          true
+        end
+
+        def define_reader target
+          target.class_eval <<-EOS
+            def #{name}
+              @#{name} ||= begin
+                association = self.class.reflect_on_association('#{name}')
+                association.klass.collection
+              end
+            end
+          EOS
+        end
+
+        def define_writer target
+          target.class_eval <<-EOS
+            def #{name}= value
+              association = self.class.reflect_on_association('#{name}')
+              @#{name} = association.klass.collection(value)
+            end
+          EOS
+        end
+
+      end
+    end
+  end
+end

data/lib/active_data/model/associations/embeds_one.rb

@@ -0,0 +1,30 @@
+module ActiveData
+  module Model
+    module Associations
+      class EmbedsOne < Association
+
+        def collection?
+          false
+        end
+
+        def define_reader target
+          target.class_eval <<-EOS
+            def #{name}
+              @#{name}
+            end
+          EOS
+        end
+
+        def define_writer target
+          target.class_eval <<-EOS
+            def #{name}= value
+              association = self.class.reflect_on_association('#{name}')
+              @#{name} = association.klass.instantiate(value) if value
+            end
+          EOS
+        end
+
+      end
+    end
+  end
+end

data/lib/active_data/model/associations.rb

@@ -1,4 +1,6 @@
-require 'active_data/model/associations/many'
+require 'active_data/model/associations/association'
+require 'active_data/model/associations/embeds_many'
+require 'active_data/model/associations/embeds_one'
 
 module ActiveData
   module Model
@@ -6,14 +8,22 @@ module ActiveData
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :_associations, :instance_reader => false, :instance_writer => false
-        self._associations = ActiveSupport::HashWithIndifferentAccess.new
+        class_attribute :_associations, instance_reader: false, instance_writer: false
+        self._associations = {}
+
+        { embeds_many: EmbedsMany, embeds_one: EmbedsOne }.each do |(name, association_class)|
+          define_singleton_method name do |*args|
+            association = association_class.new *args
+            association.define_accessor self
+            self._associations = _associations.merge(association.name => association)
+          end
+        end
       end
 
       module ClassMethods
 
         def reflect_on_association name
-          _associations[name]
+          _associations[name.to_s]
         end
 
         def associations
@@ -23,27 +33,14 @@ module ActiveData
         def association_names
           _associations.keys
         end
+      end
 
-        def embeds_many name, options = {}
-          association = Many.new name, options
-          define_collection_reader association
-          define_collection_writer association
-          self._associations = _associations.merge!(association.name => association)
-        end
-
-        def define_collection_reader association
-          define_method association.name do
-            instance_variable_get("@#{association.name}") || association.klass.collection([])
-          end
-        end
-
-        def define_collection_writer association
-          define_method "#{association.name}=" do |value|
-            instance_variable_set "@#{association.name}", association.klass.collection(value)
-          end
+      def == other
+        super(other) && self.class.association_names.all? do |association|
+          send(association) == other.send(association)
         end
-
       end
+
     end
   end
 end

data/lib/active_data/model/attributable.rb

@@ -5,15 +5,21 @@ module ActiveData
 
       included do
         class_attribute :_attributes, :instance_reader => false, :instance_writer => false
-        self._attributes = ActiveSupport::HashWithIndifferentAccess.new
-
-        extend generated_class_attributes_methods
-        include generated_instance_attributes_methods
+        self._attributes = {}
 
         delegate :attribute_default, :to => 'self.class'
       end
 
       module ClassMethods
+        def attribute name, options = {}, &block
+          attribute = build_attribute(name, options, &block)
+          self._attributes = _attributes.merge(attribute.name => attribute)
+
+          attribute.generate_instance_methods generated_instance_attributes_methods
+          attribute.generate_class_methods generated_class_attributes_methods
+          attribute
+        end
+
         def build_attribute name, options = {}, &block
           klass = case options[:type].to_s
           when 'Localized'
@@ -24,47 +30,44 @@ module ActiveData
           klass.new name, options, &block
         end
 
-        def attribute name, options = {}, &block
-          attribute = build_attribute(name, options, &block)
-          self._attributes = _attributes.merge(attribute.name => attribute)
-
-          attribute.generate_instance_methods generated_instance_attributes_methods
-          attribute.generate_singleton_methods generated_class_attributes_methods
-          attribute
-        end
-
         def generated_class_attributes_methods
-          @generated_class_attributes_methods ||= Module.new
+          @generated_class_attributes_methods ||= Module.new.tap { |proxy| extend proxy }
         end
 
         def generated_instance_attributes_methods
-          @generated_instance_attributes_methods ||= Module.new
+          @generated_instance_attributes_methods ||= Module.new.tap { |proxy| include proxy }
         end
 
         def initialize_attributes
-          _attributes.inject(ActiveSupport::HashWithIndifferentAccess.new) do |result, (name, value)|
-            result[name] = nil
-            result
-          end
+          Hash[_attributes.map { |(name, _)| [name, nil] }]
         end
       end
 
       def read_attribute name
-        attribute = self.class._attributes[name]
-        source = @attributes[name].nil? ? attribute.default_value(self) : @attributes[name]
-        attribute.type_cast source
+        name = name.to_sym
+        if attributes_cache.key? name
+          attributes_cache[name]
+        else
+          attribute = self.class._attributes[name]
+          value = attribute.type_cast @attributes[name]
+          use_default = attribute.default_blank? && value.blank? || value.nil?
+
+          attributes_cache[name] = use_default ? attribute.default_value(self) : value
+        end
       end
       alias_method :[], :read_attribute
 
       def has_attribute? name
-        @attributes.key? name
+        @attributes.key? name.to_sym
       end
 
       def read_attribute_before_type_cast name
-        @attributes[name]
+        @attributes[name.to_sym]
       end
 
       def write_attribute name, value
+        name = name.to_sym
+        attributes_cache.delete name
         @attributes[name] = value
       end
       alias_method :[]=, :write_attribute
@@ -87,9 +90,10 @@ module ActiveData
       def attributes= attributes
         assign_attributes(attributes)
       end
+      alias_method :update_attributes, :attributes=
 
-      def update_attributes attributes
-        self.attributes = attributes
+      def write_attributes attributes
+        attributes.each { |(name, value)| send("#{name}=", value) }
       end
 
       def reverse_update_attributes attributes
@@ -98,18 +102,20 @@ module ActiveData
 
     private
 
+      def attributes_cache
+        @attributes_cache ||= {}
+      end
+
       def assign_attributes attributes
         (attributes.presence || {}).each do |(name, value)|
-          send("#{name}=", value) if respond_to?("#{name}=")
+          send("#{name}=", value) if has_attribute?(name) || respond_to?("#{name}=")
         end
-        self.attributes
       end
 
       def reverse_assign_attributes attributes
         (attributes.presence || {}).each do |(name, value)|
           send("#{name}=", value) if respond_to?("#{name}=") && respond_to?(name) && send(name).blank?
         end
-        self.attributes
       end
 
     end

data/lib/active_data/model/collectionizable.rb

@@ -6,27 +6,24 @@ module ActiveData
       extend ActiveSupport::Concern
 
       included do
-        collectionize Array
+        class_attribute :_collection_superclass
+        collectionize
       end
 
       module ClassMethods
 
-        def collectionize collection_superclass = nil
-          collection = Class.new(collection_superclass) do
-            include ActiveData::Model::Collectionizable::Proxy
-          end
-          collection.collectible = self
-
-          remove_const :Collection if const_defined? :Collection
-          const_set :Collection, collection
+        def collectionize collection_superclass = Array
+          self._collection_superclass = collection_superclass
         end
 
-        def respond_to? method
+        def respond_to_missing? method, include_private
           super || collection_class.superclass.method_defined?(method)
         end
 
         def method_missing method, *args, &block
-          current_scope.send(method, *args, &block) if collection_class.superclass.method_defined?(method)
+          collection_class.superclass.method_defined?(method) ?
+            current_scope.send(method, *args, &block) :
+            super
         end
 
         def collection source = nil
@@ -34,7 +31,11 @@ module ActiveData
         end
 
         def collection_class
-          @collection_class ||= const_get(:Collection)
+          @collection_class ||= begin
+            Class.new(_collection_superclass) do
+              include ActiveData::Model::Collectionizable::Proxy
+            end.tap { |klass| klass.collectible = self }
+          end
         end
 
         def current_scope= value

data/lib/active_data/model/extensions/array.rb

@@ -7,10 +7,10 @@ module ActiveData
         module ClassMethods
           def active_data_type_cast value
             case value
-            when String then
-              value.split(',').map(&:strip)
-            when Array then
+            when ::Array then
               value
+            when ::String then
+              value.split(',').map(&:strip)
             else
               nil
             end

data/lib/active_data/model/extensions/big_decimal.rb

@@ -1,4 +1,4 @@
-module ActiveData
+ module ActiveData
   module Model
     module Extensions
       module BigDecimal
@@ -6,7 +6,7 @@ module ActiveData
 
         module ClassMethods
           def active_data_type_cast value
-            ::BigDecimal.new value.to_s if value.to_s =~ /\A\d+(?:\.\d*)?\Z/
+            ::BigDecimal.new Float(value).to_s rescue nil if value
           end
         end
       end

data/lib/active_data/model/extensions/date.rb

@@ -6,14 +6,7 @@ module ActiveData
 
         module ClassMethods
           def active_data_type_cast value
-            case value
-            when String then
-              Date.parse(value.to_s) rescue nil
-            when Date, DateTime, Time then
-              value.to_date
-            else
-              nil
-            end
+            value.to_date rescue nil
           end
         end
       end

data/lib/active_data/model/extensions/date_time.rb

@@ -0,0 +1,17 @@
+module ActiveData
+  module Model
+    module Extensions
+      module DateTime
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          def active_data_type_cast value
+            value.to_datetime rescue nil
+          end
+        end
+      end
+    end
+  end
+end
+
+DateTime.send :include, ActiveData::Model::Extensions::DateTime

data/lib/active_data/model/extensions/float.rb

@@ -6,7 +6,7 @@ module ActiveData
 
         module ClassMethods
           def active_data_type_cast value
-            value.try(:to_f) if value.to_s =~ /\A\d+(?:\.\d*)?\Z/
+            Float(value) rescue nil if value
           end
         end
       end

data/lib/active_data/model/extensions/hash.rb

@@ -7,7 +7,7 @@ module ActiveData
         module ClassMethods
           def active_data_type_cast value
             case value
-            when Hash then
+            when ::Hash then
               value
             else
               nil

data/lib/active_data/model/extensions/integer.rb

@@ -6,7 +6,7 @@ module ActiveData
 
         module ClassMethods
           def active_data_type_cast value
-            value.try(:to_i) if value.to_s =~ /\A\d+(?:\.\d*)?\Z/
+            Float(value).to_i rescue nil if value
           end
         end
       end

data/lib/active_data/model/extensions/localized.rb

@@ -7,8 +7,8 @@ module ActiveData
         module ClassMethods
           def active_data_type_cast value
             case value
-            when Hash then
-              value.stringify_keys!
+            when ::Hash then
+              value.stringify_keys
             else
               nil
             end

data/lib/active_data/model/extensions/object.rb

@@ -0,0 +1,17 @@
+module ActiveData
+  module Model
+    module Extensions
+      module Object
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          def active_data_type_cast value
+            value
+          end
+        end
+      end
+    end
+  end
+end
+
+Object.send :include, ActiveData::Model::Extensions::Object

data/lib/active_data/model/extensions/time.rb

@@ -0,0 +1,17 @@
+module ActiveData
+  module Model
+    module Extensions
+      module Time
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          def active_data_type_cast value
+            value.to_time rescue nil
+          end
+        end
+      end
+    end
+  end
+end
+
+Time.send :include, ActiveData::Model::Extensions::Time

data/lib/active_data/model/localizable.rb

@@ -17,13 +17,13 @@ module ActiveData
       end
 
       def read_localized_attribute name, locale = self.class.locale
-        translations = read_attribute(name)
-        translations[self.class.fallbacks(locale).detect { |fallback| translations[fallback.to_s] }]
+        translations = read_attribute(name.to_s)
+        translations[self.class.fallbacks(locale).detect { |fallback| translations[fallback.to_s] }.to_s]
       end
       alias_method :read_localized_attribute_before_type_cast, :read_localized_attribute
 
       def write_localized_attribute name, value, locale = self.class.locale
-        translations = read_attribute(name)
+        translations = read_attribute(name.to_s)
         write_attribute(name, translations.merge(locale.to_s => value))
       end
     end

data/lib/active_data/model/nested_attributes.rb

@@ -43,10 +43,16 @@ module ActiveData
 
         reflection = self.class.reflect_on_association association_name
 
-        send("#{association_name}=", attributes_collection.map do |attributes|
-          reflection.klass.new attributes
-        end)
+        send "#{association_name}=", attributes_collection
+      end
+
+      def assign_nested_attributes_for_one_to_one_association(association_name, attributes, assignment_opts = {})
+        unless attributes.is_a?(Hash)
+          raise ArgumentError, "Hash expected, got #{attributes.class.name} (#{attributes.inspect})"
+        end
+
+        send "#{association_name}=", attributes
       end
     end
   end
-end
+end