objectify 0.2.1 → 0.3.0

data/README.md

@@ -1,4 +1,4 @@
-# objectify
+# objectify [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/bitlove/objectify)
 
 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
 
@@ -27,7 +27,7 @@ Objectify has two primary components:
       ```ruby
         class RequiresLoginPolicy
           # more on how current user gets injected below
-          def allowed?(current_user) 
+          def allowed?(current_user)
             !current_user.nil?
           end
         end
@@ -207,7 +207,7 @@ objectify.resolvers :current_user => "objectify_auth/current_user"
 ```
 
 ### Why did you constructor-inject the User constant in to the CurrentUserResolver?
-  
+
 Because that makes it possible to test in isolation.
 
 ```ruby
@@ -299,10 +299,8 @@ gem "objectify", "> 0"
 # config/application.rb
 module MyApp
   class Application < Rails::Application
-    require "objectify/rails/application"
-    require "objectify/rails/controller"
     # only have to require this if you want objectify logging
-    require "objectify/rails/log_subscriber" 
+    require "objectify/rails/log_subscriber"
     include Objectify::Rails::Application
   end
 end

data/Rakefile

@@ -11,10 +11,7 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'rspec/core'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/lib/objectify/config/action.rb

@@ -4,7 +4,8 @@ require "objectify/route"
 module Objectify
   module Config
     class Action
-      attr_reader :resource_name, :name, :route, :policies, :service, :responder
+      attr_reader :resource_name, :name, :route, :policies,
+                  :service, :responder, :namespace
 
       def initialize(routing_opts,
                      resource_name, name, options, default_policies,
@@ -13,6 +14,7 @@ module Objectify
         @resource_name = resource_name
         @name = name
         @policies = default_policies.merge(options, options[name])
+        @namespace = options[:namespace] || resource_name
 
         if options[name]
           @service = options[name][:service]
@@ -21,11 +23,11 @@ module Objectify
       end
 
       def service
-        @service ||= [resource_name, name].join("_").to_sym
+        @service ||= [namespace, name].join("/")
       end
 
       def responder
-        @responder ||= [resource_name, name].join("_").to_sym
+        @responder ||= [namespace, name].join("/")
       end
     end
   end

data/lib/objectify/injector.rb

@@ -14,20 +14,21 @@ module Objectify
     def call(object, method)
       payload = {:object => object, :method => method}
       instrument("inject.objectify", payload) do |payload|
+        namespace            = object.respond_to?(:name) && object.name ? object.name.underscore.split("/")[0...-1].join("/") : nil
         method_obj           = method_object(object, method)
         injectables          = method_obj.parameters.map do |reqd, name|
-          @decoration_context[name] || @config.get(name) if reqd == :req
+          @decoration_context[[namespace, name].join("/").to_sym] || @decoration_context[name] || @config.get(name) if reqd == :req
         end.compact
         arguments            = injectables.map do |type, value|
           if type == :unknown
-            type, value = unknown_value_to_injectable(value)
+            type, value = unknown_value_to_injectable(namespace, value)
           end
 
           if type == :resolver
-            resolver_klass = [value, :resolver].join("_").classify.constantize
+            resolver_klass = [value, :resolver].join("_").camelize.constantize
             call(call(resolver_klass, :new), :call)
           elsif type == :implementation
-            implementation_klass = value.to_s.classify.constantize
+            implementation_klass = value.to_s.camelize.constantize
             call(implementation_klass, :new)
           elsif type == :value
             value
@@ -45,7 +46,7 @@ module Objectify
           base_name = object.name.underscore.to_sym
           add_decoration_context(base_name, result)
           result = @config.decorators(base_name).inject(result) do |memo, decorator|
-            call(decorator.to_s.classify.constantize, :new).tap do |decorated|
+            call(decorator.to_s.camelize.constantize, :new).tap do |decorated|
               add_decoration_context(base_name, decorated)
             end
           end
@@ -65,12 +66,14 @@ module Objectify
         end
       end
 
-      def unknown_value_to_injectable(value)
-        [nil, :resolver].each do |suffix|
-          begin
-            [value, suffix].compact.join("_").classify.constantize
-            return [suffix.nil? ? :implementation : suffix, value]
-          rescue NameError => e
+      def unknown_value_to_injectable(namespace, value)
+        [namespace, nil].uniq.each do |ns|
+          [nil, :resolver].each do |suffix|
+            begin
+              [ns, [value, suffix].compact.join("_")].compact.join("/").camelize.constantize
+              return [suffix.nil? ? :implementation : suffix, [ns, value].compact.join("/")]
+            rescue NameError => e
+            end
           end
         end
 

data/lib/objectify/instantiator.rb

@@ -7,7 +7,8 @@ module Objectify
     end
 
     def call(name, type)
-      klass = [name, type].join("_").classify.constantize
+      join_char = type == :policy ? "_" : "/"
+      klass = [name, type].join(join_char).classify.constantize
       @injector.call(klass, :new)
     end
   end

data/lib/objectify/rails/controller.rb

@@ -2,7 +2,6 @@ require "objectify/config/policies"
 require "objectify/executor"
 require "objectify/policy_chain_executor"
 require "objectify/instrumentation"
-require "objectify/rails/renderer"
 require "objectify/rails/routes"
 
 module Objectify
@@ -37,14 +36,13 @@ module Objectify
             injectables_context.add_value(:request, request)
             injectables_context.add_value(:response, response)
             injectables_context.add_value(:flash, flash)
-            injectables_context.add_value(:renderer, Renderer.new(self))
             injectables_context.add_value(:format, objectify_response_collector)
             injectables_context.add_value(:routes, objectify_routes)
           end
         end
 
         def objectify_response_collector
-          @objectify_response_collector ||= ActionController::MimeResponds::Collector.new { default_response }
+          @objectify_response_collector ||= ActionController::MimeResponds::Collector.new {}
         end
         
         def objectify_executor

data/lib/objectify/version.rb

@@ -1,3 +1,3 @@
 module Objectify
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/objectify.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "rspec", "~> 2.4.0"
+  s.add_development_dependency "rspec", "~> 2.10.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"
 
-  s.add_runtime_dependency "rails", ">=3.0.0"
+  s.add_runtime_dependency "rails", ">=3.2.5"
   s.add_runtime_dependency "i18n"
 end

data/spec/config/action_spec.rb

@@ -20,6 +20,7 @@ describe "Objectify::Config::Action" do
       }
 
       @options = {
+        :namespace => :somewhere,
         :policies => :asdf,
         :skip_policies => :bsdf,
         :index => @index_options
@@ -72,12 +73,12 @@ describe "Objectify::Config::Action" do
                                               @route_factory)
     end
 
-    it "has a default service of \#{resource_name}_\#{action_name}" do
-      @action.service.should == :pictures_index
+    it "has a default service of \#{resource_name}/\#{action_name}" do
+      @action.service.should == "pictures/index"
     end
 
-    it "has a default responder of \#{resource_name}_\#{action_name}" do
-      @action.responder.should == :pictures_index
+    it "has a default responder of \#{resource_name}/\#{action_name}" do
+      @action.responder.should == "pictures/index"
     end
   end
 end

data/spec/injector_spec.rb

@@ -135,4 +135,55 @@ describe "Objectify::Injector" do
       @injector.call(ToBeDecorated, :new).should be_instance_of(ToBeDecorated)
     end
   end
+
+  module An
+    class Service
+      attr_reader :canada
+
+      def initialize(canada)
+        @canada = canada
+      end
+    end
+
+    class ServiceWithStuff
+      attr_reader :service
+
+      def initialize(service)
+        @service = service
+      end
+    end
+
+    class ServiceWithOtherStuff
+      def initialize(service, my_injected_class)
+        @service = service
+        @my_injected_class = my_injected_class
+      end
+    end
+
+    class Canada
+    end
+  end
+
+  context "within a namespace" do
+    before do
+      @config.stubs(:get).with(:canada).returns([:unknown, :canada])
+      @result = @injector.call(An::Service, :new)
+    end
+
+    it "first searches within the namespace to fulfill the dependency" do
+      @result.canada.should be_instance_of(An::Canada)
+    end
+
+    it "can decorate" do
+      @config.stubs(:decorators).with(:"an/service").returns([:"an/service_with_stuff"])
+      @injector.call(An::Service, :new).should be_instance_of(An::ServiceWithStuff)
+    end
+
+    it "can still look up the module chain for decorators" do
+      @config.stubs(:decorators).with(:"an/service").returns([:"an/service_with_other_stuff"])
+      @config.stubs(:get).with(:my_injected_class).returns([:unknown, :my_injected_class])
+      @config.stubs(:get).with(:some_dependency).returns([:value, :asdf])
+      @injector.call(An::Service, :new).should be_instance_of(An::ServiceWithOtherStuff)
+    end
+  end
 end

data/spec/instantiator_spec.rb

@@ -2,21 +2,48 @@ require "spec_helper"
 require "objectify/instantiator"
 
 describe "Objectify::Instantiator" do
-  class MyService
+  module My
+    class Service
+    end
+  end
+
+  class MyPolicy
   end
 
   before do
-    @service      = MyService.new
-    @injector     = stub("Injector", :call => @service)
+    @injector     = stub("Injector")
     @instantiator = Objectify::Instantiator.new(@injector)
-    @result       = @instantiator.call(:my, :service)
   end
 
-  it "returns the result of injector#call" do
-    @result.should == @service
+  context "with a service" do
+    before do
+      @service = My::Service.new
+      @injector.stubs(:call).returns(@service)
+      @result = @instantiator.call(:my, :service)
+    end
+
+    it "returns the result of injector#call" do
+      @result.should == @service
+    end
+
+    it "locates the service in the supplied namespace and instantiates" do
+      @injector.should have_received(:call).with(My::Service, :new)
+    end
   end
 
-  it "calls the injector with the generated constant" do
-    @injector.should have_received(:call).with(MyService, :new)
+  context "with a policy" do
+    before do
+      @policy = MyPolicy.new
+      @injector.stubs(:call).returns(@policy)
+      @result = @instantiator.call(:my, :policy)
+    end
+
+    it "returns the result of injector#call" do
+      @result.should == @policy
+    end
+
+    it "locates the policy namespace and instantiates" do
+      @injector.should have_received(:call).with(MyPolicy, :new)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,15 +1,5 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require "rubygems"
-require "rspec"
-require "mocha"
 require "bourne"
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
 RSpec.configure do |config|
   config.mock_with :mocha
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: objectify
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70230408805980 !ruby/object:Gem::Requirement
+  requirement: &70174896773480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70230408805980
+  version_requirements: *70174896773480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70230408805480 !ruby/object:Gem::Requirement
+  requirement: &70174896772980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70230408805480
+  version_requirements: *70174896772980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70230408805020 !ruby/object:Gem::Requirement
+  requirement: &70174896772520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70230408805020
+  version_requirements: *70174896772520
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70230408804560 !ruby/object:Gem::Requirement
+  requirement: &70174896772060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70230408804560
+  version_requirements: *70174896772060
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70230408804100 !ruby/object:Gem::Requirement
+  requirement: &70174896771600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,21 +65,21 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70230408804100
+  version_requirements: *70174896771600
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70230408803640 !ruby/object:Gem::Requirement
+  requirement: &70174896771140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70230408803640
+  version_requirements: *70174896771140
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70230408803260 !ruby/object:Gem::Requirement
+  requirement: &70174896770760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70230408803260
+  version_requirements: *70174896770760
 description: Objects on rails.
 email:
 - jamesgolick@gmail.com
@@ -131,7 +131,6 @@ files:
 - spec/injector_spec.rb
 - spec/instantiator_spec.rb
 - spec/policy_chain_executor_spec.rb
-- spec/rails/renderer_spec.rb
 - spec/rails/routing_spec.rb
 - spec/route_spec.rb
 - spec/spec_helper.rb
@@ -170,7 +169,6 @@ test_files:
 - spec/injector_spec.rb
 - spec/instantiator_spec.rb
 - spec/policy_chain_executor_spec.rb
-- spec/rails/renderer_spec.rb
 - spec/rails/routing_spec.rb
 - spec/route_spec.rb
 - spec/spec_helper.rb

data/spec/rails/renderer_spec.rb

@@ -1,63 +0,0 @@
-require "spec_helper"
-require "objectify/rails/renderer"
-
-describe "Objectify::Rails::Renderer" do
-  before do
-    @controller = stub("Controller", :render => nil,
-                                     :redirect_to => nil,
-                                     :instance_variable_set => nil) # yeah, well.
-    @renderer = Objectify::Rails::Renderer.new(@controller)
-  end
-
-  it "delegates template rendering" do
-    @renderer.template("something.html.erb", :some => :option)
-    @controller.should have_received(:render).with(:template => "something.html.erb",
-                                                   :some     => :option)
-  end
-
-  it "delegates action rendering" do
-    @renderer.action("something.html.erb", :some => :option)
-    @controller.should have_received(:render).with(:action => "something.html.erb",
-                                                   :some   => :option)
-  end
-
-  it "delegates partial rendering" do
-    @renderer.partial("something.html.erb", :some => :option)
-    @controller.should have_received(:render).with(:partial => "something.html.erb",
-                                                   :some    => :option)
-  end
-
-  it "delegates rendering nothing" do
-    @renderer.nothing(:some => :option)
-    @controller.should have_received(:render).with(:nothing => true,
-                                                   :some => :option)
-  end
-
-  it "exposes the full render method" do
-    @renderer.render(:json => "asdf")
-    @controller.should have_received(:render).with(:json => "asdf")
-  end
-
-  it "delegates the respond_to method" do
-    @responder = stub("Responder")
-    @responder.stubs(:html).yields
-    @controller.stubs(:respond_to).yields(@responder)
-
-    @renderer.respond_to do |format|
-      format.html { }
-    end
-
-    @responder.should have_received(:html)
-  end
-
-  it "delegates the redirect_to method" do
-    @renderer.redirect_to :somewhere
-    @controller.should have_received(:redirect_to).with(:somewhere)
-  end
-
-  it "can set the data on the controller" do
-    @renderer.data("asdf")
-    @controller.should have_received(:instance_variable_set).
-                        with(:@objectify_data, "asdf")
-  end
-end