objectify 0.0.6 → 0.0.7

data/.gitignore

@@ -14,6 +14,12 @@ doc
 # built gems
 *.gem
 
+# rvm
+.rvmrc
+
+# http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
+Gemfile.lock
+
 # Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
 #
 # * Create a file at ~/.gitignore
@@ -38,8 +44,8 @@ doc
 #\#*
 #.\#*
 
-# For vim:
-#*.swp
+ For vim:
+*.swp
 
 # For redcar:
 #.redcar

data/Gemfile.lock

@@ -1,42 +1,41 @@
 PATH
   remote: .
   specs:
-    bitlove-objectify (0.0.1)
+    objectify (0.0.6)
       i18n
       rails (>= 3.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.1.1)
-      actionpack (= 3.1.1)
-      mail (~> 2.3.0)
-    actionpack (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.2)
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-      arel (~> 2.2.1)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-    activesupport (3.1.1)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.3)
+    arel (3.0.2)
     bourne (1.0)
       mocha (= 0.9.8)
     builder (3.0.0)
@@ -49,8 +48,9 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    journey (1.0.3)
     json (1.7.3)
-    mail (2.3.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -59,26 +59,24 @@ GEM
       rake
     multi_json (1.3.5)
     polyglot (0.3.3)
-    rack (1.3.6)
+    rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.1)
-      actionmailer (= 3.1.1)
-      actionpack (= 3.1.1)
-      activerecord (= 3.1.1)
-      activeresource (= 3.1.1)
-      activesupport (= 3.1.1)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.1.1)
-    railties (3.1.1)
-      actionpack (= 3.1.1)
-      activesupport (= 3.1.1)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -94,10 +92,10 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
-    sprockets (2.0.4)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -109,9 +107,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bitlove-objectify!
   bourne (= 1.0)
-  bundler (~> 1.0.0)
+  bundler (>= 1.0.0)
   jeweler (~> 1.6.4)
   mocha (= 0.9.8)
+  objectify!
   rspec (~> 2.4.0)

data/README.md

@@ -1,12 +1,12 @@
 # objectify
 
-Objectify is a framework that codifies good object oriented design practices for building maintainable rails applications.
+Objectify is a framework that codifies good object oriented design practices for building maintainable rails applications. For more on the motivations that led to objectify, check out this blog post: http://jamesgolick.com/2012/5/22/objectify-a-better-way-to-build-rails-applications.html
 
 ## How it works
 
 Objectify has two primary components:
 
-  1. A request execution framework that separates the responsibilities that are typically jammed together in rails controller actions in to 3 types of components: Policies, Services, and Responders. Properly separating and assigning these responsibilities makes for far more testable code, and facilitates better reuse of components.
+  1. A request execution framework that separates the responsibilities that are typically jammed together in rails controller actions in to 3 types of components: Policies, Services, and Responders. Properly separating and assigning these responsibilities makes code far more testable, and facilitates better reuse of components.
 
   The flow of an objectify request is as follows:
 
@@ -20,7 +20,7 @@ Objectify has two primary components:
 
       Objectify currently only supports resourceful actions, but that's just a temporary thing.
 
-    1. The policy chain is resolved (based on the various levels of configuration) and executed. Objectify calls the #allowed?(...) method on each policy in the chain. If one of the policies fails, the chain short-circuits at that point, and objectify executes the configured responder for that policy.
+    1. The policy chain is resolved (based on the various levels of configuration) and executed. Objectify calls the `#allowed?(...)` method on each policy in the chain. If one of the policies fails, the chain short-circuits at that point, and objectify executes the configured responder for that policy.
 
       An example Policy:
 
@@ -68,7 +68,7 @@ Objectify has two primary components:
         end
       ```
 
-    3. Finally, the responder is executed. Following with our Pictures#create example:
+    3. Finally, the responder is executed. Following with our `Pictures#create` example:
 
       ```ruby
         class PicturesCreateResponder
@@ -86,12 +86,12 @@ Objectify has two primary components:
         end
       ```
 
-  2. A dependency injection framework. Objectify automatically injects dependencies in to objects it manages based on parameter names. So, if you have a service method signature like: PictureCreationService#call(params), objectify will automatically inject the request's params when it calls that method. It's very simple to create custom injections by implementing Resolver classes. More on that below.
+  2. A dependency injection framework. Objectify automatically injects dependencies into objects it manages based on parameter names. So, if you have a service method signature like  `PictureCreationService#call(params)`, objectify will automatically inject the request's params when it calls that method. It's very simple to create custom injections by implementing Resolver classes. More on that below.
 
 
 ## What if I have a bunch of existing rails code?
 
-Objectify has a legacy mode that allows you to execute the policy chain as a before_filter in your ApplicationController. You can also configure policies (and skip_policies) for your "legacy" actions. That way, access control code is shared between the legacy and objectified components of your application.
+Objectify has a legacy mode that allows you to execute the policy chain as a `before_filter` in your ApplicationController. You can also configure policies (and `skip_policies`) for your "legacy" actions. That way, access control code is shared between the legacy and objectified components of your application.
 
 I completely rewrote our legacy authentication system as a set of objectify policies, resolvers, and services - I'm gonna package that up and release it soon.
 
@@ -140,7 +140,7 @@ end
 
 ## Custom Injections
 
-Several of the above methods have parameters named 'current_user'. By default, objectify won't know how to inject a parameter by that name, so it'll raise an error when it encounters one. Here's how to create a custom resolver for it that'll automatically get found by name.
+Several of the above methods have parameters named `current_user`. By default, objectify won't know how to inject a parameter by that name, so it'll raise an error when it encounters one. Here's how to create a custom resolver for it that'll automatically get found by name.
 
 ```ruby
 # app/resolvers/current_user_resolver.rb
@@ -181,9 +181,9 @@ end
 
 Objectify has two major impacts on your views.
 
-  1. You can only pass one variable from an objectified action to the controller. You do that by calling renderer.data(the_object_you_want_to_pass). Then, you call objectify_data in the view to fetch the data. If it's not there, it'll raise an error. Use a presenter or some kind of other struct object to pass multiple objects to your views.
+  1. You can only pass one variable from an objectified action to the controller. You do that by calling `renderer.data(the_object_you_want_to_pass)`. Then, you call `objectify_data` in the view to fetch the data. If it's not there, it'll raise an error. Use a presenter or some kind of other struct object to pass multiple objects to your views.
 
-  2. You can reuse your policies in your views. require "objectify/rails/helpers" and add Objectify::Rails::Helpers to your helpers list, and you'll get a helper called #policy_allowed?(policy_name). Yay code reuse.
+  2. You can reuse your policies in your views. `require "objectify/rails/helpers"` and add `Objectify::Rails::Helpers` to your helpers list, and you'll get a helper called `#policy_allowed?(policy_name)`. Yay code reuse.
 
 ## Installation
 

data/lib/objectify.rb

@@ -1,4 +1,7 @@
-require "objectify/railtie"
-
 module Objectify
+  module Rails
+  end
 end
+
+require "objectify/rails/railtie"
+

data/lib/objectify/rails/railtie.rb

@@ -1,9 +1,9 @@
 module Objectify
   module Rails
-    class Railtie < Rails::Railtie
+    class Railtie < ::Rails::Railtie
       initializer "objectify.reloader" do
         ActionDispatch::Callbacks.to_prepare do
-          Rails.application.objectify.reload
+          ::Rails.application.objectify.reload
         end
       end
     end

data/lib/objectify/rails/routing.rb

@@ -24,19 +24,9 @@ module Objectify
           rails_options     = options.merge(:controller => controller)
 
           args.each do |resource_name|
-            objectify_defaults = {:objectify => {:resource => resource_name}}
-            defaults = (rails_options[:defaults] || {}).merge(objectify_defaults)
-            with_defaults = rails_options.merge(:defaults => defaults)
-            @rails_mapper.resources(resource_name, with_defaults)
-
-            RESOURCE_ACTIONS.each do |action_name|
-              action = @action_factory.new(resource_name,
-                                           action_name,
-                                           objectify_options,
-                                           @application.objectify.policies)
-
-              @application.objectify.append_action(action)
-            end
+            merged_defaults = objectify_defaults(resource_name, rails_options)
+            @rails_mapper.resources(resource_name, merged_defaults)
+            RESOURCE_ACTIONS.each { |action_name| append_action(resource_name, action_name, objectify_options) }
           end
         end
 
@@ -53,13 +43,7 @@ module Objectify
         end
 
         def legacy_action(controller, actions, options)
-          [*actions].each do |action_name|
-            action = @action_factory.new(controller,
-                                         action_name,
-                                         options,
-                                         @application.objectify.policies)
-            @application.objectify.append_action(action)
-          end
+          [*actions].each { |action_name| append_action(controller, action_name, options) }
         end
 
         private
@@ -68,6 +52,21 @@ module Objectify
               [key, options.delete(key)] if options.include?(key)
             end.compact.flatten]
           end
+
+          def objectify_defaults(resource_name, rails_options)
+            defaults = {:objectify => {:resource => resource_name}}
+            defaults = (rails_options[:defaults] || {}).merge(defaults)
+            defaults = rails_options.merge(:defaults => defaults)
+          end
+
+          def append_action(resource_name, action_name, options)
+            action = @action_factory.new(resource_name,
+                                         action_name,
+                                         options,
+                                         @application.objectify.policies)
+
+            @application.objectify.append_action(action)
+          end
       end
 
       class Mapper < ActionDispatch::Routing::Mapper

data/lib/objectify/version.rb

@@ -1,3 +1,3 @@
 module Objectify
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/objectify.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec", "~> 2.4.0"
-  s.add_development_dependency "bundler", "~> 1.0.0"
+  s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "jeweler", "~> 1.6.4"
   s.add_development_dependency "bourne", "1.0"
   s.add_development_dependency "mocha", "0.9.8"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: objectify
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70115721100420 !ruby/object:Gem::Requirement
+  requirement: &70332392343920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70115721100420
+  version_requirements: *70332392343920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70115721055440 !ruby/object:Gem::Requirement
+  requirement: &70332392343200 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70115721055440
+  version_requirements: *70332392343200
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70115720317260 !ruby/object:Gem::Requirement
+  requirement: &70332400562900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70115720317260
+  version_requirements: *70332400562900
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70115720274080 !ruby/object:Gem::Requirement
+  requirement: &70332400562340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70115720274080
+  version_requirements: *70332400562340
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70115720242140 !ruby/object:Gem::Requirement
+  requirement: &70332400561620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70115720242140
+  version_requirements: *70332400561620
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70115720214000 !ruby/object:Gem::Requirement
+  requirement: &70332400560740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70115720214000
+  version_requirements: *70332400560740
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70115718886580 !ruby/object:Gem::Requirement
+  requirement: &70332400559120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70115718886580
+  version_requirements: *70332400559120
 description: Objects on rails.
 email:
 - jamesgolick@gmail.com