active_attr 0.6.0 → 0.7.0

data/.gitignore

@@ -1,8 +1,10 @@
 *.gem
 .bundle
+.rvmrc
 .yardoc
 coverage
 doc
 Gemfile.lock
 gemfiles/*.gemfile.lock
 pkg/*
+tmp/

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3@active_attr

data/.travis.yml

@@ -10,6 +10,8 @@ gemfile:
   - gemfiles/rails_3_1.gemfile
   - gemfiles/rails_head.gemfile
 matrix:
+  allow_failures:
+    - gemfile: gemfiles/rails_head.gemfile
   exclude:
     - rvm: ree
       gemfile: gemfiles/rails_head.gemfile

data/CHANGELOG.md

@@ -1,8 +1,15 @@
+# ActiveAttr 0.7.0 (December 15, 2012) #
+
+* Added Serialization
+* Changed Typecasting::DateTypecaster to not raise on invalid Strings
+* #114 Fixed NoMethodError in TypecastedAttributes#attribute_before_type_cast
+
 # ActiveAttr 0.6.0 (June 27, 2012) #
 
 * Added AttributeDefinition#inspect
 * Added Attributes.attribute!
 * Added Attributes.dangerous_attribute?
+* Added missing autoload for BlockInitialization
 * Added Typecasting#typecaster_for
 * Added Typecasting::UnknownTypecasterError
 * Changed Typecasting#typecast_attribute to take a typecaster, not a type

data/Gemfile

@@ -1,7 +1,13 @@
 source "https://rubygems.org"
 
 gemspec :development_group => :test
-gem "factory_girl", "< 3.0", :group => :test if RUBY_VERSION < "1.9.2"
+
+if RUBY_VERSION < "1.9.2"
+  gem "factory_girl", "< 3.0", :group => :test
+  gem "strong_parameters", :git => "git://github.com/rails/strong_parameters.git", :group => :test
+else
+  gem "strong_parameters"
+end
 
 group :development do
   gem "debugger",  :platforms => :mri_19

data/Guardfile

@@ -3,7 +3,7 @@ guard "bundler" do
   watch(/^.+\.gemspec/)
 end
 
-guard "rspec", :version => 2, :cli=> "--format nested --debugger" do
+guard "rspec", :cli => "--format nested --debugger" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$}) { |m| ["spec/unit/#{m[1]}_spec.rb", "spec/functional/#{m[1]}_spec.rb"] }
   watch("spec/spec_helper.rb") { "spec" }

data/README.md

@@ -1,21 +1,34 @@
 # ActiveAttr #
 
-[![Build History][2]][1] [![Dependency Status][5]][4]
+[![Build History][travis badge]][travis]
+[![Code Climate][codeclimate badge]][codeclimate]
 
 ActiveAttr is a set of modules that makes it easy to create plain old ruby
 models with functionality found in ORMs, like ActiveRecord, without
 reinventing the wheel. Think of ActiveAttr as the stuff ActiveModel left out.
 
-ActiveAttr is distributed as a rubygem [on rubygems.org][3].
-
-* [API Documentation](http://rubydoc.info/gems/active_attr)
-* [Contributors](https://github.com/cgriego/active_attr/contributors)
-
-[1]: http://travis-ci.org/cgriego/active_attr
-[2]: https://secure.travis-ci.org/cgriego/active_attr.png?branch=master
-[3]: http://rubygems.org/gems/active_attr
-[4]: https://gemnasium.com/cgriego/active_attr
-[5]: https://gemnasium.com/cgriego/active_attr.png
+ActiveAttr is distributed as a rubygem [on rubygems.org][rubygems].
+
+[![Models Models Every Where][speakerdeck slide]][speakerdeck]
+[![ActiveAttr Railscast][railscast poster]][railscast]
+
+* [Slides][speakerdeck]
+* [RailsCast][railscast]
+* [API Documentation][api]
+* [Contributors][contributors]
+
+[api]: http://rubydoc.info/gems/active_attr
+[codeclimate badge]: https://codeclimate.com/badge.png
+[codeclimate]: https://codeclimate.com/github/cgriego/active_attr
+[contributors]: https://github.com/cgriego/active_attr/contributors
+[railscast poster]: http://railscasts.com/static/episodes/stills/326-activeattr.png
+[railscast]: http://railscasts.com/episodes/326-activeattr
+[rubygems]: http://rubygems.org/gems/active_attr
+[strong_parameters]: https://github.com/rails/strong_parameters
+[speakerdeck slide]: https://speakerd.s3.amazonaws.com/presentations/4f31f1dec583b4001f008ec3/thumb_slide_0.jpg
+[speakerdeck]: https://speakerdeck.com/u/cgriego/p/models-models-every-where
+[travis badge]: https://secure.travis-ci.org/cgriego/active_attr.png?branch=master
+[travis]: http://travis-ci.org/cgriego/active_attr
 
 ## Modules ##
 
@@ -168,6 +181,24 @@ blacklists or whitelists including support for mass assignment roles.
     person.first_name #=> "Chris"
     person.last_name #=> nil
 
+If you prefer the [Strong Paramters][strong_parameters] approach,
+include the ActiveModel::ForbiddenAttributesProtection module after
+including the MassAssignmentSecurity model.
+
+    class Person
+      include ActiveAttr::MassAssignmentSecurity
+      include ActiveModel::ForbiddenAttributesProtection
+    end
+
+### Serialization ###
+
+The Serialization module is a shortcut for incorporating ActiveModel's
+serialization functionality into your model with one include.
+
+    class Person
+      include ActiveAttr::Model
+    end
+
 ### Model ###
 
 The Model module is a shortcut for incorporating the most common model

data/gemfiles/rails_3_0.gemfile

@@ -1,7 +1,10 @@
 source "http://rubygems.org"
 
 gemspec :development_group => :test, :path => ".."
-gem "factory_girl", "< 3.0", :group => :test if RUBY_VERSION < "1.9.2"
+
+if RUBY_VERSION < "1.9.2"
+  gem "factory_girl", "< 3.0", :group => :test
+end
 
 gem "activemodel",   "~> 3.0.2"
 gem "activesupport", "~> 3.0.2"

data/gemfiles/rails_3_1.gemfile

@@ -1,7 +1,10 @@
 source "http://rubygems.org"
 
 gemspec :development_group => :test, :path => ".."
-gem "factory_girl", "< 3.0", :group => :test if RUBY_VERSION < "1.9.2"
+
+if RUBY_VERSION < "1.9.2"
+  gem "factory_girl", "< 3.0", :group => :test
+end
 
 gem "activemodel",   "~> 3.1.0"
 gem "activesupport", "~> 3.1.0"

data/lib/active_attr.rb

@@ -21,6 +21,7 @@ module ActiveAttr
   autoload :MassAssignmentSecurity
   autoload :Model
   autoload :QueryAttributes
+  autoload :Serialization
   autoload :TypecastedAttributes
   autoload :Typecasting
   autoload :UnknownAttributeError

data/lib/active_attr/attribute_defaults.rb

@@ -90,7 +90,7 @@ module ActiveAttr
     #
     # @since 0.5.0
     def attribute_defaults
-      Hash[ self.class.attribute_names.map { |name| [name, _attribute_default(name)] } ]
+      attributes_map { |name| _attribute_default name }
     end
 
     # Applies attribute default values

data/lib/active_attr/attributes.rb

@@ -57,7 +57,7 @@ module ActiveAttr
     #
     # @since 0.2.0
     def attributes
-      Hash[self.class.attribute_names.map { |key| [key, send(key)] }]
+      attributes_map { |name| send name }
     end
 
     # Returns the class name plus its attributes
@@ -138,6 +138,21 @@ module ActiveAttr
       @attributes[name] = value
     end
 
+    # Maps all attributes using the given block
+    #
+    # @example Stringify attributes
+    #   person.attributes_map { |name| send(name).to_s }
+    #
+    # @yield [name] block called to return hash value
+    # @yieldparam [String] name The name of the attribute to map.
+    #
+    # @return [Hash{String => Object}] The Hash of mapped attributes
+    #
+    # @since 0.7.0
+    def attributes_map
+      Hash[ self.class.attribute_names.map { |name| [name, yield(name)] } ]
+    end
+
     module ClassMethods
       # Defines an attribute
       #

data/lib/active_attr/mass_assignment_security.rb

@@ -32,16 +32,23 @@ module ActiveAttr
     # @since 0.3.0
     def assign_attributes(new_attributes, options={})
       if new_attributes && !options[:without_protection]
-        if method(:sanitize_for_mass_assignment).arity.abs > 1
-          mass_assignment_role = options[:as] || :default
-          new_attributes = sanitize_for_mass_assignment new_attributes, mass_assignment_role
-        else
-          # Rails 3.0 has no roles support in mass assignment
-          new_attributes = sanitize_for_mass_assignment new_attributes
-        end
+        mass_assignment_role = options[:as] || :default
+        new_attributes = sanitize_for_mass_assignment_with_or_without_role new_attributes, mass_assignment_role
       end
 
       super
     end
+
+    private
+
+    # Rails 3.0 has no roles support in mass assignment
+    # @since 0.7.0
+    def sanitize_for_mass_assignment_with_or_without_role(new_attributes, mass_assignment_role)
+      if method(:sanitize_for_mass_assignment).arity.abs > 1
+        sanitize_for_mass_assignment new_attributes, mass_assignment_role
+      else
+        sanitize_for_mass_assignment new_attributes
+      end
+    end
   end
 end

data/lib/active_attr/model.rb

@@ -4,8 +4,8 @@ require "active_attr/block_initialization"
 require "active_attr/logger"
 require "active_attr/mass_assignment_security"
 require "active_attr/query_attributes"
+require "active_attr/serialization"
 require "active_attr/typecasted_attributes"
-require "active_model"
 require "active_support/concern"
 
 module ActiveAttr
@@ -29,13 +29,6 @@ module ActiveAttr
     include AttributeDefaults
     include QueryAttributes
     include TypecastedAttributes
-
-    if defined? ActiveModel::Serializable
-      include ActiveModel::Serializable::JSON
-      include ActiveModel::Serializable::XML
-    else
-      include ActiveModel::Serializers::JSON
-      include ActiveModel::Serializers::Xml
-    end
+    include Serialization
   end
 end

data/lib/active_attr/serialization.rb

@@ -0,0 +1,31 @@
+require "active_attr/attributes"
+require "active_attr/mass_assignment"
+require "active_model"
+require "active_support/concern"
+
+module ActiveAttr
+  # Serialization is a shortcut for incorporating ActiveModel's
+  # serialization functionality into your model with one include
+  #
+  # See the included modules to learn more.
+  #
+  # @example Usage
+  #   class Person
+  #     include ActiveAttr::Serialization
+  #   end
+  #
+  # @since 0.7.0
+  module Serialization
+    extend ActiveSupport::Concern
+    include Attributes
+    include MassAssignment
+
+    if defined? ActiveModel::Serializable
+      include ActiveModel::Serializable::JSON
+      include ActiveModel::Serializable::XML
+    else
+      include ActiveModel::Serializers::JSON
+      include ActiveModel::Serializers::Xml
+    end
+  end
+end

data/lib/active_attr/typecasted_attributes.rb

@@ -46,6 +46,7 @@ module ActiveAttr
     #
     # @since 0.5.0
     def attribute_before_type_cast(name)
+      @attributes ||= {}
       @attributes[name.to_s]
     end
 

data/lib/active_attr/typecasting/date_typecaster.rb

@@ -24,6 +24,7 @@ module ActiveAttr
       # @since 0.5.0
       def call(value)
         value.to_date if value.respond_to? :to_date
+      rescue NoMethodError
       end
     end
   end

data/lib/active_attr/version.rb

@@ -1,5 +1,5 @@
 module ActiveAttr
   # Complete version string
   # @since 0.1.0
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/spec/functional/active_attr/mass_assignment_security_spec.rb

@@ -0,0 +1,45 @@
+require "spec_helper"
+require "active_attr/mass_assignment_security"
+
+module ActiveAttr
+  describe MassAssignmentSecurity, :mass_assignment do
+    context "integrating with strong_parameters", :active_model_version => "~> 3.2.0" do
+      subject { model_class }
+
+      before do
+        require "strong_parameters"
+
+        model_class.class_eval do
+          include ActiveAttr::MassAssignmentSecurity
+          include ActiveModel::ForbiddenAttributesProtection
+          attr_accessor :age
+        end
+      end
+
+      shared_examples "strong mass assignment method", :strong_mass_assignment_method => true do
+        it "raises if provided parameters when none are permitted" do
+          expect { mass_assign_attributes(ActionController::Parameters.new(:age => 21)) }.to raise_error ActiveModel::ForbiddenAttributes
+        end
+
+        it "sets a permitted parameter" do
+          person = mass_assign_attributes(ActionController::Parameters.new(:age => 21).permit(:age))
+          person.age.should == 21
+        end
+
+        it "does not set forbidden parameters" do
+          person = mass_assign_attributes(ActionController::Parameters.new(:age => 21).permit(:first_name))
+          person.age.should be_nil
+        end
+
+        it "continues to set normal attributes" do
+          person = mass_assign_attributes(:age => 21)
+          person.age.should == 21
+        end
+      end
+
+      describe "#assign_attributes", :assign_attributes, :strong_mass_assignment_method
+      describe "#attributes=", :attributes=, :strong_mass_assignment_method
+      describe "#initialize", :initialize, :strong_mass_assignment_method
+    end
+  end
+end

data/spec/functional/active_attr/serialization_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+require "active_attr/serialization"
+require "active_support/core_ext/hash/conversions"
+require "active_support/json/decoding"
+
+module ActiveAttr
+  describe Serialization do
+    let :model_class do
+      Class.new do
+        include Serialization
+        attribute :first_name
+
+        def self.name
+          "Person"
+        end
+      end
+    end
+
+    subject { model_class.new }
+
+    it "serializes to/from JSON" do
+      subject.first_name = "Chris"
+      model_class.new.from_json(subject.to_json).first_name.should == "Chris"
+    end
+
+    it "serializes to/from XML" do
+      subject.first_name = "Chris"
+      model_class.new.from_xml(subject.to_xml).first_name.should == "Chris"
+    end
+  end
+end

data/spec/unit/active_attr/typecasted_attributes_spec.rb

@@ -60,6 +60,10 @@ module ActiveAttr
     end
 
     describe "#attribute_before_type_cast" do
+      it "returns nil when the attribute has not been assigned yet" do
+        subject.attribute_before_type_cast(:amount).should be_nil
+      end
+
       it "returns the assigned attribute value, without typecasting, when given an attribute name as a Symbol" do
         value = :value
         subject.amount = value

data/spec/unit/active_attr/typecasting/date_typecaster_spec.rb

@@ -14,6 +14,10 @@ module ActiveAttr
           subject.call(nil).should equal nil
         end
 
+        it "returns nil for an invalid String" do
+          subject.call("x").should equal nil
+        end
+
         it "casts a UTC Time to a Date representing the date portion" do
           subject.call(Time.utc(2012, 1, 1, 0, 0, 0)).should eql Date.new(2012, 1, 1)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_attr
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -152,7 +152,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
+- .ruby-version
 - .travis.yml
 - .yardopts
 - CHANGELOG.md
@@ -183,6 +183,7 @@ files:
 - lib/active_attr/query_attributes.rb
 - lib/active_attr/railtie.rb
 - lib/active_attr/rspec.rb
+- lib/active_attr/serialization.rb
 - lib/active_attr/typecasted_attributes.rb
 - lib/active_attr/typecasting.rb
 - lib/active_attr/typecasting/big_decimal_typecaster.rb
@@ -200,9 +201,11 @@ files:
 - spec/functional/active_attr/attribute_defaults_spec.rb
 - spec/functional/active_attr/attributes_spec.rb
 - spec/functional/active_attr/chainable_initialization_spec.rb
+- spec/functional/active_attr/mass_assignment_security_spec.rb
 - spec/functional/active_attr/matchers/have_attribute_matcher_spec.rb
 - spec/functional/active_attr/model_spec.rb
 - spec/functional/active_attr/query_attributes_spec.rb
+- spec/functional/active_attr/serialization_spec.rb
 - spec/functional/active_attr/typecasted_attributes_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_lint.rb
@@ -250,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1481400115643803652
+      hash: 158822626383359135
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -259,10 +262,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1481400115643803652
+      hash: 158822626383359135
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: What ActiveModel left out
@@ -270,9 +273,11 @@ test_files:
 - spec/functional/active_attr/attribute_defaults_spec.rb
 - spec/functional/active_attr/attributes_spec.rb
 - spec/functional/active_attr/chainable_initialization_spec.rb
+- spec/functional/active_attr/mass_assignment_security_spec.rb
 - spec/functional/active_attr/matchers/have_attribute_matcher_spec.rb
 - spec/functional/active_attr/model_spec.rb
 - spec/functional/active_attr/query_attributes_spec.rb
+- spec/functional/active_attr/serialization_spec.rb
 - spec/functional/active_attr/typecasted_attributes_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_lint.rb
@@ -306,3 +311,4 @@ test_files:
 - spec/unit/active_attr/typecasting_spec.rb
 - spec/unit/active_attr/unknown_attribute_error_spec.rb
 - spec/unit/active_attr/version_spec.rb
+has_rdoc: 

data/.rvmrc

@@ -1,81 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.3@active_attr"
-
-#
-# Uncomment the following lines if you want to verify rvm version per project
-#
-# rvmrc_rvm_version="1.10.1" # 1.10.1 seams as a safe start
-# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-#   return 1
-# }
-#
-
-#
-# Uncomment following line if you want options to be set only for given project.
-#
-# PROJECT_JRUBY_OPTS=( --1.9 )
-#
-# The variable PROJECT_JRUBY_OPTS requires the following to be run in shell:
-#
-#    chmod +x ${rvm_path}/hooks/after_use_jruby_opts
-#
-
-#
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-#
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-
-  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
-  then
-    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
-  fi
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  if ! rvm --create use  "$environment_id"
-  then
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  fi
-fi
-
-#
-# If you use an RVM gemset file to install a list of gems (*.gems), you can have
-# it be automatically loaded. Uncomment the following and adjust the filename if
-# necessary.
-#
-# filename=".gems"
-# if [[ -s "$filename" ]]
-# then
-#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
-# fi
-
-# If you use bundler, this might be useful to you:
-# if [[ -s Gemfile ]] && ! command -v bundle >/dev/null
-# then
-#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
-#   gem install bundler
-# fi
-# if [[ -s Gemfile ]] && command -v bundle
-# then
-#   bundle install
-# fi
-
-if [[ $- == *i* ]] # check for interactive shells
-then
-    echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
-else
-	echo "Using: $GEM_HOME" # don't use colors in interactive shells
-fi
-