operable 0.1.1 → 0.2.0

data/README.md

@@ -6,11 +6,7 @@ An easy way to perform simple operations (addition, subtraction, multiplication,
 
 ## A Simple Example
 
-Let's say we're collecting records of Baseball games. A `Team` model has various stats like `W`, `L`, `T`, etc.
-
-Operable, once included in your models, lets you use the `+`, `-`, `*` and `/` operators on them, just as you would an Integer. It returns in the value of the class you're already working with.
-
-We might imagine something like this:
+Let's say we're collecting records of Baseball games. A `Team` model has various stats like `W`, `L`, `T`, etc. Including Operable in your model definition lets you use the `+`, `-`, `*` and `/` operators on objects just as you would on primatives, returning a new instance of the model class containing the result of your desired operation.
 
 ```ruby
 # Create team instances for the 2 NY baseball teams:
@@ -62,17 +58,17 @@ That's it! You can call operable_on multiple times to add more fields.
 Four operations are provided: `+`, `-`, `*`, `/`.
 
 ```ruby
-red = Color.new   :r => 128, :g => 0,   :b => 0
+red =   Color.new :r => 128, :g => 0,   :b => 0
 green = Color.new :r => 0,   :g => 128, :b => 0
-blue = Color.new  :r => 0,   :g => 0,   :b => 128
+blue =  Color.new :r => 0,   :g => 0,   :b => 128
 
-yellow = green + red # => #<Color r: 128, g: 128, b: 0>
-grey = yellow + blue # => #<Color r: 128, g: 128, b: 128>
+yellow =     green + red # => #<Color r: 128, g: 128, b: 0>
+grey =       yellow + blue # => #<Color r: 128, g: 128, b: 128>
 bright_red = red * 2 # => #<Color r: 255, g: 0,   b: 0>
-dark_grey = grey / 3 # => #<Color r: 43,  g: 43,  b: 43>
+dark_grey =  grey / 3 # => #<Color r: 43,  g: 43,  b: 43>
 ```
 
-## Equality
+## Testing Equality
 
 Compare the equality of operable objects with the `matches?` method:
 
@@ -83,7 +79,8 @@ purple.matches?(red + blue)  #=> true
 purple.matches?(red + green) #=> false
 ```
 
-### Operate On All (Mongoid only)
+
+## Operate On All (Mongoid only)
 
 Mongoid models define their fields explicitly in the model declaration. We can use this to automatically determine what to operate on:
 
@@ -99,11 +96,16 @@ class Team
 end
 ```
 
-### Operate On Associations (Mongoid only)
+## Operate On Associations
 
 We can include associations in our list of operable fields just as with normal attributes!
 
-First, include Operable on **both** documents. Then, on the **parent** document, manually specify the name of the association to *operable_on* (associations are not included by *operable_on_all* methods)
+To operate on associations:
+
+1. Include Operable on **both** document classes.
+2. Manually specify the name of the association on the **parent** document using *operable_on*
+
+NOTE: associations are not included by *operable_on_all* methods, you need to manually add them.
 
 ```ruby
 class First
@@ -131,6 +133,8 @@ f3 = f1 + f2  # => #<First a: 3, b: 5>
 f3.second     # => #<Second c: 3, d: 5>
 ```
 
+This feature now works with ActiveRecord as well.
+
 ## Enhancements and Pull Requests
 
 If you find the project useful but it doesn't meet all of your needs, feel free to fork it and send a pull request. I'd especially love contributions that enhance behavior with ActiveRecord. Please make sure to include specs!

data/lib/operable/fields.rb

@@ -13,8 +13,17 @@ module Operable
       attributes.select {|k, v| self.class.operable_fields.include? k }.each do |k, v|
         values[k.to_s] = v
       end
+
+      if respond_to?(:reflections)
+        reflections.select {|k, v| self.class.operable_fields.include? k.to_s }.each do |k, v|
+          if self.send(k).present?
+            values[k.to_s] = send(k)
+          end
+        end
+      end
+
       if respond_to?(:associations)
-        associations.select {|k, v| self.class.operable_fields.include? k }.each do |k, v|
+        associations.select {|k, v| self.class.operable_fields.include? k.to_s }.each do |k, v|
           values[k.to_s] = send(k)
         end
       end

data/lib/operable/version.rb

@@ -1,3 +1,3 @@
 module Operable
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: operable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,55 +9,55 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-08 00:00:00.000000000Z
+date: 2011-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70222187456640 !ruby/object:Gem::Requirement
+  requirement: &70324818204340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70222187456640
+  version_requirements: *70324818204340
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70222187455280 !ruby/object:Gem::Requirement
+  requirement: &70324818203660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70222187455280
+  version_requirements: *70324818203660
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70222187453300 !ruby/object:Gem::Requirement
+  requirement: &70324818203180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :development
   prerelease: false
-  version_requirements: *70222187453300
+  version_requirements: *70324818203180
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70222187452100 !ruby/object:Gem::Requirement
+  requirement: &70324818202700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
-  version_requirements: *70222187452100
+  version_requirements: *70324818202700
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70222187450200 !ruby/object:Gem::Requirement
+  requirement: &70324818202020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70222187450200
+  version_requirements: *70324818202020
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70222187448920 !ruby/object:Gem::Requirement
+  requirement: &70324818201460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70222187448920
+  version_requirements: *70324818201460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70222187448060 !ruby/object:Gem::Requirement
+  requirement: &70324818200720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,29 +87,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70222187448060
+  version_requirements: *70324818200720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70222187446480 !ruby/object:Gem::Requirement
+  requirement: &70324818199700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 2.8.0.rc1
   type: :development
   prerelease: false
-  version_requirements: *70222187446480
+  version_requirements: *70324818199700
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70222187445540 !ruby/object:Gem::Requirement
+  requirement: &70324818199040 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70222187445540
+  version_requirements: *70324818199040
 description: Perform addition, subtraction, multiplication and division on your models.
 email:
 - jcoene@gmail.com
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Arithmetic operations on your models.