active_attr 0.3.0 → 0.4.0

data/.gitignore

@@ -4,4 +4,5 @@
 coverage
 doc
 Gemfile.lock
+gemfiles/*.gemfile.lock
 pkg/*

data/.travis.yml

@@ -3,3 +3,6 @@ rvm:
   - 1.9.2
   - 1.9.3
 bundler_args: --without development
+gemfile:
+  - Gemfile
+  - gemfiles/rails_head.gemfile

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# ActiveAttr 0.4.0 (November 26, 2011) #
+
+* Added Model
+* Support for ActiveModel 3.2
+
 # ActiveAttr 0.3.0 (November 26, 2011) #
 
 * Added BlockInitialization
@@ -7,7 +12,7 @@
 * Added QueryAttributes
 * Added UnknownAttributeError
 * Attributes now honors getters/setters when calling #read_attribute,
-  #write_attribute, #[], and #[]=
+  \#write_attribute, #[], and #[]=
 * Attributes now raises DangerousAttributeError when defining an attribute
   whose methods would conflict with an existing method
 * Attributes now raises UnknownAttributeError when getting/setting any

data/README.md

@@ -12,6 +12,16 @@ the wheel.
 
 ## Modules ##
 
+### Model ###
+
+The Model module is a shortcut for incorporating the most common model
+functionality into your model with one include. All of the following modules
+are included when you include Model.
+
+    class Person
+      include ActiveAttr::Model
+    end
+
 ### Attributes ###
 
 Including the Attributes module into your class gives you a DSL for defining
@@ -133,10 +143,20 @@ providing instance methods for querying your attributes
     person.first_name? #=> true
     person.last_name? #=> false
 
-## RSpec Integration ##
+## Integrations ##
+
+### Ruby on Rails ###
+
+When using ActiveAttr inside a Rails application, ActiveAttr will configure
+your models' default logger to use the Rails logger automatically. Just
+include ActiveAttr in your Gemfile.
+
+    gem "active_attr"
+
+### RSpec ###
 
 ActiveAttr comes with matchers and RSpec integration to assist you in testing
-your models.
+your models. The matchers also work with compatible frameworks like Shoulda.
 
     require "active_attr/rspec"
 

data/gemfiles/rails_head.gemfile

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gemspec :development_group => :test, :path => ".."
+
+git "git://github.com/rails/rails.git" do
+  gem "activemodel"
+  gem "activesupport"
+end

data/lib/active_attr.rb

@@ -17,6 +17,7 @@ module ActiveAttr
   autoload :Logger
   autoload :MassAssignment
   autoload :MassAssignmentSecurity
+  autoload :Model
   autoload :QueryAttributes
   autoload :StrictMassAssignment
   autoload :UnknownAttributeError

data/lib/active_attr/attributes.rb

@@ -29,7 +29,7 @@ module ActiveAttr
     DEPRECATED_OBJECT_METHODS = %w(id type)
 
     included do
-      attribute_method_suffix ""
+      attribute_method_suffix "" if attribute_method_matchers.none? { |matcher| matcher.prefix == "" && matcher.suffix == "" }
       attribute_method_suffix "="
     end
 

data/lib/active_attr/model.rb

@@ -0,0 +1,28 @@
+require "active_attr/basic_model"
+require "active_attr/block_initialization"
+require "active_attr/logger"
+require "active_attr/mass_assignment_security"
+require "active_attr/query_attributes"
+require "active_support/concern"
+
+module ActiveAttr
+  # Model is a shortcut for incorporating the most common model
+  # functionality into your model with one include
+  #
+  # See the included modules to learn more.
+  #
+  # @example Usage
+  #   class Person
+  #     include ActiveAttr::Model
+  #   end
+  #
+  # @since 0.4.0
+  module Model
+    extend ActiveSupport::Concern
+    include BasicModel
+    include BlockInitialization
+    include Logger
+    include MassAssignmentSecurity
+    include QueryAttributes
+  end
+end

data/lib/active_attr/version.rb

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

data/spec/functional/active_attr/attributes_spec.rb

@@ -65,8 +65,14 @@ module ActiveAttr
       let :model_class do
         Class.new do
           include Attributes
-          include ActiveModel::Serializers::JSON
-          include ActiveModel::Serializers::Xml
+
+          if defined? ActiveModel::Serializable
+            include ActiveModel::Serializable::JSON
+            include ActiveModel::Serializable::XML
+          else
+            include ActiveModel::Serializers::JSON
+            include ActiveModel::Serializers::Xml
+          end
 
           attribute :first_name
           attribute :last_name

data/spec/functional/active_attr/model_spec.rb

@@ -0,0 +1,71 @@
+require "spec_helper"
+require "active_attr/model"
+
+module ActiveAttr
+  describe Model do
+    let :model_class do
+      Class.new do
+        include Model
+
+        attribute :first_name
+        attribute :last_name
+
+        attr_protected :last_name
+
+        def self.name
+          "Person"
+        end
+      end
+    end
+
+    subject { model_class.new }
+    it_should_behave_like "ActiveModel"
+
+    it "reads and writes attributes" do
+      subject.first_name = "Chris"
+      subject.first_name.should == "Chris"
+      subject.attributes["first_name"].should == "Chris"
+    end
+
+    it "can query attributes" do
+      subject.first_name?.should be_false
+      subject.first_name = "Chris"
+      subject.first_name?.should be_true
+    end
+
+    it "initializes with a block that can use attributes" do
+      model_class.new do |person|
+        person.write_attribute :first_name, "Chris"
+      end.read_attribute(:first_name).should == "Chris"
+    end
+
+    it "processes mass assignment yielding an initialization block" do
+      model_class.new(:first_name => "Chris") do |person|
+        person.first_name.should == "Chris"
+      end
+    end
+
+    it "has a logger" do
+      logger = double("logger")
+      model_class.logger?.should be_false
+      subject.logger?.should be_false
+
+      model_class.logger = logger
+
+      model_class.logger?.should be_true
+      model_class.logger.should == logger
+      subject.logger?.should be_true
+      subject.logger.should == logger
+    end
+
+    it "supports mass assignment with security" do
+      person = model_class.new(:first_name => "Chris", :last_name => "Griego")
+      person.first_name.should == "Chris"
+      person.last_name.should be_nil
+    end
+
+    it "does not use strict mass assignment" do
+      expect { subject.assign_attributes :middle_initial => "J" }.not_to raise_error
+    end
+  end
+end

data/spec/unit/active_attr/basic_model_spec.rb

@@ -8,7 +8,7 @@ module ActiveAttr
         include BasicModel
 
         def self.name
-          "Foo"
+          "Person"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_attr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-26 00:00:00.000000000Z
+date: 2011-11-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70119267606720 !ruby/object:Gem::Requirement
+  requirement: &70208496667400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70119267606720
+  version_requirements: *70208496667400
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70119267605900 !ruby/object:Gem::Requirement
+  requirement: &70208496659840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70119267605900
+  version_requirements: *70208496659840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70119267605220 !ruby/object:Gem::Requirement
+  requirement: &70208496720580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70119267605220
+  version_requirements: *70208496720580
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70119267604420 !ruby/object:Gem::Requirement
+  requirement: &70208496732300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *70119267604420
+  version_requirements: *70208496732300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70119267603600 !ruby/object:Gem::Requirement
+  requirement: &70208496743100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70119267603600
+  version_requirements: *70208496743100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70119267602780 !ruby/object:Gem::Requirement
+  requirement: &70208496750220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +77,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70119267602780
+  version_requirements: *70208496750220
 description: Create plain old ruby models without reinventing the wheel.
 email:
 - cgriego@gmail.com
@@ -98,6 +98,7 @@ files:
 - README.md
 - Rakefile
 - active_attr.gemspec
+- gemfiles/rails_head.gemfile
 - lib/active_attr.rb
 - lib/active_attr/attribute_definition.rb
 - lib/active_attr/attributes.rb
@@ -111,6 +112,7 @@ files:
 - lib/active_attr/mass_assignment_security.rb
 - lib/active_attr/matchers.rb
 - lib/active_attr/matchers/have_attribute_matcher.rb
+- lib/active_attr/model.rb
 - lib/active_attr/query_attributes.rb
 - lib/active_attr/railtie.rb
 - lib/active_attr/rspec.rb
@@ -120,6 +122,7 @@ files:
 - lib/active_attr/version.rb
 - spec/functional/active_attr/attributes_spec.rb
 - spec/functional/active_attr/chainable_initialization_spec.rb
+- spec/functional/active_attr/model_spec.rb
 - spec/functional/active_attr/query_attributes_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_lint.rb
@@ -154,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4548017716057297773
+      hash: 2277450769391114254
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -163,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4548017716057297773
+      hash: 2277450769391114254
 requirements: []
 rubyforge_project: active_attr
 rubygems_version: 1.8.10
@@ -173,6 +176,7 @@ summary: What ActiveModel left out
 test_files:
 - spec/functional/active_attr/attributes_spec.rb
 - spec/functional/active_attr/chainable_initialization_spec.rb
+- spec/functional/active_attr/model_spec.rb
 - spec/functional/active_attr/query_attributes_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_lint.rb