simple_model 1.2.12 → 1.2.13

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - "2.0.0"
   - "1.9.2"
   - "1.9.3"
   - jruby-19mode # JRuby in 1.9 mode

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 Joshua T. Mckinney
+Copyright (c) 2010-2013 Joshua T. McKinney
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -10,7 +10,7 @@ SimpleModel implements:
 * ActiveModel::Dirty
 * ActiveModel::Naming
 * ActiveModel::Callbacks
-* ActiveSupport core extentions (see [SimpleModel::Base](https://github.com/JoshMcKin/simple_model/blob/master/lib/simple_model/base.rb))
+* ActiveSupport core extensions (see [SimpleModel::Base](https://github.com/JoshMcKin/simple_model/blob/master/lib/simple_model/base.rb))
 
 Additionally SimpleModel implements basic model actions
 

data/lib/simple_model.rb

@@ -46,5 +46,4 @@ module SimpleModel
   require "simple_model/validation"
   require "simple_model/base"
   require 'simple_model/simple_model_railtie.rb' if defined?(Rails)
-  
 end

data/lib/simple_model/attributes.rb

@@ -46,7 +46,7 @@ module SimpleModel
       arg
     end
 
-    # Returns attribute that have defaults in a hash: {:attrbute => "default value"}
+    # Returns attribute that have defaults in a hash: {:attribute => "default value"}
     # Checks for alias attributes to ensure they are not overwritten
     def attributes_with_for_init(attrs)
       d = attrs.with_indifferent_access
@@ -86,7 +86,7 @@ module SimpleModel
       b
     end
 
-    # Rails 3.2 + required when searching for attributes in from inherited classes/cmodles
+    # Rails 3.2 + required when searching for attributes in from inherited classes/models
     def attribute(name)
       attributes[name.to_sym]
     end
@@ -94,7 +94,7 @@ module SimpleModel
     module ClassMethods
       # Creates a new instance where the attributes store is set to object
       # provided, which allows one to pass a session store hash or any other
-      # hash-like object to be used for persistance. Typically used for modeling
+      # hash-like object to be used for persistence. Typically used for modeling
       # session stores for authorization or shopping carts
       # EX:
       #     class ApplicationController < ActionController::Base
@@ -138,7 +138,7 @@ module SimpleModel
       # * :on_get - accepts a lambda that is run when you get/read an attribute
       # * :default - the default value for the attribute, can be a symbol that is sent for a method
       # * :initialize - informations the object whether or not it should initialize the attribute with :default value, defaults to true
-      # ** If :intialize is set to false you must set :allow_blank to false or it will never set the default value
+      # ** If :initialize is set to false you must set :allow_blank to false or it will never set the default value
       # * :allow_blank - when set to false, if an attributes value is blank attempts to set the default value, defaults to true
       def default_attribute_settings
         @default_attribute_settings ||= {:attributes_method => :attributes,
@@ -262,25 +262,24 @@ module SimpleModel
 
       # A hook to perform actions after all attributes have been initialized
       # Expects an lambda that accept the object and the pending attributes hash
-      # EX: lambda{|obj| puts "initialized"}
+      # EX: lambda {|obj| puts "initialized"}
       def after_initialize
         @after_initialize
       end
 
       # Expects an lambda that accept the object and the pending attributes hash
-      # EX: lambda{|obj| puts "initialized"}
+      # EX: lambda {|obj| puts "initialized"}
       def after_initialize=after_initialize
         raise TypeError "after_initalize must be a Proc" unless after_initialize.is_a?(Proc)
         @after_initialize = after_initialize
       end
 
-
-
       # Must inherit super's defined_attributes and alias_attributes
       # Rails 3.0 does some weird stuff with ActiveModel::Dirty so we need a
       # hack to keep things working when a class inherits from a super that
       # has ActiveModel::Dirty included
       def inherited(base)
+        base.alias_attributes = base.alias_attributes.merge(self.alias_attributes)
         super
         # Rails 3.0 Hack
         if (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR == 0)

data/lib/simple_model/base.rb

@@ -18,9 +18,9 @@ require 'active_support/core_ext/object/blank'
 
   # == SimpleModel::Base
   #
-  # Provides an interface for any class to build tableless models.
+  # Provides an interface for any class to build table-less models.
   # 
-  # Implements Validations, Callbacks and Dirty from ActiveModel, and datatype specific
+  # Implements Validations, Callbacks and Dirty from ActiveModel, and data-type specific
   # attribute definitions with default options. SimpleModel::Base is intended as
   # an example, while it may be used in production, which it is on many of my apps
   # today, it is recommend you use SimpleModel::Base as an example to implement your
@@ -39,7 +39,7 @@ require 'active_support/core_ext/object/blank'
   #   # save
   #   # update
   #   # create
-  #   # destory
+  #   # destroy
   # 
   # ==== Example
   # 

data/lib/simple_model/error_helpers.rb

@@ -71,7 +71,6 @@ module SimpleModel
       s
     end
 
-  
     def errors_to_s
       error_string = ""
       self.errors.full_messages.each do |m|

data/lib/simple_model/validation.rb

@@ -11,7 +11,6 @@ module SimpleModel
       end
     end
 
-
     def validates_format_of(*attr_names)
       options = attr_names.extract_options!
       #set defaults

data/lib/simple_model/version.rb

@@ -1,3 +1,3 @@
 module SimpleModel
-  VERSION = "1.2.12"
+  VERSION = "1.2.13"
 end

data/spec/attributes_spec.rb

@@ -24,7 +24,7 @@ describe SimpleModel::Attributes do
     before(:all) do
       class TestInit
         include SimpleModel::Attributes
-        # Do not initalize blank attributes
+        # Do not initialize blank attributes
         self.before_initialize = lambda {|obj,attrs| attrs.select{|k,v| !v.blank?}}
         has_attribute :far
       end
@@ -47,7 +47,7 @@ describe SimpleModel::Attributes do
     before(:all) do
       class TestInit
         include SimpleModel::Attributes
-        # Do not initalize blank attributes
+        # Do not initialize blank attributes
         self.after_initialize = lambda { |obj| obj.car = "test" if obj.car.blank?}
         has_attribute :car
       end
@@ -136,7 +136,7 @@ describe SimpleModel::Attributes do
       @default.attributes[:bar].should eql("bar")
     end
 
-    it "should set the defaul to the supplied symbol, if the method does not exist" do
+    it "should set the default to the supplied symbol, if the method does not exist" do
       @default.attributes[:fab].should eql(:some_symbol)
     end
 
@@ -234,7 +234,7 @@ describe SimpleModel::Attributes do
         has_boolean :bar
         has_attribute :str
         has_dates :some, :thing, :default => :fetch_date, :allow_blank => false, :initialize => false
-
+        alias_attribute :other, :bar
         def fetch_date
           Date.today
         end
@@ -245,7 +245,7 @@ describe SimpleModel::Attributes do
         has_int :str
       end
     end
-    it "should merge defined attributes when class are inhereted" do
+    it "should merge defined attributes when class are inherited" do
       NewerBase.attribute_defined?(:bar).should be_true
       n = NewerBase.new
       n.respond_to?(:bar_will_change!).should be_true
@@ -264,6 +264,11 @@ describe SimpleModel::Attributes do
       n.str = '1'
       n.str.should eql(1)
     end
+
+    it "should set attribute from alias" do
+      MyBase.new(:other => true).bar?.should be_true
+      NewerBase.new(:other => true).bar?.should be_true
+    end
   end
 
   after(:all) do

data/spec/extend_core_spec.rb

@@ -59,7 +59,7 @@ describe SimpleModel::ExtendCore, 'String.rb' do
   end
 
   context '#to_date' do 
-    it "should handel US formatted date strings" do
+    it "should handle US formatted date strings" do
       lambda {"12/31/2010".to_date}.should_not raise_error
       "12/31/2010".to_date.class.should eql(Date)
       "12/31/2010".to_date.should eql(Date.parse("2010-12-31"))
@@ -72,7 +72,7 @@ describe SimpleModel::ExtendCore, 'String.rb' do
   end
   
   context '#to_time' do
-    it "should handel US formatted date strings" do
+    it "should handle US formatted date strings" do
       lambda {"12/31/2010 12:00:00".to_time}.should_not raise_error
       "12/31/2010 12:00:00".to_time.should be_kind_of(Time)
       "12/31/2010 12:00:00".to_time.should eql(Time.parse("2010-12-31 12:00:00"))
@@ -84,7 +84,7 @@ describe SimpleModel::ExtendCore, 'String.rb' do
   end
   
   context '#to_f' do
-    it "return a Foat from a string that may contain non-numeric values" do
+    it "return a Float from a string that may contain non-numeric values" do
       "$5,000.006".to_f.should eql(5000.006)
     end
   end

data/spec/simple_model_spec.rb

@@ -125,7 +125,7 @@ describe SimpleModel do
     
   end
   
-  it 'Should include peform validation callbacks' do
+  it 'Should perform validation callbacks' do
     class TestStuff < SimpleModel::Base
       before_validation :set_foo   
       after_validation :set_bar
@@ -217,11 +217,11 @@ describe SimpleModel do
       end
            
     end
-    it "should merge defined attributes when class are inhereted" do
+    it "should merge defined attributes when class are inherited" do
       NewTestStuff.attribute_defined?(:bar).blank?.should be_false
       NewTestStuff.attribute_defined?(:foo).blank?.should be_false
     end
-    it "should merge defined attributes when class are inhereted" do
+    it "should merge defined attributes when class are inherited" do
       TestStuff.new.respond_to?(:bar_will_change!).should be_true
       t = OtherStuff.new
       t.bar = [1,2,4]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_model
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 1.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport